diff options
| author | (no author) <(no author)@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-01-31 20:38:54 +0000 |
|---|---|---|
| committer | (no author) <(no author)@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-01-31 20:38:54 +0000 |
| commit | 59ac20130178f4dc977d171044c85f3cf07caa84 (patch) | |
| tree | aa369ecffc2a87f503929cfae66b07b606cbdc64 | |
| parent | 964944fc854c1dd723f7b8150d0deac634aabdbb (diff) | |
This commit was manufactured by cvs2svn to create taghammer-3_3-merge-20030131
'hammer-3_3-merge-20030131'.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/tags/hammer-3_3-merge-20030131@62199 138bc75d-0d04-0410-961f-82ee72b054a4
628 files changed, 45010 insertions, 23915 deletions
diff --git a/ChangeLog b/ChangeLog index a67a388084c..84c2ad97b5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,49 @@ +2003-01-30 Roger Sayle <roger@eyesopen.com> + + * config.guess: Updated to 2003-01-30's version. + * config.sub: Updated to 2003-01-28's version. + +2003-01-30 Alexandre Oliva <aoliva@redhat.com> + + * config.if: If gcc_version is already set, just use it. Don't set + gcc_version_trigger if it's already set, otherwise set it to + gcc/version.c, but only if the file exists. If it is not set and + gcc/version.c does not exist, try to extract the version number from + $CC. + +2003-01-26 Christian Cornelssen <ccorn@cs.tu-berlin.de> + + * Makefile.tpl (BASE_FLAGS_TO_PASS): Also pass DESTDIR. + (install-info, dir.info): Prepend $(DESTDIR) to $(infodir). + * Makefile.in: Regenerate. + +2003-01-22 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + + * MAINTAINERS: Move myself from GNATS-only-accounts to + write-after-approval. + +2002-12-31 Tom Tromey <tromey@redhat.com> + + * Makefile.in: Rebuilt. + * Makefile.def (target_modules) [libffi]: Allow installation. + +2002-12-13 Jason Merrill <jason@redhat.com> + + * Makefile.tpl (check-gcc-c++): Renamed from check-c++. Don't run + library tests. + (check-c++): Just depend on it and check-target-libstdc++-v3. + * Makefile.in: Regenerate. + +2002-12-12 Alexandre Oliva <aoliva@redhat.com> + + * Makefile.tpl (configure-target-rda): Depend on $(ALL_GCC_C). + * Makefile.in: Rebuilt. + +2002-12-25 Svein E. Seldal <Svein.Seldal@solidas.com> + + * config.sub: Import from master repository + * config.guess: Ditto + 2002-12-13 Jason Merrill <jason@redhat.com> * Makefile.in (check-gcc-c++): Renamed from check-c++. Don't run diff --git a/MAINTAINERS b/MAINTAINERS index 8d7db8812c8..f614756633b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -231,6 +231,7 @@ Sebastian Pop s.pop@laposte.net Clinton Popetz cpopetz@cpopetz.com Ken Raeburn raeburn@redhat.com Rolf Rasmussen rolfwr@gcc.gnu.org +Volker Reichelt reichelt@igpm.rwth-aachen.de Tom Rix trix@redhat.com Craig Rodrigues rodrigc@gcc.gnu.org Gavin Romig-Koch gavin@redhat.com @@ -266,7 +267,6 @@ GNATS only accounts Wolfgang Bangerth bangerth bangerth@ticam.utexas.edu James Dennett jdennett jdennett@acm.org Christian Ehrhardt cae ehrhardt@mathematik.uni-ulm.de -Volker Reichelt reichelt reichelt@igpm.rwth-aachen.de Peter Bienstman(?) Benjamin Chelf(?) diff --git a/Makefile.def b/Makefile.def index ae4b2e6fa0b..72df449baef 100644 --- a/Makefile.def +++ b/Makefile.def @@ -72,7 +72,7 @@ target_modules = { module= libgloss; no_check=true; }; target_modules = { module= libiberty; }; target_modules = { module= gperf; }; target_modules = { module= examples; no_check=true; no_install=true; }; -target_modules = { module= libffi; no_install=true; }; +target_modules = { module= libffi; }; target_modules = { module= libjava; }; target_modules = { module= zlib; }; target_modules = { module= boehm-gc; }; diff --git a/Makefile.in b/Makefile.in index 0c5606e5715..b4fd48967e8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -367,6 +367,7 @@ BASE_FLAGS_TO_PASS = \ "CXXFLAGS=$(CXXFLAGS)" \ "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \ "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \ + "DESTDIR=$(DESTDIR)" \ "DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \ "INSTALL=$(INSTALL)" \ "INSTALL_DATA=$(INSTALL_DATA)" \ @@ -761,7 +762,7 @@ ALL_TARGET_MODULES = \ all-target-zlib \ all-target-boehm-gc \ all-target-qthreads \ - all-target-rda + all-target-rda # This is a list of the configure targets for all of the modules which # are compiled using the target tools. @@ -781,7 +782,7 @@ CONFIGURE_TARGET_MODULES = \ configure-target-zlib \ configure-target-boehm-gc \ configure-target-qthreads \ - configure-target-rda + configure-target-rda # This is a list of the check targets for all of the modules which are # compiled using $(TARGET_FLAGS_TO_PASS). @@ -798,7 +799,7 @@ CHECK_TARGET_MODULES = \ check-target-zlib \ check-target-boehm-gc \ check-target-qthreads \ - check-target-rda + check-target-rda # This is a list of the install targets for all of the modules which are # compiled using $(TARGET_FLAGS_TO_PASS). @@ -812,11 +813,12 @@ INSTALL_TARGET_MODULES = \ install-target-libgloss \ install-target-libiberty \ install-target-gperf \ + install-target-libffi \ install-target-libjava \ install-target-zlib \ install-target-boehm-gc \ install-target-qthreads \ - install-target-rda + install-target-rda # This is a list of the targets for which we can do a clean-{target}. CLEAN_MODULES = \ @@ -879,7 +881,7 @@ CLEAN_MODULES = \ clean-uudecode \ clean-wdiff \ clean-zip \ - clean-zlib + clean-zlib # All of the target modules that can be cleaned CLEAN_TARGET_MODULES = \ @@ -897,7 +899,7 @@ CLEAN_TARGET_MODULES = \ clean-target-zlib \ clean-target-boehm-gc \ clean-target-qthreads \ - clean-target-rda + clean-target-rda # All of the x11 modules that can be cleaned CLEAN_X11_MODULES = \ @@ -997,7 +999,7 @@ do-info: all-texinfo install-info: do-install-info dir.info s=`cd $(srcdir); ${PWD}`; export s; \ if [ -f dir.info ] ; then \ - $(INSTALL_DATA) dir.info $(infodir)/dir.info ; \ + $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \ else true ; fi local-clean: @@ -1784,7 +1786,7 @@ installdirs: mkinstalldirs dir.info: do-install-info if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \ - $(srcdir)/texinfo/gen-info-dir $(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \ + $(srcdir)/texinfo/gen-info-dir $(DESTDIR)$(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \ mv -f dir.info.new dir.info ; \ else true ; \ fi diff --git a/Makefile.tpl b/Makefile.tpl index 7428f412451..6d935ee9d3c 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -370,6 +370,7 @@ BASE_FLAGS_TO_PASS = \ "CXXFLAGS=$(CXXFLAGS)" \ "CXXFLAGS_FOR_TARGET=$(CXXFLAGS_FOR_TARGET)" \ "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \ + "DESTDIR=$(DESTDIR)" \ "DLLTOOL_FOR_TARGET=$(DLLTOOL_FOR_TARGET)" \ "INSTALL=$(INSTALL)" \ "INSTALL_DATA=$(INSTALL_DATA)" \ @@ -738,7 +739,7 @@ do-info: all-texinfo install-info: do-install-info dir.info s=`cd $(srcdir); ${PWD}`; export s; \ if [ -f dir.info ] ; then \ - $(INSTALL_DATA) dir.info $(infodir)/dir.info ; \ + $(INSTALL_DATA) dir.info $(DESTDIR)$(infodir)/dir.info ; \ else true ; fi local-clean: @@ -1327,17 +1328,19 @@ check-gcc: true; \ fi -.PHONY: check-c++ -check-c++: +.PHONY: check-gcc-c++ +check-gcc-c++: @if [ -f ./gcc/Makefile ] ; then \ r=`${PWD}`; export r; \ s=`cd $(srcdir); ${PWD}`; export s; \ $(SET_LIB_PATH) \ (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) check-c++); \ - $(MAKE) check-target-libstdc++-v3; \ else \ true; \ - fi + fi + +.PHONY: check-c++ +check-c++: check-target-libstdc++-v3 check-gcc-c++ .PHONY: install-gcc install-gcc: @@ -1466,6 +1469,7 @@ all-textutils: all-time: all-tix: all-tcl all-tk all-wdiff: +configure-target-rda: $(ALL_GCC_C) configure-target-winsup: $(ALL_GCC_C) all-target-winsup: all-target-libiberty all-target-libtermcap all-uudecode: all-libiberty @@ -1507,7 +1511,7 @@ installdirs: mkinstalldirs dir.info: do-install-info if [ -f $(srcdir)/texinfo/gen-info-dir ] ; then \ - $(srcdir)/texinfo/gen-info-dir $(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \ + $(srcdir)/texinfo/gen-info-dir $(DESTDIR)$(infodir) $(srcdir)/texinfo/dir.info-template > dir.info.new ; \ mv -f dir.info.new dir.info ; \ else true ; \ fi diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index 21d304df594..a002c4cdbb1 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,17 @@ +2003-01-27 Alexandre Oliva <aoliva@redhat.com> + + * configure.in (toolexecdir, toolexeclibdir): Set and AC_SUBST. + Remove USE_LIBDIR conditional. + * Makefile.am (toolexecdir, toolexeclibdir): Don't override. + * Makefile.in, configure: Rebuilt. + +2002-12-31 Tom Tromey <tromey@redhat.com> + + For PR libgcj/8933: + * include/Makefile.in: Rebuilt. + * include/Makefile.am (noinst_HEADERS): Renamed from + include_HEADERS. + 2002-11-19 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> * ltconfig (osf[345]): Append $major to soname_spec. diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am index 960cc606fbb..4c22a0f3dac 100644 --- a/boehm-gc/Makefile.am +++ b/boehm-gc/Makefile.am @@ -16,15 +16,6 @@ MULTISUBDIR = MULTIDO = true MULTICLEAN = true -## Install a library built with a cross compiler in tooldir, not -## libdir. -if USE_LIBDIR -toolexeclibdir = $(libdir)$(MULTISUBDIR) -else -toolexecdir = $(exec_prefix)/$(target_alias) -toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR) -endif - noinst_LTLIBRARIES = libgcjgc.la libgcjgc_convenience.la GC_SOURCES = allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \ diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in index ab8a7d1c915..edecc834988 100644 --- a/boehm-gc/Makefile.in +++ b/boehm-gc/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated automatically by automake 1.4a from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am # Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation @@ -46,10 +46,9 @@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) INSTALL_DATA = @INSTALL_DATA@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_FLAG = transform = @program_transform_name@ NORMAL_INSTALL = : @@ -94,6 +93,8 @@ addobjs = @addobjs@ gc_basedir = @gc_basedir@ mkinstalldirs = @mkinstalldirs@ target_all = @target_all@ +toolexecdir = @toolexecdir@ +toolexeclibdir = @toolexeclibdir@ AUTOMAKE_OPTIONS = cygnus @@ -106,16 +107,21 @@ MULTIDIRS = MULTISUBDIR = MULTIDO = true MULTICLEAN = true -@USE_LIBDIR_TRUE@toolexeclibdir = $(libdir)$(MULTISUBDIR) -@USE_LIBDIR_FALSE@toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR) -@USE_LIBDIR_FALSE@toolexecdir = $(exec_prefix)/$(target_alias) noinst_LTLIBRARIES = libgcjgc.la libgcjgc_convenience.la -GC_SOURCES = allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c irix_threads.c linux_threads.c malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c obj_map.c os_dep.c pcr_interface.c ptr_chck.c real_malloc.c reclaim.c solaris_pthreads.c solaris_threads.c specific.c stubborn.c typd_mlc.c backgraph.c win32_threads.c +GC_SOURCES = allchblk.c alloc.c blacklst.c checksums.c dbg_mlc.c \ +dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c irix_threads.c \ +linux_threads.c malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c \ +obj_map.c os_dep.c pcr_interface.c ptr_chck.c real_malloc.c reclaim.c \ +solaris_pthreads.c solaris_threads.c specific.c stubborn.c typd_mlc.c \ +backgraph.c win32_threads.c -EXTRA_GC_SOURCES = alpha_mach_dep.s mips_sgi_mach_dep.S mips_ultrix_mach_dep.s powerpc_macosx_mach_dep.s rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s +EXTRA_GC_SOURCES = alpha_mach_dep.s \ +mips_sgi_mach_dep.S mips_ultrix_mach_dep.s powerpc_macosx_mach_dep.s \ +rs6000_mach_dep.s sparc_mach_dep.S sparc_netbsd_mach_dep.s \ +sparc_sunos4_mach_dep.s ia64_save_regs_in_stack.s libgcjgc_la_SOURCES = $(GC_SOURCES) @@ -147,14 +153,52 @@ TESTS = gctest all_objs = @addobjs@ $(libgcjgc_la_OBJECTS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(MY_CFLAGS) $(GC_CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(MY_CFLAGS) $(GC_CFLAGS) LINK = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(MY_CFLAGS) $(LDFLAGS) -o $@ # Work around what appears to be a GNU make bug handling MAKEFLAGS # values defined in terms of make variables, as is the case for CC and # friends when we are called from the top level Makefile. -AM_MAKEFLAGS = "AR_FLAGS=$(AR_FLAGS)" "CC_FOR_BUILD=$(CC_FOR_BUILD)" "CFLAGS=$(CFLAGS)" "CXXFLAGS=$(CXXFLAGS)" "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" "INSTALL=$(INSTALL)" "INSTALL_DATA=$(INSTALL_DATA)" "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" "LDFLAGS=$(LDFLAGS)" "LIBCFLAGS=$(LIBCFLAGS)" "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" "MAKE=$(MAKE)" "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" "PICFLAG=$(PICFLAG)" "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" "SHELL=$(SHELL)" "EXPECT=$(EXPECT)" "RUNTEST=$(RUNTEST)" "RUNTESTFLAGS=$(RUNTESTFLAGS)" "exec_prefix=$(exec_prefix)" "infodir=$(infodir)" "libdir=$(libdir)" "prefix=$(prefix)" "tooldir=$(tooldir)" "AR=$(AR)" "AS=$(AS)" "CC=$(CC)" "CXX=$(CXX)" "LD=$(LD)" "LIBCFLAGS=$(LIBCFLAGS)" "NM=$(NM)" "PICFLAG=$(PICFLAG)" "RANLIB=$(RANLIB)" "DESTDIR=$(DESTDIR)" +AM_MAKEFLAGS = \ + "AR_FLAGS=$(AR_FLAGS)" \ + "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ + "CFLAGS=$(CFLAGS)" \ + "CXXFLAGS=$(CXXFLAGS)" \ + "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \ + "CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \ + "INSTALL=$(INSTALL)" \ + "INSTALL_DATA=$(INSTALL_DATA)" \ + "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ + "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \ + "LDFLAGS=$(LDFLAGS)" \ + "LIBCFLAGS=$(LIBCFLAGS)" \ + "LIBCFLAGS_FOR_TARGET=$(LIBCFLAGS_FOR_TARGET)" \ + "MAKE=$(MAKE)" \ + "MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \ + "PICFLAG=$(PICFLAG)" \ + "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \ + "SHELL=$(SHELL)" \ + "EXPECT=$(EXPECT)" \ + "RUNTEST=$(RUNTEST)" \ + "RUNTESTFLAGS=$(RUNTESTFLAGS)" \ + "exec_prefix=$(exec_prefix)" \ + "infodir=$(infodir)" \ + "libdir=$(libdir)" \ + "prefix=$(prefix)" \ + "tooldir=$(tooldir)" \ + "AR=$(AR)" \ + "AS=$(AS)" \ + "CC=$(CC)" \ + "CXX=$(CXX)" \ + "LD=$(LD)" \ + "LIBCFLAGS=$(LIBCFLAGS)" \ + "NM=$(NM)" \ + "PICFLAG=$(PICFLAG)" \ + "RANLIB=$(RANLIB)" \ + "DESTDIR=$(DESTDIR)" CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host @@ -485,7 +529,7 @@ uninstall: uninstall-recursive all-am: Makefile $(LTLIBRARIES) all-redirect: all-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_STRIP_FLAG=-s install + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive installdirs-am: diff --git a/boehm-gc/configure b/boehm-gc/configure index f6b2277188c..9c287da9615 100755 --- a/boehm-gc/configure +++ b/boehm-gc/configure @@ -61,7 +61,6 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= -sitefile= srcdir= target=NONE verbose= @@ -176,7 +175,6 @@ Configuration: --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages - --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -347,11 +345,6 @@ EOF -site=* | --site=* | --sit=*) site="$ac_optarg" ;; - -site-file | --site-file | --site-fil | --site-fi | --site-f) - ac_prev=sitefile ;; - -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) - sitefile="$ac_optarg" ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -517,16 +510,12 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$sitefile"; then - if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -else - CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -604,7 +593,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:608: checking for a BSD compatible install" >&5 +echo "configure:597: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -657,7 +646,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:661: checking whether build environment is sane" >&5 +echo "configure:650: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -714,7 +703,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:718: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:707: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -747,12 +736,12 @@ else fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:751: checking for Cygwin environment" >&5 +echo "configure:740: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 756 "configure" +#line 745 "configure" #include "confdefs.h" int main() { @@ -763,7 +752,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:767: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:756: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -780,19 +769,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:784: checking for mingw32 environment" >&5 +echo "configure:773: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 789 "configure" +#line 778 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:796: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -903,7 +892,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:907: checking host system type" >&5 +echo "configure:896: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -924,7 +913,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:928: checking target system type" >&5 +echo "configure:917: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -942,7 +931,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:946: checking build system type" >&5 +echo "configure:935: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -982,7 +971,7 @@ fi missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:986: checking for working aclocal" >&5 +echo "configure:975: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -995,7 +984,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:999: checking for working autoconf" >&5 +echo "configure:988: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1008,7 +997,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1012: checking for working automake" >&5 +echo "configure:1001: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1021,7 +1010,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1025: checking for working autoheader" >&5 +echo "configure:1014: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1034,7 +1023,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1038: checking for working makeinfo" >&5 +echo "configure:1027: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1060,7 +1049,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1064: checking for $ac_word" >&5 +echo "configure:1053: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1090,7 +1079,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1094: checking for $ac_word" >&5 +echo "configure:1083: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1139,7 +1128,7 @@ fi fi echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1143: checking whether we are using GNU C" >&5 +echo "configure:1132: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1148,7 +1137,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1152: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1163,7 +1152,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1167: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1156: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1200,7 +1189,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1204: checking for $ac_word" >&5 +echo "configure:1193: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1233,7 +1222,7 @@ test -n "$CXX" || CXX="gcc" test -z "$CXX" && { echo "configure: error: no acceptable c++ found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1237: checking whether we are using GNU C++" >&5 +echo "configure:1226: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1242,7 +1231,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1235: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1257,7 +1246,7 @@ if test $ac_cv_prog_gxx = yes; then ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1261: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1250: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1290,7 +1279,7 @@ fi # NEWLIB_CONFIGURE, which doesn't work because that means that it will # be run before AC_CANONICAL_HOST. echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1294: checking build system type" >&5 +echo "configure:1283: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1311,7 +1300,7 @@ echo "$ac_t""$build" 1>&6 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1315: checking for $ac_word" >&5 +echo "configure:1304: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1343,7 +1332,7 @@ fi # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1347: checking for $ac_word" >&5 +echo "configure:1336: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1375,7 +1364,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1379: checking for $ac_word" >&5 +echo "configure:1368: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1407,7 +1396,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1411: checking for $ac_word" >&5 +echo "configure:1400: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1452,7 +1441,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1456: checking for a BSD compatible install" >&5 +echo "configure:1445: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1506,7 +1495,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1510: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1499: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1544,7 +1533,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1548: checking for executable suffix" >&5 +echo "configure:1537: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1554,10 +1543,10 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.c | *.o | *.obj | *.ilk | *.pdb) ;; + *.c | *.o | *.obj) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -1676,7 +1665,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1680: checking for ld used by GCC" >&5 +echo "configure:1669: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1706,10 +1695,10 @@ echo "configure:1680: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1710: checking for GNU ld" >&5 +echo "configure:1699: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1713: checking for non-GNU ld" >&5 +echo "configure:1702: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1744,7 +1733,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1748: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1737: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1761,7 +1750,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1765: checking for $LD option to reload object files" >&5 +echo "configure:1754: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1773,7 +1762,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1777: checking for BSD-compatible nm" >&5 +echo "configure:1766: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1811,7 +1800,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1815: checking whether ln -s works" >&5 +echo "configure:1804: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1832,7 +1821,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:1836: checking how to recognise dependant libraries" >&5 +echo "configure:1825: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2005,13 +1994,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2009: checking for object suffix" >&5 +echo "configure:1998: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2004: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2035,7 +2024,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2039: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2028: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2097,7 +2086,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2101: checking for file" >&5 +echo "configure:2090: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2168,7 +2157,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2172: checking for $ac_word" >&5 +echo "configure:2161: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2200,7 +2189,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2204: checking for $ac_word" >&5 +echo "configure:2193: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2235,7 +2224,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2239: checking for $ac_word" >&5 +echo "configure:2228: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2267,7 +2256,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2271: checking for $ac_word" >&5 +echo "configure:2260: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2334,8 +2323,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2338 "configure"' > conftest.$ac_ext - if { (eval echo configure:2339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2327 "configure"' > conftest.$ac_ext + if { (eval echo configure:2328: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2354,7 +2343,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2358: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2367,12 +2356,54 @@ ia64-*-hpux*) rm -rf conftest* ;; +x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo configure:2363: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + case "`/usr/bin/file conftest.o`" in + *32-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2376: checking whether the C compiler needs -belf" >&5 +echo "configure:2407: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2385,14 +2416,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2389 "configure" +#line 2420 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2422,7 +2453,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 esac echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2426: checking how to run the C++ preprocessor" >&5 +echo "configure:2457: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2435,12 +2466,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext <<EOF -#line 2439 "configure" +#line 2470 "configure" #include "confdefs.h" #include <stdlib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2475: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2587,7 +2618,7 @@ fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:2591: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:2622: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -2620,7 +2651,7 @@ if false; then echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:2624: checking for executable suffix" >&5 +echo "configure:2655: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2630,10 +2661,10 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:2634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:2665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.c | *.o | *.obj | *.ilk | *.pdb) ;; + *.c | *.o | *.obj) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -2653,7 +2684,7 @@ ac_exeext=$EXEEXT fi echo $ac_n "checking for thread model used by GCC""... $ac_c" 1>&6 -echo "configure:2657: checking for thread model used by GCC" >&5 +echo "configure:2688: checking for thread model used by GCC" >&5 THREADS=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'` if test -z "$THREADS"; then THREADS=no @@ -2784,7 +2815,7 @@ esac echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:2788: checking for dlopen in -ldl" >&5 +echo "configure:2819: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2792,7 +2823,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 2796 "configure" +#line 2827 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2803,7 +2834,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:2807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -3038,15 +3069,17 @@ EOF fi - - -if test -z "$with_cross_host"; then - USE_LIBDIR_TRUE= - USE_LIBDIR_FALSE='#' +if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + toolexecdir='$(exec_prefix)/$(target_alias)' + toolexeclibdir='$(toolexecdir)/lib' else - USE_LIBDIR_TRUE='#' - USE_LIBDIR_FALSE= + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' fi +toolexeclibdir=$toolexeclibdir/`$CC -print-multi-os-directory` + + if test "${multilib}" = "yes"; then multilib_arg="--enable-multilib" @@ -3120,15 +3153,34 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then we branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +cat >confdef2opt.sed <<\_ACEOF +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +t quote +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +t quote +d +: quote +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,\[,\\&,g +s,\],\\&,g +s,\$,$$,g +p +_ACEOF +# We use echo to avoid assuming a particular line-breaking character. +# The extra dot is to prevent the shell from consuming trailing +# line-breaks from the sub-command output. A line-break within +# single-quotes doesn't work because, if this script is created in a +# platform that uses two characters for line-breaks (e.g., DOS), tr +# would break. +ac_LF_and_DOT=`echo; echo .` +DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +rm -f confdef2opt.sed # Without the "./", some shells look in PATH for config.status. @@ -3249,8 +3301,8 @@ s%@INCLUDES@%$INCLUDES%g s%@CXXINCLUDES@%$CXXINCLUDES%g s%@addobjs@%$addobjs%g s%@MY_CFLAGS@%$MY_CFLAGS%g -s%@USE_LIBDIR_TRUE@%$USE_LIBDIR_TRUE%g -s%@USE_LIBDIR_FALSE@%$USE_LIBDIR_FALSE%g +s%@toolexecdir@%$toolexecdir%g +s%@toolexeclibdir@%$toolexeclibdir%g CEOF EOF diff --git a/boehm-gc/configure.in b/boehm-gc/configure.in index d34b723de07..2b38fa06cea 100644 --- a/boehm-gc/configure.in +++ b/boehm-gc/configure.in @@ -1,4 +1,4 @@ -# Copyright (c) 1999, 2000, 2001, 2002 by Red Hat, Inc. All rights reserved. +# Copyright (c) 1999, 2000, 2001, 2002, 2003 by Red Hat, Inc. All rights reserved. # # THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED # OR IMPLIED. ANY USE IS AT YOUR OWN RISK. @@ -267,7 +267,17 @@ AC_ARG_ENABLE(full-debug, esac ] fi) -AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host") +if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + toolexecdir='$(exec_prefix)/$(target_alias)' + toolexeclibdir='$(toolexecdir)/lib' +else + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' +fi +toolexeclibdir=$toolexeclibdir/`$CC -print-multi-os-directory` +AC_SUBST(toolexecdir) +AC_SUBST(toolexeclibdir) if test "${multilib}" = "yes"; then multilib_arg="--enable-multilib" diff --git a/boehm-gc/include/Makefile.am b/boehm-gc/include/Makefile.am index 7a7654567ca..381ae76b8fe 100644 --- a/boehm-gc/include/Makefile.am +++ b/boehm-gc/include/Makefile.am @@ -1,6 +1,6 @@ AUTOMAKE_OPTIONS = foreign -include_HEADERS = gc.h gc_backptr.h gc_local_alloc.h \ +noinst_HEADERS = gc.h gc_backptr.h gc_local_alloc.h \ gc_pthread_redirects.h gc_cpp.h diff --git a/boehm-gc/include/Makefile.in b/boehm-gc/include/Makefile.in index 611f5651839..65bd34e2e33 100644 --- a/boehm-gc/include/Makefile.in +++ b/boehm-gc/include/Makefile.in @@ -96,11 +96,11 @@ target_all = @target_all@ AUTOMAKE_OPTIONS = foreign -include_HEADERS = gc.h gc_backptr.h gc_local_alloc.h \ +noinst_HEADERS = gc.h gc_backptr.h gc_local_alloc.h \ gc_pthread_redirects.h gc_cpp.h CONFIG_CLEAN_FILES = -HEADERS = $(include_HEADERS) +HEADERS = $(noinst_HEADERS) DIST_COMMON = Makefile.am Makefile.in @@ -119,21 +119,6 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir) - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \ - done - -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - list='$(include_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(includedir)/$$p; \ - done - tags: TAGS ID: $(HEADERS) $(SOURCES) $(LISP) @@ -191,20 +176,19 @@ install-info: install-info-am install-exec-am: install-exec: install-exec-am -install-data-am: install-includeHEADERS +install-data-am: install-data: install-data-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: uninstall-includeHEADERS +uninstall-am: uninstall: uninstall-am all-am: Makefile $(HEADERS) all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: - $(mkinstalldirs) $(DESTDIR)$(includedir) mostlyclean-generic: @@ -236,14 +220,13 @@ maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ maintainer-clean: maintainer-clean-am -.PHONY: uninstall-includeHEADERS install-includeHEADERS tags \ -mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \ -distdir info-am info dvi-am dvi check check-am installcheck-am \ -installcheck install-info-am install-info install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +.PHONY: tags mostlyclean-tags distclean-tags clean-tags \ +maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \ +installcheck-am installcheck install-info-am install-info \ +install-exec-am install-exec install-data-am install-data install-am \ +install uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/config.guess b/config.guess index 9b1384be4b1..4fc21ecc3aa 100755 --- a/config.guess +++ b/config.guess @@ -1,9 +1,9 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2002-11-30' +timestamp='2003-01-30' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -98,14 +98,17 @@ trap 'exit 1' 1 2 15 # Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still # use `HOST_CC' if defined, but it is deprecated. -# This shell variable is my proudest work .. or something. --bje +# Portable tmp directory creation inspired by the Autoconf team. -set_cc_for_build='tmpdir=${TMPDIR-/tmp}/config-guess-$$ ; -(old=`umask` && umask 077 && mkdir $tmpdir && umask $old && unset old) - || (echo "$me: cannot create $tmpdir" >&2 && exit 1) ; -dummy=$tmpdir/dummy ; -files="$dummy.c $dummy.o $dummy.rel $dummy" ; -trap '"'"'rm -f $files; rmdir $tmpdir; exit 1'"'"' 1 2 15 ; +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in ,,) echo "int x;" > $dummy.c ; for c in cc gcc c89 c99 ; do @@ -113,15 +116,13 @@ case $CC_FOR_BUILD,$HOST_CC,$CC in CC_FOR_BUILD="$c"; break ; fi ; done ; - rm -f $files ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; fi ;; ,,*) CC_FOR_BUILD=$CC ;; ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ; -unset files' +esac ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) @@ -234,70 +235,54 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in *:OpenBSD:*:*) echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} exit 0 ;; + *:MicroBSD:*:*) + echo ${UNAME_MACHINE}-unknown-microbsd${UNAME_RELEASE} + exit 0 ;; alpha:OSF1:*:*) if test $UNAME_RELEASE = "V4.0"; then UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` fi + # According to Compaq, /usr/sbin/psrinfo has been available on + # OSF/1 and Tru64 systems produced since 1995. I hope that + # covers most systems running today. This code pipes the CPU + # types through head -n 1, so we only detect the type of CPU 0. + ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` + case "$ALPHA_CPU_TYPE" in + "EV4 (21064)") + UNAME_MACHINE="alpha" ;; + "EV4.5 (21064)") + UNAME_MACHINE="alpha" ;; + "LCA4 (21066/21068)") + UNAME_MACHINE="alpha" ;; + "EV5 (21164)") + UNAME_MACHINE="alphaev5" ;; + "EV5.6 (21164A)") + UNAME_MACHINE="alphaev56" ;; + "EV5.6 (21164PC)") + UNAME_MACHINE="alphapca56" ;; + "EV5.7 (21164PC)") + UNAME_MACHINE="alphapca57" ;; + "EV6 (21264)") + UNAME_MACHINE="alphaev6" ;; + "EV6.7 (21264A)") + UNAME_MACHINE="alphaev67" ;; + "EV6.8CB (21264C)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8AL (21264B)") + UNAME_MACHINE="alphaev68" ;; + "EV6.8CX (21264D)") + UNAME_MACHINE="alphaev68" ;; + "EV6.9A (21264/EV69A)") + UNAME_MACHINE="alphaev69" ;; + "EV7 (21364)") + UNAME_MACHINE="alphaev7" ;; + "EV7.9 (21364A)") + UNAME_MACHINE="alphaev79" ;; + esac # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. - eval $set_cc_for_build - cat <<EOF >$dummy.s - .data -\$Lformat: - .byte 37,100,45,37,120,10,0 # "%d-%x\n" - - .text - .globl main - .align 4 - .ent main -main: - .frame \$30,16,\$26,0 - ldgp \$29,0(\$27) - .prologue 1 - .long 0x47e03d80 # implver \$0 - lda \$2,-1 - .long 0x47e20c21 # amask \$2,\$1 - lda \$16,\$Lformat - mov \$0,\$17 - not \$1,\$18 - jsr \$26,printf - ldgp \$29,0(\$26) - mov 0,\$16 - jsr \$26,exit - .end main -EOF - $CC_FOR_BUILD -o $dummy $dummy.s 2>/dev/null - if test "$?" = 0 ; then - case `$dummy` in - 0-0) - UNAME_MACHINE="alpha" - ;; - 1-0) - UNAME_MACHINE="alphaev5" - ;; - 1-1) - UNAME_MACHINE="alphaev56" - ;; - 1-101) - UNAME_MACHINE="alphapca56" - ;; - 2-303) - UNAME_MACHINE="alphaev6" - ;; - 2-307) - UNAME_MACHINE="alphaev67" - ;; - 2-1307) - UNAME_MACHINE="alphaev68" - ;; - 3-1307) - UNAME_MACHINE="alphaev7" - ;; - esac - fi - rm -f $dummy.s $dummy && rmdir $tmpdir echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` exit 0 ;; Alpha\ *:Windows_NT*:*) @@ -450,8 +435,7 @@ EOF EOF $CC_FOR_BUILD -o $dummy $dummy.c \ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + && exit 0 echo mips-mips-riscos${UNAME_RELEASE} exit 0 ;; Motorola:PowerMAX_OS:*:*) @@ -535,8 +519,7 @@ EOF exit(0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo rs6000-ibm-aix3.2.5 elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 @@ -635,10 +618,20 @@ EOF } EOF (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - if test -z "$HP_ARCH"; then HP_ARCH=hppa; fi - rm -f $dummy.c $dummy && rmdir $tmpdir + test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac + if [ ${HP_ARCH} = "hppa2.0w" ] + then + # avoid double evaluation of $set_cc_for_build + test -n "$CC_FOR_BUILD" || eval $set_cc_for_build + if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null + then + HP_ARCH="hppa2.0w" + else + HP_ARCH="hppa64" + fi + fi echo ${HP_ARCH}-hp-hpux${HPUX_REV} exit 0 ;; ia64:HP-UX:*:*) @@ -672,8 +665,7 @@ EOF exit (0); } EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 - rm -f $dummy.c $dummy && rmdir $tmpdir + $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 echo unknown-hitachi-hiuxwe2 exit 0 ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) @@ -731,15 +723,15 @@ EOF CRAY*TS:*:*:*) echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; - CRAY*T3D:*:*:*) - echo alpha-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' exit 0 ;; + *:UNICOS/mp:*:*) + echo nv1-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' + exit 0 ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` @@ -767,7 +759,6 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`${LIBC:+-$LIBC} exit 0 ;; i*:CYGWIN*:*) @@ -832,7 +823,6 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - rm -f $dummy.c && rmdir $tmpdir test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; mips64:Linux:*:*) @@ -852,7 +842,6 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - rm -f $dummy.c && rmdir $tmpdir test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 ;; ppc:Linux:*:*) @@ -948,7 +937,6 @@ EOF #endif EOF eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` - rm -f $dummy.c && rmdir $tmpdir test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0 test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0 ;; @@ -1146,7 +1134,11 @@ EOF echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} exit 0 ;; *:Darwin:*:*) - echo `uname -p`-apple-darwin${UNAME_RELEASE} + case `uname -p` in + *86) UNAME_PROCESSOR=i686 ;; + powerpc) UNAME_PROCESSOR=powerpc ;; + esac + echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit 0 ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` @@ -1320,8 +1312,7 @@ main () } EOF -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && rm -f $dummy.c $dummy && rmdir $tmpdir && exit 0 -rm -f $dummy.c $dummy && rmdir $tmpdir +$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 # Apollos put the system type in the environment. diff --git a/config.if b/config.if index aa35a3f8140..c38b59c841e 100644 --- a/config.if +++ b/config.if @@ -22,9 +22,18 @@ fi # Set libstdcxx_incdir. # This is the same as gcc/configure.in and libstdc++-v3/acinclude.m4. -gcc_version_trigger=${if_topsrcdir}/gcc/version.c -gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*"\([^"]*\)".*/\1/'` -gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` +if test -z "$gcc_version"; then + if test -z "${gcc_version_trigger}" \ + && test -f ${if_topsrcdir}/gcc/version.c; then + gcc_version_trigger=${if_topsrcdir}/gcc/version.c + fi + if test -f "${gcc_version_trigger}"; then + gcc_version_full=`grep version_string "${gcc_version_trigger}" | sed -e 's/.*"\([^"]*\)".*/\1/'` + else + gcc_version_full=`$CC -v 2>&1 | sed -n 's/^gcc version //p'` + fi + gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` +fi libstdcxx_incdir=c++/${gcc_version} # The trickiest part is libc_interface. diff --git a/config.sub b/config.sub index 60338429828..2ab7f25694c 100755 --- a/config.sub +++ b/config.sub @@ -1,9 +1,9 @@ #! /bin/sh # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002 Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -timestamp='2002-08-20' +timestamp='2003-01-28' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -118,7 +118,7 @@ esac # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in - nto-qnx* | linux-gnu* | freebsd*-gnu* | storm-chaos* | os2-emx* | windows32-* | rtmk-nova*) + nto-qnx* | linux-gnu* | freebsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; @@ -229,7 +229,7 @@ case $basic_machine in | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | c4x | clipper \ + | clipper \ | d10v | d30v | dlx | dsp16xx \ | fr30 | frv \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ @@ -239,23 +239,25 @@ case $basic_machine in | mips | mipsbe | mipseb | mipsel | mipsle \ | mips16 \ | mips64 | mips64el \ - | mips64vr | mips64vrel \ + | mips64vr | mips64vrel \ | mips64orion | mips64orionel \ | mips64vr4100 | mips64vr4100el \ | mips64vr4300 | mips64vr4300el \ | mips64vr5000 | mips64vr5000el \ | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ | mipsisa64 | mipsisa64el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipstx39 | mipstx39el \ | mn10200 | mn10300 \ + | msp430 \ | ns16k | ns32k \ | openrisc | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ | pyramid \ - | sh | sh[1234] | sh3e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ + | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv9 | sparcv9b \ | strongarm \ @@ -294,7 +296,7 @@ case $basic_machine in | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* \ | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c54x-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* \ | clipper-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | elxsi-* \ @@ -309,27 +311,29 @@ case $basic_machine in | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ | mips16-* \ | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ + | mips64vr-* | mips64vrel-* \ | mips64orion-* | mips64orionel-* \ | mips64vr4100-* | mips64vr4100el-* \ | mips64vr4300-* | mips64vr4300el-* \ | mips64vr5000-* | mips64vr5000el-* \ | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39 | mipstx39el \ - | none-* | np1-* | ns16k-* | ns32k-* \ + | mipstx39-* | mipstx39el-* \ + | msp430-* \ + | none-* | np1-* | nv1-* | ns16k-* | ns32k-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ | pyramid-* \ | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh3e-* | sh[34]eb-* | shbe-* \ + | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* | tic30-* | tic54x-* | tic80-* | tron-* \ + | tahoe-* | thumb-* | tic30-* | tic4x-* | tic54x-* | tic80-* | tron-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ @@ -716,6 +720,10 @@ case $basic_machine in np1) basic_machine=np1-gould ;; + nv1) + basic_machine=nv1-cray + os=-unicosmp + ;; nsr-tandem) basic_machine=nsr-tandem ;; @@ -749,7 +757,7 @@ case $basic_machine in pbb) basic_machine=m68k-tti ;; - pc532 | pc532-*) + pc532 | pc532-*) basic_machine=ns32k-pc532 ;; pentium | p5 | k5 | k6 | nexgen | viac3) @@ -776,22 +784,22 @@ case $basic_machine in power) basic_machine=power-ibm ;; ppc) basic_machine=powerpc-unknown - ;; + ;; ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle | ppc-le | powerpc-little) basic_machine=powerpcle-unknown - ;; + ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown - ;; + ;; ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little | ppc64-le | powerpc64-little) basic_machine=powerpc64le-unknown - ;; + ;; ppc64le-* | powerpc64little-*) basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` ;; @@ -893,7 +901,7 @@ case $basic_machine in sun386 | sun386i | roadrunner) basic_machine=i386-sun ;; - sv1) + sv1) basic_machine=sv1-cray os=-unicos ;; @@ -901,10 +909,6 @@ case $basic_machine in basic_machine=i386-sequent os=-dynix ;; - t3d) - basic_machine=alpha-cray - os=-unicos - ;; t3e) basic_machine=alphaev5-cray os=-unicos @@ -913,6 +917,10 @@ case $basic_machine in basic_machine=t90-cray os=-unicos ;; + tic4x | c4x*) + basic_machine=tic4x-unknown + os=-coff + ;; tic54x | c54x*) basic_machine=tic54x-unknown os=-coff @@ -951,8 +959,8 @@ case $basic_machine in os=-vms ;; vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; + basic_machine=f301-fujitsu + ;; vxworks960) basic_machine=i960-wrs os=-vxworks @@ -973,11 +981,7 @@ case $basic_machine in basic_machine=hppa1.1-winbond os=-proelf ;; - windows32) - basic_machine=i386-pc - os=-windows32-msvcrt - ;; - xps | xps100) + xps | xps100) basic_machine=xps100-honeywell ;; ymp) @@ -1023,7 +1027,7 @@ case $basic_machine in we32k) basic_machine=we32k-att ;; - sh3 | sh4 | sh3eb | sh4eb | sh[1234]le | sh3ele) + sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; sh64) @@ -1032,7 +1036,7 @@ case $basic_machine in sparc | sparcv9 | sparcv9b) basic_machine=sparc-sun ;; - cydra) + cydra) basic_machine=cydra-cydrome ;; orion) @@ -1047,10 +1051,6 @@ case $basic_machine in pmac | pmac-mpw) basic_machine=powerpc-apple ;; - c4x*) - basic_machine=c4x-none - os=-coff - ;; *-unknown) # Make sure to match an already-canonicalized machine name. ;; @@ -1113,11 +1113,12 @@ case $os in | -chorusos* | -chorusrdb* \ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -linux-gnu* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -rhapsody* | -darwin* | -opened* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* | -powermax*) + | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ + | -powermax* | -dnix* | -microbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1129,8 +1130,10 @@ case $os in ;; esac ;; + -nto-qnx*) + ;; -nto*) - os=-nto-qnx + os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ @@ -1182,7 +1185,7 @@ case $os in os=-rtmk-nova ;; -ns2 ) - os=-nextstep2 + os=-nextstep2 ;; -nsk*) os=-nsk @@ -1221,8 +1224,11 @@ case $os in -xenix) os=-xenix ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -aros*) + os=-aros ;; -none) ;; @@ -1259,7 +1265,7 @@ case $basic_machine in pdp10-*) os=-tops20 ;; - pdp11-*) + pdp11-*) os=-none ;; *-dec | vax-*) @@ -1352,19 +1358,19 @@ case $basic_machine in *-next) os=-nextstep3 ;; - *-gould) + *-gould) os=-sysv ;; - *-highlevel) + *-highlevel) os=-bsd ;; *-encore) os=-bsd ;; - *-sgi) + *-sgi) os=-irix ;; - *-siemens) + *-siemens) os=-sysv4 ;; *-masscomp) diff --git a/contrib/ChangeLog b/contrib/ChangeLog index a8adeb3439a..cfa08f05619 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,18 @@ +2003-01-03 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * gcc_update (files_and_dependencies): Add gcc/cp/cfns.h depends + on gcc/cp/cfns.gperf and gcc/java/keyword.h depends on + gcc/java/keyword.gperf + +2002-12-29 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> + + * gcc_update (files_and_dependencies): Add gcc/intl/plural.c as + depending on gcc/intl/plural.y. + +2002-12-28 Joseph S. Myers <jsm@polyomino.org.uk> + + * texi2pod.pl: Skip contents of @copying. + 2002-10-21 Richard Henderson <rth@redhat.com> * paranoia.cc (real_c_float::image): Accomodate size of diff --git a/contrib/gcc_update b/contrib/gcc_update index d00fd43c6b6..82302645943 100755 --- a/contrib/gcc_update +++ b/contrib/gcc_update @@ -29,7 +29,7 @@ # contrib/gcc_update --list # # -# (C) 1998, 1999, 2000, 2001 Free Software Foundation +# (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation # Originally by Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at>, August 1998. # # This script is Free Software, and it can be copied, distributed and @@ -69,8 +69,11 @@ gcc/configure: gcc/configure.in gcc/cstamp-h.in: gcc/configure.in gcc/acconfig.h gcc/config.in: gcc/cstamp-h.in gcc/fixinc/fixincl.x: gcc/fixinc/fixincl.tpl gcc/fixinc/inclhack.def +gcc/intl/plural.c: gcc/intl/plural.y # And then, language-specific files gcc/f/intdoc.texi: gcc/f/intdoc.in gcc/f/intdoc.c gcc/f/intrin.h gcc/f/intrin.def +gcc/cp/cfns.h: gcc/cp/cfns.gperf +gcc/java/keyword.h: gcc/java/keyword.gperf gcc/ada/treeprs.ads: gcc/ada/treeprs.adt gcc/ada/sinfo.ads gcc/ada/xtreeprs.adb gcc/ada/einfo.h: gcc/ada/einfo.ads gcc/ada/einfo.adb gcc/ada/xeinfo.adb gcc/ada/sinfo.h: gcc/ada/sinfo.ads gcc/ada/xsinfo.adb diff --git a/contrib/texi2pod.pl b/contrib/texi2pod.pl index e5560f303de..d3839458896 100755 --- a/contrib/texi2pod.pl +++ b/contrib/texi2pod.pl @@ -138,7 +138,7 @@ while(<$inf>) { # Ignore @end foo, where foo is not an operation which may # cause us to skip, if we are presently skipping. my $ended = $1; - next if $skipping && $ended !~ /^(?:ifset|ifclear|ignore|menu|iftex)$/; + next if $skipping && $ended !~ /^(?:ifset|ifclear|ignore|menu|iftex|copying)$/; die "\@end $ended without \@$ended at line $.\n" unless defined $endw; die "\@$endw ended by \@end $ended at line $.\n" unless $ended eq $endw; @@ -178,7 +178,7 @@ while(<$inf>) { next; }; - /^\@(ignore|menu|iftex)\b/ and do { + /^\@(ignore|menu|iftex|copying)\b/ and do { push @endwstack, $endw; push @skstack, $skipping; $endw = $1; diff --git a/fastjar/ChangeLog b/fastjar/ChangeLog index 34a5bdcccbf..02b0d913366 100644 --- a/fastjar/ChangeLog +++ b/fastjar/ChangeLog @@ -1,3 +1,24 @@ +2003-01-28 Ranjit Mathew <rmathew@hotmail.com> + + * jargrep.c: Include xregex.h from libiberty instead of + system regex.h for better portability. + +2003-01-21 Ranjit Mathew <rmathew@hotmail.com> + + * jartool.c (list_jar): Terminate the 'ascii_date' buffer + with a '\0' to guard against the case where the formatted + time string is more than the size allowed by the buffer. + +2002-12-30 DJ Delorie <dj@redhat.com> + + * Makefile.am (jar.1, grepjar.1): Protect against + texi2pod/pod2man failing. + * Makefile.in: Regenerated. + +2002-12-23 Joseph S. Myers <jsm@polyomino.org.uk> + + * fastjar.texi: Include Cover Texts in man page. + 2002-12-04 Jakub Jelinek <jakub@redhat.com> * fastjar.texi (jar @direntry, grepjar @direntry): Add (fastjar). diff --git a/fastjar/Makefile.am b/fastjar/Makefile.am index 39a57c40d22..74f491e850c 100644 --- a/fastjar/Makefile.am +++ b/fastjar/Makefile.am @@ -85,14 +85,14 @@ POD2MAN = pod2man --center="GNU" --release="gcc-@gcc_version@" $(srcdir)/jar.1: $(srcdir)/fastjar.texi -$(TEXI2POD) -D jar < $(srcdir)/fastjar.texi > fastjar.pod - ($(POD2MAN) --section=1 fastjar.pod > jar.1.T$$$$ && \ + -($(POD2MAN) --section=1 fastjar.pod > jar.1.T$$$$ && \ mv -f jar.1.T$$$$ $(srcdir)/jar.1) || \ (rm -f jar.1.T$$$$ && exit 1) - rm -f fastjar.pod + -rm -f fastjar.pod $(srcdir)/grepjar.1: $(srcdir)/fastjar.texi -$(TEXI2POD) -D grepjar < $(srcdir)/fastjar.texi > grepjar.pod - ($(POD2MAN) --section=1 grepjar.pod > grepjar.1.T$$$$ && \ + -($(POD2MAN) --section=1 grepjar.pod > grepjar.1.T$$$$ && \ mv -f grepjar.1.T$$$$ $(srcdir)/grepjar.1) || \ (rm -f grepjar.1.T$$$$ && exit 1) - rm -f grepjar.pod + -rm -f grepjar.pod diff --git a/fastjar/Makefile.in b/fastjar/Makefile.in index 4b6675000fe..fe294dcd42f 100644 --- a/fastjar/Makefile.in +++ b/fastjar/Makefile.in @@ -614,17 +614,17 @@ fastjar.info: fastjar.texi $(fastjar_TEXINFOS) $(srcdir)/jar.1: $(srcdir)/fastjar.texi -$(TEXI2POD) -D jar < $(srcdir)/fastjar.texi > fastjar.pod - ($(POD2MAN) --section=1 fastjar.pod > jar.1.T$$$$ && \ + -($(POD2MAN) --section=1 fastjar.pod > jar.1.T$$$$ && \ mv -f jar.1.T$$$$ $(srcdir)/jar.1) || \ (rm -f jar.1.T$$$$ && exit 1) - rm -f fastjar.pod + -rm -f fastjar.pod $(srcdir)/grepjar.1: $(srcdir)/fastjar.texi -$(TEXI2POD) -D grepjar < $(srcdir)/fastjar.texi > grepjar.pod - ($(POD2MAN) --section=1 grepjar.pod > grepjar.1.T$$$$ && \ + -($(POD2MAN) --section=1 grepjar.pod > grepjar.1.T$$$$ && \ mv -f grepjar.1.T$$$$ $(srcdir)/grepjar.1) || \ (rm -f grepjar.1.T$$$$ && exit 1) - rm -f grepjar.pod + -rm -f grepjar.pod # 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. diff --git a/fastjar/fastjar.texi b/fastjar/fastjar.texi index f51cb99e730..e072e3949c7 100644 --- a/fastjar/fastjar.texi +++ b/fastjar/fastjar.texi @@ -49,6 +49,8 @@ man page gfdl(7). @c man end @end ignore +@c man begin COPYRIGHT + (a) The FSF's Front-Cover Text is: A GNU Manual @@ -58,6 +60,7 @@ man page gfdl(7). You have freedom to copy and modify this GNU Manual, like GNU software. Copies published by the Free Software Foundation raise funds for GNU development. +@c man end @end ifinfo @titlepage diff --git a/fastjar/jargrep.c b/fastjar/jargrep.c index 1a9ee91be5d..9e0e4914ed9 100644 --- a/fastjar/jargrep.c +++ b/fastjar/jargrep.c @@ -1,6 +1,6 @@ /* jargrep.c - main functions for jargrep utility - Copyright (C) 2002 Free Software Foundation + Copyright (C) 2002, 2003 Free Software Foundation Copyright (C) 1999, 2000 Bryan Burns Copyright (C) 2000 Cory Hollingsworth @@ -105,7 +105,6 @@ will test some other platforms later. #include "config.h" #include <stdio.h> #include <unistd.h> -#include <regex.h> #include <errno.h> #include <string.h> #include <sys/types.h> @@ -115,6 +114,9 @@ will test some other platforms later. #ifdef HAVE_STDLIB_H #include <stdlib.h> #endif + +#include "xregex.h" + #include "jargrep.h" #include "jartool.h" #include "pushback.h" diff --git a/fastjar/jartool.c b/fastjar/jartool.c index 7cc06aaad5b..359b785c520 100644 --- a/fastjar/jartool.c +++ b/fastjar/jartool.c @@ -1571,7 +1571,7 @@ int list_jar(int fd, char **files, int file_num){ int i, j; time_t tdate; struct tm *s_tm; - char ascii_date[30]; + char ascii_date[31]; zipentry ze; #ifdef DEBUG @@ -1662,6 +1662,7 @@ int list_jar(int fd, char **files, int file_num){ tdate = dos2unixtime(mdate); s_tm = localtime(&tdate); strftime(ascii_date, 30, "%a %b %d %H:%M:%S %Z %Y", s_tm); + ascii_date[30] = '\0'; } if(filename_len < fnlen + 1){ @@ -1781,6 +1782,7 @@ int list_jar(int fd, char **files, int file_num){ tdate = dos2unixtime(mdate); s_tm = localtime(&tdate); strftime(ascii_date, 30, "%a %b %d %H:%M:%S %Z %Y", s_tm); + ascii_date[30] = '\0'; } if(filename_len < fnlen + 1){ diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d1036a4fc88..8f06e2d93d0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,982 @@ +2003-01-31 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> + + * pa32-regs.h (REGNO_REG_CLASS, REG_CLASS_FROM_LETTER): Delete + duplicated code. + +2003-01-30 Richard Earnshaw <rearnsha@arm.com> + + * arm.c (arm_compute_initial_elimination_offset): If optimizing for + size, the link register is always saved if any other register is + saved. + +2003-01-30 Jerry Quinn <jlquinn@optonline.net> + + * gcc/doc/invoke.texi (Optimization Options): Group together + optional and experimental flags. Move trapv and bounds-check + out of this section. Group floating point flags together. + (Code Gen Options): Move trapv and bounds-check to here. + +2003-01-30 Jerry Quinn <jlquinn@optonline.net> + + * gcc/doc/invoke.texi (Optimization Options): List -O levels + for each optimization flag. + +2003-01-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + PR target/9316 + * config/rs6000/rtems.h: Add CPP_OS_DEFAULT_SPEC. + * config/rs6000/sysv4.h: Add CPP_OS_RTEMS_SPEC. + * config/rs6000/t-rtems: New file. multilib variants to match OS. + * config.gcc (powerpc-*-rtems*): Use rs6000/t-rtems instead of + rs6000/t-ppcgas so we get the desired multilibs. + +2003-01-30 Alexandre Oliva <aoliva@redhat.com> + + * config/fp-bit.h (__make_dp): Declare if TMODES. + +2003-01-29 Steve Ellcey <sje@cup.hp.com> + + * config/ia64/ia64.c (ia64_rwreloc_section_type_flags): New. + * config/ia64/hpux.h (TARGET_SECTION_TYPE_FLAGS): New. + +2003-01-29 Steve Ellcey <sje@cup.hp.com> + + * config/ia64/ia64.c (ia64_rwreloc_select_rtx_section): Rename + from ia64_aix_select_rtx_section. + (ia64_rwreloc_select_section): Simlarly; use default*_1 function + instead of saving and restoring flag_pic. + (ia64_rwreloc_unique_section): Similarly. + * config/ia64/aix.h (TARGET_ASM_SELECT_SECTION, + TARGET_ASM_UNIQUE_SECTION, TARGET_ASM_SELECT_RTX_SECTION): Update. + * config/ia64/hpux.h (TARGET_ASM_SELECT_SECTION, + TARGET_ASM_UNIQUE_SECTION, TARGET_ASM_SELECT_RTX_SECTION): New. + +2003-01-29 Joel Sherrill <joel@OARcorp.com> + + PR bootstrap/9296 + * gthr-rtems.h: Define __GTHREAD_MUTEX_INIT. Apparently no code + depended on it being defined until now. + +2003-01-29 Joel Sherrill <joel@OARcorp.com> + + PR target/9295 + * config/mips/rtems.h: Predefine __USE_INIT_FINI__ so generic + RTEMS code knows which C++ initialization style the toolset + configuration is using. + +2003-01-29 Joel Sherrill <joel@OARcorp.com> + + PR bootstrap/9293 + * config/m68k/t-crtstuff: Replace spaces with tabs, add + $(MULTILIB_CFLAGS) as compiler option and multilib crtbegin/end.o. + +2003-01-29 Joel Sherrill <joel@OARcorp.com> + + PR bootstrap/9292 + * config.gcc (hppa1.1-rtems): Did not include t-rtems nor enable + RTEMS threads. + * config/pa/rtems.h (LIB_SPEC): Use -N when linking. + +2003-01-25 Andrew Haley <aph@redhat.com> + + * tree-inline.c (walk_tree): Add CHAR_TYPE. + +2003-01-28 Christian Cornelssen <ccorn@cs.tu-berlin.de> + + * doc/install.texi: Add documentation for installation into + tooldirs and with DESTDIR. + +2003-01-28 Andreas Schwab <schwab@suse.de> + + * config/m68k/m68k.md (tablejump+2): Don't sign extend an address + register. + * config/m68k/apollo68.h (ASM_RETURN_CASE_JUMP): Likewise. + * config/m68k/coff.h (ASM_RETURN_CASE_JUMP): Likewise. + * config/m68k/linux.h (ASM_RETURN_CASE_JUMP): Likewise. + * config/m68k/m68kelf.h (ASM_RETURN_CASE_JUMP): Likewise. + * config/m68k/mot3300.h (ASM_RETURN_CASE_JUMP): Likewise. + * config/m68k/netbsd-elf.h (ASM_RETURN_CASE_JUMP): Likewise. + * config/m68k/pbb.h (ASM_RETURN_CASE_JUMP): Likewise. + +2003-01-28 David Edelsohn <edelsohn@gnu.org> + + * config/rs6000/rs6000.md (movti_string): Remove clobber. + * config/rs6000/rs6000.c (rs6000_emit_move, TImode): Explicitly + generate PARALLEL with clobber for TARGET_POWER. + +2003-01-28 Richard Henderson <rth@redhat.com> + + * ifcvt.c (noce_process_if_block): Re-add check vs X being changed + in no-else-block case. Add commentary. + +2003-01-28 Alexandre Oliva <aoliva@redhat.com> + + * config/mips/mips.h (UNITS_PER_HWFPVALUE): Renamed from... + (UNITS_PER_FPVALUE): Defined as the width of a long double, or + zero if no hardware floating point. + (LONG_DUBLE_TYPE_SIZE): Set to 128 on N32 and N64. + (MAX_FIXED_MODE_SIZE): Define to LONG_DOUBLE_TYPE_SIZE. + (LIBGCC2_LONG_DOUBLE_TYPE_SIZE): Define. + (BIGGEST_ALIGNMENT): Same as LONG_DOUBLE_TYPE_SIZE. + (FUNCTION_VALUE_REGNO_P): Set for FP_RETURN+2 on N32 and N64. + * config/mips/iris6.h (MIPS_TFMODE_FORMAT): Define. + * config/mips/mips.c (override_options): Use it. + (mips_arg_info): Pass TFmode values in even FP registers on N32 + and N64. + (mips_setup_incoming_varargs): Use UNITS_PER_HWFPVALUE. + (mips_va_start): Adjust alignment of ARG_POINTER_REGNUM. + (mips_va_arg): Use UNITS_PER_HWFPVALUE. Impose additional + even-register-like alignment to 128-bit arguments. + (save_restore_insns): Use UNITS_PER_HWFPVALUE. + (mips_function_value): Likewise. Return TFmode in $f0 and $f2 + on N32 or N64. + * config/mips/_tilib.c (__negti2, __ashlti3, __lshrti3): New. + * config/mips/t-iris6 (LIB2FUNCS_EXTRA): Add _tilib.c. + (TPBIT): Set to tp-bit.c. + (tp-bit.c): Create out of fp-bit.c. + +2003-01-27 Gabriel Dos_Reis <gdosreis@sophia.inria.fr> + + * c-parse.in: Remove '%expect 32' directive when in objc mode. + +2003-01-27 Josef Zlomek <zlomekj@suse.cz> + + * gcse.c (constprop_register): Check NEXT_INSN (insn) != NULL. + +2003-01-27 Richard Earnshaw <rearnsha@arm.com> + + PR optimization/9090 + * function.c (purge_addressof_1): After pushing an addressed register + onto the stack, simplify the result. + +2003-01-27 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + + * doc/extend.texi: Fix typo. + +2003-01-27 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + + * doc/cppopts.texi: Fix typo. + * doc/objc.texi: Likewise. + * doc/passes.texi: Likewise. + +2003-01-27 Alexandre Oliva <aoliva@redhat.com> + + * real.c (ibm_extended_format): Add 53 to minimum exponent. + (encode_ibm_extended): Adjust. + +2003-01-26 Kazu Hirata <kazu@cs.umass.edu> + + * doc/gccint.texi: Update the copyright. + +2003-01-26 Kazu Hirata <kazu@cs.umass.edu> + + * doc/cpp.texi: Fix typos. + * doc/extend.texi: Likewise. + * doc/gty.texi: Likewise. + * doc/install.texi: Likewise. + * doc/passes.texi: Likewise. + * doc/rtl.texi: Likewise. + +2003-01-26 Christian Cornelssen <ccorn@cs.tu-berlin.de> + + * Makefile.in (ORDINARY_FLAGS_TO_PASS): Also pass DESTDIR. + (install-cpp, installdirs, install-common) + (install-driver, install-info, install-man) + (install-headers, install-include-dir, install-headers-tar) + (install-headers-cpio, install-headers-cp, install-mkheaders) + (install-collect2, uninstall): Prepend $(DESTDIR) to + destination paths in all (un)installation commands. + (install-driver): Rewrite $(LN) commands to support DESTDIR + with "ln" as well as with "ln -s". + (installdirs): Simply use mkinstalldirs. + (install-libgcc, install-multilib): Also pass DESTDIR. + * mklibgcc.in: Prepend $(DESTDIR) to $(libsubdir) in the + installation destination variable ldir. + * config/alpha/t-osf4 (SHLIB_INSTALL): Prepend $$(DESTDIR) + to $$(slibdir) in the installation commands. + * config/arm/t-netbsd (SHLIB_INSTALL): Likewise. + * config/ia64/t-hpux (SHLIB_INSTALL): Likewise. + * config/mips/t-iris5-6 (SHLIB_INSTALL): Likewise. + * config/pa/t-hpux-shlib (SHLIB_INSTALL): Likewise. + * config/rs6000/t-aix43 (SHLIB_INSTALL): Likewise. + * config/rs6000/t-aix52 (SHLIB_INSTALL): Likewise. + * config/t-slibgcc-elf-ver (SHLIB_INSTALL): Likewise. + * config/t-slibgcc-sld (SHLIB_INSTALL): Likewise. + * config/arc/t-arc (install-multilib-arc): Prepend $(DESTDIR) to + $(libsubdir) in the installation commands. + +2003-01-26 Alexandre Oliva <aoliva@redhat.com> + + * fp-bit.h: Define macros for TFmode floating-point constants + in IBM-extended TFmode types. + (TMODES): Define if __LDBL_MANT_DIG__ has the newly-supported + widths. + * config/fp-bit.c (pack_d, unpack_d): Support IBM-extended + TFmode type. + + * config/fp-bit.h: Define macros for TFmode floating-point + constants in IEEE quad TFmode type. Declare functions according + to L_ macros. + (TMODES): Define if __LDBL_MANT_DIG__ is 113. + (TFtype, TItype, UTItype): Define if TMODES is defined. + (MAX_UDI_INT, MAX_DI_INT, BITS_PER_DI): Likewise. + (F_T_BITOFF, D_T_BITOFF): Define. + (IMPLICIT_1, IMPLICIT_2): Cast constants to types that are + guaranteed to be wide enough. + * config/fp-bit.c: Check for L_ macros for tf functions. + (__thenan_tf): New. + (nan): Adjust. + (pack_d, unpack_d): Support IEEE 854 quad type. + (_fpmul_parts): Support TFmode. Compute exponent adjustment + from FRAC_NBITS, FRAC_BITS and NGARDS. + (usi_to_float): Cast constants to be shifted to fractype + instead of assuming long long is wide enough. + (sf_to_tf, df_to_tf, __make_tp, tf_to_df, tf_to_sf): New. + + * Makefile.in (FPBIT_FUNCS): Added _sf_to_tf. + (DBBIT_FUNCS): Added _df_to_tf. + (TPBIT_FUNCS): New. + (libgcc.mk): Pass TPBIT and TPBIT_FUNCS down. + (LIBGCC_DEPS): Added TPBIT. + * mklibgcc.in: Support TPBIT and TPBIT_FUNCS. + + * optabs.c (expand_binop) <add, sub>: Return xtarget if we haven't + been able to move the result to target. + + * expr.c (emit_group_store): Initialize dst with CONST0_RTX + for the appropriate mode. + + * calls.c (emit_library_call_value_1): Handle return values + in a PARALLEL. + + * rtl.c (get_mode_alignment): Moved to... + * stor-layout.c: ... here. + + * print-rtl.c (print_rtx): Don't print MEM details in + GENERATOR_FILEs. + +2003-01-26 Michael Hayes <m.hayes@elec.canterbury.ac.nz> + + * df.c (df_uses_record): Handle CC0. + +Sat Jan 25 21:04:33 CET 2003 Jan Hubicka <jh@suse.cz> + Eric Botcazou <ebotcazou@libertysurf.fr> + PR opt/8492 + * gcse.c (one_cprop_pass): Delete unreachable blocks. + +2003-01-25 Ulrich Weigand <uweigand@de.ibm.com> + + * reload.c (maybe_memory_address_p): New function. + (find_reloads_address): Use it instead of memory_address_p. + +2003-01-25 Kaz Kojima <kkojima@gcc.gnu.org> + + * final.c (shorten_branches): Align the address of code label + when computing initial lengths and addresses. + +2003-01-25 Richard Henderson <rth@redhat.com> + + 2002-02-19 Robert Lipe <robertlipe@usa.net> + * config/i386/t-sco5gas: (CRTSTUFF_T_CFLAGS_S): Delete -mcoff. + +2003-01-23 Andreas Schwab <schwab@suse.de> + + * config/ia64/crtend.asm [HAVE_INITFINI_ARRAY]: Make + __do_global_ctors_aux hidden global and don't put it in + .init_array. + * config/ia64/crtbegin.asm [HAVE_INITFINI_ARRAY]: Put it here + instead so that it comes first. + +2003-01-25 Michael Hayes <m.hayes@elec.canterbury.ac.nz> + + * config/c4x/c4x.h (ASM_SPEC): Fix for new gas format. + +2003-01-24 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * calls.c (fix_unsafe_tree): Prototype. + * loop.c (loop_invariant_p): Avoid signed/unsigned warning. + +2003-01-24 Richard Henderson <rth@redhat.com> + + PR optimization/4382 + * tree-inline.c (find_builtin_longjmp_call_1): New. + (find_builtin_longjmp_call): New. + (inlinable_function_p): Use it. + +2003-01-24 Ulrich Weigand <uweigand@de.ibm.com> + + * configure.in (HAVE_AS_TLS): Add s390-*-* and s390x-*-* cases. + * configure: Regenerate. + + * config/s390/s390-protos.h (tls_symbolic_operand): Add prototype. + (tls_symbolic_reference_mentioned_p): Add prototype. + (s390_tls_get_offset): Add prototype. + (emit_pic_move): Remove prototype, replace by ... + (emit_symbolic_move): .. this new prototype. + + * config/s390/s390.c (TARGET_HAVE_TLS): Conditionally define. + (tls_model_chars): New global variable. + (s390_encode_section_info): Encode TLS model. + Use targetm.binds_local_p to check for local symbols. + (s390_strip_name_encoding): New function. + (TARGET_STRIP_NAME_ENCODING): Define. + + (get_thread_pointer): New function. + (legitimize_tls_address): New function. + (legitimize_address): Call it. + (emit_pic_move): Remove, replace by ... + (emit_symbolic_move): ... this new function. + + (larl_operand): Handle TLS operands. + (legitimate_constant_p): Likewise. + (s390_decompose_address): Likewise. + (s390_cannot_force_const_mem): New function. + (TARGET_CANNOT_FORCE_CONST_MEM): Define. + + (s390_output_symbolic_const): Handle TLS unspecs. + (print_operand): New code 'J'. + (machine_function): Add struct member 'some_ld_name'. + (get_some_local_dynamic_name, get_some_local_dynamic_name_1): New. + + (enum s390_builtin): New type. + (code_for_builtin_64, code_for_builtin_31): New global variables. + (s390_init_builtins, s390_expand_builtin): New functions. + (TARGET_INIT_BUILTINS, TARGET_EXPAND_BUILTIN): Define. + + * config/s390/s390.h (TLS_SYMBOLIC_CONST): New macro. + (ASM_OUTPUT_LABELREF): Define. + (ASM_OUTPUT_SPECIAL_POOL_ENTRY): Handle TLS constants. + + * config/s390/s390.md: Define TLS UNSPEC constants. + ("movdi", "movsi"): Handle TLS operands. + ("get_tp_64", "get_tp_31", "set_tp_64", "set_tp_31"): New insns. + ("*tls_load_64", "*tls_load_31"): New insns. + ("call_value_tls", "call_value_tls_exp"): New expanders. + ("brasl_tls", "bras_tls", "basr_tls_64", "basr_tls_31", + "bas_tls_64", "bas_tls_31"): New insns. + +2003-01-24 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + + * doc/passes.texi: Fix typo. + +2003-01-24 Gabriel Dos Reis <gdr@integrable-solutions.net> + + * timevar.def (TV_NAME_LOOKUP, TV_OVERLOAD, + TV_TEMPLATE_INSTANTIATION): New timevar_id eumerations. + * timevar.h (POP_TIMEVAR_AND_RETURN): New macro. + * timevar.c (timevar_pop): Be verbose when aborting. Include + "toplev.h". + +2003-01-24 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + + * doc/bugreport.texi: Use @command instead of @code for commands. + * doc/collect2.texi: Likewise. + * doc/headerdirs.texi: Likewise. + * doc/invoke.texi: Likewise. + * doc/standards.texi: Likewise. + * doc/tm.texi: Likewise. + * doc/trouble.texi: Likewise. + +2003-01-23 Franz Sirl <Franz.Sirl-kernel@lauterbach.com> + + PR java/6748 + * config/rs6000/linux.h (MD_FALLBACK_FRAME_STATE_FOR): Don't destroy + regs->nip. Fix rt_sigreturn frame layout. Add support for newer + kernels. + +2003-01-23 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + + PR other/7341 + * invoke.texi (ftest-coverage): Fix broken cross-reference. + Change @code to @command for gcov command. + + * gcc.texi: Adjust title of gcov section. + Adjust copyright. + * gcov.texi: Likewise. + +2003-01-23 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + + PR other/7448 + * doc/passes.texi (fssa-ccp): Remove misplaced line. + +2003-01-22 Ulrich Weigand <uweigand@de.ibm.com> + + * config/s390/s390.h (HARD_REGNO_MODE_OK): Fix warning regression + introduced by last change. + +2003-01-22 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * configure.in: Make --disable-checking the default. + * configure: Regenerate. + +2003-01-22 Ulrich Weigand <uweigand@de.ibm.com> + + * config/s390/s390-protos.h (preferred_la_operand_p): + Remove second parameter. + * config/s390/s390.c (preferred_la_operand_p): Likewise. + * config/s390/s390.h (FRAME_REGNO_P, FRAME_REG_P): New macros. + (HARD_REGNO_MODE_OK): Use FRAME_REGNO_P. + * config/s390/s390.md ("*la_cc_64", "*la_cc_31", splitters): Remove. + Add peepholes to transform ADD to LOAD ADDRESS. + +Mon Jan 20 14:36:23 CET 2003 Jan Hubicka <jh@suse.cz> + + * i386.md (SSE cmov splitter): Handle memory operand in operand 5. + +2003-01-21 Christian Ehrhardt <ehrhardt@mathematik.uni-ulm.de> + + PR opt/7507 + * calls.c (fix_unsafe_tree): Split out from ... + (expand_call): ... here. Use it on the function address too. + +2003-01-20 Richard Henderson <rth@redhat.com> + + PR opt/7154 + * stmt.c (expand_asm_operands): Validize memory operands. + +2003-01-20 Richard Henderson <rth@redhat.com> + + PR opt/8848 + * ifcvt.c (noce_process_if_block): Correct arguments to + modified_between_p for no-else-block case. + +2003-01-20 John David Anglin <dave.anglin@nrc-cnrc.gc.ca> + + * ifcvt.c (noce_emit_store_flag): Don't emit store flag if mode of x + is not a scalar int mode. + +2003-01-20 Kazu Hirata <kazu@cs.umass.edu> + + * config/h8300/h8300.c (notice_update_cc): Don't assume that + recog_data.operands[0] is always associated with cc0. + +2003-01-19 Stephane Carrez <stcarrez@nerim.fr> + + * config/m68hc11/m68hc11.c (stack_push_word, stack_pop_word, + z_reg, z_reg_qi): Declare static and GTY(). + (da_reg): Remove. + (create_regs_rtx): Don't create da_reg. + ("gt-m68hc11.h"): Include for GTY roots. + (m68hc11_autoinc_compatible_p): Remove. + (autoinc_mode): Declare prototype. + (m68hc11_make_autoinc_notes): Likewise. + * config/m68hc11/m68hc11.h (ix_reg, iy_reg, d_reg): Declare extern + and GTY() here. + (m68hc11_compare_op0, m68hc11_compare_op1): Likewise. + (m68hc11_soft_tmp_reg): Likewise. + * config/m68hc11/m68hc11-protos.h: Remove above declarations. + +2003-01-18 Roger Sayle <roger@eyesopen.com> + + * config/pa/pa.md (muldi3): Avoid invalid sharing of SUBREG RTXs. + +2003-01-10 Geoffrey Keating <geoffk@apple.com> + + * varasm.c (struct constant_descriptor_rtx): Remove unused + `label' field. + + * ggc-page.c (ggc_collect): Avoid overflow computing + min_expand. + +2002-12-20 Geoffrey Keating <geoffk@apple.com> + + * integrate.c (output_inline_function): Don't hold private + pointers to 'struct function' over GC calls. + +2003-01-17 Alexandre Oliva <aoliva@redhat.com> + + * config/mips/mips.h: Don't use #elif. Reported by Kaveh + R. Ghazi. + +2003-01-16 Kaz Kojima <kkojima@gcc.gnu.org> + + * config/sh/sh.c (sh_initialize_trampoline): Emit rotrdi3_mextr + instead of rotldi3_mextr. + +2003-01-16 Stephane Carrez <stcarrez@nerim.fr> + + * config/m68hc11/m68hc11.c (m68hc11_check_z_replacement): Fix handling + 68HC12 pre/post inc/dec side effects. + +2003-01-16 Stephane Carrez <stcarrez@nerim.fr> + + * config/m68hc11/m68hc11.h (MASK_M6812): Define. + +2003-01-16 Stephane Carrez <stcarrez@nerim.fr> + + * config/m68hc11/m68hc11.c (expand_prologue): Use push/pop to + allocate 4-bytes of locals on 68HC11. + (expand_epilogue): Likewise. + (m68hc11_memory_move_cost): Increase cost of HI/QI soft registers. + +2003-01-15 John David Anglin <dave@hiauly1.hia.nrc.ca> + + * som.h (SUPPORTS_WEAK, SUPPORTS_ONE_ONLY, MAKE_DECL_ONE_ONLY, + ASM_WEAKEN_LABEL, GTHREAD_USE_WEAK): Define. + * pa.h (TARGET_SOM_SDEF): Define. + * pa-hpux11.h (TARGET_SOM_SDEF): Define. + +2003-01-15 Stephane Carrez <stcarrez@nerim.fr> + + * config/m68hc11/m68hc11.h (ASM_SPEC): Handle -m68hcs12; Pass -mshort + and -mshort-double to the assembler to specify the ABI. + (LINK_SPEC): Likewise. + (CPP_SPEC): Pass HCS12 specific define. + (MASK_M68S12): New define. + (TARGET_M68S12): Likewise. + (TARGET_SWITCHES): New options -m68hcs12 and -m68S12. + (TARGET_VERSION): Update. + * config/m68hc11/m68hc12.h (CPP_SPEC): Pass HCS12 specific define. + (LINK_SPEC): Update. + (ASM_SPEC): Update. + * config/m68hc11/m68hc11.c (m68hc11_asm_file_start): Update. + * doc/invoke.texi (M68hc1x Options): Document -m68hcs12. + +2003-01-15 John David Anglin <dave.anglin@nrc.gc.ca> + + * gengtype-lex.l (malloc, realloc): Move defines after include of + system.h. + +2003-01-15 Stephane Carrez <stcarrez@nerim.fr> + + * config/m68hc11/m68hc11.md ("return"): Use emit_jump_insn to emit + the return code. + +2003-01-15 Josef Zlomek <zlomekj@suse.cz> + + * cfganal.c (set_edge_can_fallthru_flag): Clear the EDGE_CAN_FALLTHRU + flag before setting it. + +2003-01-15 Josef Zlomek <zlomekj@suse.cz> + + Segher Boessenkool <segher@koffie.nl> + + * predict.c (real_inv_br_prob_base): New variable. + (propagate_freq): Use multiply by reciprocal instead of + division. Don't divide by 1.0 at all. + (estimate_bb_frequencies): Similar. + +2003-01-15 Alexandre Oliva <aoliva@redhat.com> + + * configure.in (libgcc_visibility): Force disabled on IRIX 6 too. + * configure: Rebuilt. + + * config/mips/mips.h (CRT_CALL_STATIC_FUNCTION): Define so as + to set $gp before the call. + +2003-01-10 Andrew Haley <aph@redhat.com> + + * config/i386/linux64.h (MD_FALLBACK_FRAME_STATE_FOR): Rename + registers to be in correct order. Add rip. + +2003-01-14 Denis Chertykov <denisc@overta.ru> + + * config/ip2k/ip2k.h (VALID_MACHINE_DECL_ATTRIBUTE): Remove. + (VALID_MACHINE_TYPE_ATTRIBUTE): Remove. + + * config/ip2k/ip2k.c (ip2k_attribute_table): New table of + attributes. + (TARGET_ATTRIBUTE_TABLE): New macro. + (valid_machine_type_attribute): Remove. + (valid_machine_decl_attribute): Remove. + (ip2k_handle_progmem_attribute): New function. + (ip2k_handle_fndecl_attribute): New function. + +2003-01-14 Eric Botcazou <ebotcazou@libertysurf.fr> + + PR target/8870, PR target/9195 + + Backport from mainline: + + 2003-01-10 Richard Henderson <rth@redhat.com> + + * combine.c (make_compound_operation): Use SCALAR_INT_MODE_P, + not INTEGRAL_MODE_P when widening extensions. + +2003-01-13 Alexandre Oliva <aoliva@redhat.com> + + * aclocal.m4 (gcc_AC_PROG_GNAT): Don't try to prepend + ${ac_tool_prefix} to ADAC or CC. Protect them from word + splitting. + * configure: Rebuilt. + +2003-01-12 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * unwind-dw2-fde.h (last_fde): Mark parameter with __attribute__ + ((__unused__)). + +2003-01-12 Alan Modra <amodra@bigpond.net.au> + + * expr.c (expand_expr <RDIV_EXPR>): Correct recursive call args. + +Sat Jan 11 11:10:19 CET 2003 Jan Hubicka <jh@suse.cz> + + PR target/9068 + * i386.c (output_fp_compare): Fix typo + +2003-01-10 Josef Zlomek <zlomekj@suse.cz> + + * jump.c (next_nonnote_insn_in_loop): New function. + (copy_loop_headers): Use next_nonnote_insn_in_loop instead of + next_nonnote_insn. + (duplicate_loop_exit_test). Likewise. + +Wed Jan 8 14:09:30 CET 2003 Jan Hubicka <jh@suse.cz> + + PR target/8213 + * i386.c (ix86_expand_int_movcc): Fix RTL sharing problem. + +2003-01-09 Kazu Hirata <kazu@cs.umass.edu> + + * config/h8300/h8300.md (*extzv_1_r_h8300): Correct the insn + length. + (*extzv_1_r_h8300hs): Likewise. + (*extzv_1_r_inv_h8300): Likewise. + (*extzv_1_r_inv_h8300hs): Likewise. + +2003-01-09 Josef Zlomek <zlomj9am@artax.karlin.mff.cuni.cz> + + * Makefile.in (optabs.o): Add dependency on basic-block.h. + * basic-block.h (control_flow_insn_p): Fuction was exported. + * cfgbuild.c (control_flow_insn_p): Fuction was made non-static. + * optabs.c (emit_libcall_block): Emit REG_LIBCALL and REG_RETVAL + notes only when the region is contained in a single basic block. + +2003-01-09 Josef Zlomek <zlomj9am@artax.karlin.mff.cuni.cz> + + * Makefile.in (PARTITION_H): New. + (BASIC_BLOCK_H): Added hard-reg-set.h and $(PARTITION_H). + * basic-block.h: Include hard-reg-set.h. + +2003-01-09 Eric Botcazou <ebotcazou@libertysurf.fr> + + PR inline-asm/8832 + * tree.h (expand_asm): New prototype. + * stmt.c (expand_asm): Set the MEM_VOLATILE_P flag if instructed + to do so. + * c-semantics (genrtl_asm_stmt): Pass the RID_VOLATILE qualifier + down to expand_asm. + * c-typeck.c (simple_asm_stmt): Set the RID_VOLATILE qualifier. + * rtlanal.c (volatile_insn_p) [ASM_INPUT]: Test the MEM_VOLATILE_P flag. + (volatile_refs_p) [ASM_INPUT]: Likewise. + (side_effects_p) [ASM_INPUT]: Likewise. + +2003-01-09 Eric Botcazou <ebotcazou@libertysurf.fr> + + PR c/8032 + * c-typeck.c (process_init_element) [RECORD_TYPE]: For + an empty element, do not advance the pointer to unfilled + fields if there are pending initializers. + +2003-01-09 Kaz Kojima <kkojima@gcc.gnu.org> + + * config/sh/sh.h (CASE_VECTOR_MODE): Use SImode for a + non-optimizing compile. + (ASM_OUTPUT_ADDR_VEC_ELT): Use .long for a non-optimizing + compile. + +2003-01-09 Andreas Jaeger <aj@suse.de> + + * unwind-dw2-fde.h (last_fde): Revert last patch. + +2003-01-08 Danny Smith <dannysmith@users.sourceforge.net> + + PR optimization/8750 + * config/i386/i386.c (ix86_expand_prologue): Don't allow + scheduling pass to move insns across __alloca call. + +2003-01-08 Jeff Sturm <jsturm@one-point.com> + + PR target/9210 + * config/rs6000/rs6000.c (rs6000_elf_encode_section_info): + Set SYMBOL_REF_FLAG on local data sym_ref. + +Wed Jan 8 19:53:56 CET 2003 Jan Hubicka <jh@suse.cz> + + PR target/8322 + * i386.c (ix86_init_mmx_sse_builtins): Constify arguments of loads. + * xmmintrin.h (_mm_load*_si128. _mm_store*_si128): Add casts. + + PR target/7782 + * reload1.c (delete_output_reload): Avoid repeated attempts + to delete insn. + + * cselib.c (cselib_current_insn_in_libcall): New static variable. + (new_elt_loc_list, cselib_process_insn, cselib_init): Keep track on whether + we are inside libcall. + * cselib.h (elt_loc_list): Add in_libcall. + * gcse.c (do_local_cprop): Do not copy propagate using insns + in libcalls. + +2003-01-07 Janis Johnson <janis187@us.ibm.com> + + PR other/8947 + * doc/invoke.texi (-malign-double): Explain that the option breaks + binary compatibility. + +2003-01-07 Richard Henderson <rth@redhat.com> + + * alias.c (find_base_value): Only use new_reg_base_value shortcut + if the register is set once. + +2003-01-07 Sylvain Pion <Sylvain.Pion@mpi-sb.mpg.de> + + * config/i386/i386.c (ix86_init_mmx_sse_builtins): + __builtin_ia32_ldmxcsr and __builtin_ia32_stmxcsr are SSE, not MXX. + * config/i386/i386.md (ldmxcsr, stmxcsr): SSE, not MMX. + +2003-01-07 Benjamin Kosnik <bkoz@redhat.com> + Sunil Davasam <sunil.k.davasam@intel.com> + + PR libstdc++/9076 + * unwind-dw2.c (execute_cfa_program): DW_CFA_undefined, + DW_CFA_same_value, read next and ignore. + +2003-01-07 Richard Henderson <rth@redhat.com> + + * cfganal.c (flow_call_edges_add): Don't crash on noreturn call. + +2003-01-06 Aldy Hernandez <aldyh@redhat.com> + + Segher Boessenkool <segher@koffie.nl> + + * config/rs6000/rs6000.c (rs6000_reg_names): Add missing registers. + (alt_reg_names): Ditto, fix formatting. + * config/rs6000/rs6000.h (DEBUG_REGISTER_NAMES): Fix formatting. + +2003-01-06 Bruce Korb <bkorb@gnu.org> + + * fixinc/fixfixes.c(wrap_fix): the wrapper guard must be a function + of *both* the file name and the fix name. + +2003-01-06 Richard Henderson <rth@redhat.com> + + * config/alpha/alpha.c (alpha_encode_section_info): Adjust symbol_str + properly when changing "local-ness". + * config/alpha/alpha.md (movdi_er_high_g): Allow all symbols. + +2003-01-05 Andreas Jaeger <aj@suse.de> + + * unwind-dw2-fde.h (last_fde): Add unused attribute for obj. + +2003-01-05 John David Anglin <dave@hiauly1.hia.nrc.ca> + + * pa64-hpux.h (JCR_SECTION_NAME): Define. + (PA_INIT_FRAME_DUMMY_ASM_OP): Check EH_FRAME_SECTION_NAME instead of + USE_EH_FRAME_REGISTRY when defining. + +2003-01-04 John David Anglin <dave.anglin@nrc.ca> + + * config.gcc (hppa*64*-*-hpux11*): Define extra_parts. Don't use + collect2. + * pa-hpux11.h (LDD_SUFFIX, PARSE_LDD_OUTPUT): Undefine. + (HAS_INIT_SECTION, LD_INIT_SWITCH, LD_FINI_SWITCH): Define. + * pa64-hpux.h (HP_INIT_ARRAY_SECTION_ASM_OP, + GNU_INIT_ARRAY_SECTION_ASM_OP, HP_FINI_ARRAY_SECTION_ASM_OP, + GNU_FINI_ARRAY_SECTION_ASM_OP): Define. + (CTORS_SECTION_ASM_OP, DTORS_SECTION_ASM_OP): Define when not using + elfos.h. + (EH_FRAME_IN_DATA_SECTION): Delete define. + (HAS_INIT_SECTION, LD_INIT_SWITCH, LD_FINI_SWITCH): Undefine. + (STARTFILE_SPEC): Use crtbegin.o. + (ENDFILE_SPEC): Use crtend.o. + (INIT_SECTION_ASM_OP, FINI_SECTION_ASM_OP, CRT_CALL_STATIC_FUNCTION, + SUPPORTS_INIT_PRIORITY, PA_CXA_FINALIZE_STUB, PA_INIT_FINI_HACK, + PA_INIT_FRAME_DUMMY_ASM_OP, PA_JV_REGISTERCLASSES_STUB, + DTOR_LIST_BEGIN): Define. + * pa.c (TARGET_ASM_CONSTRUCTOR): Define. + (pa_asm_out_constructor, pa_asm_out_destructor): New functions. + * som.h (SUPPORTS_INIT_PRIORITY): Delete define. + +2003-01-02 Eric Christopher <echristo@redhat.com> + + * config/mips/mips.md (movdf_internal2): Fix constraints. + +2003-01-03 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> + + * doc/install.texi (Configuration): Fix markup for reference to + gcc/config.gcc. + +2003-01-02 Kazu Hirata <kazu@cs.umass.edu> + + * config/h8300/h8300.c (stack_pointer_operand): New. + (const_int_gt_2_operand): Likewise. + (const_int_ge_8_operand): Likewise. + * config/h8300/h8300.md (a splitter): Likewise. + (a peephole2): Likewise. + * config/h8300/h8300-protos.h: Add prototypes for the new + functions above. + +2003-01-02 Neil Booth <neil@daikokuya.co.uk> + + * gccbug.in: Update for new categories. + +2002-12-31 Tom Tromey <tromey@redhat.com> + + * doc/install.texi (Testing): Fixed typo. + +2002-12-31 Jerry Quinn <jlquinn@optonline.net> + + * gcc/doc/invoke.texi (Optimization Options): Clean up -O flag + descriptions. + +2002-12-31 Jerry Quinn <jlquinn@optonline.net> + + * gcc/doc/invoke.texi (Optimization Options): List the options + enabled by each -O flag. + +2002-12-31 David Edelsohn <edelsohn@gnu.org> + + * config/rs6000/rs6000.h (WIDEST_HARDWARE_FP_SIZE): Define. + +2002-12-31 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> + + * doc/install.texi (Configuration): Explicitly refer + gcc/config.gcc for a list of cpu models. + +2002-12-30 Joseph S. Myers <jsm@polyomino.org.uk> + + * doc/gcc.texi, doc/gccint.texi: Update last modification dates. + +2002-12-30 Tom Tromey <tromey@redhat.com> + + * doc/install.texi (Testing): Mention Jacks. + +2002-12-30 Joseph S. Myers <jsm@polyomino.org.uk> + + * doc/service.texi: Uncomment and update FAQ link. + +2002-12-28 Joseph S. Myers <jsm@polyomino.org.uk> + + * doc/cpp.texi, doc/gcc.texi, doc/gccint.texi, doc/install.texi: + Use @copying. + +2002-12-28 Joseph S. Myers <jsm@polyomino.org.uk> + + * configure.in: Increase makeinfo version requirement to 4.[2-9]. + * configure: Regenerate. + * doc/install.texi: Update Texinfo version requirement. + +2002-12-27 Joseph S. Myers <jsm@polyomino.org.uk> + + * doc/include/texinfo.tex: Update to version 2002-12-26.16. + +2002-12-26 Joseph S. Myers <jsm@polyomino.org.uk> + + * doc/standards.texi, doc/invoke.texi: Point to 3.3 version of + c99status.html. + +2002-12-26 Kazu Hirata <kazu@cs.umass.edu> + + * config/h8300/h8300.h (IDENT_ASM_OP): End with a tab. + +2002-12-23 Larin Hennessy <larin@science.oregonstate.edu> + + * doc/install.texi: Remove i386-*-isc, i860-*-bsd, + m68k-altos-sysv, m68k-isi-bsd, m68k-sony-bsd entries. + * doc/invoke.texi: Remove AMD 29K, ARM RISC/iX, Clipper, Convex, + DG/UX entries. + * doc/md.texi: Remove AMD 29K entries. + * doc/trouble.texi: Remove Alliant, DG/UX, Iris 4.0.5F, GAS + 1.38.1, NewsOS, RT PC, WE32K entries. + +2002-12-23 Aldy Hernandez <aldyh@redhat.com> + + PR/8763 + * config/rs6000/altivec.md (mulv4sf3): Rewrite to add -0.0 vector. + (altivec_vspltisw_v4sf): Name pattern. + (altivec_vslw_v4sf): New pattern. + +2002-12-23 Joseph S. Myers <jsm@polyomino.org.uk> + + * doc/include/gcc-common.texi: Clear DEVELOPMENT. + +2002-12-23 David Edelsohn <edelsohn@gnu.org> + + PR middle-end/8784 + * expr.c (expand_assignment): Apply special treatment to + ARRAY_TYPE. + +2002-12-21 Kazu Hirata <kazu@cs.umass.edu> + + * config/h8300/h8300.md (zero_extendqisi2): Correct the + length. + +2002-12-19 Devang Patel <dpatel@apple.com> + + * config/darwin.h (TARGET_OPTION_TRANSLATE_TABLE): Add support for -dynamic. + (CPP_SPEC): Define __STATIC__ and __DYNAMIC__ depending on -dynamic. + (LINK_SPEC): Pass -dynamic to linker. + * config/rs6000/darwin.h: Reject conflicting -static and -dynamic. + +2002-12-19 Kazu Hirata <kazu@cs.umass.edu> + + * config/h8300/h8300.md (pushqi_h8300): Don't push the stack + pointer. + (pushqi_h8300hs): Likewise. + (pushhi_h8300): Likewise. + (pushhi_h8300hs): Likewise. + +2002-12-19 Eric Botcazou <ebotcazou@libertysurf.fr> + + PR optimization/8988 + * loop.c (maybe_eliminate_biv): Kill REG_EQUAL notes mentioning + the biv when eliminating. + +2002-12-19 Aldy Hernandez <aldyh@redhat.com> + + PR 8553 + * config/rs6000/altivec.md ("absv8hi2"): Add & to clobbered + registers. + ("absv16qi2"): Same. + ("absv4si2"): Same. + ("absv4sf2"): Same. + ("altivec_abss_v16qi"): Same. + ("altivec_abss_v8hi"): Same. + ("altivec_abss_v4si"): Same. + +2002-12-19 Ulrich Weigand <uweigand@de.ibm.com> + + * config/s390/s390.md ("*tsthiCCT", "*tsthiCCT_cconly", + "*tstqiCCT", "*tstqiCCT_cconly"): New insns. + +2002-12-18 Aldy Hernandez <aldyh@redhat.com> + + * config/rs6000/altivec.h (vec_cmplt macro): Reverse arguments in + macro. + (vec_cmplt C++ functions): Reverse arguments. + +2002-12-17 Kazu Hirata <kazu@cs.umass.edu> + + * doc/c-tree.texi: Restore deliberate spelling mistakes. + +2002-12-17 Kazu Hirata <kazu@cs.umass.edu> + + * doc/c-tree.texi: Fix typos and follow spelling conventions. + * doc/cpp.texi: Likewise. + * doc/extend.texi: Likewise. + * doc/gty.texi: Likewise. + * doc/install.texi: Likewise. + * doc/invoke.texi: Likewise. + * doc/md.texi: Likewise. + * doc/passes.texi: Likewise. + * doc/rtl.texi: Likewise. + * doc/sourcebuild.texi: Likewise. + * doc/tm.texi: Likewise. + +2002-12-17 Jerry Quinn <jlquinn@optonline.net> + + * doc/invoke.texi: Minor spelling and grammar fixes. + +2002-12-16 Mark Mitchell <mark@codesourcery.com> + + * version.c (version_string): Mark as prerelease. + +2002-12-13 John David Anglin <dave@hiauly1.hia.nrc.ca> + + * pa.c (output_millicode_call): Correct typo. + (output_call): Likewise. + Fri Dec 13 21:07:18 2002 Alexandre Oliva <aoliva@redhat.com> * config/mn10300/mn10300.c (print_operand) <case N>: Check @@ -191,7 +1170,7 @@ Wed Dec 11 18:39:52 2002 J"orn Rennecke <joern.rennecke@superh.com> * config/darwin.h(LINK_SPEC): Add darwin specific linker options. * doc/invoke.texi: Add new "Darwin Options" section. - + 2002-12-10 Jim Wilson <wilson@redhat.com> * rs6000.h (RETURN_IN_MEMORY): If ABI_V4, then TFmode is returned in @@ -268,7 +1247,7 @@ Mon Dec 9 21:33:38 CET 2002 Jan Hubicka <jh@suse.cz> * stmt.c (expand_return): Ditto. * expr.c (move_block_from_reg): Ditto. (copy_blkmode_from_reg): Ditto. - * expmed.c (store_bit_field): Ditto. + * expmed.c (store_bit_field): Ditto. 2002-12-09 Svein E. Seldal <Svein.Seldal@solidas.com> @@ -424,7 +1403,7 @@ Wed Dec 4 15:20:54 CET 2002 Jan Hubicka <jh@suse.cz> 2002-12-03 Aldy Hernandez <aldyh@redhat.com> - * config/rs6000/spe.md (*movv1di_const0): New pattern. + * config/rs6000/spe.md (*movv1di_const0): New pattern. 2002-12-03 Richard Henderson <rth@redhat.com> @@ -529,7 +1508,7 @@ Mon Dec 2 14:43:22 2002 J"orn Rennecke <joern.rennecke@superh.com> * c-format.c (T_ST): Use size_type_node, not c_size_type_node. * tree.h (TI_SIZE_TYPE): New enumeral. (size_type_node): Likewise. - + 2002-11-30 John David Anglin <dave@hiauly1.hia.nrc.ca> * cfg.c (dump_flow_info): Use max_reg_num () to determine the largest @@ -1106,7 +2085,7 @@ Thu Nov 21 23:52:04 CET 2002 Jan Hubicka <jH@suse.cz> (ggc_realloc): Update valgrind annotations. * ggc-page.c [!ENABLE_VALGRIND_CHECKING] (VALGRIND_DISCARD): Define as empty. - (alloc_anon, free_page, ggc_alloc, poison_pages): Add machinery to + (alloc_anon, free_page, ggc_alloc, poison_pages): Add machinery to valgrind-annotate memory. 2002-11-20 Ulrich Weigand <uweigand@de.ibm.com> diff --git a/gcc/Makefile.in b/gcc/Makefile.in index e1fb947e4ed..5d6b40ee393 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -1,6 +1,6 @@ # Makefile for GNU C compiler. # Copyright (C) 1987, 1988, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 -# 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +# 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. #This file is part of GCC. @@ -254,6 +254,7 @@ HASHTAB_H = $(srcdir)/../include/hashtab.h OBSTACK_H = $(srcdir)/../include/obstack.h SPLAY_TREE_H= $(srcdir)/../include/splay-tree.h FIBHEAP_H = $(srcdir)/../include/fibheap.h +PARTITION_H = $(srcdir)/../include/partition.h # Default native SYSTEM_HEADER_DIR, to be overridden by targets. NATIVE_SYSTEM_HEADER_DIR = /usr/include @@ -569,7 +570,8 @@ RTL_H = $(RTL_BASE_H) genrtl.h PARAMS_H = params.h params.def TREE_H = tree.h tree.def $(MACHMODE_H) tree-check.h version.h builtins.def \ location.h -BASIC_BLOCK_H = basic-block.h bitmap.h sbitmap.h varray.h +BASIC_BLOCK_H = basic-block.h bitmap.h sbitmap.h varray.h $(PARTITION_H) \ + hard-reg-set.h DEMANGLE_H = $(srcdir)/../include/demangle.h RECOG_H = recog.h EXPR_H = expr.h @@ -681,6 +683,7 @@ ORDINARY_FLAGS_TO_PASS = \ "BISON=$(BISON)" \ "BISONFLAGS=$(BISONFLAGS)" \ "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" \ + "DESTDIR=$(DESTDIR)" \ "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" \ "LDFLAGS=$(LDFLAGS)" \ "FLEX=$(FLEX)" \ @@ -796,12 +799,17 @@ LIB2FUNCS_ST = _eprintf _bb __gcc_bcmp FPBIT_FUNCS = _pack_sf _unpack_sf _addsub_sf _mul_sf _div_sf \ _fpcmp_parts_sf _compare_sf _eq_sf _ne_sf _gt_sf _ge_sf \ _lt_sf _le_sf _unord_sf _si_to_sf _sf_to_si _negate_sf _make_sf \ - _sf_to_df _thenan_sf _sf_to_usi _usi_to_sf + _sf_to_df _sf_to_tf _thenan_sf _sf_to_usi _usi_to_sf DPBIT_FUNCS = _pack_df _unpack_df _addsub_df _mul_df _div_df \ _fpcmp_parts_df _compare_df _eq_df _ne_df _gt_df _ge_df \ _lt_df _le_df _unord_df _si_to_df _df_to_si _negate_df _make_df \ - _df_to_sf _thenan_df _df_to_usi _usi_to_df + _df_to_sf _df_to_tf _thenan_df _df_to_usi _usi_to_df + +TPBIT_FUNCS = _pack_tf _unpack_tf _addsub_tf _mul_tf _div_tf \ + _fpcmp_parts_tf _compare_tf _eq_tf _ne_tf _gt_tf _ge_tf \ + _lt_tf _le_tf _unord_tf _si_to_tf _tf_to_si _negate_tf _make_tf \ + _tf_to_df _tf_to_sf _thenan_tf _tf_to_usi _usi_to_tf # These might cause a divide overflow trap and so are compiled with # unwinder info. @@ -1021,6 +1029,8 @@ libgcc.mk: config.status Makefile mklibgcc $(LIB2ADD) $(LIB2ADD_ST) xgcc$(exeext LIB2_DIVMOD_FUNCS='$(LIB2_DIVMOD_FUNCS)' \ DPBIT='$(DPBIT)' \ DPBIT_FUNCS='$(DPBIT_FUNCS)' \ + TPBIT='$(TPBIT)' \ + TPBIT_FUNCS='$(TPBIT_FUNCS)' \ MULTILIBS=`$(GCC_FOR_TARGET) --print-multi-lib` \ EXTRA_MULTILIB_PARTS='$(EXTRA_MULTILIB_PARTS)' \ SHLIB_LINK='$(SHLIB_LINK)' \ @@ -1040,8 +1050,9 @@ libgcc.mk: config.status Makefile mklibgcc $(LIB2ADD) $(LIB2ADD_ST) xgcc$(exeext LIBGCC_DEPS = $(GCC_PASSES) $(LANGUAGES) stmp-int-hdrs $(STMP_FIXPROTO) \ libgcc.mk $(srcdir)/libgcc2.c $(TCONFIG_H) \ $(MACHMODE_H) longlong.h gbl-ctors.h config.status stmp-int-hdrs \ - tsystem.h $(FPBIT) $(DPBIT) $(LIB2ADD) $(LIB2ADD_ST) $(LIB2ADDEH) \ - $(LIB2ADDEHDEP) $(EXTRA_PARTS) $(srcdir)/config/$(LIB1ASMSRC) + tsystem.h $(FPBIT) $(DPBIT) $(TPBIT) $(LIB2ADD) \ + $(LIB2ADD_ST) $(LIB2ADDEH) $(LIB2ADDEHDEP) $(EXTRA_PARTS) \ + $(srcdir)/config/$(LIB1ASMSRC) libgcc.a: $(LIBGCC_DEPS) $(MAKE) GCC_FOR_TARGET="$(GCC_FOR_TARGET)" \ @@ -1446,7 +1457,7 @@ explow.o : explow.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) $(TREE_H) flags.h \ toplev.h function.h ggc.h $(TM_P_H) gt-explow.h optabs.o : optabs.c $(CONFIG_H) $(SYSTEM_H) $(RTL_H) $(TREE_H) flags.h \ insn-config.h $(EXPR_H) $(OPTABS_H) libfuncs.h $(RECOG_H) reload.h \ - toplev.h $(GGC_H) real.h $(TM_P_H) except.h gt-optabs.h + toplev.h $(GGC_H) real.h $(TM_P_H) except.h gt-optabs.h $(BASIC_BLOCK_H) dbxout.o : dbxout.c $(CONFIG_H) $(SYSTEM_H) $(TREE_H) $(RTL_H) flags.h \ $(REGS_H) debug.h $(TM_P_H) $(TARGET_H) function.h langhooks.h \ insn-config.h reload.h gstab.h xcoffout.h output.h dbxout.h toplev.h @@ -2739,173 +2750,163 @@ install: install-common $(INSTALL_HEADERS) $(INSTALL_LIBGCC) \ # Handle cpp installation. install-cpp: cpp$(exeext) -if [ -f gcc-cross$(exeext) ] ; then \ - rm -f $(bindir)/$(CPP_CROSS_NAME)$(exeext); \ - $(INSTALL_PROGRAM) -m 755 cpp$(exeext) $(bindir)/$(CPP_CROSS_NAME)$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$(CPP_CROSS_NAME)$(exeext); \ + $(INSTALL_PROGRAM) -m 755 cpp$(exeext) $(DESTDIR)$(bindir)/$(CPP_CROSS_NAME)$(exeext); \ if [ x$(cpp_install_dir) != x ]; then \ - rm -f $(prefix)/$(cpp_install_dir)/$(CPP_CROSS_NAME)$(exeext); \ - $(INSTALL_PROGRAM) -m 755 cpp$(exeext) $(prefix)/$(cpp_install_dir)/$(CPP_CROSS_NAME)$(exeext); \ + rm -f $(DESTDIR)$(prefix)/$(cpp_install_dir)/$(CPP_CROSS_NAME)$(exeext); \ + $(INSTALL_PROGRAM) -m 755 cpp$(exeext) $(DESTDIR)$(prefix)/$(cpp_install_dir)/$(CPP_CROSS_NAME)$(exeext); \ else true; fi; \ else \ - rm -f $(bindir)/$(CPP_INSTALL_NAME)$(exeext); \ - $(INSTALL_PROGRAM) -m 755 cpp$(exeext) $(bindir)/$(CPP_INSTALL_NAME)$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$(CPP_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) -m 755 cpp$(exeext) $(DESTDIR)$(bindir)/$(CPP_INSTALL_NAME)$(exeext); \ if [ x$(cpp_install_dir) != x ]; then \ - rm -f $(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \ - $(INSTALL_PROGRAM) -m 755 cpp$(exeext) $(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \ + rm -f $(DESTDIR)$(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) -m 755 cpp$(exeext) $(DESTDIR)$(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \ else true; fi; \ fi # Create the installation directories. +# $(libdir)/gcc-lib/include isn't currently searched by cpp. installdirs: - -if [ -d $(prefix) ] ; then true ; else mkdir $(prefix) ; chmod a+rx $(prefix) ; fi - -if [ -d $(exec_prefix) ] ; then true ; else mkdir $(exec_prefix) ; chmod a+rx $(exec_prefix) ; fi - -if [ -d $(libdir) ] ; then true ; else mkdir $(libdir) ; chmod a+rx $(libdir) ; fi - -if [ -d $(libdir)/gcc-lib ] ; then true ; else mkdir $(libdir)/gcc-lib ; chmod a+rx $(libdir)/gcc-lib ; fi -# This dir isn't currently searched by cpp. -# -if [ -d $(libdir)/gcc-lib/include ] ; then true ; else mkdir $(libdir)/gcc-lib/include ; chmod a+rx $(libdir)/gcc-lib/include ; fi - -fdir= ; for dir in `echo $(libsubdir) | tr '/' ' '`; do \ - fdir=$${fdir}/$${dir}; \ - if [ -d $${fdir} ] ; then true ; else mkdir $${fdir}; chmod a+rx $${fdir}; fi ; \ - done - -if [ -d $(bindir) ] ; then true ; else mkdir $(bindir) ; chmod a+rx $(bindir) ; fi - -if [ -d $(includedir) ] ; then true ; else mkdir $(includedir) ; chmod a+rx $(includedir) ; fi - -if [ -d $(infodir) ] ; then true ; else mkdir $(infodir) ; chmod a+rx $(infodir) ; fi - -if [ -d $(slibdir) ] ; then true ; else mkdir $(slibdir) ; chmod a+rx $(slibdir) ; fi -# We don't use mkdir -p to create the parents of man1dir, -# because some systems don't support it. -# Instead, we use this technique to create the immediate parent of man1dir. - -parent=`echo $(man1dir)|sed -e 's@/[^/]*$$@@'`; \ - if [ -d $$parent ] ; then true ; else mkdir $$parent ; chmod a+rx $$parent ; fi - -if [ -d $(man1dir) ] ; then true ; else mkdir $(man1dir) ; chmod a+rx $(man1dir) ; fi - -if [ -d $(man7dir) ] ; then true ; else mkdir $(man7dir) ; chmod a+rx $(man7dir) ; fi + $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(libsubdir) + $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(bindir) + $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(includedir) + $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(infodir) + $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(slibdir) + $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(man1dir) + $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(man7dir) # Install the compiler executables built during cross compilation. install-common: native $(EXTRA_PARTS) lang.install-common for file in $(COMPILERS); do \ if [ -f $$file ] ; then \ - rm -f $(libsubdir)/$$file; \ - $(INSTALL_PROGRAM) $$file $(libsubdir)/$$file; \ + rm -f $(DESTDIR)$(libsubdir)/$$file; \ + $(INSTALL_PROGRAM) $$file $(DESTDIR)$(libsubdir)/$$file; \ else true; \ fi; \ done for file in $(EXTRA_PASSES) $(EXTRA_PROGRAMS) $(USE_COLLECT2) ..; do \ if [ x"$$file" != x.. ]; then \ - rm -f $(libsubdir)/$$file; \ - $(INSTALL_PROGRAM) $$file $(libsubdir)/$$file; \ + rm -f $(DESTDIR)$(libsubdir)/$$file; \ + $(INSTALL_PROGRAM) $$file $(DESTDIR)$(libsubdir)/$$file; \ else true; fi; \ done for file in $(EXTRA_PARTS) ..; do \ if [ x"$$file" != x.. ]; then \ - rm -f $(libsubdir)/$$file; \ - $(INSTALL_DATA) $$file $(libsubdir)/$$file; \ - chmod a-x $(libsubdir)/$$file; \ + rm -f $(DESTDIR)$(libsubdir)/$$file; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(libsubdir)/$$file; \ + chmod a-x $(DESTDIR)$(libsubdir)/$$file; \ else true; fi; \ done # Don't mess with specs if it doesn't exist yet. -if [ -f specs ] ; then \ - rm -f $(libsubdir)/specs; \ - $(INSTALL_DATA) specs $(libsubdir)/specs; \ - chmod a-x $(libsubdir)/specs; \ + rm -f $(DESTDIR)$(libsubdir)/specs; \ + $(INSTALL_DATA) specs $(DESTDIR)$(libsubdir)/specs; \ + chmod a-x $(DESTDIR)$(libsubdir)/specs; \ fi # Install protoize if it was compiled. -if [ -f protoize$(exeext) ]; \ then \ if [ -f gcc-cross$(exeext) ] ; then \ - rm -f $(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \ - $(INSTALL_PROGRAM) protoize$(exeext) $(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \ - rm -f $(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \ - $(INSTALL_PROGRAM) unprotoize$(exeext) $(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \ + $(INSTALL_PROGRAM) protoize$(exeext) $(DESTDIR)$(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \ + $(INSTALL_PROGRAM) unprotoize$(exeext) $(DESTDIR)$(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext); \ else \ - rm -f $(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \ - $(INSTALL_PROGRAM) protoize$(exeext) $(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \ - rm -f $(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \ - $(INSTALL_PROGRAM) unprotoize$(exeext) $(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) protoize$(exeext) $(DESTDIR)$(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) unprotoize$(exeext) $(DESTDIR)$(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext); \ fi ; \ - rm -f $(libsubdir)/SYSCALLS.c.X; \ - $(INSTALL_DATA) SYSCALLS.c.X $(libsubdir)/SYSCALLS.c.X; \ - chmod a-x $(libsubdir)/SYSCALLS.c.X; \ + rm -f $(DESTDIR)$(libsubdir)/SYSCALLS.c.X; \ + $(INSTALL_DATA) SYSCALLS.c.X $(DESTDIR)$(libsubdir)/SYSCALLS.c.X; \ + chmod a-x $(DESTDIR)$(libsubdir)/SYSCALLS.c.X; \ fi # Install gcov if it was compiled. -if [ -f gcov$(exeext) ]; \ then \ - rm -f $(bindir)/gcov$(exeext); \ - $(INSTALL_PROGRAM) gcov$(exeext) $(bindir)/$(GCOV_INSTALL_NAME)$(exeext); \ + rm -f $(DESTDIR)$(bindir)/gcov$(exeext); \ + $(INSTALL_PROGRAM) gcov$(exeext) $(DESTDIR)$(bindir)/$(GCOV_INSTALL_NAME)$(exeext); \ fi - $(INSTALL_SCRIPT) gccbug $(bindir)/$(GCCBUG_INSTALL_NAME) + $(INSTALL_SCRIPT) gccbug $(DESTDIR)$(bindir)/$(GCCBUG_INSTALL_NAME) # Install the driver program as $(target_alias)-gcc, # $(target-alias)-gcc-$(version) # and also as either gcc (if native) or $(gcc_tooldir)/bin/gcc. install-driver: installdirs xgcc$(exeext) -if [ -f gcc-cross$(exeext) ] ; then \ - rm -f $(bindir)/$(GCC_CROSS_NAME)$(exeext); \ - $(INSTALL_PROGRAM) gcc-cross$(exeext) $(bindir)/$(GCC_CROSS_NAME)$(exeext); \ - rm -f $(bindir)/$(target_alias)-gcc-$(version); \ - $(LN) $(bindir)/$(GCC_CROSS_NAME)$(exeext) $(bindir)/$(target_alias)-gcc-$(version) ; \ - if [ -d $(gcc_tooldir)/bin/. ] ; then \ - rm -f $(gcc_tooldir)/bin/gcc$(exeext); \ - $(INSTALL_PROGRAM) gcc-cross$(exeext) $(gcc_tooldir)/bin/gcc$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$(GCC_CROSS_NAME)$(exeext); \ + $(INSTALL_PROGRAM) gcc-cross$(exeext) $(DESTDIR)$(bindir)/$(GCC_CROSS_NAME)$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$(target_alias)-gcc-$(version); \ + ( cd $(DESTDIR)$(bindir) && \ + $(LN) $(GCC_CROSS_NAME)$(exeext) $(target_alias)-gcc-$(version) ); \ + if [ -d $(DESTDIR)$(gcc_tooldir)/bin/. ] ; then \ + rm -f $(DESTDIR)$(gcc_tooldir)/bin/gcc$(exeext); \ + $(INSTALL_PROGRAM) gcc-cross$(exeext) $(DESTDIR)$(gcc_tooldir)/bin/gcc$(exeext); \ else true; fi; \ else \ - rm -f $(bindir)/$(GCC_INSTALL_NAME)$(exeext); \ - $(INSTALL_PROGRAM) xgcc$(exeext) $(bindir)/$(GCC_INSTALL_NAME)$(exeext); \ - rm -f $(bindir)/$(target_alias)-gcc-$(version); \ - $(LN) $(bindir)/$(GCC_INSTALL_NAME)$(exeext) $(bindir)/$(target_alias)-gcc-$(version) ; \ - rm -f $(bindir)/$(target_alias)-gcc-tmp$(exeext); \ - $(LN) $(bindir)/$(GCC_INSTALL_NAME)$(exeext) $(bindir)/$(target_alias)-gcc-tmp$(exeext); \ - mv $(bindir)/$(target_alias)-gcc-tmp$(exeext) $(bindir)/$(GCC_TARGET_INSTALL_NAME)$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) xgcc$(exeext) $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$(target_alias)-gcc-$(version); \ + ( cd $(DESTDIR)$(bindir) && \ + $(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_alias)-gcc-$(version) ); \ + rm -f $(DESTDIR)$(bindir)/$(target_alias)-gcc-tmp$(exeext); \ + ( cd $(DESTDIR)$(bindir) && \ + $(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_alias)-gcc-tmp$(exeext) && \ + mv -f $(target_alias)-gcc-tmp$(exeext) $(GCC_TARGET_INSTALL_NAME)$(exeext) ); \ fi # Install the info files. # $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir # to do the install. install-info: doc installdirs lang.install-info - -rm -f $(infodir)/cpp.info* $(infodir)/gcc.info* - -rm -f $(infodir)/cppinternals.info* $(infodir)/gccint.info* + -rm -f $(DESTDIR)$(infodir)/cpp.info* $(DESTDIR)$(infodir)/gcc.info* + -rm -f $(DESTDIR)$(infodir)/cppinternals.info* $(DESTDIR)$(infodir)/gccint.info* if [ -f $(docdir)/gcc.info ]; then \ for f in $(docdir)/cpp.info* $(docdir)/gcc.info* \ $(docdir)/cppinternals.info* $(docdir)/gccint.info*; do \ realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \ - $(INSTALL_DATA) $$f $(infodir)/$$realfile; \ + $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$realfile; \ done; \ else true; fi -if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ - if [ -f $(infodir)/dir ] ; then \ + if [ -f $(DESTDIR)$(infodir)/dir ] ; then \ for f in cpp.info gcc.info gccint.info cppinternals.info; do \ - if [ -f $(infodir)/$$f ]; then \ - install-info --dir-file=$(infodir)/dir $(infodir)/$$f; \ + if [ -f $(DESTDIR)$(infodir)/$$f ]; then \ + install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/$$f; \ else true; fi; \ done; \ else true; fi; \ else true; fi; - -chmod a-x $(infodir)/cpp.info* $(infodir)/gcc.info* - -chmod a-x $(infodir)/cppinternals.info* $(infodir)/gccint.info* + -chmod a-x $(DESTDIR)$(infodir)/cpp.info* $(DESTDIR)$(infodir)/gcc.info* + -chmod a-x $(DESTDIR)$(infodir)/cppinternals.info* $(DESTDIR)$(infodir)/gccint.info* # Install the man pages. install-man: installdirs $(GENERATED_MANPAGES) lang.install-man -if [ -f gcc-cross$(exeext) ] ; then \ - rm -f $(man1dir)/$(GCC_CROSS_NAME)$(man1ext); \ - $(INSTALL_DATA) $(docdir)/gcc.1 $(man1dir)/$(GCC_CROSS_NAME)$(man1ext); \ - chmod a-x $(man1dir)/$(GCC_CROSS_NAME)$(man1ext); \ + rm -f $(DESTDIR)$(man1dir)/$(GCC_CROSS_NAME)$(man1ext); \ + $(INSTALL_DATA) $(docdir)/gcc.1 $(DESTDIR)$(man1dir)/$(GCC_CROSS_NAME)$(man1ext); \ + chmod a-x $(DESTDIR)$(man1dir)/$(GCC_CROSS_NAME)$(man1ext); \ else \ - rm -f $(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \ - $(INSTALL_DATA) $(docdir)/gcc.1 $(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \ - chmod a-x $(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \ + rm -f $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \ + $(INSTALL_DATA) $(docdir)/gcc.1 $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \ + chmod a-x $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext); \ fi - -rm -f $(man1dir)/cpp$(man1ext) - -$(INSTALL_DATA) $(docdir)/cpp.1 $(man1dir)/cpp$(man1ext) - -chmod a-x $(man1dir)/cpp$(man1ext) - -rm -f $(man1dir)/gcov$(man1ext) - -$(INSTALL_DATA) $(docdir)/gcov.1 $(man1dir)/gcov$(man1ext) - -chmod a-x $(man1dir)/gcov$(man1ext) - -rm -f $(man7dir)/fsf-funding$(man7ext) - -$(INSTALL_DATA) $(docdir)/fsf-funding.7 $(man7dir)/fsf-funding$(man7ext) - -chmod a-x $(man7dir)/fsf-funding$(man7ext) - -rm -f $(man7dir)/gfdl$(man7ext) - -$(INSTALL_DATA) $(docdir)/gfdl.7 $(man7dir)/gfdl$(man7ext) - -chmod a-x $(man7dir)/gfdl$(man7ext) - -rm -f $(man7dir)/gpl$(man7ext) - -$(INSTALL_DATA) $(docdir)/gpl.7 $(man7dir)/gpl$(man7ext) - -chmod a-x $(man7dir)/gpl$(man7ext) + -rm -f $(DESTDIR)$(man1dir)/cpp$(man1ext) + -$(INSTALL_DATA) $(docdir)/cpp.1 $(DESTDIR)$(man1dir)/cpp$(man1ext) + -chmod a-x $(DESTDIR)$(man1dir)/cpp$(man1ext) + -rm -f $(DESTDIR)$(man1dir)/gcov$(man1ext) + -$(INSTALL_DATA) $(docdir)/gcov.1 $(DESTDIR)$(man1dir)/gcov$(man1ext) + -chmod a-x $(DESTDIR)$(man1dir)/gcov$(man1ext) + -rm -f $(DESTDIR)$(man7dir)/fsf-funding$(man7ext) + -$(INSTALL_DATA) $(docdir)/fsf-funding.7 $(DESTDIR)$(man7dir)/fsf-funding$(man7ext) + -chmod a-x $(DESTDIR)$(man7dir)/fsf-funding$(man7ext) + -rm -f $(DESTDIR)$(man7dir)/gfdl$(man7ext) + -$(INSTALL_DATA) $(docdir)/gfdl.7 $(DESTDIR)$(man7dir)/gfdl$(man7ext) + -chmod a-x $(DESTDIR)$(man7dir)/gfdl$(man7ext) + -rm -f $(DESTDIR)$(man7dir)/gpl$(man7ext) + -$(INSTALL_DATA) $(docdir)/gpl.7 $(DESTDIR)$(man7dir)/gpl$(man7ext) + -chmod a-x $(DESTDIR)$(man7dir)/gpl$(man7ext) # Install the library. install-libgcc: libgcc.mk libgcc.a installdirs @@ -2929,6 +2930,7 @@ install-libgcc: libgcc.mk libgcc.a installdirs MAKEOVERRIDES= \ INSTALL_DATA="$(INSTALL_DATA)" \ RANLIB_FOR_TARGET="$$r_f_t" \ + DESTDIR="$(DESTDIR)" \ libsubdir="$(libsubdir)" \ slibdir="$(slibdir)" \ -f libgcc.mk install @@ -2955,6 +2957,7 @@ install-multilib: stmp-multilib installdirs MAKEOVERRIDES= \ INSTALL_DATA="$(INSTALL_DATA)" \ RANLIB_FOR_TARGET="$$r_f_t" \ + DESTDIR="$(DESTDIR)" \ libsubdir="$(libsubdir)" \ slibdir="$(slibdir)" \ -f libgcc.mk install @@ -2964,23 +2967,23 @@ install-headers: $(INSTALL_HEADERS_DIR) # Fix symlinks to absolute paths in the installed include directory to # point to the installed directory, not the build directory. # Don't need to use LN_S here since we really do need ln -s and no substitutes. - -files=`cd $(libsubdir)/include; find . -type l -print 2>/dev/null`; \ + -files=`cd $(DESTDIR)$(libsubdir)/include; find . -type l -print 2>/dev/null`; \ if [ $$? -eq 0 ]; then \ dir=`cd include; ${PWD}`; \ for i in $$files; do \ - dest=`ls -ld $(libsubdir)/include/$$i | sed -n 's/.*-> //p'`; \ + dest=`ls -ld $(DESTDIR)$(libsubdir)/include/$$i | sed -n 's/.*-> //p'`; \ if expr "$$dest" : "$$dir.*" > /dev/null; then \ - rm -f $(libsubdir)/include/$$i; \ - ln -s `echo $$i | sed "s|/[^/]*|/..|g" | sed 's|/..$$||'``echo "$$dest" | sed "s|$$dir||"` $(libsubdir)/include/$$i; \ + rm -f $(DESTDIR)$(libsubdir)/include/$$i; \ + ln -s `echo $$i | sed "s|/[^/]*|/..|g" | sed 's|/..$$||'``echo "$$dest" | sed "s|$$dir||"` $(DESTDIR)$(libsubdir)/include/$$i; \ fi; \ done; \ fi # Create or recreate the gcc private include file directory. install-include-dir: installdirs - -rm -rf $(libsubdir)/include - mkdir $(libsubdir)/include - -chmod a+rx $(libsubdir)/include + -rm -rf $(DESTDIR)$(libsubdir)/include + mkdir $(DESTDIR)$(libsubdir)/include + -chmod a+rx $(DESTDIR)$(libsubdir)/include # Install the include directory using tar. install-headers-tar: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir @@ -2989,7 +2992,7 @@ install-headers-tar: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir # found in CDPATH, corrupting the output. We could just redirect the # output of `cd', but some shells lose on redirection within `()'s (cd `${PWD}`/include ; \ - tar -cf - .; exit 0) | (cd $(libsubdir)/include; tar xpf - ) + tar -cf - .; exit 0) | (cd $(DESTDIR)$(libsubdir)/include; tar xpf - ) # /bin/sh on some systems returns the status of the first tar, # and that can lose with GNU tar which always writes a full block. # So use `exit 0' to ignore its exit status. @@ -2998,78 +3001,78 @@ install-headers-tar: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir install-headers-cpio: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir # See discussion about the use of `pwd` above cd `${PWD}`/include ; \ - find . -print | cpio -pdum $(libsubdir)/include + find . -print | cpio -pdum $(DESTDIR)$(libsubdir)/include # Install the include directory using cp. install-headers-cp: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir - cp -p -r include $(libsubdir) + cp -p -r include $(DESTDIR)$(libsubdir) itoolsdir = $(libsubdir)/install-tools # Don't install the headers. Instead, install appropriate scripts # and supporting files for fixincludes to be run later. install-mkheaders: stmp-int-hdrs $(STMP_FIXPROTO) install-include-dir \ mkheaders xlimits.h - -rm -rf $(itoolsdir) - $(SHELL) $(srcdir)/mkinstalldirs $(itoolsdir)/include + -rm -rf $(DESTDIR)$(itoolsdir) + $(SHELL) $(srcdir)/mkinstalldirs $(DESTDIR)$(itoolsdir)/include for file in $(USER_H); do \ realfile=`echo $$file | sed -e 's|.*/\([^/]*\)$$|\1|'`; \ $(INSTALL_DATA) $$file \ - $(itoolsdir)/include/$$realfile ; \ + $(DESTDIR)$(itoolsdir)/include/$$realfile ; \ done - $(INSTALL_DATA) xlimits.h $(itoolsdir)/include/limits.h + $(INSTALL_DATA) xlimits.h $(DESTDIR)$(itoolsdir)/include/limits.h if [ x$(STMP_FIXINC) != x ] ; then \ $(INSTALL_DATA) $(srcdir)/README-fixinc \ - $(itoolsdir)/include/README ; \ - $(INSTALL_PROGRAM) fixinc.sh $(itoolsdir)/fixinc.sh ; \ - $(INSTALL_PROGRAM) fixinc/fixincl $(itoolsdir)/fixincl ; \ - $(INSTALL_DATA) $(srcdir)/gsyslimits.h $(itoolsdir)/gsyslimits.h ; \ + $(DESTDIR)$(itoolsdir)/include/README ; \ + $(INSTALL_PROGRAM) fixinc.sh $(DESTDIR)$(itoolsdir)/fixinc.sh ; \ + $(INSTALL_PROGRAM) fixinc/fixincl $(DESTDIR)$(itoolsdir)/fixincl ; \ + $(INSTALL_DATA) $(srcdir)/gsyslimits.h $(DESTDIR)$(itoolsdir)/gsyslimits.h ; \ else :; fi if [ x$(STMP_FIXPROTO) != x ] ; then \ $(INSTALL_PROGRAM) $(srcdir)/mkinstalldirs \ - $(itoolsdir)/mkinstalldirs ; \ - $(INSTALL_PROGRAM) $(srcdir)/fixproto $(itoolsdir)/fixproto ; \ + $(DESTDIR)$(itoolsdir)/mkinstalldirs ; \ + $(INSTALL_PROGRAM) $(srcdir)/fixproto $(DESTDIR)$(itoolsdir)/fixproto ; \ $(INSTALL_PROGRAM) fix-header$(build_exeext) \ - $(itoolsdir)/fix-header$(build_exeext) ; \ + $(DESTDIR)$(itoolsdir)/fix-header$(build_exeext) ; \ else :; fi - $(INSTALL_PROGRAM) mkheaders $(itoolsdir)/mkheaders + $(INSTALL_PROGRAM) mkheaders $(DESTDIR)$(itoolsdir)/mkheaders echo 'SYSTEM_HEADER_DIR="$(SYSTEM_HEADER_DIR)"' \ - > $(itoolsdir)/mkheaders.conf + > $(DESTDIR)$(itoolsdir)/mkheaders.conf echo 'OTHER_FIXINCLUDES_DIRS="$(OTHER_FIXINCLUDES_DIRS)"' \ - >> $(itoolsdir)/mkheaders.conf + >> $(DESTDIR)$(itoolsdir)/mkheaders.conf echo 'FIXPROTO_DEFINES="$(FIXPROTO_DEFINES)"' \ - >> $(itoolsdir)/mkheaders.conf - echo 'STMP_FIXPROTO="$(STMP_FIXPROTO)"' >> $(itoolsdir)/mkheaders.conf - echo 'STMP_FIXINC="$(STMP_FIXINC)"' >> $(itoolsdir)/mkheaders.conf + >> $(DESTDIR)$(itoolsdir)/mkheaders.conf + echo 'STMP_FIXPROTO="$(STMP_FIXPROTO)"' >> $(DESTDIR)$(itoolsdir)/mkheaders.conf + echo 'STMP_FIXINC="$(STMP_FIXINC)"' >> $(DESTDIR)$(itoolsdir)/mkheaders.conf # Use this target to install the program `collect2' under the name `collect2'. install-collect2: collect2 installdirs - $(INSTALL_PROGRAM) collect2$(exeext) $(libsubdir)/collect2$(exeext) + $(INSTALL_PROGRAM) collect2$(exeext) $(DESTDIR)$(libsubdir)/collect2$(exeext) # Install the driver program as $(libsubdir)/gcc for collect2. - $(INSTALL_PROGRAM) xgcc$(exeext) $(libsubdir)/gcc$(exeext) + $(INSTALL_PROGRAM) xgcc$(exeext) $(DESTDIR)$(libsubdir)/gcc$(exeext) # Cancel installation by deleting the installed files. uninstall: intl.uninstall lang.uninstall - -rm -rf $(libsubdir) - -rm -rf $(bindir)/$(GCC_INSTALL_NAME)$(exeext) - -rm -rf $(bindir)/$(GCC_CROSS_NAME)$(exeext) - -rm -f $(bindir)/$(CPP_INSTALL_NAME)$(exeext) - -rm -f $(bindir)/$(CPP_CROSS_NAME)$(exeext) + -rm -rf $(DESTDIR)$(libsubdir) + -rm -rf $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext) + -rm -rf $(DESTDIR)$(bindir)/$(GCC_CROSS_NAME)$(exeext) + -rm -f $(DESTDIR)$(bindir)/$(CPP_INSTALL_NAME)$(exeext) + -rm -f $(DESTDIR)$(bindir)/$(CPP_CROSS_NAME)$(exeext) -if [ x$(cpp_install_dir) != x ]; then \ - rm -f $(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \ - rm -f $(prefix)/$(cpp_install_dir)/$(CPP_CROSS_NAME)$(exeext); \ + rm -f $(DESTDIR)$(prefix)/$(cpp_install_dir)/$(CPP_INSTALL_NAME)$(exeext); \ + rm -f $(DESTDIR)$(prefix)/$(cpp_install_dir)/$(CPP_CROSS_NAME)$(exeext); \ else true; fi - -rm -rf $(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext) - -rm -rf $(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext) - -rm -rf $(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext) - -rm -rf $(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext) - -rm -rf $(bindir)/$(GCOV_INSTALL_NAME)$(exeext) - -rm -rf $(man1dir)/$(GCC_INSTALL_NAME)$(man1ext) - -rm -rf $(man1dir)/$(GCC_CROSS_NAME)$(man1ext) - -rm -rf $(man1dir)/cpp$(man1ext) - -rm -rf $(man1dir)/protoize$(man1ext) - -rm -rf $(man1dir)/unprotoize$(man1ext) - -rm -f $(infodir)/cpp.info* $(infodir)/gcc.info* - -rm -f $(infodir)/cppinternals.info* $(infodir)/gccint.info* + -rm -rf $(DESTDIR)$(bindir)/$(PROTOIZE_INSTALL_NAME)$(exeext) + -rm -rf $(DESTDIR)$(bindir)/$(PROTOIZE_CROSS_NAME)$(exeext) + -rm -rf $(DESTDIR)$(bindir)/$(UNPROTOIZE_INSTALL_NAME)$(exeext) + -rm -rf $(DESTDIR)$(bindir)/$(UNPROTOIZE_CROSS_NAME)$(exeext) + -rm -rf $(DESTDIR)$(bindir)/$(GCOV_INSTALL_NAME)$(exeext) + -rm -rf $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext) + -rm -rf $(DESTDIR)$(man1dir)/$(GCC_CROSS_NAME)$(man1ext) + -rm -rf $(DESTDIR)$(man1dir)/cpp$(man1ext) + -rm -rf $(DESTDIR)$(man1dir)/protoize$(man1ext) + -rm -rf $(DESTDIR)$(man1dir)/unprotoize$(man1ext) + -rm -f $(DESTDIR)$(infodir)/cpp.info* $(DESTDIR)$(infodir)/gcc.info* + -rm -f $(DESTDIR)$(infodir)/cppinternals.info* $(DESTDIR)$(infodir)/gccint.info* # # These targets are for the dejagnu testsuites. The file site.exp # contains global variables that all the testsuites will use. diff --git a/gcc/aclocal.m4 b/gcc/aclocal.m4 index 0cec464e2aa..9859468942f 100644 --- a/gcc/aclocal.m4 +++ b/gcc/aclocal.m4 @@ -306,10 +306,7 @@ procedure conftest is begin null; end conftest; EOF gcc_cv_prog_adac=no # Have to do ac_tool_prefix and user overrides by hand. -user_adac=$ADAC -user_cc=$CC -for cand in ${ac_tool_prefix}$user_adac $user_adac \ - ${ac_tool_prefix}$user_cc $user_cc \ +for cand in ${ADAC+"$ADAC"} ${CC+"$CC"} \ ${ac_tool_prefix}gcc gcc \ ${ac_tool_prefix}cc cc \ ${ac_tool_prefix}gnatgcc gnatgcc \ diff --git a/gcc/ada/5rosinte.ads b/gcc/ada/5rosinte.ads index e15c01e82d4..3442fa13c44 100644 --- a/gcc/ada/5rosinte.ads +++ b/gcc/ada/5rosinte.ads @@ -106,6 +106,7 @@ package System.OS_Interface is SIGTERM : constant := 15; -- software termination signal from kill SIGUSR1 : constant := 16; -- user defined signal 1 SIGUSR2 : constant := 17; -- user defined signal 2 + SIGXCPU : constant := 0; -- XCPU SIGADAABORT : constant := SIGABRT; diff --git a/gcc/ada/5rtpopsp.adb b/gcc/ada/5rtpopsp.adb new file mode 100644 index 00000000000..a1f15975793 --- /dev/null +++ b/gcc/ada/5rtpopsp.adb @@ -0,0 +1,266 @@ +------------------------------------------------------------------------------ +-- -- +-- GNU ADA RUN-TIME LIBRARY (GNARL) COMPONENTS -- +-- -- +-- S Y S T E M . T A S K _ P R I M I T I V E S . O P E R A T I O N S . -- +-- S P E C I F I C -- +-- -- +-- B o d y -- +-- -- +-- $Revision: 1.7 $ +-- -- +-- Copyright (C) 1991-1999, Florida State University -- +-- -- +-- GNARL is free software; you can redistribute it and/or modify it under -- +-- terms of the GNU General Public License as published by the Free Soft- -- +-- ware Foundation; either version 2, or (at your option) any later ver- -- +-- sion. GNARL is distributed in the hope that it will be useful, but WITH- -- +-- OUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY -- +-- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -- +-- for more details. You should have received a copy of the GNU General -- +-- Public License distributed with GNARL; see file COPYING. If not, write -- +-- to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, -- +-- MA 02111-1307, USA. -- +-- -- +-- As a special exception, if other files instantiate generics from this -- +-- unit, or you link this unit with other files to produce an executable, -- +-- this unit does not by itself cause the resulting executable to be -- +-- covered by the GNU General Public License. This exception does not -- +-- however invalidate any other reasons why the executable file might be -- +-- covered by the GNU Public License. -- +-- -- +-- GNARL was developed by the GNARL team at Florida State University. It is -- +-- now maintained by Ada Core Technologies Inc. in cooperation with Florida -- +-- State University (http://www.gnat.com). -- +-- -- +------------------------------------------------------------------------------ + +-- This is a POSIX version of this package where foreign threads are +-- recognized. +-- Currently, DEC Unix, SCO UnixWare 7 and RTEMS use this version. + +with System.Soft_Links; +-- used to initialize TSD for a C thread, in function Self + +separate (System.Task_Primitives.Operations) +package body Specific is + + ------------------ + -- Local Data -- + ------------------ + + -- The followings are logically constants, but need to be initialized + -- at run time. + + -- The following gives the Ada run-time direct access to a variable + -- context switched by RTEMS at the lowest level. + + RTEMS_Ada_Self : System.Address; + pragma Import (C, RTEMS_Ada_Self, "rtems_ada_self"); + + -- The following are used to allow the Self function to + -- automatically generate ATCB's for C threads that happen to call + -- Ada procedure, which in turn happen to call the Ada runtime system. + + type Fake_ATCB; + type Fake_ATCB_Ptr is access Fake_ATCB; + type Fake_ATCB is record + Stack_Base : Interfaces.C.unsigned := 0; + -- A value of zero indicates the node is not in use. + Next : Fake_ATCB_Ptr; + Real_ATCB : aliased Ada_Task_Control_Block (0); + end record; + + Fake_ATCB_List : Fake_ATCB_Ptr; + -- A linear linked list. + -- The list is protected by All_Tasks_L; + -- Nodes are added to this list from the front. + -- Once a node is added to this list, it is never removed. + + Fake_Task_Elaborated : aliased Boolean := True; + -- Used to identified fake tasks (i.e., non-Ada Threads). + + Next_Fake_ATCB : Fake_ATCB_Ptr; + -- Used to allocate one Fake_ATCB in advance. See comment in New_Fake_ATCB + + ----------------------- + -- Local Subprograms -- + ----------------------- + + --------------------------------- + -- Support for New_Fake_ATCB -- + --------------------------------- + + function New_Fake_ATCB return Task_ID; + -- Allocate and Initialize a new ATCB. This code can safely be called from + -- a foreign thread, as it doesn't access implicitely or explicitely + -- "self" before having initialized the new ATCB. + + ------------------- + -- New_Fake_ATCB -- + ------------------- + + function New_Fake_ATCB return Task_ID is + Self_ID : Task_ID; + P, Q : Fake_ATCB_Ptr; + Succeeded : Boolean; + + begin + -- This section is ticklish. + -- We dare not call anything that might require an ATCB, until + -- we have the new ATCB in place. + + Write_Lock (All_Tasks_L'Access); + Q := null; + P := Fake_ATCB_List; + + while P /= null loop + if P.Stack_Base = 0 then + Q := P; + end if; + + P := P.Next; + end loop; + + if Q = null then + + -- Create a new ATCB with zero entries. + + Self_ID := Next_Fake_ATCB.Real_ATCB'Access; + Next_Fake_ATCB.Stack_Base := 1; + Next_Fake_ATCB.Next := Fake_ATCB_List; + Fake_ATCB_List := Next_Fake_ATCB; + Next_Fake_ATCB := null; + + else + -- Reuse an existing fake ATCB. + + Self_ID := Q.Real_ATCB'Access; + Q.Stack_Base := 1; + end if; + + -- Record this as the Task_ID for the current thread. + + Self_ID.Common.LL.Thread := pthread_self; + + RTEMS_Ada_Self := To_Address (Self_ID); + + -- Do the standard initializations + + System.Tasking.Initialize_ATCB + (Self_ID, null, Null_Address, Null_Task, Fake_Task_Elaborated'Access, + System.Priority'First, Task_Info.Unspecified_Task_Info, 0, Self_ID, + Succeeded); + pragma Assert (Succeeded); + + -- Finally, it is safe to use an allocator in this thread. + + if Next_Fake_ATCB = null then + Next_Fake_ATCB := new Fake_ATCB; + end if; + + Self_ID.Common.State := Runnable; + Self_ID.Awake_Count := 1; + + -- Since this is not an ordinary Ada task, we will start out undeferred + + Self_ID.Deferral_Level := 0; + + System.Soft_Links.Create_TSD (Self_ID.Common.Compiler_Data); + + -- ???? + -- The following call is commented out to avoid dependence on + -- the System.Tasking.Initialization package. + -- It seems that if we want Ada.Task_Attributes to work correctly + -- for C threads we will need to raise the visibility of this soft + -- link to System.Soft_Links. + -- We are putting that off until this new functionality is otherwise + -- stable. + -- System.Tasking.Initialization.Initialize_Attributes_Link.all (T); + + for J in Known_Tasks'Range loop + if Known_Tasks (J) = null then + Known_Tasks (J) := Self_ID; + Self_ID.Known_Tasks_Index := J; + exit; + end if; + end loop; + + -- Must not unlock until Next_ATCB is again allocated. + + Unlock (All_Tasks_L'Access); + return Self_ID; + end New_Fake_ATCB; + + ---------------- + -- Initialize -- + ---------------- + + procedure Initialize (Environment_Task : Task_ID) is + + begin + RTEMS_Ada_Self := To_Address (Environment_Task); + + -- Create a free ATCB for use on the Fake_ATCB_List. + + Next_Fake_ATCB := new Fake_ATCB; + end Initialize; + + --------- + -- Set -- + --------- + + procedure Set (Self_Id : Task_ID) is + + begin + RTEMS_Ada_Self := To_Address (Self_Id); + end Set; + + ---------- + -- Self -- + ---------- + + -- To make Ada tasks and C threads interoperate better, we have + -- added some functionality to Self. Suppose a C main program + -- (with threads) calls an Ada procedure and the Ada procedure + -- calls the tasking runtime system. Eventually, a call will be + -- made to self. Since the call is not coming from an Ada task, + -- there will be no corresponding ATCB. + + -- (The entire Ada run-time system may not have been elaborated, + -- either, but that is a different problem, that we will need to + -- solve another way.) + + -- What we do in Self is to catch references that do not come + -- from recognized Ada tasks, and create an ATCB for the calling + -- thread. + + -- The new ATCB will be "detached" from the normal Ada task + -- master hierarchy, much like the existing implicitly created + -- signal-server tasks. + + -- We will also use such points to poll for disappearance of the + -- threads associated with any implicit ATCBs that we created + -- earlier, and take the opportunity to recover them. + + -- A nasty problem here is the limitations of the compilation + -- order dependency, and in particular the GNARL/GNULLI layering. + -- To initialize an ATCB we need to assume System.Tasking has + -- been elaborated. + + function Self return Task_ID is + Result : System.Address; + + begin + Result := RTEMS_Ada_Self; + + -- If the key value is Null, then it is a non-Ada task. + + if Result = System.Null_Address then + return New_Fake_ATCB; + end if; + + return To_Task_ID (Result); + end Self; + +end Specific; diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index e5d0586de54..75bc373a3ce 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,58 @@ +2003-01-29 Laurent Guerby <guerby@acm.org> + + PR ada/8344 + * final.c: rename to adafinal.c to avoid file name conflicts with gcc file. + * Makefile.in: match previous change. + * Make-lang.in: match previous change. + +2003-01-29 Joel Sherrill <joel@OARcorp.com> + + * 5rosinte.ads: Add SIGXCPU. + * 5rtpopsp.adb: New file. + * Make-lang.in: Do not build gnatpsta and gnatpsys when cross. + * Makefile.in: Recognize more RTEMS targets and add the RTEMS + specific file 5rtpopsp.adb. + * adaint.h: Add include of <stdio.h> when target is RTEMS. This + is likely needed for all newlib targets. + * init.c: Add RTEMS specific version of __gnat_initialize(). + +2003-01-28 Christian Cornelssen <ccorn@cs.tu-berlin.de> + + * Make-lang.in (ada.install-info): Let $(DESTDIR)$(infodir) + be created if necessary. + (ada.install-common): Let $(DESTDIR)$(bindir) be created + if necessary. Remove erroneous and redundant gnatchop + installation commands. Test for gnatdll before attempting + to install it. + (ada.uninstall): Also uninstall gnatfind, gnatxref, gnatlbr, + and gnatdll from all plausible locations. + (cross-gnattools, ada.install-common): Use initial tab + instead of spaces in continuation lines. + +2003-01-26 Christian Cornelssen <ccorn@cs.tu-berlin.de> + + * Make-lang.in (ada.install-info, ada.install-common) + (ada.uninstall): Prepend $(DESTDIR) to the destination + directory in all (un)installation commands. + * Makefile.in (install-gnatlib, install-rts): Ditto. + +2002-12-28 Joseph S. Myers <jsm@polyomino.org.uk> + + * gnat_rm.texi, gnat_ug.texi: Use @copying. + * gnat_ug_unx.texi, gnat_ug_vms.texi, gnat_ug_vxw.texi, + gnat_ug_wnt.texi: Regenerate. + +2002-12-23 Joseph S. Myers <jsm@polyomino.org.uk> + + * gnat_rm.texi: Include gcc-common.texi. Use GCC version number + only. + * Make-lang.in ($(srcdir)/ada/gnat_ug_unx.info, + $(srcdir)/ada/gnat_ug_vms.info, $(srcdir)/ada/gnat_ug_vxw.info, + $(srcdir)/ada/gnat_ug_wnt.info, $(srcdir)/ada/gnat_rm.info, + ada/gnat_ug_unx.dvi, ada/gnat_ug_vms.dvi, ada/gnat_ug_vxw.dvi, + ada/gnat_ug_wnt.dvi, ada/gnat_rm.dvi): Depend on + $(srcdir)/doc/include/gcc-common.texi. + 2002-11-18 Nathanael Nerode <neroden@gcc.gnu.org> * adaint.c (__gnat_tmp_name): Better, but good enough for now, solution to buffer overflow bug on GNU/Linux. @@ -3166,3 +3221,9223 @@ Thu Nov 15 18:16:17 2001 Richard Kenner <kenner@vlsi1.ultra.nyu.edu> 2001-10-02 Geert Bosch <bosch@gnat.com> * misc.c (insert_default_attributes): Add dummy version. +2003-01-26 Christian Cornelssen <ccorn@cs.tu-berlin.de> + + * Makefile.tpl (BASE_FLAGS_TO_PASS): Also pass DESTDIR. + (install-info, dir.info): Prepend $(DESTDIR) to $(infodir). + * Makefile.in: Regenerate. + +2003-01-22 Volker Reichelt <reichelt@igpm.rwth-aachen.de> + + * MAINTAINERS: Move myself from GNATS-only-accounts to + write-after-approval. + +2002-12-31 Tom Tromey <tromey@redhat.com> + + * Makefile.in: Rebuilt. + * Makefile.def (target_modules) [libffi]: Allow installation. + +2002-12-13 Jason Merrill <jason@redhat.com> + + * Makefile.tpl (check-gcc-c++): Renamed from check-c++. Don't run + library tests. + (check-c++): Just depend on it and check-target-libstdc++-v3. + * Makefile.in: Regenerate. + +2002-12-12 Alexandre Oliva <aoliva@redhat.com> + + * Makefile.tpl (configure-target-rda): Depend on $(ALL_GCC_C). + * Makefile.in: Rebuilt. + +2002-12-25 Svein E. Seldal <Svein.Seldal@solidas.com> + + * config.sub: Import from master repository + * config.guess: Ditto + +2002-12-13 Jason Merrill <jason@redhat.com> + + * Makefile.in (check-gcc-c++): Renamed from check-c++. Don't run + library tests. + (check-c++): Just depend on it and check-target-libstdc++-v3. + +2002-12-12 Alexandre Oliva <aoliva@redhat.com> + + * Makefile.in (configure-target-rda): Depend on ALL_GCC_C. + +2002-12-09 Svein E. Seldal <Svein.Seldal@solidas.com> + + * config.sub: Import from master repository + * config.guess: Ditto + * MAINTAINERS: Added Svein Seldal under write after approval + +2002-12-05 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> + + * MAINTAINERS: Add Christian Ehrhardt under "GNATS only". + +2002-11-28 Geoffrey Keating <geoffk@apple.com> + + * configure.in: Move host-specific darwin noconfigdirs into + the host-specific section. + +2002-11-19 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> + + * ltconfig (osf[345]): Append $major to soname_spec. + Reflect this in library_names_spec. + * ltmain.sh (osf): Prefix $major with . for use as extension. + +2002-11-19 Andreas Jaeger <aj@suse.de> + + * libtool.m4 (libtool_flags): Add patch from libtool CVS: Support + linking of 32-bit libraries with ld on the x86-64, ppc64, s390x + and sparc64 GNU/Linux systems. + +2002-11-19 Nathan Sidwell <nathan@codesourcery.com> + + * MAINTAINERS: Update email. + +2002-11-18 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> + + * MAINTAINERS: Complete James Dennett's entry. + +2002-11-15 Eric Botcazou <ebotcazou@libertysurf.fr> + + * MAINTAINERS (Write After Approval): Add myself. + +2002-11-13 Bruce Korb <bkorb@gnu.org> + + * Makefile.tpl: syntactic cleanup + +2002-11-13 Stuart Hastings <stuart@apple.com> + + * MAINTAINERS: Add myself to write-after-approval list. + +2002-11-11 Jonathan Wakely <redi@gcc.gnu.org> + + * MAINTAINERS (Write After Approval): Add myself. + +2002-11-04 Adam Nemet <anemet@lnxw.com> + + * MAINTAINERS (Write After Approval): Add myself. + +2002-11-04 Kevin Buettner <kevinb@redhat.com> + + * Makefile.def (host_modules): Add rda. + * Makefile.in: Regenerate. + * configure.in (target_tool): Add target-rda to list. + +2002-10-28 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> + + * MAINTAINERS: Remove "co-maintainer" note for web pages. + +2002-10-25 Phil Edwards <pme@gcc.gnu.org> + + * Makefile.tpl (bootstrap): Add bubblestrap, quickstrap, cleanstrap, + and restrap targets to this rule. + * Makefile.in: Regenerate. + +2002-10-25 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> + + * MAINTAINERS: Add Wolfgang Bangerth and Volker Reichelt under + GNATS only accounts. + +2002-10-24 Hans-Peter Nilsson <hp@bitrange.com> + + * configure.in (i[3456]86-*-linux*): Add check to disable + ${libgcj} for glibc1. + +2002-10-24 Denis Chertykov <denisc@overta.ru> + + * MAINTAINERS: Add myself as ip2k port maintainer. + +2002-10-07 Svein E. Seldal <Svein.Seldal@solidas.com> + + * configure.in: Add tic4x target. + +2002-10-03 Nathanael Nerode <neroden@gcc.gnu.org> + + * Makefile.tpl: Make SET_LIB_PATH substitution more autoconfy. + * configure.in: Make SET_LIB_PATH substitution more autoconfy. + * Makefile.in: Regenerate. + + * Makefile.tpl: Make RPATH_ENVVAR substitution more autoconfy. + * configure.in: Make RPATH_ENVVAR substitution more autoconfy. + * Makefile.in: Regenerate. + +2002-10-02 Janis Johnson <janis187@us.ibm.com> + + * MAINTAINERS: Add myself as web pages co-maintainer. + +2002-10-02 Nathanael Nerode <neroden@gcc.gnu.org> + + * Makefile.tpl: Eliminate reference to all-gui, all-libproc. + * Makefile.in: Regenerate. + +2002-10-02 Zack Weinberg <zack@codesourcery.com> + + * MAINTAINERS: Add myself and Nathan Sidwell + <nathan@codesourcery.com> as VxWorks maintainers. + +2002-10-02 Nathanael Nerode <neroden@gcc.gnu.org> + + * Makefile.def: Remove order dependency comments. + * Makefile.tpl: Add explicit install-install dependencies. + * Makefile.in: Regenerate. + + * Makefile.tpl: Remove material now in src-release. (Finally!) + * Makefile.in: Regenerate. + + * Makefile.tpl: Add configure-target (for src-release in src) + * Makefile.in: Regenerate. + +2002-09-30 Nick Clifton <nickc@redhat.com> + + * Makefile.in (BINUTILS_SUPPORT_DIRS): Add cpu directory. + +2002-09-30 Ulrich Weigand <uweigand@de.ibm.com> + + * configure.in (s390*-*-linux*): Enable libgcj. + +2002-09-29 Nathanael Nerode <neroden@gcc.gnu.org> + + * configure: Revert accidentally applied changes. + + * Makefile.tpl: Make more autoconf-friendly. + * Makefile.in: Regenerate. + * configure: Make substitution more autoconf-like. + +2002-09-28 Richard Earnshaw <rearnsha@arm.com> + + * configure.in (arm-*-coff, strongarm-*-coff, xscale-*-coff): Use a + single entry to handle all these. + (arm-*-elf, strongarm-*-elf, xscale-*-elf): Likewise. Also enable + libjava on arm-*-elf. + +2002-09-27 Geoffrey Keating <geoffk@apple.com> + + * configure.in (powerpc-*-darwin*): Don't configure BFD, TK, or the + things that depend on them. + +2002-09-25 Nathanael Nerode <neroden@gcc.gnu.org> + + * Makefile.tpl: Make subsituted variables more autoconfy. + * Makefile.in: Regenerate. + * configure: Make seds more autoconfy. + +2002-09-25 Nathanael Nerode <neroden@gcc.gnu.org> + + * Makefile.tpl: Rewrite substituted lines to look autoconfy. + * Makefile.in: Regenerate. + * configure.in: Rewrite sed statements to look autoconfy. + + * Makefile.tpl: Autogenerate *-target-* lists, dependencies of + all-target-foo on configure-target-foo. + * Makefile.def: Ditto. + * Makefile.in: Rebuild. + +2002-09-25 Andrew Haley <aph@redhat.com> + + * MAINTAINERS: Add aph@redhat.com as Java maintainer. + +2002-09-22 Nathanael Nerode <neroden@gcc.gnu.org> + + * Makefile.def: New file. + * Makefile.tpl: New file. + * Makefile.in: Generate from Makefile.tpl with 'autogen Makefile.def'. + * contrib/gcc_update: Note that Makefile.in is a generated file. + + * configure.in: Minor rearrangement. Simplify tests. + +2002-09-22 Jason Thorpe <thorpej@wasabisystems.com> + + * configure.in (with_headers): Skip copy if value is "yes". + (with_libs): Likewise. + +2002-09-20 Nathanael Nerode <neroden@gcc.gnu.org> + + * configure.in (*-*-netbsd*): Use noconfigdirs, not skipdirs. + * configure.in (sh*-*-pe*): Ditto. + * configure.in (mips*-*-pe*): Ditto. + * configure.in (*arm-wince-pe): Ditto. + + * configure.in: Rearrange. + +2002-09-14 Kazu Hirata <kazu@cs.umass.edu> + + * MAINTAINERS: Update my email address. + +2002-08-30 Paul Koning <pkoning@equallogic.com> + + * MAINTAINERS: (Write After Approval): Add myself. + +2002-08-29 Geoffrey Keating <geoffk@redhat.com> + + * MAINTAINERS: Update Jason Eckhardt's address, remove i860. + +2002-08-24 Geoffrey Keating <geoffk@redhat.com> + + * MAINTAINERS: Change my mailing address. + +2002-08-21 Paolo Carlini <pcarlini@unitus.it> + + * MAINTAINERS (Write After Approval): Remove myself. + (Various Maintainers: c++ runtime libs): Add myself. + +2002-08-20 Loren J. Rittle <ljrittle@acm.org> + + * MAINTAINERS (Write After Approval): Remove myself. + (Various Maintainers: c++ runtime libs): Add myself. + +2002-08-15 Eric Christopher <echristo@redhat.com> + + * config.sub: Import from master repository. + * config.guess: Ditto. + +2002-08-19 Alexandre Oliva <aoliva@redhat.com> + + * Makefile.in (GCC_FOR_TARGET): Prepend STAGE_CC_WRAPPER. + * configure.in (CC_FOR_TARGET, GCJ_FOR_TARGET, CXX_FOR_TARGET, + CXX_FOR_TARGET_FOR_RECURSIVE_MAKE): Likewise. + +2002-08-16 Aldy Hernandez <aldyh@redhat.com> + + * MAINTAINERS: Add self to rs6000 vector extensions. + +2002-08-15 Alexandre Oliva <aoliva@redhat.com> + + * libiberty/configure: Reverted unintended yesterday's check in. + +2002-08-14 Alexandre Oliva <aoliva@redhat.com> + + * boehm-gc/configure, libf2c/configure: Rebuilt. + * libffi/configure, libiberty/configure: Ditto. + * libjava/configure, libobjc/configure: Ditto. + * libstdc++-v3/configure, zlib/configure: Ditto. + Merged from binutils: + 2002-01-27 Daniel Jacobowitz <drow@mvista.com> + From Steve Ellcey <sje@cup.hp.com>: + * libtool.m4 (HPUX_IA64_MODE): Set to 32 or 64 based on ABI. + (lt_cv_deplibs_check_method, lt_cv_file_magic_cmd, + lt_cv_file_magic_test_file): Set to appropriate values for HP-UX + IA64. + * ltcf-c.sh (archive_cmds, hardcode_*): Ditto. + * ltconfig (shlibpath_*, dynamic_linker, library_names_spec, + soname_spec, sys_lib_search_path_spec): Ditto. + +2002-08-06 Federico G. Schwindt <fgsch@olimpo.com.br> + + * configure.in (hppa*-*-openbsd*): Treat like hppa*-*-*elf*. + +2002-08-04 H.J. Lu (hjl@gnu.org) + + * configure.in (mips*-*-linux*): Don't skip target-libffi. + +2002-08-02 Krister Walfridsson <cato@df.lth.se> + + * MAINTAINERS (Write After Approval): Add myself. + +2002-07-31 Alan Modra <amodra@bigpond.net.au> + + * configure.in: Move generic linux case to end. Copy generic + linux noconfigdirs to mips*-*-linux* entry and new + powerpc64*-*-linux* entry. Add target-libffi for the latter. + +2002-07-19 Michael Matz <matz@suse.de> + + * MAINTAINERS: Add myself as ra* maintainer. + +2002-07-16 Chris Demetriou <cgd@broadcom.com> + + * config.guess: Update to 2002-07-09 version. + * config.sub: Update to 2002-07-03 version. + +2002-07-15 Hans-Peter Nilsson <hp@bitrange.com> + + * MAINTAINERS: Fix typo in a maintainer email address. + +2002-07-11 Nathanael Nerode <neroden@gcc.gnu.org> + + * configure.in: Remove two redundant tests. + +2002-07-11 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> + + * configure.in (mips*-*-irix6*o32): Enable stabs. + +2002-07-08 Nathanael Nerode <neroden@gcc.gnu.org> + + * configure.in: Don't build grez. + * Makefile.in: Ditto. + + * Makefile.in: Remove references to bsp, cygmon, libstub. + * configure.in: Ditto. + + * configure.in: Remove leftover reference to gdbtest. + +2002-07-08 Phil Edwards <pme@gcc.gnu.org> + + * configure.in (gxx_include_dir): Change to match versioned + C++ headers if --enable-version-specific-runtime-libs is used. + +2002-07-04 Steve Ellcey <sje@cup.hp.com> + + * ltcf-cxx.sh (hpux*): Modify to support ia64-*-hpux*. + +2002-07-03 Nathanael Nerode <neroden@gcc.gnu.org> + + * configure.in: Make --without-x work. + +2002-07-02 Nathanael Nerode <neroden@gcc.gnu.org> + + * configure.in: Rearrange target Makefile fragment collection. + + * Makefile.in: Don't try to build gdbtest, tgas, ispell, inet, or + cvs[src]. + * configure.in: Ditto. + +2002-07-01 Matt Kraai <kraai@alumni.cmu.edu> + + * MAINTAINERS (Write After Approval): Update my e-mail address. + +2002-06-24 Ben Elliston <bje@redhat.com> + + * configure.in (host_tools): Remove cgen. + + * Makefile.in (all-cgen): Remove; runs from its source directory. + (check-cgen, install-cgen, clean-cgen): Likewise. + (all-opcodes): Do not depend on all-cgen. + (all-sim): Likewise. + +2002-07-01 Nathanael Nerode <neroden@gcc.gnu.org> + + * Makefile.in: Eliminate 'apache' targets. + * configure.in: Eliminate 'apache' targets. + + * configure.in: Eliminate redundant tests. Reorganize. + + * Makefile.in: Eliminate last reference to LIBGCC1_TEST. + + * config-ml.in: Eliminate references to Cygnus configure. + + * Makefile.in: Eliminate references to building emacs. + +2002-06-28 Graham Stott <graham.stott@btinternet.com> + + * MAINTAINERS: Update my email address. + +2002-06-26 Benjamin Kosnik <bkoz@redhat.com> + + * config.if (libstdcxx_incdir): Version C++ headers. + (cxx_incdir): Remove. + +2002-06-25 Nathanael Nerode <neroden@gcc.gnu.org> + + * MAINTAINERS (Write After Approval): Add self. + +Thu Jun 20 00:35:14 2002 Denis Chertykov <denisc@overta.ru> + + * configure.in: Add support for ip2k. + +2002-06-22 Nathanael Nerode <neroden@twcny.rr.com> + + * configure.in: Fix AIX configury bug. + +2002-06-20 Steve Ellcey <sje@cup.hp.com> + + * MAINTAINERS (Write After Approval): Add self. + +2002-06-19 Nathanael Nerode <neroden@twcny.rr.com> + + * configure.in: replace ${topsrcdir} with ${srcdir} + + * configure.in: Move definition of libstdcxx_flags + right above usage, rather than waaay earlier. + + * configure.in: Pull definition of is_cross_compiler earlier. + + * configure.in: Rearrange a little. + + * configure.in: Remove references to librx. + * Makefile.in: Remove references to librx. + +Tue Jun 18 22:37:35 2002 Denis Chertykov <denisc@overta.ru> + + * config.sub: Add support for avr target. + Import from master sources, rev 1.255 + +2002-06-19 Phil Edwards <pme@gcc.gnu.org> + + * configure, .cvsignore: Revert previous change... + * Makefile: ...delete. + +2002-06-19 Nathanael Nerode <neroden@twcny.rr.com> + + * configure.in: Eliminate ${gasdir} variable. + +2002-06-18 Dave Brolley <brolley@redhat.com> + + * configure.in: Add support for frv. + * config.sub: Add support for frv. + +2002-06-18 Phil Edwards <pme@gcc.gnu.org> + + * configure: Remove garbage from previous commit. + +2002-06-18 Phil Edwards <pme@gcc.gnu.org> + + * configure: For in-source builds, make a subdir and re-exec there. + * Makefile: New file. Pass targets through to build directory. + * .cvsignore: No longer ignore "Makefile". + +2002-06-16 Douglas Rupp <rupp@gnat.com> + + * MAINTAINERS (Write After Approval): Add self. + +2002-06-11 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * Makefile.in (CFLAGS_FOR_TARGET): Add -O2. + +2002-06-08 Jason Thorpe <thorpej@wasabisystems.com> + + * configure.in (vax-*-netbsd*): Re-enable gas. + +2002-05-31 Nathanael Nerode <neroden@twcny.rr.com> + + * Makefile.in: Replace HOST_PREFIX, HOST_PREFIX_1 with BUILD_PREFIX, + BUILD_PREFIX_1, to correct nomenclature. + * configure: Likewise. + + * Makefile.in: Eliminate version-specific references to tcl8.1, tk8.1. + * configure.in: Eliminate version-specific references to tcl8.1, tk8.1. + +2002-05-31 Olaf Hering <olh@suse.de> + + * config-ml.in: Propogate DESTDIR also. + +2002-05-29 Jason Thorpe <thorpej@wasabisystems.com> + + * configure.in (vax-*-netbsd*): Don't build gas for this + platform. + +2002-05-28 Marek Michalkiewicz <marekm@amelek.gda.pl> + + * configure.in (noconfigdirs): Don't compile libiberty, libstdcxx + and libgcj for AVR. + +2002-05-23 Kaz Kojima <kkojima@gcc.gnu.org> + + * MAINTAINERS (Write After Approval): Add myself. + +2002-05-22 Jason Thorpe <thorpej@wasabisystems.com> + + * config.guess: Update to 2002-05-22 version. + * config.sub: Likewise. + +2002-05-16 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> + + * Makefile.in: Allow for PWDCMD to override hardcoded pwd. + * config-ml.in: Likewise. + * configure: Likewise. + * configure.in: Likewise. + +2002-05-16 Stephane Carrez <stcarrez@nerim.fr> + + * MAINTAINERS: Update my email address. + +2002-05-13 Nathanael Nerode <neroden@twcny.rr.com> + + * configure.in: Simplify makefile fragment collection. + + * configure.in: Remove code to build emacs. + + * configure.in : Remove --srcdir argument from targargs and buildargs + (it's always overridden in the Makefile anyway). Rearrange a bit. + + * configure: Move some logic to configure.in. + * configure.in: Move some logic from configure. + +2002-05-11 Tom Tromey <tromey@redhat.com> + + * MAINTAINERS: Reflect libgcj reality. + +2002-05-09 Federico G. Schwindt <fgsch@olimpo.com.br> + + * Makefile.in: Honour DESTDIR. + +2002-05-08 Mark Mitchell <mark@codesourcery.com> + + * config.guess: Import 2002-03-20 version. + * config.sub: Import 2002-04-26 version. + +2002-05-08 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> + + * config-ml.in: Allow for PWDCMD to determine ML_POPDIR. + +2002-05-07 Tim Josling <tej@melbpc.org.au> + + * MAINTAINERS: Add self. + +2002-05-06 Loren J. Rittle <ljrittle@acm.org> + + * ltmain.sh: Detect and handle object name conflicts + while piecewise linking a static library. + +2002-05-05 Alexandre Oliva <aoliva@redhat.com> + + * configure.in (noconfigdirs): Don't disable libgcj on + sparc64-*-solaris* and sparcv9-*-solaris*. + +2002-05-03 Alexandre Oliva <aoliva@redhat.com> + + * configure.in: Revert 2002-04-18's patch; fixed in libjava. + +2002-05-03 Thomas Fitzsimmons <fitzsim@redhat.com> + + * configure.in (FLAGS_FOR_TARGET): Do not add + -B$$r/$(TARGET_SUBDIR)/newlib/ when compiling newlib natively + on i[3456]86-*-linux*. + +2002-05-01 Thomas Fitzsimmons <fitzsim@redhat.com> + + * configure.in (noconfigdirs): Replace [ ] with test. + + * configure.in (noconfigdirs): Do not add target-newlib if + target == i[3456]86-*-linux*, and host == target. + +2002-04-29 Nathanael Nerode <neroden@doctormoo.dyndns.org> + + * configure.in: delete reference to absent file + + * configure.in: replace '[' with 'test' + + * configure.in: Eliminate references to gash. + * Makefile.in: Eliminate references to gash. + + * configure.in: remove useless references to 'pic' makefile fragments. + + * configure.in: (*-*-windows*) Finish removing. + + * configure.in: Eliminate redundant test for libgui. + +2002-04-29 Roger Sayle <roger@eyesopen.com> + + * MAINTAINERS: Add self and realphabetize. Update entries + for Dan Berlin, Chris Demetriou and Michael Matz. Remove + entry for a29k port maintainer. + +2002-04-26 Joel Sherrill <joel@OARcorp.com> + + * configure.in (h8300*-*-rtems*): Disable libf2c and libgcj. + (sparc-*-elf*, sparc64-*-elf*): Disable libgcj. + +2002-04-19 Nathanael Nerode <neroden@twcny.rr.com> + + * configure.in: remove references to dead files + +2002-04-19 Mark Mitchell <mark@codesourcery.com> + + * MAINTAINERS: Add information about purpose of this file. + +2002-04-18 Tom Tromey <tromey@redhat.com> + + * configure.in: Disallow configuring libgcj when it is already + installed and we're using Solaris 2.8 linker. Do enable libgcj on + Solaris 2.8 by default. For PR libgcj/6158. + +2002-04-17 Nathanael Nerode <neroden@twcny.rr.com> + + * configure.in: Move default CC setting out of config/mh-* fragments + directly into here. + +2002-04-17 Nathanael Nerode <neroden@twcny.rr.com> + + * configure.in: don't even try to configure or make a subdirectory + if there's no configure script for it. + +2002-04-15 Mark Mitchell <mark@codesourcery.com> + + * MAINTAINERS: Remove chill maintainers. + * Makefile.in (CHILLFLAGS): Remove. + (CHILL_LIB): Remove. + (TARGET_CONFIGDIRS): Remove libchill. + (CHILL_FOR_TARGET): Remove. + (BASE_FLAGS_TO_PASS): Don't pass CHILLFLAGS, CHILL_FOR_TARGET, or + CHILL_LIB. + (CONFIGURE_TARGET_MODULES): Remove configure-target-libchill. + (CHECK_TARGET_MODULES): Likewise. + (INSTALL_TARGET_MODULES): Likewise. + (CLEAN_TARGET_MODULES): Likewise. + (configure-target-libchill): Remove. + (all-target-libchill): Remove. + * configure.in (target_libs): Remove target-libchill. + Do not compute CHILL_FOR_TARGET. + * libchill: Remove directory. + +2002-04-11 DJ Delorie <dj@redhat.com> + + * Makefile.in, configure.in: Sync with binutils, entries + follow... + +2002-04-07 Andrew Cagney <ac131313@redhat.com> + + * Makefile.in (do-tar-bz2): Delete rule. Replace with ... + (do-tar, do-bz2): New rules. + (taz): Update. Replace do-tar-bz2 with do-tar and do-bz2. + (gdb-tar): New rule. + (gdb-taz): Rewrite. Use gdb-tar and do-bz2. + (insight_dejagnu.tar): New rule. + (insight.tar): New rule. + (gdb+dejagnu.tar): New rule. + (gdb.tar): New rule. + +2002-02-01 Mo DeJong <supermo@bayarea.net> + + * Makefile.in: Add all-tix to deps for all-snavigator + so that tix is built when building snavigator. + +2002-01-11 Steve Ellcey <sje@cup.hp.com> + + * configure.in (ia64*-*-hpux*): New target for IA64 HP-UX, + ld and gdb are not supported. + +2002-01-07 Mark Salter <msalter@redhat.com> + + * configure.in: Remove target-bsp and target-cygmon from arm builds. + Allow target-libgloss to be built for arm, strongarm, and xscale. + +2001-12-13 Thomas Fitzsimmons <fitzsim@redhat.com> + + * configure.in (FLAGS_FOR_TARGET): Remove -nostdinc and -isystem + options for i[3456]86-pc-linux* native builds. + +2001-11-20 Nick Clifton <nickc@cambridge.redhat.com> + + * Makefile.in (do-proto-toplev): Use msgfmt to generate .gmo + files from .po files for a distribution. + +2001-09-03 Jeff Holcomb <jeffh@redhat.com> + + * configure.in: Enable libstdc++-v3 for h8300 targets. + +2001-06-19 Alan Modra <amodra@bigpond.net.au> + + * Makefile.in (VER): If AM_INIT_AUTOMAKE uses BFD_VERSION, get + version from bfd/. + +Fri Jun 8 11:14:02 2001 Andrew Cagney <cagney@b1.cygnus.com> + + * Makefile.in (VER): When present, extract the version number from + the file version.in. + +2001-05-24 Tom Rix <trix@redhat.com> + + * configure.in : enable ld for aix + +2001-02-09 Martin Schwidefsky <schwidefsky@de.ibm.com> + + * config.guess: Add linux target for S/390. + +2000-11-07 Philip Blundell <pb@futuretv.com> + + * Makefile.in (ETC_SUPPORT): Also add configbuild.* and configdev.*. + +2000-11-03 Philip Blundell <pb@futuretv.com> + + * Makefile.in (ETC_SUPPORT): Add configure.texi and associated info + files. + +2001-01-15 Ben Elliston <bje@redhat.com> + + * configure.in (host_tools): Add sid. + Always configure cgen. + +2000-11-24 Nick Clifton <nickc@redhat.com> + + * configure.in (c4x, c5x, tic54x): Move after ARM targets. + + +2000-08-20 Doug Evans <dje@casey.transmeta.com> + + * Makefile.in (ALL_MODULES): Add all-cgen. + (CROSS_CHECK_MODULES,INSTALL_MODULES,CLEAN_MODULES): Similarily. + (all-cgen): New target. + (all-opcodes,all-sim): Depend on all-cgen. + * configure.in (host_tools): Add cgen. + Only configure cgen if --enable-cgen-maint. + +2002-04-09 Loren J. Rittle <ljrittle@acm.org> + + * configure.in: Add *-*-freebsd* configurations. + +2002-04-08 Tom Tromey <tromey@redhat.com> + + * configure.in: Add FLAGS_FOR_TARGET to GCJ_FOR_TARGET. + Fixes PR libgcj/6068. + +2002-03-30 Krister Walfridsson <cato@df.lth.se> + + * configure.in (i*86-*-netbsdelf*): Don't disable libgcj. + +2002-03-27 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> + + * configure.in (alpha*-dec-osf*): Enable libgcj. + +2003-03-27 Matthew Gingell <gingell@gnat.com> + + * MAINTAINERS (Write After Approval): Add myself. + +2002-03-24 Nick Clifton <nickc@cambridge.redhat.com> + + Fix for: PR bootstrap/3591, target/5676 + * configure.in (mcore-pe): Disable the configuration of + libstdc++-v3 since exceptions are not supported. + +2002-03-20 Anthony Green <green@redhat.com> + + * configure.in: Enable libgcj for xscale-elf target. + +Tue Mar 19 09:05:08 2002 J"orn Rennecke <joern.rennecke@superh.com> + + * MAINTAINERS: Update my email address. + +2002-03-16 Alexandre Oliva <aoliva@redhat.com> + + * ltmain.sh (relink_command): Fix typo in previous change. + +2002-03-15 Alexandre Oliva <aoliva@redhat.com> + + * ltmain.sh (taglist): Initialized. Don't let `CC' tag out of it. + (relink_command): Added --tag flags. + (mode=install): If relinking fails; error out. + +2002-03-12 Richard Henderson <rth@redhat.com> + + * Makefile.in (NOTPARALLEL): New. Use it instead of explicit + .NOTPARALLEL tag. + (do-check): Rename from check. + (check): Allow parallel check. + +2002-03-12 Bob Wilson <bob.wilson@acm.org> + + * MAINTAINERS: Add myself as maintainer for xtensa port. + Fix alphabetical order in CPU port maintainer list. + Remove myself from Write After Approval list. + +2002-03-11 Richard Henderson <rth@redhat.com> + + * Makefile.in (.NOTPARALLEL): Add fake tag. + +2002-03-07 H.J. Lu (hjl@gnu.org) + + * configure.in: Enable gprof for mips*-*-linux*. + +2002-03-05 Danny Smith <dannysmith@users.sourceforge.net> + + * MAINTAINERS (Write After Approval): Add myself. + +2002-02-28 Alexandre Oliva <aoliva@redhat.com> + + * configure.in (libstdcxx_flags): Don't add libstdc++-v3 flags for + libjava. + (CXX_FOR_TARGET): Explain why -shared-libgcc here. + +2002-02-23 Alexandre Oliva <aoliva@redhat.com> + + * Makefile.in (MAKEINFO): Don't assume makeinfo will be built just + because its Makefile is there; test for the executable instead. + +2002-02-22 Alexandre Oliva <aoliva@redhat.com> + + * configure.in (CXX_FOR_TARGET): Add -shared-libgcc for + libstdc++-v3 and libjava. + +2002-02-11 Adam Megacz <adam@xwt.org> + + * gcc/Makefile.in: Removed libstdc++-v3 dependancy for libjava and + boehm-gc + +2002-02-09 Alexandre Oliva <aoliva@redhat.com> + + * config.guess: Updated to 2002-01-30's version. + * config.sub: Updated to 2002-02-01's version. + Contribute sh64-elf. + 2000-12-01 Alexandre Oliva <aoliva@redhat.com> + * configure.in: Added sh64-*-*. + +2002-02-08 Chris Demetriou <cgd@broadcom.com> + + * MAINTAINERS: Belatedly add myself to write after approval list. + +Thu Feb 7 12:40:58 CET 2002 Jan Hubicka <jh@suse.cz> + + * MAINTAINERS: Put self in as maintainer for x86-64 port. + Remove self as Write After Approval. + +2002-01-31 Geoffrey Keating <geoffk@redhat.com> + + * MAINTAINERS: Put self in as maintainer for contrib/regression + directory. + +2002-01-28 Phil Edwards <pme@gcc.gnu.org> + + * MAINTAINERS: Update my email address. + +2002-01-26 Jason Thorpe <thorpej@wasabisystems.com> + + * configure.in (*-*-netbsd*): New. Skip target-newlib, + target-libiberty, and target-libgloss. Skip Java-related + libraries if not supported for NetBSD on target CPU. + +2002-01-25 Douglas B Rupp <rupp@gnat.com> + + * install-sh: Use _inst.$$_ for temp file name. + +2002-01-24 Jason Thorpe <thorpej@wasabisystems.com> + + * MAINTAINERS (Write After Approval): Move my contact info + from here... + (OS Port Maintainers): ...to here (netbsd). + +2002-01-22 Bob Wilson <bob.wilson@acm.org> + + * MAINTAINERS (Write After Approval): Add myself. + +2002-01-17 H.J. Lu <hjl@gnu.org> + + * Makefile.in (all-fastjar): Also depend on all-libiberty. + (all-target-fastjar): Also depend on all-target-libiberty. + +2002-01-16 H.J. Lu (hjl@gnu.org) + + * config.guess: Import from master sources, rev 1.225. + * config.sub: Import from master sources, rev 1.238. + +2002-01-16 Kazu Hirata <kazu@hxi.com> + + * MAINTAINERS (Write After Approval): Remove myself. + +2001-12-19 Florian Weimer <fw@deneb.enyo.de> + + * MAINTAINERS (Write After Approval): Add myself. + +2001-12-17 Joseph S. Myers <jsm28@cam.ac.uk> + + * MAINTAINERS: Add self as docs co-maintainer. + +2001-12-11 Matthias Klose <doko@debian.org> + + * MAINTAINERS (Write After Approval): Add myself. + +2001-12-09 Zack Weinberg <zack@codesourcery.com> + + * MAINTAINERS: Update my email address. + +2001-12-07 Turly O'Connor <turly@apple.com> + * MAINTAINERS (Write After Approval): Add myself. + * rs6000.c (rs6000_trampoline_size): Handle ABI_DARWIN case. + (rs6000_initialize_trampoline): Call __trampoline_setup for + ABI_DARWIN too. + * darwin-tramp.asm: New file, implements __trampoline_setup. + * t-darwin (LIB2FUNCS_EXTRA): Include darwin-tramp.asm. + +2001-12-07 Paolo Carlini <pcarlini@unitus.it> + + * MAINTAINERS (Write After Approval): Add myself. + +Wed Dec 5 07:33:45 2001 Douglas B. Rupp <rupp@gnat.com> + + * configure, configure.in: Use temp file for long sed commands. + +2001-12-03 Laurent Guerby <guerby@acm.org> + + * config.sub: Update to version 1.232 on subversion. + +2001-12-03 Ben Elliston <bje@redhat.com> + + * MAINTAINERS: Update mail address for config.* patches. + +2001-11-27 DJ Delorie <dj@redhat.com> + Zack Weinberg <zack@codesourcery.com> + + When build != host, create libiberty for the build machine. + + * Makefile.in (TARGET_CONFIGARGS, BUILD_CONFIGARGS): Replace + CONFIG_ARGUMENTS. + (ALL_BUILD_MODULES_LIST, BUILD_CONFIGDIRS, BUILD_SUBDIR): + New variables. + (ALL_BUILD_MODULES, CONFIGURE_BUILD_MODULES): New variables + and rules. + (all.normal): Depend on ALL_BUILD_MODULES. + (CONFIGURE_TARGET_MODULES rule): Use TARGET_CONFIGARGS. + (all-build-libiberty): Depend on configure-build-libiberty. + + * configure: Calculate and substitute proper value for + ALL_BUILD_MODULES. + * configure.in: Create the build subdirectory. + Calculate and substitute TARGET_CONFIGARGS (formerly + CONFIG_ARGUMENTS); also BUILD_SUBDIR and BUILD_CONFIGARGS (new). + +2001-11-26 Ziemowit Laski <zlaski@apple.com> + + * MAINTAINERS (write-after-approval): Add self. + +2001-11-17 Craig Rodrigues <rodrigc@gcc.gnu.org> + + * MAINTAINERS (GNATS only accounts): Remove self. + +2001-11-14 Hans-Peter Nilsson <hp@bitrange.com> + + * configure.in (noconfigdirs) [h8300*-*-*, h8500-*-*]: Disable + libf2c. + +2001-11-12 Craig Rodrigues <rodrigc@gcc.gnu.org> + + * MAINTAINERS (Write After Approval): Add self. + +2001-11-12 David O'Brien <obrien@FreeBSD.org> + + * MAINTAINERS: mips and s390 are also CPU ports. + +2001-11-12 David O'Brien <obrien@FreeBSD.org> + + * MAINTAINERS: mcore, cris and mmix are also CPU ports. + +2001-11-11 David O'Brien <obrien@FreeBSD.org> + + * MAINTAINERS: Alphabetize. + +2001-11-09 Kazu Hirata <kazu@hxi.com> + + * MAINTAINERS (Various maintainers: h8 port): Add myself. + +2001-11-09 John David Anglin <dave@hiauly1.hia.nrc.ca> + + * MAINTAINERS (Various maintainers: hppa port): Added myself. + +2001-11-08 Phil Edwards <pedwards@disaster.jaj.com> + + * configure.in (--enable-languages): Be more permissive about + syntax. Check for empty lists better. Warn about $LANGUAGES. + +2001-11-08 Geoffrey Keating <geoffk@redhat.com> + + * config.sub: Import from master sources, rev. 1.230. + * MAINTAINERS: Change 'stormy16' to 'xstormy16'. + +2001-11-07 Laurent Guerby <guerby@acm.org> + + * MAINTAINERS (Write After Approval): Add self. + +2001-11-06 Hans-Peter Nilsson <hp@bitrange.com> + + * Makefile.in (MAKEINFO): Use "missing" for makeinfo older than 4.0. + +2001-11-05 Hans-Peter Nilsson <hp@bitrange.com> + + * config.sub: Import from master sources, rev 1.226. + * config.guess: Import from master sources, rev 1.216. + +2001-11-03 Hans-Peter Nilsson <hp@bitrange.com> + + * configure.in (noconfigdirs) [mmix-*-*]: Disable libgcj. + * MAINTAINERS: Add self as maintainer of MMIX port. + Remove old after-approval entry. + +2001-10-28 Joseph S. Myers <jsm28@cam.ac.uk> + + * ChangeLog, configure: Fix spelling errors. + +2001-10-20 Brendan Kehoe <brendan@zen.org> + + * MAINTAINERS: Tweak my address. + +Thu Oct 11 21:50:15 2001 J"orn Rennecke <amylaar@onetel.net.uk> + + * MAINTAINERS: Update my email address. + +2001-10-11 Hans-Peter Nilsson <hp@axis.com> + + * configure.in (noconfigdirs) [cris-*-*]: Disable libgcj. + * MAINTAINERS: Add self as maintainer of CRIS port. + +2001-10-10 Geert Bosch <bosch@gnat.com> + + * MAINTAINERS (Various maintainers: Ada front end): + Added Robert Dewar. + +2001-10-03 David Billinghurst <David.Billinghurst@riotinto.com> + + * MAINTAINERS (Write After Approval): Added self + +2001-10-02 Geert Bosch <bosch@gnat.com> + + * MAINTAINERS (Various maintainers: Ada front end): Added myself. + +2001-10-02 Joseph S. Myers <jsm28@cam.ac.uk> + + * configure: Handle temporary files securely using mkdir. + +2001-09-29 Alexandre Oliva <aoliva@redhat.com> + + * Makefile.in (configure-target-gperf): Depend on $(ALL_GCC_CXX). + +2001-09-26 Will Cohen <wcohen@redhat.com> + + * configure.in (*-*-linux*): Disable configuration of target-newlib + and target-libgloss. + +2001-09-26 Alexandre Oliva <aoliva@redhat.com> + + * Makefile.in (EXTRA_TARGET_FLAGS): Pass RANLIB_FOR_TARGET for + RANLIB. + +2001-09-21 Alexandre Oliva <aoliva@redhat.com> + + * Makefile.in (AS_FOR_TARGET, LD_FOR_TARGET, + DLLTOOL_FOR_TARGET, WINDRES_FOR_TARGET, AR_FOR_TARGET, + RANLIB_FOR_TARGET, NM_FOR_TARGET): Don't use double quotes to + avoid quotes nesting problems. + (NATIVE_CHECK_MODULES): Ditto, just for consistency. + (DO_X): Export only variables that are set. + +2001-09-19 Ben Elliston <bje@redhat.com> + + * configure.in (sparc-sun-solaris2*): Don't use /usr/bin/which on + Solaris when testing for the /usr/ucb/cc compiler; it has incorrect + semantics. Use the shell built-in "type" command instead. + +2001-08-31 Alexandre Oliva <aoliva@redhat.com> + + Merged from gcc-3_0-branch: + 2001-07-30 Jeff Sturm <jsturm@one-pont.com> + * ltcf-c.sh: Use $objext, not $ac_objext. + 2001-07-27 Mark Kettenis <kettenis@gnu.org> + * ltcf-cxx.sh: Add support for GNU. + 2001-07-22 Timothy Wall <twall@redhat.com> + * ltcf-c.sh: Don't disable shared libraries for AIX5/IA64. Preserve + default settings if using GNU tools with that configuration. + * ltcf-cxx.sh: Ditto. + * ltcf-gcj.sh: Ditto. + 2001-07-21 Michael Chastain <chastain@redhat.com> + * ltconfig: Set max_cmd_len to a maximum of 512Kb, as it seems some + HPUX 11.0 systems have trouble with 1MB. Mark as gcc-local. + * ltmain.sh: Mark as gcc-local. + +2001-08-30 Eric Christopher <echristo@redhat.com> + Jason Eckhardt <jle@redhat.com> + + * config.guess: Merge from master sources. + * config.sub: Merge from master sources, add support for mipsisa32. + +2001-08-25 Geoffrey Keating <geoffk@redhat.com> + * config.sub: Merge from master sources, rev 1.219. + * MAINTAINERS: Add self as contact for stormy16 port. + +2001-08-14 Zack Weinberg <zackw@panix.com> + + * config.sub: Merge from master sources, rev 1.218. + * config.guess: Merge from master sources, rev 1.209. + +2001-08-11 Graham Stott <grahams@redhat.com> + + * Makefile.in (check-c++): Add missing semicolon. + +Mon Jul 30 19:24:13 CEST 2001 Jan Hubicka <jh@suse.cz> + + * MAINTAINERS (Various maitainers: predict.def): Added myself. + +2001-07-30 Eric Christopher <echristo@redhat.com> + + * MAINTAINERS (Various maintainers: mips port): Added myself. + +2001-07-25 Andrew Haley <aph@cambridge.redhat.com> + + * configure.in (sh-*-linux*): New. + +2001-07-27 Richard Henderson <rth@redhat.com> + + * .cvsignore: Add LAST_UPDATED. + +2001-07-23 Ulrich Weigand <uweigand@de.ibm.com> + + * MAINTAINERS (Various maintainers: s390 port): Added myself. + +2001-07-16 Aldy Hernandez <aldyh@redhat.com> + + * config.sub: Fix mips64vr5000el typo in CPU-COMPANY. + +Fri Jul 13 14:31:57 2001 Nicola Pero <nicola@brainstorm.co.uk> + + * MAINTAINERS (Write After Approval): Added myself. + +2001-07-12 Stephane Carrez <Stephane.Carrez@worldnet.fr> + + * configure.in (noconfigdirs): Don't compile libiberty, libstdcxx + and libgcj on m68hc11/m68hc12. + +2001-06-27 H.J. Lu (hjl@gnu.org) + + * Makefile (CFLAGS_FOR_BUILD): New. + (EXTRA_GCC_FLAGS): Add CFLAGS_FOR_BUILD. + +2001-06-13 Joseph S. Myers <jsm28@cam.ac.uk> + + * README: Remove version number. + +2001-06-13 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> + + * INSTALL/README: Update wrt. to the installation instructions now + residing in gcc/doc/install.texi. + +2001-06-13 Joseph S. Myers <jsm28@cam.ac.uk> + + * README: Replace with a cut-down and updated version of gcc/README. + +2001-06-12 David Edelsohn <edelsohn@gnu.org> + + * config-ml.in (powerpc-*-* | rs6000-*-*): Allow aix64 and pthread + multilibs to be disabled. + +2001-06-11 Daniel Berlin <dan@cgsoftware.com> + + * MAINTAINERS (Write After Approval): Add myself. + +2001-06-09 Alexandre Oliva <aoliva@redhat.com> + + * config.guess: Import CVS version 1.195. + * config.sub: Import CVS version 1.212. + +2001-06-08 Alexandre Oliva <aoliva@redhat.com>, Jeff Sturm <jsturm@one-point.com> + + * Makefile.in (AS_FOR_TARGET, LD_FOR_TARGET, NM_FOR_TARGET): If + gcc/xgcc is built, use -print-prog-name to find out the program + name to use. + +2001-06-04 Phil Edwards <pme@sources.redhat.com> + + * config.guess: Import CVS version 1.194. All gcc-local changes + appear to also be in the master copy. + * config.sub: Import CVS version 1.211. + +Mon Jun 4 16:32:53 2001 Mark Mitchell <mark@codesourcery.com> + + * ltcf-c.sh (archive_cmds, archive_expsym_cmds) [solaris, + with_gcc]: Use `gcc -shared' to build a shared library. + +Mon Jun 4 16:24:43 2001 John David Anglin <dave@hiauly1.hia.nrc.ca> + + * ltcf-c.sh (archive_cmd) [hpux, with_gcc]: Use gcc to link shared + archives. + +Fri Jun 1 18:55:19 2001 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> + + * MAINTAINERS (Write After Approval): Add myself. + +2001-06-01 Hans-Peter Nilsson <hp@axis.com> + + * configure.in (libstdcxx_flags): Do not try to execute + libstdc++-v3/testsuite_flags until it exists. + +2001-06-01 Alan Modra <amodra@bigpond.net.au> + + * MAINTAINERS: Update my email address. + +2001-05-31 Graham Stott <grahams@redhat.com> + + * MAINTAINERS (Write After Approval): Add myself. + +2001-05-28 Simon Patarin <simon.patarin@inria.fr> + + * ltcf-cxx.sh (osf3/osf4/osf5): Support creation of C++ shared + libraries when using g++ with native linker. + +2001-05-28 Alexandre Oliva <aoliva@redhat.com> + + * ltconfig, ltmain.sh: Upgrade to libtool 1.4a 1.641.2.256. + +2001-05-22 Alexandre Oliva <aoliva@redhat.com> + + * ltcf-cxx.sh (allow_undefined_flag, no_undefined_flag) + [aix4*|aix5*]: Prepend blank. + +2001-05-20 Alexandre Oliva <aoliva@redhat.com> + + * ltconfig, ltmain.sh, libtool.m4, ltcf-c.sh, ltcf-cxx.sh, + ltcf-gcj.sh: Upgraded to libtool 1.4a 1.641.2.254. Rebuilt a number + of subdir/configure scripts to use the new libtool.m4. + +2001-05-19 Matt Kraai <kraai@alumni.carnegiemellon.edu> + + * MAINTAINERS (Write After Approval): Add myself. + +2001-05-18 Benjamin Kosnik <bkoz@redhat.com> + + * configure.in (libstdcxx_flags): Remove reference to libstdc++.INC. + +2001-05-11 Ben Elliston <bje@redhat.com> + + * Makefile.in (all-sid): New target. + (check-sid, clean-sid, install-sid): Likewise. + +2001-05-09 Jeffrey Oldham <oldham@codesourcery.com> + + * ltcf-cxx.sh: Add -nostdlib to IRIX 6 archive_cmds. + +2001-05-03 Alexandre Oliva <aoliva@redhat.com> + + * configure.in (noconfigdirs) [*-cygwin*, *-mingw*, *-beos]: Disable + libgcj. + +2001-05-03 Alexandre Oliva <aoliva@redhat.com> + + * Makefile.in (AS_FOR_TARGET, LD_FOR_TARGET, NM_FOR_TARGET): If + gcc/xgcc is built, use -print-prog-name to find out the program + name to use. + +2001-04-26 Alexandre Oliva <aoliva@redhat.com> + + * configure.in (noconfigdirs): Don't reset it from scratch in the + target case; only append to it. + + * configure.in (noconfigdirs) [hppa*-*-*, mips*-*-irix6*, + sparc-*-solaris2.8]: Disable ${libgcj}. + +2001-04-25 Alexandre Oliva <aoliva@redhat.com> + + * configure.in (libgcj_saved): Copy from $libgcj. + (libgcj): Zero out if --enable-libgcj; add to noconfigdirs is + --disable-libgcj. + +2001-04-25 Gavin Romig-Koch <gavin@redhat.com> + + * MAINTAINERS: Remove self as MIPS maintainer and + C front end maintainer. + +Mon Apr 23 09:15:03 2001 Anthony Green <green@redhat.com> + + * configure.in: Move *-chorusos target case to the proper switch. + Disable libgcj. + +2001-04-12 Alexandre Oliva <aoliva@redhat.com> + + * ltconfig, ltmain.sh, ltcf-cxx.sh: Upgraded to libtool 1.4a + 1.641.2.228. + +2001-04-13 Franz Sirl <Franz.Sirl-kernel@lauterbach.com> + + * Makefile.in (STAGE1_CFLAGS): Pass down. + +2001-04-13 Alan Modra <amodra@one.net.au> + + * config.guess: Add hppa64-linux support. Note for next import that + this is already in the master file. + * configure.in: Likewise. Accept `parisc' alias for `hppa'. + +2001-04-12 Alexandre Oliva <aoliva@redhat.com> + + * ltconfig, ltmain.sh, libtool.m4, ltcf-c.sh, ltcf-cxx.sh, + ltcf-gcj.sh: Upgraded to libtool 1.4a 1.641.2.226. + +2001-04-11 Stan Shebs <shebs@apple.com> + + * MAINTAINERS: Add self as Darwin port maintainer. + +2001-04-11 Alan Modra <amodra@one.net.au> + + * MAINTAINERS: Update my email address. + +2001-04-10 Loren J. Rittle <ljrittle@acm.org> + + * ltcf-cxx.sh: Support creation of C++ shared libraries on + recent versions of FreeBSD (release 3 or later). + * ltconfig: On FreeBSD, -lc must not be provided when building + a shared library or else the standard -pthread gcc option is + rendered worthless to later users of the built library. + +2001-04-06 Joseph S. Myers <jsm28@cam.ac.uk> + + * MAINTAINERS: Add self and RTH as C front end maintainers. + +2001-04-05 Alexandre Oliva <aoliva@redhat.com> + + * config.sub: Make sure to match an already-canonicalized + machine name (eg. mn10300-unknown-elf). + +2001-04-01 Alexandre Oliva <aoliva@redhat.com> + + * Makefile.in (CXX_FOR_TARGET_FOR_RECURSIVE_MAKE, RECURSE_FLAGS): + New macros. + (bootstrap, cross): Use RECURSE_FLAGS. + * configure.in: Subst CXX_FOR_TARGET_FOR_RECURSIVE_MAKE. + +2001-03-27 Alexandre Oliva <aoliva@redhat.com> + + * configure.in (CXX_FOR_TARGET): Use xgcc for libstdc++-v3. + +2001-03-22 Colin Howell <chowell@redhat.com> + + * Makefile.in (DO_X): Do not backslash single-quotes in + backquotes (two places). + +2001-03-22 Alexandre Oliva <aoliva@redhat.com> + + Re-installed: + 2001-01-02 Laurynas Biveinis <lauras@softhome.net> + * ltcf-c.sh: Clear ac_cv_prog_cc_pic for DJGPP. Do not add + '-DPIC' to ac_cv_prog_cc_pic for DJGPP. + * ltcf-cxx.sh: Likewise. + * ltcf-gcj.sh: Likewise. + +2001-03-22 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> + + * MAINTAINERS: Add myself as "documentation co-maintainer". + +2001-03-22 Alexandre Oliva <aoliva@redhat.com> + + * ltconfig, ltmain.sh, libtool.m4, ltcf-c.sh, ltcf-cxx.sh, + ltcf-gcj.sh: Upgraded to libtool 1.4a 1.641.2.198. + +2001-03-19 Tom Tromey <tromey@redhat.com> + + * config-ml.in: Handle GCJ and GCJFLAGS. + +2001-03-21 Michael Chastain <chastain@redhat.com> + + * Makefile.in: all-m4 depends on all-texinfo. + +2001-03-20 Loren J. Rittle <ljrittle@acm.org> + + * MAINTAINERS: Add myself to write after approval list. + +2001-03-18 Laurynas Biveinis <lauras@softhome.net> + + * Makefile.in (DO_X): Quote nested quotes. + +2001-03-18 Alan Modra <alan@linuxcare.com.au> + + * MAINTAINERS: Add myself to write after approval list. + +2001-03-15 Laurynas Biveinis <lauras@softhome.net> + + * Makefile.in (DO_X): Use double quotes for quoting + "RANLIB=$${RANLIB}". + +2001-03-10 Ovidiu Predescu <ovidiu@cup.hp.com> + + * MAINTAINERS: Added Stan Shebs as new maintainer for Objective-C. + +2001-03-09 Nicola Pero <n.pero@mi.flashnet.it> + + * configure.in: Only use `lang_requires' for languages athat are + actually enabled. + +2001-03-08 Phil Edwards <pme@sources.redhat.com> + + * MAINTAINERS (C++ runtime libs): Update and alphabatize. + +2001-03-08 Alexandre Oliva <aoliva@redhat.com> + + * Makefile.in (ALL_GCC, ALL_GCC_C, ALL_GCC_CXX): Set before use. + +2001-03-07 Tom Tromey <tromey@redhat.com> + + * configure.in: Allow config-lang.in to set `lang_requires' to list + of other required languages. + +2001-03-06 Laurynas Biveinis <lauras@softhome.net> + + * Makefile.in: Remove RANLIB definition. Use RANLIB + in RANLIB_FOR_TARGET, EXTRA_HOST_FLAGS, EXTRA_TARGET_FLAGS, + EXTRA_GCC_FLAGS, $(DO_X) targets only when the RANLIB is set. + +2001-02-28 Benjamin Kosnik <bkoz@redhat.com> + Alexandre Oliva <aoliva@redhat.com> + + * Makefile.in (check-c++): Use tabs, not spaces. + +2001-02-20 Laurynas Biveinis <lauras@softhome.net> + + * MAINTAINERS: add myself to Write After Approval list. + +2001-02-19 Benjamin Kosnik <bkoz@redhat.com> + + * Makefile.in (check-c++): New rule. + + * configure.in (target_libs): Remove libg++. + (noconfigdirs): Remove libg++. + (noconfigdirs): Same. + (noconfigdirs): Same. + (noconfigdirs): Same. + + * config-ml.in: Remove libg++ references. + + * Makefile.in (TARGET_CONFIGDIRS): Remove libio, libstdc++, libg++. + (ALL_TARGET_MODULES): Same. + (configure-target-libg++): Remove. + (all-target-libg++): Remove. + (configure-target-libio): Remove. + (all-target-libio): Remove. + (check-target-libio): Remove. + (.PHONY): Remove. + (libg++.tar.bz2): Remove. + (all-target-cygmon): Remove libio. + (all-target-libstdc++): Remove. + (configure-target-libstdc++): Remove. + (TARGET_LIB_PATH): Remove libstdc++. + (ALL_GCC_CXX): Remove libstdc++. + (all-target-gperf): Correct. + +2001-02-16 Nick Clifton <nickc@redhat.com> + + * configure.in (noconfigdirs): Allow configuration of texinfo + for Cygwin hosts. + +2001-02-15 Anthony Green <green@redhat.com> + + * configure: Introduce GCJ_FOR_TARGET. + * configure.in: Ditto. + * Makefile.in: Ditto. + +2001-02-13 Andreas Schwab <schwab@suse.de> + + * MAINTAINERS: Update mail address. + +2001-02-09 Martin Schwidefsky <schwidefsky@de.ibm.com> + + * config.guess: Add linux target for S/390. + * config.sub: Likewise. + +2001-02-08 Chandrakala Chavva <cchavva@redhat.com> + + * configure.in: for *-chorusos, don't config target-newlib and + target-libgloss. + +2001-02-06 Ben Elliston <bje@redhat.com> + + * configure: Output host type to stdout, not stderr. + +2001-02-05 Mark Mitchell <mark@codesourcery.com> + + * ltcf-c.sh: Add support for -no-undefined under GNU/Linux. + * ltcf-cxx.sh: Likewise. + + * config.if: Assume enable_libstdcxx_v3 is defined. + +2001-02-04 Mark Mitchell <mark@codesourcery.com> + + Remove V2 C++ library. + * configure.in: Remove --enable-libstdcxx_v3 support. + +2001-01-31 Bryce McKinlay <bryce@albatross.co.nz> + + * include/demangle.h: Add prototype for java_demangle_v3. + +2001-01-29 Phil Edwards <pme@sources.redhat.com> + + * COPYING.LIB: Update to LGPL 2.1 from the FSF. + +2001-01-27 Richard Henderson <rth@redhat.com> + + * configure.in (target_makefile_frag) [alpha*-*]: Use mt-alphaieee. + +2001-01-27 Michael Sokolov <msokolov@ivan.Harhan.ORG> + + * ltcf-cxx.sh (ac_cv_prog_cc_pic_works, ac_cv_prog_cc_static_works): + Don't unset, it's non-portable and no longer necessary, set to empty + instead. + +2001-01-27 Michael Sokolov <msokolov@ivan.Harhan.ORG>, Alexandre Oliva <oliva@lsd.ic.unicamp.br> + + * ltconfig: Shell portability fix for the tagname validity check. + +2001-01-27 Alexandre Oliva <aoliva@redhat.com> + + * ltcf-c.sh (ld_shlibs) [aix5*]: Disable on unknown CPU types. + * ltcf-cxx.sh, ltcf-gcj.sh: Likewise. + +2001-01-26 Michael Sokolov <msokolov@ivan.Harhan.ORG> + + * ltcf-cxx.sh: Use parentheses around eval $ac_compile. + +2001-01-26 Tom Tromey <tromey@redhat.com> + + * configure.in: Allow libgcj to be built on Sparc Solaris. + +2001-01-25 David Edelsohn <edelsohn@gnu.org> + + * ltcf-c.sh: Add aix5 case. + * ltcf-cxx.sh: Likewise. + * ltconfig: Likewise. + +2001-01-24 Alexandre Oliva <aoliva@redhat.com> + + * ltmain.sh (TAG disable-shared, TAG disable-static): Make sure we + keep at least one of build_libtool_libs or build_old_libs set to + yes. + + * ltcf-gcj.sh (lt_simple_link_test_code): Remove stray `(0)'. + * libtool.m4 (_AC_LIBTOOL_GCJ): Pass $CPPFLAGS on. + +2001-01-23 Bryce McKinlay <bryce@albatross.co.nz> + + * configure.in: Enable libgcj on several additional platforms. + +2001-01-22 Bryce McKinlay <bryce@albatross.co.nz> + + * configure.in: Enable libgcj for linux targets. + +2001-01-20 Michael Sokolov <msokolov@ivan.Harhan.ORG> + + * MAINTAINERS (Write After Approval): Add myself. + +2001-01-15 John David Anglin <dave@hiauly1.hia.nrc.ca> + + * MAINTAINERS: Add myself as vax port maintainer. + +2001-01-11 Fergus Henderson <fjh@cs.mu.oz.au> + + * MAINTAINERS: Add myself as Mercury front-end maintainer. + +2001-01-09 Mike Stump <mrs@wrs.com> + + * Makefile.in (CONFIGURE_TARGET_MODULES): Pass back configuration + failures of subdirectories. + +2001-01-02 Laurynas Biveinis <lauras@softhome.net> + + * ltcf-c.sh: Clear ac_cv_prog_cc_pic for DJGPP. Do not add + '-DPIC' to ac_cv_prog_cc_pic for DJGPP. + * ltcf-cxx.sh: Likewise. + * ltcf-gcj.sh: Likewise. + * ltconfig.sh: Fix typo. + +2001-01-02 Laurynas Biveinis <lauras@softhome.net> + + * configure: handle DOS-style absolute paths. + +2001-01-02 Laurynas Biveinis <lauras@softhome.net> + + * configure.in: remove supported directories from $noconfigdirs for DJGPP. + +2000-12-30 Marek Michalkiewicz <marekm@linux.org.pl> + + * MAINTAINERS: Add myself as avr port co-maintainer. + +2000-12-28 Ben Elliston <bje@redhat.com> + + * MAINTAINERS: Add myself under ``Write After Approval''. + +2000-12-19 Joseph S. Myers <jsm28@cam.ac.uk> + + * texinfo: Remove directory from GCC. + +2000-12-18 Joseph S. Myers <jsm28@cam.ac.uk> + + * COPYING: Update to current + ftp://ftp.gnu.org/pub/gnu/Licenses/COPYING-2.0 (fixes references + to 19yy as example year in copyright notice). + +2000-12-18 Benjamin Kosnik <bkoz@redhat.com> + + * Makefile.in (BASE_FLAGS_TO_PASS): Alphabetize. + (libstdcxx_incdir): Pass down. + * config.if: Remove expired bits for cxx_interface, add stub. + (libstdcxx_incdir): Add variable for g++ include directory. + * configure.in (gxx_include_dir): Use it. + +2000-12-18 Alexandre Oliva <aoliva@redhat.com> + + * MAINTAINERS: Added self as sh port co-maintainer. Removed entry + with old-email address from ``Write After Approval''. + +2000-12-15 Andreas Jaeger <aj@suse.de> + + * configure.in: Handle lang_dirs. + +2000-12-14 Tom Tromey <tromey@redhat.com> + + * MAINTAINERS: Removed brads. + + * MAINTAINERS: Added gcj developers. + +2000-12-13 Anthony Green <green@redhat.com> + + * configure.in: Disable libgcj for any target not specifically + listed. Disable libgcj for x86 and Alpha Linux until compatible + with g++ abi. + +2000-12-13 Mike Stump <mrs@wrs.com> + + * Makefile.in (local-distclean): Also remove fastjar. + +2000-12-12 Rodney Brown <RodneyBrown@mynd.com> + + * contrib/gcc_update: Add fastjar --touch entries. + +2000-12-12 Alexandre Oliva <aoliva@redhat.com> + + * configure.in: Disable language-specific target libraries for + languages that aren't enabled. + +2000-12-10 Anthony Green <green@redhat.com> + + * configure.in: Define libgcj. Disable libgcj target libraries for + most targets. + +2000-12-10 Neil Booth <neilb@earthling.net> + + * MAINTAINERS: Update mail address, remove from WAA list. + +2000-12-09 Alexandre Petit-Bianco <apbianco@cygnus.com> + + * libjava: Imported from /cvs/java. + * libffi: Likewise. + * Boehm-gc: Likewise. + +2000-12-09 Alexandre Petit-Bianco <apbianco@cygnus.com> + + * configure.in (target_libs): Revert 2000-12-08 patch. + (noconfigdirs): Added target-libjava. + +2000-12-09 Laurynas Biveinis <lauras@softhome.net> + + * djunpack.bat: removed. + +2000-12-09 Laurynas Biveinis <lauras@softhome.net> + + * Makefile.in: handle DOS-style absolute paths. + * config-ml.in: likewise. + * symlink-tree: likewise. + +2000-12-08 Alexandre Petit-Bianco <apbianco@cygnus.com> + + * fastjar: Imported. + +2000-12-08 Alexandre Petit-Bianco <apbianco@cygnus.com> + + * Makefile.in (TARGET_CONFIGDIRS): Wrong place. Removed note about + libjava. + * configure.in (target_libs): Removed `target-libjava'. + +2000-12-08 Alexandre Petit-Bianco <apbianco@cygnus.com> + + * Makefile.in (TARGET_CONFIGDIRS): Added note about libjava. + (ALL_MODULES): Added fastjar. + (NATIVE_CHECK_MODULES, INSTALL_MODULES, CLEAN_MODULES): Likewise. + (all-target-libjava): all-fastjar replaces all-zip. + (all-fastjar): Added. + (configure-target-fastjar, all-target-fastjar): Likewise. + * configure.in (host_tools): Added fastjar. + +2000-12-07 Mike Stump <mrs@wrs.com> + + * Makefile.in (local-distclean): Remove leftover built files. + +2000-11-24 Nick Clifton <nickc@redhat.com> + + * configure.in (xscale-elf): Add target. + (xscale-coff): Add target. + +2000-11-22 Loren J. Rittle <ljrittle@acm.org> + + * ltcf-cxx.sh: Support creation of C++ shared libraries on + recent versions of FreeBSD (release 3 or later). + * ltconfig: On FreeBSD, -lc must not be provided when building + a shared library or else the standard -pthread gcc option is + rendered worthless to later users of the built library. + +2000-11-16 Fred Fish <fnf@be.com> + + * configure.in (enable_libstdcxx_v3): Fix typo, + libstd++ -> libstdc++. + +2000-11-21 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + + * MAINTAINERS: Add self to Write After Approval list. + +2000-11-21 Bernd Schmidt <bernds@redhat.com> + + * MAINTAINERS: Update my email address. Add myself to global write + privs list. + +2000-11-18 Alexandre Oliva <aoliva@redhat.com> + + * Makefile.in: Merge with src and libgcj. + (ALL_GCC_C, ALL_GCC_CXX): New macros. Use them as dependencies of + configure-target-<library> when their configure scripts need the C + or C++ library to have already been built to work properly. + (do_proto_toplev): Set them to an empty string. + + * Makefile.in (HOST_LIB_PATH, TARGET_LIB_PATH): New macros. + (REALLY_SET_LIB_PATH): Use them. + +2000-11-17 Stan Shebs <shebs@apple.com> + + * MAINTAINERS: Add self to Write After Approval list. + +2000-11-13 Joseph S. Myers <jsm28@cam.ac.uk> + + * configure: Provide the original toplevel configure arguments + (including $0) to subprocesses in the environment rather than + through gcc/configargs.h. + +2000-11-13 Joseph S. Myers <jsm28@cam.ac.uk> + + * MAINTAINERS: Remove references to cccp. Change C9X reference to + C99. Alphabetise "Write After Approval" list. + +2000-11-12 Mark Mitchell <mark@codesourcery.com> + + * configure: Turn on libstdc++ V3 by default. + + * ltcf-c.sh: On Solaris, use `gcc -shared' to build a shared library + if we've got GCC. + +2000-11-11 Philip Blundell <philb@gnu.org> + + * MAINTAINERS: Add self to Write After Approval list. + +2000-11-09 David Edelsohn <edelsohn@gnu.org> + + * ltcf-c.sh (aix4): Improve shared library configuration; require + exporting symbols. + * ltcf-cxx.sh (aix4): Define. + * ltconfig (aix4): Define library and soname specs appropriate for + AIX. Define command to create export symbols list. + +Mon Nov 6 14:19:35 2000 Christopher Faylor <cgf@cygnus.com> + + * config.sub: Add support for Sun Chorus + +2000-10-31 Nick Clifton <nickc@redhat.com> + + * MAINTAINERS: Rename <name>@cygnus.com addresses to + <name>@redhat.com. Also installed new email address for Clint + Popetz. + +2000-10-30 Joseph S. Myers <jsm28@cam.ac.uk> + + * etc: Remove directory from GCC. + +2000-10-16 Michael Meissner <meissner@redhat.com> + + * configure (gcc/configargs.h): Only create if there is a build GCC + directory created. + +2000-10-16 Matthias Klose <doko@debian.org> + + * config.if: Search libstdc++-v3/configure.in for INTERFACE, + when configured for libstdc++-v3. + +2000-10-05 Phil Edwards <pme@gcc.gnu.org> + + * configure: Save configure arguments to gcc/configargs.h. + +2000-10-04 Philipp Thomas <pthomas@suse.de> + + * config.guess: Import CVS version 1.157. + * config.sub: Import CVS version 1.181. + +2000-10-04 Andris Pavenis <pavenis@latnet.lv> + + * Makefile.in (bootstrap): avoid recursion if subdir missing + (cross): ditto + (do-proto-toplev): ditto + +2000-09-30 Alexandre Oliva <aoliva@redhat.com> + + * Makefile.in (DEVO_SUPPORT): Added gettext.m4, libtool.m4, + ltcf-c.sh, ltcf-cxx.sh and ltcf-gcj.sh. + + * ltconfig, ltmain.sh, libtool.m4, ltcf-cxx.sh: Updated from libtool + multi-language branch, to work around Solaris' /bin/sh bug. Rebuilt + all affected `configure' scripts. + +2000-09-26 David Edelsohn <edelsohn@gnu.org> + + * config/mt-aix43 (NM_FOR_TARGET): Add -B bsd-style flag. + +Mon 25-Sep-2000 19:46:09 BST Neil Booth <neilb@earthling.net> + + * MAINTAINERS: Add self as cpplib co-maintainer. + +2000-09-24 Aldy Hernandez <aldyh@redhat.com> + + * MAINTAINERS: Add self to Write After Approval list. + +2000-09-18 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> + + * INSTALL/README: egcs -> GCC update. + +Sun Sep 17 16:55:59 CEST 2000 Marc Espie <espie@cvs.openbsd.org> + + * MAINTAINERS: Add myself to Write After Approval list. + +2000-09-15 Kazu Hirata <kazu@hxi.com> + + * MAINTAINERS: Add myself to Write After Approval list. + +Wed Sep 13 11:11:29 2000 Jeffrey A Law (law@cygnus.com) + + * configure.in: Do not build byacc for hppa64. Provide paths to the + X11 libraries for hppa64. + +2000-09-08 Stephane Carrez <Stephane.Carrez@worldnet.fr> + + * MAINTAINERS: Add myself as 68hc11 port maintainer. + +2000-09-06 Alexandre Oliva <aoliva@redhat.com> + + * Makefile.in (all-zlib): Added dummy target. + + * ltconfig, ltmain.sh, libtool.m4, ltcf-c.sh, ltcf-cxx.sh, + ltcf-gcj.sh: Updated from libtool multi-language branch. + +2000-09-05 Alexandre Oliva <aoliva@redhat.com> + + * Makefile.in (all-bootstrap): Added all-texinfo and all-zlib. + (bootstrap*): Depend on all-bootstrap. + +2000-09-05 Philipp Thomas <pthomas@suse.de> + + * config.guess: Import CVS version 1.156. + * config.sub: Import CVS version 1.179. + +2000-09-02 Anthony Green <green@cygnus.com> + + * Makefile.in (all-gcc): Depend on all-zlib. + (CLEAN_MODULES): Add clean-zlib. + (ALL_MODULES): Add all-zlib. + * configure.in (host_libs): Add zlib. + +2000-09-02 Alexandre Oliva <aoliva@redhat.com>, DJ Delorie <dj@redhat.com> + + * configure.in (FLAGS_FOR_TARGET): Use -nostdinc even for Canadian + crosses, but add gcc/include to the header search path for them. + +2000-08-04 David E. O'Brien <obrien@FreeBSD.org> + + * MAINTAINERS: Add self to Write After Approval list. + +2000-08-27 Franz Sirl <Franz.Sirl-kernel@lauterbach.com> + + * config.guess: Import CVS version 1.152. + * config.sub: Import CVS version 1.177. + +2000-08-25 Alexandre Oliva <aoliva@redhat.com> + + * configure.in (FLAGS_FOR_TARGET): Use $target_configdirs and + $targargs to tell whether newlib is going to be built. + + * configure.in [disable-libstdcxx-v3] (libstdcxx_flags): Search + $$r/TARGET_SUBDIR/libio for _G_config.h. + +2000-08-23 Alexandre Oliva <aoliva@redhat.com> + + * MAINTAINERS: Add self as a build machinery (*.in) maintainer. + +2000-08-22 DJ Delorie <dj@redhat.com> + + * MAINTAINERS: Add self as a build machinery (*.in) maintainer + +2000-08-22 Alexandre Oliva <aoliva@redhat.com> + + * config-ml.in (CC, CXX): Avoid trailing whitespace. + (LD_LIBRARY_PATH, SHLIB_PATH): Adjust for multilibs and export to + sub-configures. + +2000-08-21 DJ Delorie <dj@redhat.com> + + * MAINTAINERS: Add self as a libiberty maintainer + +2000-08-16 Alexandre Oliva <aoliva@redhat.com> + + * configure.in (libstdcxx_flags): Use + libstdc++-v3/src/libstdc++.INC. + +2000-08-15 Alexandre Oliva <aoliva@redhat.com> + + * configure.in (libstdcxx_flags): Use libstdc++-v3/src/INCLUDES. + +2000-08-14 Zack Weinberg <zack@wolery.cumb.org> + + * configure.in (libstdcxx_flags): Remove -isystem $$s/libio/stdio. + + * configure: Make enable_threads and enable_shared defaults + explicit. Substitute enable_threads into generated Makefiles. + * configure.in: Accept *-*-linux* not just *-*-linux-gnu*. + * libtool.m4: Accept *-*-linux* not just *-*-linux-gnu*. + +2000-08-13 Geoff Keating <geoffk@cygnus.com> + + * Makefile.in (GCC_FOR_TARGET): Also add -B$$r/gcc/ here. + +2000-08-12 Alexandre Oliva <aoliva@redhat.com> + + * config-ml.in (CC): Remove bogus duplicate quotation mark from + previous delta. + +2000-08-11 Jason Merrill <jason@redhat.com> + + * configure.in (CC_FOR_TARGET, CHILL_FOR_TARGET, + CXX_FOR_TARGET): Add -B$$r/gcc/ here. + (FLAGS_FOR_TARGET): Not here. + (CHILL_FOR_TARGET, CXX_FOR_TARGET): Don't check the list of languages. + +2000-08-11 Alexandre Oliva <aoliva@redhat.com> + + * config-ml.in (CC, CXX): Don't introduce a leading space. + +2000-08-07 DJ Delorie <dj@delorie.com> + + * MAINTAINERS: Add self as a DJGPP maintainer + +2000-08-07 DJ Delorie <dj@redhat.com> + + * configure.in (FLAGS_FOR_TARGET): invert test for xgcc, should mean + "if we're also building gcc, and it's a gcc that will run on the + build machine, we want to use its includes instead of the system's + default includes". + +2000-08-04 Joseph S. Myers <jsm28@cam.ac.uk> + + * MAINTAINERS: Add self to Write After Approval list. + +2000-08-03 Alexandre Oliva <aoliva@redhat.com> + + * configure.in (libstdcxx_flags): Don't use `"'. + + * config-ml.in: Adjust multilib search paths to the + appropriate multilib tree. + +2000-08-02 Alexandre Oliva <aoliva@redhat.com> + + * configure.in (CHILL_FOR_TARGET, CXX_FOR_TARGET): Convert blanks to + commas in $LANGUAGES. + +2000-08-02 Manfred Hollstein <manfredh@redhat.com> + + * configure.in: Re-enable all references to libg++ and librx. + +2000-08-01 Alexandre Oliva <aoliva@redhat.com> + + * ltconfig, ltmain.sh: Update from libtool multi-language branch. + * ltcf-c.sh (need_lc): Fix test message. Set wl for archive_cmds. + (ac_cv_prog_cc_pic): Don't print `cached' without `checking'. + * ltcf-cxx.sh (need_lc): Set based on postdeps. + + * configure.in (qCXX_FOR_TARGET): Use echo instead of expr. + +2000-07-31 Alexandre Oliva <aoliva@redhat.com> + + * configure.in (qCXX_FOR_TARGET): Quote `&' characters in + CXX_FOR_TARGET for sed. + +2000-07-30 Alexandre Oliva <aoliva@redhat.com> + + * configure.in (CC_FOR_TARGET, CHILL_FOR_TARGET, CXX_FOR_TARGET): + Do not override if already set in the environment or in configure. + Don't duplicate $(FLAGS_FOR_TARGET) if it already appears in them. + (FLAGS_FOR_TARGET): Don't use host directories on Canadian crosses. + +2000-07-28 Alexandre Oliva <aoliva@redhat.com> + + * libtool.m4, ltcf-c.sh, ltcf-cxx.sh, ltcf-gcj.sh: New files from + the libtool CVS tree multi-language branch. + * ltconfig, ltmain.sh: Updated. + +2000-07-27 Alexandre Oliva <aoliva@redhat.com> + + * Makefile.in (clean-target-libgcc): Remove gcc/libgcc. + (clean-target): Depend on it. + + * Makefile.in (FLAGS_FOR_TARGET): New macro. + (GCC_FOR_TARGET): Use it. + (CC_FOR_TARGET, CXX_FOR_TARGET, CHILL_FOR_TARGET): Now defined... + * configure.in: ... here. + (FLAGS_FOR_TARGET): Define. Add ld build dir to -L path. + (libstdcxx_flags): Define and append to CXX_FOR_TARGET. + +2000-07-24 Eric Christopher <echristo@cygnus.com> + + * MAINTAINERS: Add self to Write After Approval list. + +2000-07-24 Alexandre Oliva <aoliva@redhat.com> + + * Makefile.in (configure-target-libf2c): Depend on $(ALL_GCC). + (configure-target-libchill, configure-target-libobjc): Likewise. + + * configure.in: Use the same cache file for all target libs. + * config-ml.in: But different cache files per multilib variant. + +2000-07-23 Michael Sokolov <msokolov@ivan.Harhan.ORG> + + * configure (topsrcdir): Don't use dirname. + +2000-07-22 Jeffrey Oldham <oldham@codesourcery.com> + + * MAINTAINERS: Add self to Write After Approval list. + +2000-07-20 Jason Merrill <jason@redhat.com> + + * configure.in: Remove all references to libg++ and librx. + + * configure, configure.in, Makefile.in: Unify gcc and binutils. + +2000-07-20 Hans-Peter Nilsson <hp@axis.com> + + * config.sub: Update to subversions version 2000-07-06. + +2000-07-12 Andrew Haley <aph@cygnus.com> + + * configure.in (host_makefile_frag): Use mh-ia64pic on IA-64 hosts. + (target_makefile_frag): Use mt-ia64pic on IA-64 targets. + +2000-07-07 Phil Edwards <pme@sourceware.cygnus.com> + + * symlink-tree: Check number of arguments. + +2000-07-05 Jim Wilson <wilson@cygnus.com> + + * Makefile.in (CXX_FOR_TARGET): Add libstdc++ to the library + search path for a g++ extracted from the build tree. This + will allow link tests run by configure scripts in + subdirectories to succeed. + +2000-07-01 Koundinya K <kk@ddeorg.soft.net> + + * ltconfig: Add support for mips-dde-sysv4.2MP + +2000-06-29 Michael Hayes <m.hayes@elec.canterbury.ac.nz> + + * MAINTAINERS: Add myself as loop discovery maintainer. + +2000-06-28 Corinna Vinschen <vinschen@cygnus.com> + + * ltconfig: Check for host_os beeing one of `cygwin', `mingw' or + `os2'. Force ac_cv_exeext to be ".exe" in that case. + +2000-06-19 Timothy Wall <twall@cygnus.com> + + * configure.in (noconfigdirs): Set noconfigdirs for tic54x target. + * config.sub: Add tic54x target. + +Sun Jun 11 17:20:00 MET 2000 Toon Moene <toon@moene.indiv.nluug.nl> + + * MAINTAINERS: Add self as Fortran maintainer, + remove Craig Burley. + +Tue May 30 19:01:12 2000 Andrew Cagney <cagney@b1.cygnus.com> + + * config.sub: Import CVS version 1.167 Tue May 30 09:00:07 2000. + * config.guess: Import CVS version 1.148 Tue May 30 09:00:06 2000 + +Mon May 29 21:15:00 MET 2000 Philipp Thomas <pthomas@suse.de> + + * MAINTAINERS: Add self as i18n maintainer + +20000-05-21 H.J. Lu (hjl@gnu.org) + + * Makefile.in (CC_FOR_TARGET): Make sure as/ld in the gcc + directory are used if they exist. Make sure + $(build_tooldir)/include is searched for header files, + $(build_tooldir)/lib/ for library files. + (GCC_FOR_TARGET): Likewise. + (CXX_FOR_TARGET): Likewise. + +Thu May 18 10:58:13 2000 Jeffrey A Law (law@cygnus.com) + + * configure.in (hppa*64*-*-*): Do build ld for this configuration. + +Wed May 17 16:03:48 2000 Alexandre Oliva <aoliva@cygnus.com> + + * Makefile.in (configure-target-libiberty): Depend on + configure-target-newlib. + +2000-05-16 Alexandre Oliva <aoliva@cygnus.com> + + * configure.in, Makefile.in: Merge all libffi-related + configury stuff from the libgcj tree. + +Tue May 16 10:06:21 2000 Andrew Cagney <cagney@b1.cygnus.com> + + Thu Apr 27 11:01:48 2000 Andrew Cagney <cagney@b1.cygnus.com>: + * Makefile.in (do-tar-bz2, do-md5sum): Skip CVS directories. + +Tue May 16 09:57:35 2000 Andrew Cagney <cagney@b1.cygnus.com> + + Wed Apr 26 17:03:53 2000 Andrew Cagney <cagney@b1.cygnus.com>: + * Makefile.in (do-djunpack): New target. Update djunpack.bat with + current version information. Add to proto-toplev directory. + (gdb-taz): Build do-djunpack. + +2000-05-15 David Edelsohn <edelsohn@gnu.org> + + * configure.in: Special case powerpc*-*-aix* target_makefile_frag. + +Mon May 15 13:39:09 2000 Andrew Cagney <cagney@b1.cygnus.com> + + * MAINTAINERS: Add self to Write After Approval list. + +2000-05-13 Alexandre Oliva <oliva@lsd.ic.unicamp.br> + + * ltmain.sh: Preserve in relink_command any environment + variables that may affect the linker behavior. + +Fri May 12 11:23:17 2000 Jeffrey A Law (law@cygnus.com) + + * config.sub (basic_machine): Recognize hppa64 as a valid cpu type. + +Wed May 10 21:26:51 2000 Jim Wilson <wilson@cygnus.com> + + * configure.in (ia64*-*-elf*): Add gdb and friends to noconfigdirs. + +2000-05-08 Eli Zaretskii <eliz@is.elta.co.il> + + * djunpack.bat: Change the Sed script to replace @V@ in fnchange.lst + with the version name. + +Sat May 6 21:12:55 CDT 2000 Jason Eckhardt <jle@cygnus.com> + + * MAINTAINERS: Add self as bb-reorder maintainer. + +2000-05-01 Benjamin Kosnik <bkoz@cygnus.com> + + * config.if: Tweak. + +2000-04-23 Eli Zaretskii <eliz@is.elta.co.il> + + * djunpack.bat: New file. + +Wed Apr 19 12:46:26 2000 Andrew Cagney <cagney@b1.cygnus.com> + + * Makefile.in (taz, gdb-taz, gas.tar.bz2, binutils.tar.bz2, + gas+binutils.tar.bz2, libg++.tar.bz2, gnats.tar.bz2, gdb.tar.bz2, + dejagnu.tar.bz2, gdb+dejagnu.tar.bz2, insight.tar.bz2, + insight+dejagnu.tar.bz2, newlib.tar.bz2): Pass MD5PROG to sub-make. + +2000-04-16 Dave Pitts <dpitts@cozx.com> + + * config.sub (case $basic_machine): Change default for "ibm-*" + to "openedition". + +2000-04-13 Andreas Jaeger <aj@suse.de> + + * MAINTAINERS: Added myself. + +Wed Apr 12 16:42:48 2000 Andrew Cagney <cagney@b1.cygnus.com> + + * Makefile.in (gdb-taz): New target. GDB specific archive. + (do-md5sum): New target. + (MD5PROG): Define. + (PACKAGE): Default to TOOL. + (VER): Default to a shell script. + (taz): Rewrite target. Move real work to do-proto-toplev. Include + md5 checksum generation. + (do-proto-toplev): New target. Create $(PACKAGE)-$(VER) link. + (do-tar-bz2): Delete creation of $(PACKAGE)-$(VER) link. + (gdb.tar.bz2, dejagnu.tar.bz2, gdb+dejagnu.tar.bz2, + insight.tar.bz2): Use gdb-taz to create archive. + +Fri Apr 7 18:10:29 2000 Andrew Cagney <cagney@b1.cygnus.com> + + * configure (warn_cflags): Delete. + +Thu Apr 6 16:15:14 2000 Philippe De Muyter <phdm@macqel.be> + + * MAINTAINERS: Added myself. + +2000-04-05 Benjamin Kosnik <bkoz@cygnus.com> + Martin v. Loewis <martin@loewis.home.cs.tu-berlin.de> + + * configure.in (enable_libstdcxx_v3): Add. + (target_libs): Add bits here to switch between libstdc++-v2 and + libstdc++-v3. + * config.if: And this file too. + * Makefile.in: Add libstdc++-v3 targets. + +2000-04-05 Michael Meissner <meissner@redhat.com> + + * config.sub (d30v): Add d30v as a basic machine type. + +2000-03-29 Jason Merrill <jason@casey.cygnus.com> + + * configure.in: -linux-gnu*, not -linux-gnu. + +Sun Mar 12 17:30:30 2000 Toon Moene <toon@moene.indiv.nluug.nl> + + * MAINTAINERS: Add self in write-after-approval section. + +Sun Mar 12 00:23:32 2000 Jim Wilson <wilson@cygnus.com> + + * MAINTAINERS: Add self as ia64 port maintainer. + +2000-03-08 Neil Booth <NeilB@earthling.net> + + * MAINTAINERS: Add self in write-after-approval section. + +Fri Mar 3 18:44:08 2000 Andrew Cagney <cagney@b1.cygnus.com> + + * Makefile.in (taz): Set PACKAGE to TOOL when not defined. + (do-tar-bz2): Replace TOOL with PACKAGE. + (gdb.tar.bz2): Remove GDBTK from GDB package. + (gdb+dejagnu.tar.bz2, insight.tar.bz2, insight+dejagnu.tar.bz2, + dejagnu.tar.bz2): New packages. + +2000-02-27 Andreas Jaeger <aj@suse.de> + + * configure.in: Add entry for mips*-*-linux*, move catch all + *-*-*linux* entry below this one. + +2000-02-27 Ian Lance Taylor <ian@zembu.com> + + * ltconfig, ltmain.sh: Update to libtool 1.3.4. + +2000-02-24 Nick Clifton <nickc@cygnus.com> + + * config.sub: Support an OS of "wince". + +Thu Feb 24 16:15:56 2000 Andrew Cagney <cagney@b1.cygnus.com> + + * config.guess, config.sub: Updated to match config's 2000-02-15 + version. + +2000-02-23 Linas Vepstas <linas@linas.org> + + * config.sub: Add support for Linux/IBM 370. + * configure.in: Likewise. + +2000-02-22 Nick Clifton <nickc@cygnus.com> + + * configure.in: Add mips-pe, sh-pe and arm-wince-pe targets. + +2000-02-20 Christopher Faylor <cgf@cygnus.com> + + * config.guess: Guess "cygwin" rather than "cygwin32". + +2000-02-16 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * configure (gcc_version): When setting, narrow search to + lines containing `version_string'. + +2000-02-15 Denis Chertykov <denisc@overta.ru> + + * config.sub: Add support for avr target. + +2000-02-14 Nick Clifton <nickc@cygnus.com> + + * MAINTAINERS: Add maintainers for MCore port. + +Tue Feb 1 00:07:46 2000 Hans-Peter Nilsson <hp@bitrange.com> + + * config.sub: Add mmix-knuth-mmixware. + +2000-01-31 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * MAINTAINERS: Pair cccp with cpplib maintainership. + +2000-01-27 Christopher Faylor <cgf@redhat.com> + + * Makefile.in (CC_FOR_TARGET): Add new winsup directory + structure stuff to -L library search. + (CXX_FOR_TARGET): Ditto. + (CROSS_CHECK_MODULES): Fix spelling mistake. + +2000-01-24 Mark Mitchell <mark@codesourcery.com> + + * Makefile.in (CXX_FOR_TARGET): Use g++, not xgcc, to invoke + the C++ compiler. + +2000-01-12 Richard Henderson <rth@cygnus.com> + + * configure.in: Don't build some bits for beos. + +2000-01-12 Joel Sherrill (joel@OARcorp.com) + + * Makefile.in (CC_FOR_TARGET): Use newlib libraries as well + as include files. + +2000-01-11 Zack Weinberg <zack@wolery.cumb.org> + + * Add self as cpplib maintainer, as requested by Jason + Merrill. Correct my e-mail address. + +2000-01-06 Geoff Keating <geoffk@cygnus.com> + + * configure.in: Use mt-aix43 to handle *_TARGET defs, + not mh-aix43. + +Thu Dec 23 03:43:36 1999 Hans-Peter Nilsson <hp@bitrange.com> + + * MAINTAINERS: Add myself to "write after approval" list. + +1999-12-14 Richard Henderson <rth@cygnus.com> + + * config.guess (alpha-osf, alpha-linux): Detect ev67. + * config.sub: Accept alphaev[78], alphaev8. + +1999-12-03 Alexandre Oliva <oliva@lsd.ic.unicamp.br> + + * config.guess, config.sub: Update from autoconf. + +1999-11-29 Bruce Korb <autogen@linuxbox.com> + + * MAINTAINERS: update my playtime e-address. + +Tue Nov 23 00:57:41 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> + + * config-ml.in (sparc*-*-*): Disable sparcv9 support if the + necessary libraries are missing. + +Fri Nov 19 11:22:31 MST 1999 Diego Novillo <dnovillo@cygnus.com> + + * MAINTAINERS: Add new 'write after approval' maintainer. + +Wed Nov 17 16:08:43 1999 Alexandre Petit-Bianco <apbianco@cygnus.com> + + * MAINTAINERS: Add new Java maintainer. + +1999-10-25 Andreas Schwab <schwab@suse.de> + + * configure: Fix quoting inside arguments of eval. + +1999-10-21 Nick Clifton <nickc@cygnus.com> + + * config-ml.in: Allow suppression of some ARM multilibs. + +Tue Sep 7 23:33:57 1999 Linas Vepstas <linas@linas.org> + + * config.guess: Add OS/390 match pattern. + * config.sub: Add mvs, openedition targets. + * configure.in (i370-ibm-opened*): New. + +1999-09-04 Steve Chamberlain <sac@pobox.com> + + * config.sub: Add support for configuring for pj. + +1999-08-31 Nick Clifton <nickc@cygnus.com> + + * config.sub (maybe_os): Add support for configuring for fr30. + +1999-08-25 Nick Clifton <nickc@cygnus.com> + + * configure.in: Do not configure or build ld for AIX + platforms. ld is known to be broken on these platforms. + +Wed Aug 25 01:12:25 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> + + * config-ml.in: Pass compiler flag corresponding to multidirs to + subdir configures. + +1999-08-09 Ian Lance Taylor <ian@zembu.com> + + * Makefile.in (LDFLAGS): Define. + +1999-08-08 Mumit Khan <khan@xraylith.wisc.edu> + + * configure.in (i[3456]-*-mingw32*): Don't put gprof in + noconfigdirs. + (*-*-cygwin*): Likewise. + +1999-08-08 Ian Lance Taylor <ian@zembu.com> + + * mkdep: New file. + * Makefile.in (GAS_SUPPORT_DIRS): Add mkdep. + (BINUTILS_SUPPORT_DIRS): Add mkdep. + + From Eli Zaretskii <eliz@is.elta.co.il>: + * configure (tmpfile): Change cONf$$ to cNf$$ to avoid an overly + long file name when using DJGPP on MS-DOS. + +Wed Aug 4 02:07:14 1999 Jeffrey A Law (law@cygnus.com) + + * config.sub (vxworks case): Use os=-vxworks, not os=vxworks. + +1999-07-30 Alan Modra <alan@spri.levels.unisa.edu.au> + + * Makefile.in (check-target-libio): Remove all-target-libstdc++ + dependency as this causes "make check" to globally "make all" + +Tue Jun 22 23:45:18 1999 Tom Tromey <tromey@cygnus.com> + + * configure.in (target_libs): Added target-zlib. + * Makefile.in (ALL_TARGET_MODULES): Added zlib. + (CONFIGURE_TARGET_MODULES): Likewise. + (CHECK_TARGET_MODULES): Likewise. + (INSTALL_TARGET_MODULES): Likewise. + (CLEAN_TARGET_MODULES): Likewise. + (configure-target-zlib): New target. + (all-target-zlib): Likewise. + (all-target-libjava): Depend on all-target-zlib. + (configure-target-libjava): Depend on configure-target-zlib. + + * Makefile.in (configure-target-libjava): Depend on + configure-target-newlib. + (configure-target-boehm-gc): New target. + (configure-target-qthreads): New target. + + * configure.in (target_libs): Added target-qthreads. + * Makefile.in (ALL_TARGET_MODULES): Added qthreads. + (CONFIGURE_TARGET_MODULES): Likewise. + (CHECK_TARGET_MODULES): Likewise. + (INSTALL_TARGET_MODULES): Likewise. + (CLEAN_TARGET_MODULES): Likewise. + (all-target-qthreads): New target. + (configure-target-libjava): Depend on configure-target-qthreads. + (all-target-libjava): Depend on all-target-qthreads. + + * Makefile.in (ALL_TARGET_MODULES): Added libjava, boehm-gc. + (CONFIGURE_TARGET_MODULES): Likewise. + (CHECK_TARGET_MODULES): Likewise. + (INSTALL_TARGET_MODULES): Likewise. + (CLEAN_TARGET_MODULES): Likewise. + (all-target-libjava): New target. + (all-target-boehm-gc): Likewise. + * configure.in (target_libs): Added libjava, boehm-gc. + +1999-07-22 Ian Lance Taylor <ian@zembu.com> + + * Makefile.in (binutils.tar.bz2): Don't pass makeall.bat and + configure.bat in SUPPORT_FILES. + (gas+binutils.tar.bz2): Likewise. + + * makeall.bat: Remove; obsolete. + +1999-07-21 Ian Lance Taylor <ian@zembu.com> + + From Mark Elbrecht: + * configure.bat: Remove; obsolete. + +1999-07-11 Ian Lance Taylor <ian@zembu.com> + + * configure: Add -W -Wall to the default CFLAGS when compiling with + gcc. + +Thu Jul 8 12:32:23 1999 John David Anglin <dave@hiauly1.hia.nrc.ca> + + * configure.in: Build ld, binutils & gas for hppa*-*-linux-gnu*. + +1999-06-30 Mark Mitchell <mark@codesourcery.com> + + * configure.in: Build ld on IRIX6. + +1999-06-12 Ian Lance Taylor <ian@zembu.com> + + * Makefile.in: Change distribution targets to use bzip2 instead of + gzip. + (TEXINFO_SUPPORT): Set to just texinfo/texinfo.tex. + (taz): Don't use texinfo/gpl.texinfo or texinfo/lgpl.texinfo. + +1999-06-04 Nick Clifton <nickc@cygnus.com> + + * config.sub: Add mcore target. + +Sun May 30 16:03:16 1999 Cort Dougan <cort@cs.nmt.edu> + + * config.guess (ppc-*-linux-gnu): Also use ld emul elf32ppclinux. + +Tue May 25 11:20:46 1999 H.J. Lu (hjl@gnu.org) + + * config.guess (dummy): Changed to $dummy. + +1999-05-24 Nick Clifton <nickc@cygnus.com> + + * config.sub: Tidied up case statements. + +1999-05-22 Ben Elliston <bje@cygnus.com> + + * config.guess: Handle NEC UX/4800. Contributed by Jiro Takabatake + <jiro@din.or.jp>. + + * config.guess: Merge with FSF version. Future changes will be + more accurately recorded in this ChangeLog. + * config.sub: Likewise. + +Thu May 20 10:00:42 1999 Stephen L Moshier <moshier@world.std.com> + + * Makefile.in (GCC_FOR_TARGET): Add -I$(build_tooldir)/include. + +1999-04-30 Tom Tromey <tromey@cygnus.com> + + * ltmain.sh: [mode link] Always use CC given by ltconfig. + +1999-04-23 Tom Tromey <tromey@cygnus.com> + + * ltconfig, ltmain.sh: Update to libtool 1.2f. + +1999-04-20 Drew Moseley <dmoseley@cygnus.com> + + * configure.in (noconfigdirs): Don't build libstub for arm-elf targets. + (noconfigdirs): Don't build any bsp stuff for for arm-oabi targets. + Bad merge removed these two changes. + +Tue Apr 13 22:50:54 1999 Donn Terry (donn@interix.com) + Martin Heller (Ing.-Buero_Heller@t-online.de) + + * config.guess (interix Alpha): Add. + +1999-04-11 Richard Henderson <rth@cygnus.com> + + * configure.in (i?86-*-beos*): Do config gperf; don't config + gdb, newlib, or libgloss. + +Sun Apr 11 23:55:34 1999 Alexandre Oliva <oliva@dcc.unicamp.br> + + * config-ml.in: On mips*-*-*, if multidirs contains mabi=64, try to + link a trivial program with -mabi=64. If it fails, remove mabi=64 + from multidirs. + +Sat Apr 10 21:50:01 1999 Philipp Thomas (kthomas@gwdg.de) + + * config.sub: Set basic_machine to i586 when target_alias = k6-*. + +1999-04-08 Nick Clifton <nickc@cygnus.com> + + * config.sub: Add support for mcore targets. + +1999-04-07 Michael Meissner <meissner@cygnus.com> + + * configure.in (d30v-*): Use config/mt-d30v as makefile fragment, + not mt-ospace, in order to shut up assembler warning about using + symbols that are named the same as registers. + +1999-04-07 Drew Moseley <dmoseley@cygnus.com> + + * Makefile.in (all-target-cygmon): Added all-target-bsp to the + dependency list for all-target-cygmon. + +1999-04-05 Doug Evans <devans@casey.cygnus.com> + + * config-ml.in: Check $host, not $target, for selective multilibs. + (arm-*-*): Allow disabling of biendian, h/w fp, 26 bit apcs, + thumb interworking, and underscore prefix multilibs. + +1999-04-04 Ian Lance Taylor <ian@zembu.com> + + * missing: Update to version from current automake. + +Fri Apr 2 15:11:32 1999 H.J. Lu (hjl@gnu.org) + + * configure (gxx_include_dir): Removed. + + * configure.in (gxx_include_dir): Handle it. + * Makefile.in: Likewise. + +1999-03-29 Gavin Romig-Koch <gavin@cygnus.com> + + * config.sub (mips64vr4111,mips64vr4111el) Add. + +1999-03-21 Ben Elliston <bje@cygnus.com> + + * config.guess: Correct typo for detecting ELF on FreeBSD. + +Thu Mar 18 00:17:50 1999 Mark Elbrecht <snowball3@usa.net> + + * config/mh-go32: Delete. + * config/mh-djgpp: New. Renamed from mh-go32. + * configure.in (pc-msdosdjgpp): Set host_makefile_frag to + config/mh-djgpp. + +Thu Mar 11 18:37:23 1999 Drew Moseley <dmoseley@cygnus.com> + + * Makefile.in (all-target-bsp): Added all-gcc all-binutils and + all-target-newlib to dependency list for all-target-bsp. + +Thu Mar 11 01:19:31 1999 Mumit Khan <khan@xraylith.wisc.edu> + + * config.sub: Add i386-uwin support. + * config.guess: Likewise. + +Thu Mar 11 01:07:55 1999 Franz Sirl <Franz.Sirl-kernel@lauterbach.com> + + * configure.in: cleanup, add mh-*pic handling for arm, special + case powerpc*-*-aix* + +Wed Mar 10 18:35:07 1999 Jeff Johnston <jjohnstn@cygnus.com> + + * configure.in (noconfigdirs): Removed target-libgloss so libnosys.a + can be built. + +Wed Mar 10 17:39:09 1999 Drew Moseley <dmoseley@cygnus.com> + + * configure.in: Added bsp support to arm-*-coff and arm-*-elf + targets. + +1999-03-02 Nick Clifton <nickc@cygnus.com> + + * config.sub: Rename CYGNUS LOCAL to EGCS LOCAL + +Sun Feb 28 02:20:00 1999 Geoffrey Noer <noer@cygnus.com> + + * config.sub: Check for "cygwin*" rather than "cygwin32*" + +1999-02-24 Nick Clifton <nickc@cygnus.com> + + * config.sub: Fix typo in arm recognition. + +Wed Feb 24 13:51:40 1999 Drew Moseley <dmoseley@cygnus.com> + + * configure.in (noconfigdirs): Changed target_configdirs to + include target-bsp only for m68k-*-elf* and m68k-*-coff* + rather than m68k-*-* since it is not known to work on + m68k-aout. Ditto for arm-*-*oabi. + +Wed Feb 24 12:52:17 1999 Stan Shebs <shebs@andros.cygnus.com> + + * configure.in (*-*-windows*): Remove, no longer used. + * config/mh-windows: Ditto. + +1999-02-19 Ben Elliston <bje@cygnus.com> + + * config.guess: Automatically recognise ELF on FreeBSD. From Niall + Smart and improved by Andrew Cagney. + +Thu Feb 18 19:55:09 1999 Marc Espie <espie@cvs.openbsd.org> + + * config.guess: Recognize openbsd-*-hppa. + +Wed Feb 17 01:38:59 1999 H.J. Lu (hjl@gnu.org) + + * Makefile.in (REALLY_SET_LIB_PATH): Append $$$(RPATH_ENVVAR) + only if it is not empty. + +1999-02-17 Nick Clifton <nickc@cygnus.com> + + Patch from: Scott Bambrough <scottb@corelcomputer.com> + + * config.guess: Modified to recognize uname's armv* syntax. + + * config.sub: Modified to recognize uname's armv* syntax. + +1999-02-17 Mark Salter <msalter@cygnus.com> + + * configure.in: Added target-bsp for sparclite. + +Mon Feb 8 14:17:24 1999 Richard Henderson <rth@cygnus.com> + + * config.sub: Recognize alphapca5[67] and up to alphaev8. + +1999-02-08 Nick Clifton <nickc@cygnus.com> + + * configure.in: Add support for strongarm port. + * config.sub: Add support for strongarm target. + +Sun Feb 7 18:01:54 1999 Mumit Khan <khan@xraylith.wisc.edu> + + * configure.in (*-*-cygwin32*): Use config/mh-cygwin instead of + the old name config/mh-cygwin32. + Enable texinfo. + +Thu Feb 4 20:43:25 1999 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Do build ld for ix86 Solaris. + +Tue Feb 2 19:46:40 1999 Jim Wilson <wilson@cygnus.com> + + * Makefile.in (EXTRA_GCC_FLAGS): Set AR to $AR instead of + $AR_FOR_TARGET. Likewise for RANLIB. + +Tue Feb 2 20:05:05 1999 Catherine Moore <clm@cygnus.com> + + * config.sub (oabi): Recognize. + * configure.in (arm-*-oabi): Handle. + +Sat Jan 30 06:09:00 1999 Robert Lipe (robertlipe@usa.net) + + * config.guess: Improve detection of i686 on UnixWare 7. + +Sat Jan 30 08:04:00 1999 Mumit Khan <khan@xraylith.wisc.edu> + + * config.guess: Add support for i386-pc-interix. + * config.sub: Likewise. + * configure.in: Likewise. + * config/mh-interix: New file. + +Mon Jan 18 13:59:20 1999 Christopher Faylor <cgf@cygnus.com> + + * Makefile.in: Remove unneeded all-target-libio from + from all-target-winsup target since it is now unneeded. + Add all-target-libtermcap in its place since it is now + needed. + +Wed Dec 30 20:34:52 1998 Christopher Faylor <cgf@cygnus.com> + + * configure.in: makefile stub for cygwin target is probably + unnecessary. Remove it for now. + * config/mt-cygwin: Remove. + +Wed Dec 30 01:13:03 1998 Christopher Faylor <cgf@cygnus.com> + + * configure.in: libtermcap.a should be built when cygwin is the + target as well as the host. + * config.guess: Allow mixed case in cygwin uname output. + * Makefile.in: Add libtermcap target. + * config/mt-cygwin: New file. libtermcap target info. + +Wed Dec 23 00:20:50 1998 Jeffrey A Law (law@cygnus.com) + + * config.sub: Clean up handling of hppa2.0. + +Tue Dec 22 23:56:31 1998 Rodney Brown (rodneybrown@pmsc.com) + + * config.guess: Use C code to identify more HP machines. + +Thu Dec 17 01:22:30 1998 Jeffrey A Law (law@cygnus.com) + + * config.sub: Handle hppa2.0. + +Tue Dec 15 17:02:58 1998 Bob Manson <manson@charmed.cygnus.com> + + * configure.in: Add cygmon for x86-coff and x86-elf. Configure + cygmon for all sparclite targets, regardless of object format. + +1998-12-15 Mark Salter <msalter@cygnus.com> + + * configure.in: Added target-bsp for several target architectures. + + * Makefile.in: Added rules for bsp. + +Fri Dec 4 01:34:02 1998 Jeffrey A Law (law@cygnus.com) + + * config.guess: Improve detection of hppa2.0 processors. + +Fri Dec 4 01:33:05 1998 Niall Smart <nialls@euristix.ie> + + * config.guess: Recognize FreeBSD using ELF automatically. + +1998-11-26 Manfred Hollstein <manfred@s-direktnet.de> + + * configure (skip-this-dir): Add handling for new shell script, which + might be created by a sub-directory's configure to indicate, this particular + directory is "unwanted". + * Makefile.in ($(CONFIGURE_TARGET_MODULES)): Likewise. + +Wed Nov 18 18:28:45 1998 Geoffrey Noer <noer@cygnus.com> + + * ltconfig: import from libtool, after changing libtool to + account for the cygwin name change. + +Wed Nov 18 18:09:14 1998 Geoffrey Noer <noer@cygnus.com> + + * Makefile.in: CC_FOR_TARGET and CXX_FOR_TARGET should also + include newlib/libc/sys/cygwin and newlib/libc/sys/cygwin32. + +Wed Nov 18 20:13:29 1998 Christopher Faylor <cgf@cygnus.com> + + * configure.in: Add libtermcap to list of cygwin dependencies. + +Tue Nov 17 16:57:51 1998 Geoffrey Noer <noer@cygnus.com> + + * Makefile.in: modify CC_FOR_TARGET and CXX_FOR_TARGET so that + they include winsup/include when it's a cygwin target. + +1998-11-12 Tom Tromey <tromey@cygnus.com> + + * configure.in (host_tools): Added zip. + * Makefile.in (all-target-libjava): Depend on all-zip. + (all-zip): New target. + (ALL_MODULES): Added all-zip. + (NATIVE_CHECK_MODULES): Added check-zip. + (INSTALL_MODULES): Added install-zip. + (CLEAN_MODULES): Added clean-zip. + +Thu Nov 12 17:27:21 1998 Geoffrey Noer <noer@cygnus.com> + + * Makefile.in: lose "32" from comment about cygwin. + +Thu Nov 5 15:00:31 1998 Nick Clifton <nickc@cygnus.com> + + * configure.in: Use -Os to build target libraries for the fr30. + +Wed Nov 4 18:49:43 1998 Dave Brolley <brolley@cygnus.com> + + * config.sub: Add fr30. + +Mon Nov 2 15:19:33 1998 Geoffrey Noer <noer@cygnus.com> + + * configure.in: drop "32" from config/mh-cygwin32. Check + cygwin* instead of cygwin32*. + * config.sub: Check cygwin* instead of cygwin32*. + +Thu Oct 22 10:55:25 1998 Robert Lipe <robertl@dgii.com> + + * config.guess: Match any version of Unixware7. + +1998-10-20 Syd Polk <spolk@cygnus.com> + + * Makefile.in configure.in: Add the ability to use tcl8.1 and tk8.1 + if desired. + +Sun Oct 18 18:34:50 1998 Jeffrey A Law (law@cygnus.com) + + * config.if (cxx_interface, libstdcxx_interface): Do not try to set + these if the appropriate directories and files to not exist. + +Wed Oct 14 10:29:06 1998 Jeffrey A Law (law@cygnus.com) + + * Makefile.in (DEVO_SUPPORT): Add config.if. + +Tue Oct 13 15:45:36 1998 Manfred Hollstein <manfred@s-direktnet.de> + + * configure: Add pattern to replace "build_tooldir"'s + definition in the generated Makefile with "tooldir"'s + actual value. + +Tue Oct 13 09:17:06 1998 Jeffrey A Law (law@cygnus.com) + + * config.sub: Bring back lost sparcv9. + + * Makefile.in (all-snvavigator): Remove all-flexlm dependency. + +Mon Oct 12 12:09:44 1998 Jeffrey A Law (law@cygnus.com) + + * Makefile.in (CHILL_FOR_TARGET): Mirror recent changes to + CC_FOR_TARGET and friends. + +Mon Oct 12 12:09:30 1998 Alexandre Oliva <oliva@dcc.unicamp.br> + + * Makefile.in (build_tooldir): New variable, same as tooldir. + (CC_FOR_TARGET, GCC_FOR_TARGET, CXX_FOR_TARGET): Add + -B$(build_tooldir)/bin/. + (BASE_FLAGS_TO_PASS): Pass build_tooldir down. + +Tue Sep 1 16:23:11 1998 Gerald Pfeifer <pfeifer@dbai.tuwien.ac.at> + + * README: Remove installation instructions and refer to the + INSTALL directory instead. + +Wed Sep 30 22:20:50 1998 Robert Lipe <robertl@dgii.com> + + * config.sub: Add support for i[34567]86-pc-udk. + * configure.in: Likewise. + +Wed Sep 30 19:23:48 1998 Geoffrey Noer <noer@cygnus.com> + + * Makefile.in: add bzip2 package building bits for user + tools module + * configure.in: ditto + +Wed Sep 30 03:00:05 1998 Jeffrey A Law (law@cygnus.com) + + * Makefile.in (TARGET_CONFIGDIRS): Add libobjc. + (ALL_TARGET_MODULES): Add all-target-libobjc. + (CONFIGURE_TARGET_MODULES, CHECK_TARGET_MODULES): Similarly. + (INSTALL_TARGET_MODULES, CLEAN_TARGET_MODULES): Similarly. + (all-target-libchill): Add dependencies. + * configure.in (target_libs): Add libchill. + +1998-09-30 Manfred Hollstein <manfred@s-direktnet.de> + + * configure.in (target_subdir): Remove duplicate line. + +Tue Sep 29 22:45:41 1998 Felix Lee <flee@cygnus.com> + + * Makefile.in (all-automake): fix dependencies. + +Mon Sep 28 04:04:27 1998 Jeffrey A Law (law@cygnus.com) + + * configure.in: Minor cleanups for building in the $(target_alias) + subdir. + +1998-09-22 Jim Wilson <wilson@cygnus.com> + + * Makefile.in (bootstrap): Set r and s before make all. Use + BASE_FLAGS_TO_PASS in make all. + (cross): Likewise. + +1998-09-20 Mark Mitchell <mark@markmitchell.com> + + * Makefile.in (bootstrap): Pass TARGET_FLAGS_TO_PASS to `make all'. + +Sun Sep 20 00:13:02 1998 Richard Henderson <rth@cygnus.com> + + * config.sub: Fix typo in last change. + +1998-09-19 Michael Hayes <m.hayes@elec.canterbury.ac.nz> + + * config.sub: Add support for C4x target. + * configure.in: Likewise. + +1998-09-13 David S. Miller <davem@pierdol.cobaltmicro.com> + + * config.sub: Recognize sparcv9 just like sparc64. + +Wed Sep 9 15:44:52 1998 Robert Lipe <robertl@dgii.com> + + * config.guess: Match "Pent II" or "PentII" for OpenServer. + +Tue Sep 8 01:18:39 1998 Jeffrey A Law (law@cygnus.com) + + * config.guess: Correctly identify Pentium II sco boxes. + + * config.guess: Fix "tr" code. From Weiwen Liu. + +Sat Sep 5 13:56:52 1998 John Hughes <john@Calva.COM> + + * configure.in: Do not assume x86-svr4 or x86-unixware can handle + stabs. + +Sat Sep 5 02:12:02 1998 Jeffrey A Law (law@cygnus.com) + + * Makefile.in (TARGET_CONFIGDIRS): Add libchill. + (ALL_TARGET_MODULES): Add all-target-libchill. + (CONFIGURE_TARGET_MODULES, CHECK_TARGET_MODULES): Similarly. + (INSTALL_TARGET_MODULES, CLEAN_TARGET_MODULES): Similarly. + (all-target-libchill): Add dependencies. + * configure.in (target_libs): Add libchill. + +Sun Aug 30 22:27:02 1998 Lutz Wohlrab <lutz.wohlrab@informatik.tu-chemnitz.de> + + * config.guess: Avoid assumptions about "tr" behaves when + LANG is set to something other than English. + +Sun Aug 30 22:14:44 1998 H.J. Lu (hjl@gnu.org) + + * configure (gxx_include_dir): Changed to + '${prefix}/include/g++'-${libstdcxx_interface}. + + * config.if: New to determine the interfaces. + +Sun Aug 30 21:15:19 1998 Mark Klein (mklein@dis.com) + + * config.guess: Detect and handle MPE/IX. + * config.sub: Deal with MPE/IX. + +Sat Aug 29 14:32:55 1998 David Edelsohn <edelsohn@mhpcc.edu> + + * configure.in: Use mh-aix43. + +1998-07-29 Manfred Hollstein <manfred@s-direktnet.de> + + * configure: Fix --without/--disable cases for gxx-include-dir. + +Fri Aug 28 12:28:26 1998 Per Bothner <bothner@cygnus.com> + + * mdata-sh: Imported. Needed for automake support. + +Thu Aug 13 12:49:29 1998 H.J. Lu <hjl@gnu.org> + + * Makefile.in (taz): Try "chmod -R og=u ." before + "chmod og=u `find . -print`". + +Fri Jul 31 09:38:33 1998 Catherine Moore <clm@cygnus.com> + + * configure.in: Add arm-elf and thumb-elf support. + +Mon Jul 27 16:23:58 1998 Doug Evans <devans@canuck.cygnus.com> + + * Makefile.in: Undo previous patch. + +Fri Jul 24 19:55:24 1998 Doug Evans <devans@canuck.cygnus.com> + + * Makefile.in (INSTALL_TARGET): Move EXTRA_TARGET_HOST_INSTALL_MODULES + to here ... + (install-no-fixedincludes): and here + (INSTALL_MODULES): ... from here. + +Fri Jul 24 17:01:42 1998 Ian Lance Taylor <ian@cygnus.com> + + * config.sub: Merge with FSF. + + * config.guess: Merge with FSF. + +Fri Jul 24 08:43:36 1998 Doug Evans <devans@canuck.cygnus.com> + + * configure (extraconfigdirs): New variable. + (SUBDIRS): Add extraconfigdirs and recurse on them too. + * Makefile.in (all): Move higher in file. + (EXTRA_TARGET_HOST_ALL_MODULES): New variable. + (EXTRA_TARGET_HOST_{INSTALL,CHECK}_MODULES): New variables. + (ALL_MODULES): Add EXTRA_TARGET_HOST_ALL_MODULES. + (CROSS_CHECK_MODULES): Add EXTRA_TARGET_HOST_CHECK_MODULES. + (INSTALL_MODULES): Add EXTRA_TARGET_HOST_INSTALL_MODULES. + +1998-07-23 Brendan Kehoe <brendan@cygnus.com> + + * Makefile.in (all-target-libjava): Depend on all-gcc and + all-target-newlib. + (configure-target-libjava): Depend on $(ALL_GCC). + +Sat Jul 18 14:32:43 CDT 1998 Robert Lipe <robertl@dgii.com> + + * config.guess: (*-pc-sco3.2v5) Add detection for Pentium II. + (*-pc-unixware7) Add detection for Pentium II, Pentium Pro. + +Sun Jul 19 00:46:53 CEST 1998 Marc Lehmann <pcg@goof.com> + + * INSTALL/README: Fix typo. + +Fri Jul 17 13:30:18 1998 Ian Lance Taylor <ian@cygnus.com> + + * ylwrap: Change absolute path checks to check for DOS style path + names. + + * ylwrap: Don't use a full path name if the source file is in the + same directory. From hjl@lucon.org (H.J. Lu). + + * config-ml.in: Default to being verbose, to match Feb 18 change to + configure. + +Thu Jul 16 12:29:51 1998 Ian Lance Taylor <ian@cygnus.com> + + Brought over from egcs: + + Sat Jun 27 22:46:32 1998 Jeffrey A Law (law@cygnus.com) + + * configure.in (target_subdir): Set to ${target_alias} instead + of "libraries". + + Mon Sep 1 16:45:44 1997 Jim Wilson <wilson@cygnus.com> + + * configure.in (target_subdir): Set to libraries if enable_multilib. + +Wed Jul 15 01:00:54 1998 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in ($(CONFIGURE_TARGET_MODULES)): If there are any + multilibs, force reconfiguration the first time we create + multilib.out in a subdirectory, in case TARGET_SUBDIR is `.'. + +Tue Jul 14 23:41:03 1998 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Strip any --no option from CONFIG_ARGUMENTS, to + avoid confusion with --no-recursion. + +Tue Jul 14 15:37:41 1998 Geoffrey Noer <noer@cygnus.com> + + * configure.in: Win32 hosts shouldn't use install -x + * install-sh: remove -x option, and special .exe-handling + hack. + +Tue Jul 14 15:28:41 1998 Richard Henderson <rth@cygnus.com> + + * config.guess: Recognize i586-pc-beos. + * configure.in: Don't build some bits for beos. + +Tue Jul 14 13:22:18 1998 Ian Lance Taylor <ian@cygnus.com> + + * configure: If CC is set but CFLAGS is not, and CC is gcc, make + CFLAGS default to -O2. + + * ltmain.sh: Add some hacks to make SunOS --enable-shared work + when using GNU ld. + +Fri Jul 10 13:18:23 1998 Ian Lance Taylor <ian@cygnus.com> + + * ltmain.sh: Correct install when using a different shell. + +Tue Jul 7 15:24:38 1998 Ian Lance Taylor <ian@cygnus.com> + + * ltconfig, ltmain.sh: Update to libtool 1.2b. + +Thu Jul 2 13:57:36 1998 Klaus Kaempf <kkaempf@rmi.de> + + * makefile.vms: Update to build binutils/makefile.vms. Add install + target. + +Wed Jul 1 16:45:21 1998 Ian Lance Taylor <ian@cygnus.com> + + * ltconfig: Update to correct AIX handling. + +Sat Jun 27 22:46:32 1998 Jeffrey A Law (law@cygnus.com) + + * Makefile.in (BASE_FLAGS_TO_PASS): Add TARGET_SUBDIR. + + * configure.in (target_subdir): Set to ${target_alias} instead + of "libraries". + +1998-06-26 Manfred Hollstein <manfred@s-direktnet.de> + + * Makefile.in (BASE_FLAGS_TO_PASS): Add gcc_version_trigger. + (Makefile): Depend on $(gcc_version_trigger). + + * configure (gcc_version): Change default initializer to empty + string. + (gcc_version_trigger): New variable; pass this variable down + to subdir configures to enable them checking gcc's version + themselves. Emit make macros for both gcc_version vars. + (topsrcdir): Initialize reliably. + (recursion line): Remove --with-gcc-version=${gcc_version}. + +1998-06-24 Manfred Hollstein <manfred@s-direktnet.de> + + * configure (enable_version_specific_runtime_libs): Implement new flag + --enable-version-specific-runtime-libs which installs C++ runtime stuff + in $(libsubdir); emit definition in each generated Makefile. + (gxx_include_dir): Initialize depending on + $enable_version_specific_runtime_libs. + +1998-06-24 Manfred Hollstein <manfred@s-direktnet.de> + + * configure (gcc_version): Initialize properly depending on + how and where configure is started. + (recursion line): Pass a --with-gcc-version=${gcc_version} + to configures in subdirs. + +Wed Jun 24 16:01:59 1998 John Metzler <jmetzler@cygnus.com> + + * configure.in (noconfigdirs): Add configure pattern for mips tx39 + cygmon + +Tue Jun 23 22:42:32 1998 Mark Alexander <marka@cygnus.com> + + * configure.in: Add cygmon and libstub support for mn10200. + +1998-06-19 Manfred Hollstein <manfred@s-direktnet.de> + + * configure (gcc_version): Add new variable describing the + particular gcc version we're building. + * Makefile.in (libsubdir): Add new macro for the directory + in which the compiler finds executables, libraries, etc. + (BASE_FLAGS_TO_PASS): Pass down gcc_version, target_alias + and libsubdir. + +Fri Jun 19 02:36:59 1998 Alexandre Oliva <oliva@dcc.unicamp.br> + + * Makefile.in (local-clean): Remove *.log. + (warning.log): Built with warn_summary from build.log. + (mail-report.log): Run test_summary. + (mail-report-with-warnings.log): Run test_summary including + warning.log in the report. + +Thu Jun 18 11:26:03 1998 Robert Lipe <robertl@dgii.com> + + * config.guess: Detection of Pentium II for *-sco-3.2v5*. + +Mon Jun 15 14:53:54 1998 Andrew Cagney <cagney@b1.cygnus.com> + + * Makefile.in (grep): Grep no longer depends on libiberty. + +Fri Jun 12 14:03:34 1998 Syd Polk <spolk@cygnus.com> + + * Makefile.in: all-snavigator needs all-libgui. + +Thu Jun 11 19:43:47 1998 Mark Alexander <marka@cygnus.com> + + * configure.in: Add cygmon and libstub support for mn10300. + +Wed Jun 10 11:19:47 1998 Ian Lance Taylor <ian@cygnus.com> + + * missing: Update to version from automake 1.3. + + * ltmain.sh: On installation, don't get confused if the same name + appears more than once in the list of library names. + +Wed Jun 3 14:51:42 1998 Ian Lance Taylor <ian@cygnus.com> + + * config.sub: Accept m68060 and m5200 as CPU names. + +Mon Jun 1 17:25:16 1998 Ian Lance Taylor <ian@cygnus.com> + + * configure: Use && rather than using -a in test, because odd + strings can confuse test. + * configure.in: Likewise. + +Thu May 28 19:31:13 1998 Ian Lance Taylor <ian@cygnus.com> + + * ltconfig, ltmain.sh: Bring in Visual C++ support. + +Sat May 23 23:44:13 1998 Alexandre Oliva <oliva@dcc.unicamp.br> + + * Makefile.in (boostrap2-lean, bootstrap3-lean, + bootstrap4-lean): New targets. + +Mon May 11 23:55:56 1998 Jeffrey A Law (law@cygnus.com) + + * mpw-* Delete. Not used. + +Mon May 11 23:11:34 1998 Jeffrey A Law (law@cygnus.com) + + * COPYING.LIB: Update FSF address. + +Fri May 8 01:30:20 1998 Ian Lance Taylor <ian@cygnus.com> + + * ltconfig, ltmain.sh: Update to libtool 1.2a. + + * Makefile.in (GASB_SUPPORT_DIRS): Remove intl; already included via + GAS_SUPPORT_DIRS. + +Thu May 7 17:27:35 1998 Ian Lance Taylor <ian@cygnus.com> + + * ltconfig, ltmain.sh: Avoid producing a version number if + -version-info was not used. + +Tue May 5 18:02:24 1998 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Add --with-newlib to CONFIG_ARGUMENTS if we are + building with newlib. + +1998-04-30 Paul Eggert <eggert@twinsun.com> + + * Makefile.in (EXTRA_GCC_FLAGS): Remove backslash at end; + Solaris `make' causes it to continue to next definition. + +Tue Apr 28 16:24:24 1998 Jason Molenda (crash@bugshack.cygnus.com) + + * Makefile.in (install-gdbtk): Call this 'install-gdb' so that + the right GUI libraries and files are installed along with GDB. + +Tue Apr 28 18:11:24 1998 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Change alpha to alpha* in several places. + +Tue Apr 28 07:42:00 1998 Mark Alexander <marka@cygnus.com> + + * config.sub: Recognize sparc86x. + +Tue Apr 28 07:35:02 1998 Michael Meissner <meissner@cygnus.com> + + * configure.in (--enable-target-optspace): Remove debug echo. + +Thu Apr 23 21:31:16 1998 Jim Wilson <wilson@cygnus.com> + + * configure: Set CXXFLAGS from CXXFLAGS, not CFLAGS. + +Thu Apr 23 12:26:38 1998 Ian Lance Taylor <ian@cygnus.com> + + * ltconfig: Update cygwin32 support. + + * Makefile.in (GAS_SUPPORT_DIRS): Add intl. + (BINUTILS_SUPPORT_DIRS, GASB_SUPPORT_DIRS): Likewise. + (GDB_SUPPORT_DIRS): Likewise. + +Wed Apr 22 12:30:10 1998 Michael Meissner <meissner@cygnus.com> + + * configure.in (target_makefile_frag): If --enable-target-optspace, + use -Os to compile target libraries rather than -O2. Default to + using -Os for d10v and m32r if --{enable,disable}-target-optspace is + not used. + * configure.in (target_cflags): Ditto for d30v. + +Tue Apr 21 23:06:54 1998 Tom Tromey <tromey@cygnus.com> + + * Makefile.in (all-bfd): Depend on all-intl. + (all-binutils): Likewise. + (all-gas): Likewise. + (all-gprof): Likewise. + (all-ld): Likewise. + +1998-04-19 Brendan Kehoe <brendan@cygnus.com> + + * configure.in (host_tools): Fix typo, lbtool -> libtool. + +Fri Apr 17 16:20:42 1998 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (all-bfd): Depend upon all-libiberty. + + * ltconfig, ltmain.sh: Bring in newer cygwin32 support. + +Fri Apr 17 12:22:22 1998 Bob Manson <manson@charmed.cygnus.com> + + * Makefile.in: Add libstub. + + * configure.in: Ditto. Build libstub for targets that have cygmon + support. + +Tue Apr 14 18:01:55 1998 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Don't set PICFLAG on ix86-cygwin32. + +Tue Apr 14 12:24:45 1998 J. Kean Johnston <jkj@sco.com> + + * configure.in: Recognise i[3456]96-*-sysv5* as a valid host, and + use mh-sysv5 if specified. Support gprof on SCO Open Server. + +Tue Apr 14 11:33:51 1998 Krister Walfridsson <cato@df.lth.se> + + * configure: Define DEFAULT_M4 by searching PATH. + * Makfile.in: Use DEFAULT_M4. + +Mon Apr 13 15:37:24 1998 Ian Lance Taylor <ian@cygnus.com> + + * ltconfig: Add cygwin32 support. + + * Makefile.in, configure.in: Add libtool as a native only directory + to configure and build. + +Sun Apr 12 20:58:46 1998 Jeffrey A Law (law@cygnus.com) + + * Makefile.in (INSTALL_MODULES): Remove texinfo. + +Wed Apr 8 13:18:56 1998 Philippe De Muyter <phdm@macqel.be> + + * Makefile.in (EXTRA_GCC_FLAGS): XFOO lines shortened. + +Thu Apr 2 14:48:44 1998 Geoffrey Noer <noer@cygnus.com> + + * Makefile.in: add ash make rules + * configure.in: add ash to native_only and host_tools lists + +Thu Mar 26 12:53:20 1998 Tom Tromey <tromey@cygnus.com> + + * Makefile.in (all-gettext, all-intl): New targets. + (ALL_MODULES): Added all-gettext, all-intl. + (CROSS_CHECK_MODULES): Added check-gettext, check-intl. + (INSTALL_MODULES): Added install-gettext, install-intl. + (CLEAN_MODULES): Added clean-gettext, clean-intl. + + * configure.in (host_tools): Added gettext. + (native_only): Likewise. + (noconfigdirs) [various cases]: Likewise. + (host_libs): Added intl. + +Thu Mar 26 15:00:11 1998 Keith Seitz <keiths@onions.cygnus.com> + + * configure: Do not disable building gdbtk for cygwin32 hosts. + +Wed Mar 25 10:04:18 1998 Nick Clifton <nickc@cygnus.com> + + * configure.in: Add thumb-coff target. + * config.sub: Add thumb-coff target. + +Wed Mar 25 11:49:12 1998 Jason Molenda (crash@bugshack.cygnus.com) + + * Makefile.in: Revert yesterday's change. + (all-target-winsup): all-target-librx stays out of here. + +Tue Mar 24 16:58:29 1998 Jason Molenda (crash@bugshack.cygnus.com) + + * Makefile.in (TARGET_CONFIGDIRS, ALL_TARGET_MODULES, + CONFIGURE_TARGET_MODULES, CHECK_TARGET_MODULES, + INSTALL_TARGET_MODULES, CLEAN_TARGET_MODULES, all-target-winsup): + Remove references to librx and libg++. + +Tue Mar 24 18:28:12 1998 Eric Mumpower <nocturne@cygnus.com> + + * Makefile.in (BASE_FLAGS_TO_PASS): Pass $(lispdir) down to + recursive makes + +Tue Mar 24 11:37:45 1998 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (CC_FOR_TARGET): Use $(TARGET_SUBDIR) when passing -B + for newlib directory. + (CXX_FOR_TARGET): Likewise. + +Mon Mar 23 11:30:21 1998 Jeffrey A Law (law@cygnus.com) + + * ltconfig: Update after libtool/ltconfig.in change for + hpux11. + +Fri Mar 20 18:51:43 1998 Ian Lance Taylor <ian@cygnus.com> + + * ltconfig, ltmain.sh: Update to libtool 1.2. + +Fri Mar 20 09:32:14 1998 Manfred Hollstein <manfred@s-direktnet.de> + + * Makefile.in (install-gcc): Don't specify LANGUAGES here. + (install-gcc-cross): Instead, override LANGUAGES here. + +1998-03-18 Dave Love <d.love@dl.ac.uk> + + * Makefile.in ($(CONFIGURE_TARGET_MODULES)): Set CONFIG_SITE to a + non-existent file since /dev/null loses with bash 2.0/autoconf 2.12. + +Wed Mar 18 09:24:59 1998 Nick Clifton <nickc@cygnus.com> + + * configure.in: Add Thumb-pe target. + +Tue Mar 17 16:59:00 1998 Syd Polk <spolk@cygnus.com> + + * Makefile.in - changed sn targets to snavigator + * configure.in - changed sn targets to snavigator + +Tue Mar 17 10:33:28 1998 Manfred Hollstein <manfred@s-direktnet.de> + + * config-ml.in: After building symlink tree call make distclean + if a Makefile got linked into ${ml_dir}/${ml_libdir}; this happens + to be the case for libiberty. + +Tue Mar 17 10:22:37 1998 H.J. Lu (hjl@gnu.ai.mit.edu) + + * configure: When making link, also check the current + directory. The configure scripts may create one. + +Fri Mar 6 01:02:03 1998 Richard Henderson <rth@cygnus.com> + + * config.sub: Accept alphapca56 and alphaev6 properly. + +Fri Mar 6 00:14:55 1998 Franz Sirl <Franz.Sirl-kernel@lauterbach.com> + + * configure.in: Revert 3 Jan change for powerpc-linux-gnulibc1. + +Mon Feb 23 15:09:18 1998 Bruno Haible <bruno@linuix.mathematik.uni-karlsruhe.de + + * config.sub (sco5): Fix typo. + +Mon Feb 23 14:46:06 1998 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (INSTALL_MODULES): Move install-tcl before + install-itcl. + (install-itcl): Remove dependency on install-tcl. + +Mon Feb 23 09:53:28 1998 Mark Alexander <marka@cygnus.com> + + * configure.in: Remove libgloss from noconfigdirs for MN10300. + +Thu Feb 19 13:40:41 1998 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Don't build libgui for a cygwin32 target when not on + a cygwin32 host. + +Wed Feb 18 12:29:00 1998 Jason Molenda (crash@bugshack.cygnus.com) + + * configure (redirect): Set to null, so default behavior of + configure is now --verbose. + +1998-02-16 Dave Love <d.love@dl.ac.uk> + + * Makefile.in ($(CONFIGURE_TARGET_MODULES)): Run configure with + CONFIG_SITE=/dev/null to forestall lossage with site configuration. + +Mon Feb 16 12:23:53 1998 Manfred Hollstein <Manfred.Hollstein@ks.sel.alcatel.de> + + * Makefile.in (BASE_FLAGS_TO_PASS, EXTRA_TARGET_FLAGS): Really add + this change to sync Makefile.in with its ChangeLog entries. + +Thu Feb 12 15:03:08 1998 H.J. Lu <hjl@gnu.org> + + * ltmain.sh (mkdir): Check that the directory doesn't exist + before we exit with error, so that we don't get races during + parallel builds. + +Sat Feb 7 15:19:18 1998 Ian Lance Taylor <ian@cygnus.com> + + * ltconfig, ltmain.sh: Update from libtool 1.0i. + +Fri Feb 6 01:33:52 1998 Manfred Hollstein <manfred@s-direktnet.de> + + * Makefile.in (BASE_FLAGS_TO_PASS): Don't pass PICFLAG and + PICFLAG_FOR_TARGET. + (EXTRA_TARGET_FLAGS): Don't pass PICFLAG_FOR_TARGET. + + * configure: Emit a definition for the new macro enable_shared + into each Makefile. + + * config/mh-sparcpic (PICFLAG): Define to properly according + to current multilib configuration. + * config/mt-sparcpic (PICFLAG_FOR_TARGET): Define to properly + according to current multilib configuration. + +Thu Feb 5 17:01:12 1998 Jason Molenda (crash@bugshack.cygnus.com) + + * configure.in (host_tools, native_only): Add libtool. + +Wed Feb 4 16:53:58 1998 Geoffrey Noer <noer@cygnus.com> + + * configure.in: add target-gperf to noconfigdirs for Cygwin32. + Fix typo in ming config comment. + +Wed Feb 4 18:56:13 1998 Ian Lance Taylor <ian@cygnus.com> + + * ltconfig, ltmain.sh: Update from libtool 1.0h. + +Mon Feb 2 19:38:19 1998 Ian Lance Taylor <ian@cygnus.com> + + * config.sub: Add tic30 cases, and map c30 to tic30. + +Sun Feb 1 02:40:41 1998 Richard Henderson <rth@cygnus.com> + + * Makefile.in (TARGET_CONFIGDIRS): Add libf2c. + (ALL_TARGET_MODULES, CONFIGURE_TARGET_MODULES): Similarly + (CHECK_TARGET_MODULES, INSTALL_TARGET_MODULES): Similarly + (CLEAN_TARGET_MODULES): Similarly + (all-target-libf2c): Add dependences. + * configure.in (target_libs): Add libf2c. + +Fri Jan 30 17:18:32 1998 Geoffrey Noer <noer@cygnus.com> + + * configure.in: Remove expect from noconfigdirs when target + is cygwin32. OK to build expect and dejagnu with Canadian + Cross. + +Wed Jan 28 12:58:49 1998 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Do build expect, dejagnu, and cvssrc for a cygwin32 + host. + + * config.guess: Use ${UNAME_MACHINE} rather than i386 for cygwin32 + and mingw32. + +Wed Jan 28 10:26:37 1998 Manfred Hollstein <manfred@s-direktnet.de> + + * Makefile.in (BASE_FLAGS_TO_PASS): Remove passing $(local_prefix) + here as it is not defined in the toplevel Makefile. + +Tue Jan 27 23:25:06 1998 Manfred Hollstein <manfred@s-direktnet.de> + + * configure (package_makefile_rules_frag): New variable, which names + a file with generic rules, ... + Change comment to mention we now have FIVE parts. + * configure: Undo last change. + +Tue Jan 27 23:15:55 1998 Lassi A. Tuura <lat@iki.fi> + + * config.guess: More accurate determination of HP processor types. + * config.sub: More accurate determination of HP processor types. + +Sat Jan 24 01:59:45 1998 Manfred Hollstein <manfred@s-direktnet.de> + + * configure (package_makefile_frag): Move inserting the + ${package_makefile_frag} to where it should be according + to the comment. + +Fri Jan 23 00:29:28 1998 Philip Blundell <pb@nexus.co.uk> + + * config.guess: Add support for Linux/ARM. + +Thu Jan 22 15:14:01 1998 Fred Fish <fnf@cygnus.com> + + * .cvsignore: Remove *-info and *-install since they match + release-info and mpw-install, which we don't want to just ignore. + +Thu Jan 22 01:38:33 1998 Richard Henderson <rth@cygnus.com> + + * configure.in: Revert 3 Jan change for alpha-linux-gnulibc1. + +Sat Jan 17 21:28:08 1998 Pieter Nagel <pnagel@epiuse.co.za> + + * Makefile.in (FLAGS_TO_PASS): Pass down gcc_include_dir and + local_prefix to sub-make invocations. + +Sat Jan 17 21:04:59 1998 H.J. Lu (hjl@gnu.org) + + * configure.in: Check makefile fragments in the source + directory. + +Fri Jan 16 00:41:37 1998 Alexandre Oliva <oliva@dcc.unicamp.br> + + * configure.in: Check whether host and target makefile + fragments exist before adding them to *_makefile_frag. + +Wed Jan 14 23:39:10 1998 Bob Manson <manson@charmed.cygnus.com> + + * configure.in (target_configdirs): Add cygmon for sparc64-elf. + +Wed Jan 14 12:48:07 1998 Keith Seitz <keiths@pizza.cygnus.com> + + * configure.in: Make sure we only replace RPATH_ENVVAR on + lines which begin with RPATH_ENVVAR, i.e. add "^" to the + regexp to sed. + + * Makefile.in (BASE_FLAGS_TO_PASS): Pass RRPATH_ENVVAR down + to sub-makes. + +1998-01-13 Lee Iverson (leei@ai.sri.com) + + * config-ml.in (multi-do): LDFLAGS must include multilib + designator. + +Tue Jan 13 01:13:24 1998 Robert Lipe (robertl@dgii.com) + + * config.guess: Recognize i[3456]-i586-UnixWare7-sysv5. + +Sun Jan 4 01:06:55 1998 Mumit Khan <khan@xraylith.wisc.edu> + + * config.sub: Add mingw32 support. + * configure.in: Likewise. + * config/mh-mingw32: New file. + +Sat Jan 3 12:11:05 1998 Franz Sirl <franz.sirl-kernel@lauterbach.com> + + * configure.in: Finalize support for {alpha|powerpc}*-*-linux-gnulibc1 + +Sun Dec 28 11:28:58 1997 Jeffrey A Law (law@cygnus.com) + + * Makefile.in (INSTALL_TARGET): Do install-gcc first. + * configure (gxx_include_dir): Provide a definition for subdirs + which do not use autoconf. + +Wed Dec 24 22:46:55 1997 Jeffrey A Law (law@cygnus.com) + + * config.guess: Sync with egcs. Picks up new alpha support, + BeOS & some additional linux support. + +Tue Dec 23 12:44:24 1997 Jeffrey A Law (law@cygnus.com) + + * config.guess: HP 9000/803 is a PA1.1 machine. + +Mon Dec 22 02:39:24 1997 Richard Henderson <rth@cygnus.com> + + * configure.in: It's alpha*-... + +Sun Dec 21 16:53:12 1997 H.J. Lu (hjl@gnu.ai.mit.edu) + + * configure.in (host_makefile_frag, target_makefile_frag): + Handle multiple config files. + (alpha-*-linux*): Treat alpha-*-linux* as alpha-*-linux* and + alpha-*-*. + +Thu Dec 18 13:13:03 1997 Doug Evans <devans@canuck.cygnus.com> + + * mkdep: New file. + +Wed Dec 17 09:53:02 1997 Michael Meissner <meissner@cygnus.com> + + * configure.in (d30v-*-*): Allow configuring of libide, vmake, etc. + +Tue Dec 16 17:36:05 1997 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in: Add libgui directory. + (GDB_TK): Add all-libgui. + * configure.in: Add libgui directory. + * configure: Add all-libgui to GDB_TK. + +Mon Dec 15 16:12:28 1997 Nick Clifton <nickc@cygnus.com> + + * config-ml.in (multidirs): Add m32r to multilib list. + +Fri Dec 12 10:43:31 1997 Brendan Kehoe <brendan@canuck.cygnus.com> + + * Makefile.in (all-target-gperf): Change dependency to + all-target-libstdc++. + +Thu Dec 11 23:30:51 1997 Fred Fish <fnf@ninemoons.com> + + * config.guess: Add BeOS support. + +Wed Dec 10 15:10:38 1997 Ian Lance Taylor <ian@cygnus.com> + + Source directory cvs renamed to cvssrc: + * configure.in (host_tools): Change cvs to cvssrc. + (native_only): Likewise. + (noconfigdirs) [various cases]: Likewise. + * Makefile.in (ALL_MODULES): Change all-cvs to all-cvssrc. + (CROSS_CHECK_MODULES): Change check-cvs to check-cvssrc. + (INSTALL_MODULES): Change install-cvs to install-cvssrc. + (CLEAN_MODULES): Change clean-cvs to clean-cvssrc. + (all-cvssrc): Rename target from all-cvs. + +Wed Dec 3 07:55:59 1997 Jeffrey A Law (law@cygnus.com) + + * configure (gxx_include_dir): Fix thinko. + +Tue Dec 2 10:55:34 1997 Jeffrey A Law (law@cygnus.com) + + * Makefile.in (INSTALL_TARGET_CROSS): Define. + (install-cross, install-gcc-cross): New targets. + +Tue Dec 2 10:08:31 1997 Nick Clifton <nickc@cygnus.com> + + * configure.in (noconfigdirs): Add support for Thumb target. + + * config.sub (maybe_os): Add support for Thumb target. + +Sun Nov 30 16:12:27 1997 Bob Manson <manson@charmed.cygnus.com> + + * Makefile.in: Add rules for cygmon. + + * configure.in: Build cygmon for sparc-elf and sparclite-aout. + +Thu Nov 27 01:31:30 1997 Jeffrey A Law (law@cygnus.com) + + * Makefile.in (INSTALL_TARGET): Do install-gcc first. + * configure (gxx_include_dir): Provide a definition for subdirs + which do not use autoconf. + +Wed Nov 26 11:53:33 1997 Keith Seitz <keiths@onions.cygnus.com> + + * Makefile.in, configure, configure.in, ChangeLog: merge with foundry's + 11/18/97 build + +Wed Nov 26 16:08:50 1997 Jeffrey A Law (law@cygnus.com) + + * From Franz Sirl. + * config.guess (powerpc*-*-linux): Handle glibc2 beta release + found on RedHat Linux systems. + +Fri Nov 21 09:51:01 1997 Jeffrey A Law (law@cygnus.com) + + * config.guess (alpha stuff): Merge with FSF to avoid incorrect + guesses. + +Thu Nov 13 11:38:37 1997 Jeffrey A Law (law@cygnus.com) + + * configure.in (i[3456]86-ncr-sysv4.3*): Tweak. + +Mon Nov 10 15:23:21 1997 H.J. Lu <hjl@gnu.ai.mit.edu> + + * ltmain.sh: If mkdir fails, check whether the directory was created + anyhow by some other process. + +Mon Nov 10 14:38:03 1997 Michael Meissner <meissner@cygnus.com> + + * configure.in (d30v-*-*): Configure all directories. + +Sun Nov 9 17:36:20 1997 Michael Meissner <meissner@cygnus.com> + + * configure.in (d30v-*-*): Configure newlib, libiberty directories + for the D30V. + +Sat Nov 8 14:42:59 1997 Michael Meissner <meissner@cygnus.com> + + * configure.in (d30v-*-*): Configure target-libgloss on the D30V. + +Fri Nov 7 10:34:09 1997 Rob Savoye <rob@darkstar.cygnus.com> + + * include/libiberty.h: Add extern "C" { so it can be used with C++ + progrms. + * include/remote-sim.h: Add extern "C" { so it can be used with C++ + programs. + +Thu Oct 30 11:09:29 1997 Michael Meissner <meissner@cygnus.com> + + * configure.in (d30v-*-*): Configure GCC now. + +Mon Oct 27 13:17:24 1997 Stan Shebs <shebs@andros.cygnus.com> + + * configure.in: Remove a "second pass" of tweaking noconfigdirs, + is no longer needed. + +Mon Oct 27 12:03:53 1997 Jason Merrill <jason@yorick.cygnus.com> + + * Makefile.in: check-target-libio depends on all-target-libstdc++. + +Sun Oct 26 11:48:27 1997 Manfred Hollstein (manfred@s-direktnet.de) + + * Makefile.in (bootstrap-lean): Combined with `normal' bootstrap + targets using "$@" to provide support for similar but not identical + targets without having to duplicate code. + +Mon Oct 20 15:28:49 1997 Klaus K"ampf <kkaempf@progis.de> + + * makefile.vms: Fix to work with DEC C. + +Tue Oct 7 23:58:57 1997 Gavin Koch <gavin@cygnus.com> + + * config.sub: Add mips-tx39-elf to marketing names. + +Tue Oct 7 14:24:41 1997 Ian Lance Taylor <ian@cygnus.com> + + * ltmain.sh: Handle symlinks in generated script. + +Wed Oct 1 13:11:27 1997 Ian Lance Taylor <ian@cygnus.com> + + * configure: Handle autoconf style directory options: --bindir, + --datadir, --includedir, --infodir, --libdir, --libexecdir, + --mandir, --oldincludedir, --sbindir, --sharedstatedir, + --sysconfdir. + * Makefile.in (sbindir, libexecdir, sysconfdir): New variables. + (sharedstatedir, localstatedir, oldincludedir): New variables. + (BASE_FLAGS_TO_PASS): Pass down bindir, datadir, includedir, + infodir, libdir, libexecdir, localstatedir, mandir, oldincludedir, + sbindir, sharedstatedir, and sysconfdir. + +Mon Sep 29 00:38:08 1997 Aaron Jackson <jackson@negril.msrce.howard.edu> + + * Makefile.in (bootstrap-lean): New target. + +Wed Sep 24 18:06:27 1997 Stu Grossman <grossman@babylon-5.cygnus.com> + + * configure.in (d30v): Remove tcl, tk, expect, gdb, itcl, tix, db, + sn, and gnuserv from noconfigdirs. + +Wed Sep 24 15:18:32 1997 Ian Lance Taylor <ian@cygnus.com> + + * ltmain.sh: Tweak shell pattern to avoid bug in NetBSD /bin/sh. + +Thu Sep 18 23:58:27 1997 Jeffrey A Law (law@cygnus.com) + + * Makefile.in (cross): New target. + +Thu Sep 18 21:43:23 1997 Alexandre Oliva <oliva@dcc.unicamp.br> + Jeff Law <law@cygnus.com> + + * Makefile.in (bootstrap2, bootstrap3): New targets. + (all-bootstrap): Remove outdated and confusing target. + (bootstrap, bootstrap2, bootstrap3): Don't pass BOOT_CFLAGS down. + +Thu Sep 18 15:37:42 1997 Andrew Cagney <cagney@b1.cygnus.com> + + * configure (tooldir): enable_gdbtk=YES for cygwin32, NO for + windows. Consistent with gdb/configure. + +1997-09-15 02:37 Ulrich Drepper <drepper@cygnus.com> + + * config/mt-linux: Define CXXFLAGS to make sure -fvtable-thunks is + used. + * configure.in: Name Linux target fragment. + + * configure: Rewrite so that project Makefile fragment is inserted + first and appears last in the resulting Makefile. + +Tue Sep 16 09:55:07 1997 Andrew Cagney <cagney@b1.cygnus.com> + + * Makefile.in (install-itcl): Install tcl first. + +Sun Sep 14 20:53:42 1997 Geoffrey Noer <noer@cygnus.com> + + * config/mh-cygwin32: ok to build split texinfo files + +Fri Sep 12 16:19:20 1997 Geoffrey Noer <noer@cygnus.com> + + * configure.in: remove bison from noconfigdirs for Cygwin32 host + +Thu Sep 11 16:40:46 1997 H.J. Lu (hjl@gnu.ai.mit.edu) + + * Makefile.in (local-distclean): Also remove mh-frag mt-frag. + + * configure.in (skipdirs): Add target-librx for Linux. + (alpha-*-linux*): Use config/mh-elfalphapic and config/mt-elfalphapic. + +Wed Sep 10 21:29:54 1997 Jeffrey A Law (law@cygnus.com) + + * Makefile.in (bootstrap): New target. + +Wed Sep 10 15:19:22 1997 Jeffrey A Law (law@cygnus.com) + + * config.sub: Accept 'amigados' for backward compatibility. + +Mon Sep 8 20:46:20 1997 Ian Lance Taylor <ian@cygnus.com> + + * config.guess: Merge with FSF. + +Sun Sep 7 23:18:32 1997 Fred Fish <fnf@ninemoons.com> + + * config.sub: Change 'amigados' to 'amigaos' to match current usage. + +Sun Sep 7 15:55:28 1997 Gavin Koch <gavin@cygnus.com> + + * config.sub: Add "marketing-names" patch. + +Fri Sep 5 16:11:28 1997 Joel Sherrill (joel@OARcorp.com) + + * configure.in (*-*-rtems*): Do not build libgloss for rtems. + +Fri Sep 5 12:27:17 1997 Jeffrey A Law (law@cygnus.com) + + * config.sub: Handle v850-elf. + +Wed Sep 3 22:01:58 1997 Fred Fish <fnf@ninemoons.com> + + * .cvsignore (*-install): Remove. + +Wed Sep 3 12:15:24 1997 Chris Provenzano <proven@cygnus.com> + + * ltconfig: Set CONFIG_SHELL in libtool. + * ltmain.sh: Use CONFIG_SHELL instead of /bin/sh + +Mon Sep 1 16:45:44 1997 Jim Wilson <wilson@cygnus.com> + + * configure.in (target_subdir): Set to libraries if enable_multilib. + +Wed Aug 27 16:15:11 1997 Jim Wilson <wilson@cygnus.com> + + * config.guess: Update from gcc directory. + +Tue Aug 26 16:46:46 1997 Andrew Cagney <cagney@b1.cygnus.com> + + * Makefile.in (all-sim): Depends on all-readline. + +Wed Aug 20 19:57:37 1997 Jason Merrill <jason@yorick.cygnus.com> + + * Makefile.in (BISON, YACC): Use $$s. + (all-bison): Depend on all-texinfo. + +Tue Aug 19 01:41:32 1997 Jason Merrill <jason@yorick.cygnus.com> + + * Makefile.in (BISON): Add -L flag. + (YACC): Likewise. + +Mon Aug 18 11:30:50 1997 Nick Clifton <nickc@cygnus.com> + + * configure.in (noconfigdirs): Add support for v850e target. + + * config.sub (maybe_os): Add support for v850e target. + +Mon Aug 18 11:30:50 1997 Nick Clifton <nickc@cygnus.com> + + * configure.in (noconfigdirs): Add support for v850ea target. + + * config.sub (maybe_os): Add support for v850ea target. + +Mon Aug 18 09:24:06 1997 Gavin Koch <gavin@cygnus.com> + + * config.sub: Add mipstx39. Delete r3900. + +Mon Aug 18 17:20:10 1997 Jason Molenda (crash@godzilla.cygnus.co.jp) + + * Makefile.in (all-autoconf): Depends on all-texinfo. + +Fri Aug 15 23:09:26 1997 Michael Meissner <meissner@cygnus.com> + + * config-ml.in ({powerpc,rs6000}*-*-*): Update to current AIX and + eabi targets. + +Thu Aug 14 14:42:17 1997 Ian Lance Taylor <ian@cygnus.com> + + * configure: Get CFLAGS and CXXFLAGS from Makefile, if possible. + + * configure: When handling a Canadian Cross, handle YACC as well as + BISON. Just set BISON to bison. When setting YACC, prefer bison. + * Makefile.in (all-bison): Depend upon all-texinfo. + +Tue Aug 12 20:09:48 1997 Jason Merrill <jason@yorick.cygnus.com> + + * Makefile.in (BISON): bison, not byacc or bison -y. + (YACC): bison -y or byacc or yacc. + (various): Add *-bison as appropriate. + (taz): No need to mess with BISON anymore. + +Tue Aug 12 22:33:08 1997 Ian Lance Taylor <ian@cygnus.com> + + * configure: If OSTYPE matches *win32*, try to find a good value for + CONFIG_SHELL. + +Sun Aug 10 14:41:11 1997 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (taz): Get the version number from AM_INIT_AUTOMAKE in + configure.in if it is present. + +Sat Aug 9 00:58:01 1997 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (LD_FOR_TARGET): Change ld.new to ld-new. + +Fri Aug 8 16:30:13 1997 Doug Evans <dje@canuck.cygnus.com> + + * config.sub: Recognize `arc' cpu. + * configure.in: Likewise. + * config-ml.in: Likewise. + +Thu Aug 7 11:02:34 1997 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in ($(INSTALL_X11_MODULES)): Depend upon installdirs. + +Wed Aug 6 16:27:29 1997 Chris Provenzano <proven@cygnus.com> + + * configure: Changed sed delimiter from ':' to '|' when + attempting to substitute ${config_shell} for SHELL. On + NT ${config_shell} may contain a ':' in it. + +Wed Aug 6 12:29:05 1997 Jason Merrill <jason@yorick.cygnus.com> + + * Makefile.in (EXTRA_GCC_FLAGS): Fix for non-bash shells. + +Wed Aug 6 00:42:35 1997 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (AS_FOR_TARGET): Change as.new to as-new. + +Tue Aug 5 14:08:51 1997 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (NM_FOR_TARGET): Change nm.new to nm-new. + + * ylwrap: If the program is a relative path, force it to be + absolute. + +Tue Aug 5 12:12:44 1997 Andrew Cagney <cagney@b1.cygnus.com> + + * configure (tooldir): Set BISON to `bison -y' and not just bison. + +Mon Aug 4 22:59:02 1997 Andrew Cagney <cagney@b1.cygnus.com> + + * Makefile.in (CC_FOR_TARGET): When winsup/Makefile present, + correctly specify the target build directory $(TARGET_SUBDIR)/winsup + for libraries. + +Mon Aug 4 12:40:24 1997 Jason Merrill <jason@yorick.cygnus.com> + + * Makefile.in (EXTRA_GCC_FLAGS): Fix handling of macros with values + separated by spaces. + +Thu Jul 31 19:49:49 1997 Ian Lance Taylor <ian@cygnus.com> + + * ylwrap: New file. + * Makefile.in (DEVO_SUPPORT): Add ylwrap. + + * ltmain.sh: Handle /bin/sh at start of install program. + + * Makefile.in (DEVO_SUPPORT): Add ltconfig, ltmain.sh, and missing. + + * ltconfig, ltmain.sh: New files, from libtool 1.0. + * missing: New file, from automake 1.2. + +Thu Jul 24 12:57:56 1997 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in: Treat tix like tk, putting it in X11_MODULES. Add + check-tk to CHECK_X11_MODULES. + +Wed Jul 23 17:03:29 1997 Ian Lance Taylor <ian@cygnus.com> + + * config.sub: Merge with FSF. + +Tue Jul 22 19:08:29 1997 Ian Lance Taylor <ian@cygnus.com> + + * config.guess: Merge with FSF. + +Tue Jul 22 14:50:42 1997 Robert Hoehne <robert.hoehne@Mathematik.TU-Chemnitz.DE> + + * configure: Treat msdosdjgpp like go32. + * configure.in: Likewise. Don't remove gprof for go32. + + * configure: Change Makefile.tem2 to Makefile.tm2. + +Mon Jul 21 10:31:26 1997 Stephen Peters <speters@cygnus.com> + + * configure.in (noconfigdirs): For alpha-dec-osf*, don't ignore grep. + +Tue Jul 15 14:33:03 1997 Brendan Kehoe <brendan@lisa.cygnus.com> + + * install-sh (chmodcmd): Set to null if the DST directory already + exists. Same as Nov 11th change. + +Mon Jul 14 11:01:15 1997 Martin M. Hunt <hunt@cygnus.com> + + * configure (GDB_TK): Needs itcl and tix. + +Mon Jul 14 00:32:10 1997 Jason Merrill <jason@yorick.cygnus.com> + + * config.guess: Update from FSF. + +Fri Jul 11 11:57:11 1997 Martin M. Hunt <hunt@cygnus.com> + + * Makefile.in (GDB_TK): Depend on itcl and tix. + +Fri Jul 4 13:25:31 1997 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (INSTALL_PROGRAM_ARGS): New variable. + (INSTALL_PROGRAM): Use $(INSTALL_PROGRAM_ARGS). + (INSTALL_SCRIPT): New variable. + (BASE_FLAGS_TO_PASS): Pass down INSTALL_SCRIPT. + * configure.in: If host is *-*-cygwin32*, set INSTALL_PROGRAM_ARGS + to -x. + * install-sh: Add support for -x option. + +Mon Jun 30 15:51:30 1997 Ian Lance Taylor <ian@cygnus.com> + + * configure.in, Makefile.in: Treat tix like itcl. + +Thu Jun 26 13:59:19 1997 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (WINDRES): New variable. + (WINDRES_FOR_TARGET): New variable. + (BASE_FLAGS_TO_PASS): Add WINDRES_FOR_TARGET. + (EXTRA_HOST_FLAGS): Add WINDRES. + (EXTRA_TARGET_FLAGS): Add WINDRES. + (EXTRA_GCC_FLAGS): Add WINDRES. + ($(DO_X)): Pass down WINDRES. + ($(CONFIGURE_TARGET_MODULES)): Set WINDRES when configuring. + * configure: Treat WINDRES like DLLTOOL, and WINDRES_FOR_TARGET like + DLLTOOL_FOR_TARGET. + +Wed Jun 25 15:01:26 1997 Felix Lee <flee@cygnus.com> + + * configure.in: configure sim before gdb for win32-x-ppc + +Wed Jun 25 12:18:54 1997 Brendan Kehoe <brendan@lisa.cygnus.com> + + Move gperf into the toplevel, from libg++. + * configure.in (target_tools): Add target-gperf. + (native_only): Add target-gperf. + * Makefile.in (all-target-gperf): New target, depend on + all-target-libg++. + (configure-target-gperf): Empty rule. + (ALL_TARGET_MODULES): Add all-target-gperf. + (CONFIGURE_TARGET_MODULES): Add configure-target-gperf. + (CHECK_TARGET_MODULES): Add check-target-gperf. + (INSTALL_TARGET_MODULES): Add install-target-gperf. + (CLEAN_TARGET_MODULES): Add clean-target-gperf. + +Mon Jun 23 10:51:53 1997 Jeffrey A Law (law@cygnus.com) + + * config.sub (mn10200): Recognize new basic machine. + +Thu Jun 19 14:16:42 1997 Brendan Kehoe <brendan@lisa.cygnus.com> + + * configure.in: Don't set ENABLE_MULTILIB, so we'll be passing + --enable-multilib down to subdirs; setting TARGET_SUBDIR was enough. + +Tue Jun 17 15:31:20 1997 Brendan Kehoe <brendan@lisa.cygnus.com> + + * configure.in: If we're building mips-sgi-irix6* native, turn on + ENABLE_MULTILIB and set TARGET_SUBDIR. + +Tue Jun 17 12:20:59 1997 Tom Tromey <tromey@cygnus.com> + + * Makefile.in (all-sn): Depend on all-grep. + +Mon Jun 16 11:11:10 1997 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Use mh-ppcpic and mt-ppcpic for powerpc*-* targets. + + * configure: Set CFLAGS and CXXFLAGS, and substitute them into + Makefile. From Jeff Makey <jeff@cts.com>. + * Makefile.in: Add comment for CFLAGS and CXXFLAGS. + + * Makefile.in (DISTBISONFILES): Remove. + (taz): Don't futz with DISTBISONFILES. Change BISON to use + $(DEFAULT_YACC). + + * configure.in: Build itl, db, sn, etc., when building for native + cygwin32. + + * Makefile.in (LD): New variable. + (EXTRA_HOST_FLAGS): Pass down LD. + ($(DO_X)): Likewise. + +Mon Jun 16 11:10:35 1997 Philip Blundell <Philip.Blundell@pobox.com> + + * Makefile.in (INSTALL): Use $(SHELL) when executing install-sh. + +Fri Jun 13 10:22:56 1997 Bob Manson <manson@charmed.cygnus.com> + + * configure.in (targargs): Strip out any supplied --build argument + before adding our own. Always add --build. + +Thu Jun 12 21:12:28 1997 Bob Manson <manson@charmed.cygnus.com> + + * configure.in (targargs): Pass --build if we're doing + a cross-compile. + +Fri Jun 6 21:38:40 1997 Rob Savoye <rob@chinadoll.cygnus.com> + + * configure: Use '|' instead of ":" as the separator in + sed. Otherwise sed chokes on NT path names with drive + designators. Also look for "?:*" as the leading characters in an + absolute pathname. + +Mon Jun 2 13:05:20 1997 Gavin Koch <gavin@cygnus.com> + + * config.sub: Support for r3900. + +Wed May 21 17:33:31 1997 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Use install-sh, not install.sh. + +Wed May 14 16:06:51 1997 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (taz): Improve check for BISON so it doesn't try to + apply it twice. + +Fri May 9 17:22:05 1997 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (INSTALL_MODULES): Put install-opcodes before + install-binutils. + +Thu May 8 17:29:50 1997 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in: Add automake targets. + * configure.in (host_tools): Add automake. + +Tue May 6 15:49:52 1997 Ian Lance Taylor <ian@cygnus.com> + + * configure: Default CXX to c++, not gcc. + * Makefile.in (CXX): Set to c++, not gcc. + (CXX_FOR_TARGET): When cross, transform c++, not gcc. + +Thu May 1 10:11:43 1997 Geoffrey Noer <noer@cygnus.com> + + * install-sh: try appending a .exe if source file doesn't + exist + +Wed Apr 30 12:05:36 1997 Jason Merrill <jason@yorick.cygnus.com> + + * configure.in: Turn on multilib by default. + (cross_only): Remove target-libiberty. + + * Makefile.in (all-gcc): Don't depend on libiberty. + +Mon Apr 28 18:39:45 1997 Michael Snyder <msnyder@cleaver.cygnus.com> + + * config.guess: improve algorithm for recognizing Gnu Hurd x86. + +Thu Apr 24 19:30:07 1997 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (DEVO_SUPPORT): Add mpw-install. + (DISTBISONFILES): Add ld/Makefile.in + +Tue Apr 22 17:17:28 1997 Geoffrey Noer <noer@pizza.cygnus.com> + + * configure.in: if target is cygwin32 but host isn't cygwin32, + don't configure gdb tcl tk expect, not just gdb. + +Mon Apr 21 13:33:39 1997 Tom Tromey <tromey@cygnus.com> + + * configure.in: Added gnuserv everywhere sn appears. + + * Makefile.in (ALL_MODULES): Added all-gnuserv. + (CROSS_CHECK_MODULES): Added check-gnuserv. + (INSTALL_MODULES): Added install-gnuserv. + (CLEAN_MODULES): Added clean-gnuserv. + (all-gnuserv): New target. + +Thu Apr 17 13:57:06 1997 Per Fogelstrom <pefo@openbsd.org> + + * config.guess: Fixes for MIPS OpenBSD systems. + +Tue Apr 15 12:21:07 1997 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (INSTALL_XFORM): Remove. + (BASE_FLAGS_TO_PASS): Remove INSTALL_XFORM. + + * mkinstalldirs: New file, copied from automake. + * Makefile.in (installdirs): Rename from install-dirs. Use + mkinstalldirs. Change all users. + (DEVO_SUPPORT): Add mkinstalldirs. + +Mon Apr 14 11:21:38 1997 Ian Lance Taylor <ian@cygnus.com> + + * install-sh: Rename from install.sh. + * Makefile.in (INSTALL): Change install.sh to install-sh. + (DEVO_SUPPORT): Likewise. + + * configure: Use ${config_shell} with ${moveifchange}. From Thomas + Graichen <graichen@rzpd.de>. + +Fri Apr 11 16:37:10 1997 Niklas Hallqvist <niklas@appli.se> + + * config.guess: Recognize OpenBSD systems correctly. + +Fri Apr 11 17:07:04 1997 Jason Molenda (crash@godzilla.cygnus.co.jp) + + * README, Makefile.in (ETC_SUPPORT): Remove references to + cfg-paper*, configure.{texi,man,info*}._ + +Sun Apr 6 18:47:57 1997 Andrew Cagney <cagney@kremvax.cygnus.com> + + * Makefile.in (all.normal): Ensure that gcc is built after all + the x11 - ie gdb - targets. + +Tue Apr 1 16:28:50 1997 Klaus Kaempf <kkaempf@progis.de> + + * makefile.vms: Don't run conf-a-gas. + +Mon Mar 31 16:26:55 1997 Joel Sherrill <joel@oarcorp.com> + + * configure.in (hppa1.1-*-rtems*): New target, like hppa-*-*elf*. + +Sun Mar 30 12:38:27 1997 Fred Fish <fnf@cygnus.com> + + * configure.in: Remove noconfigdirs case since gdb also + configures and builds for tic80-coff. + +Fri Mar 28 18:28:52 1997 Ian Lance Taylor <ian@cygnus.com> + + * configure: Set cache_file to config.cache. + * Makefile.in (local-distclean): Remove config.cache. + +Wed Mar 26 18:49:39 1997 Ian Lance Taylor <ian@cygnus.com> + + * COPYING: Update FSF address. + +Wed Mar 26 10:38:25 1997 Michael Meissner <meissner@cygnus.com> + + * configure.in (tic80-*-*): Remove G++ libraries and libgloss from + noconfigdirs. + +Mon Mar 24 15:02:39 1997 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (install-dirs): Don't crash if prefix, and hence + MAKEDIRS, is empty. + +Mon Mar 24 12:40:55 1997 Doug Evans <dje@canuck.cygnus.com> + + * config.sub: Tweak mn10300 entry. + +Fri Mar 21 15:35:27 1997 Michael Meissner <meissner@cygnus.com> + + * configure.in (host_tools): Put sim before gdb, so gdb's + configure.tgt can determine if the simulator was configured. + +Sun Mar 16 16:07:08 1997 Fred Fish <fnf@cygnus.com> + + * config.sub: Move BeOS $os case to be with other Cygnus + local cases. + +Sun Mar 16 01:34:55 1997 Martin Hunt <hunt@cygnus.com> + + * config.sub: Remove misplaced comment that broke Linux. + +Sat Mar 15 22:50:15 1997 Fred Fish <fnf@cygnus.com> + + * config.sub: Add BeOS support. + +Mon Mar 10 13:30:11 1997 Tom Tromey <tromey@cygnus.com> + + * Makefile.in (CHECK_X11_MODULES): Don't run check-tk. + +Wed Mar 5 12:09:29 1997 Martin <hunt@cygnus.com> + + * configure.in (noconfigdirs): Remove tcl and tk from + noconfigdirs for cygwin32 builds. + +Fri Feb 28 18:20:15 1997 Fred Fish <fnf@cygnus.com> + + * configure.in (tic80-*-*): Remove ld from noconfigdirs. + +Thu Feb 27 14:57:26 1997 Ken Raeburn <raeburn@cygnus.com> + + * Makefile.in (GAS_SUPPORT_DIRS, BINUTILS_SUPPORT_DIRS): Remove + make-all.com, use makefile.vms instead. + +Tue Feb 25 18:46:14 1997 Stan Shebs <shebs@andros.cygnus.com> + + * config.sub: Accept -lnews*. + +Tue Feb 25 13:19:14 1997 Andrew Cagney <cagney@kremvax.tpgi.com.au> + + * configure.in (noconfigdirs): Disable target-newlib, + target-examples and target-libiberty for d30v. + +Fri Feb 21 17:56:25 1997 Martin M. Hunt <hunt@pizza.cygnus.com> + + * configure.in (noconfigdirs): Enable ld for d30v. + +Fri Feb 21 20:58:51 1997 Michael Meissner <meissner@cygnus.com> + + * configure.in (tic80-*-*): Build compiler. + +Sun Feb 16 15:41:09 1997 Andrew Cagney <cagney@critters.cygnus.com> + + * configure.in (d30v-*): Remove sim directory from list of + unsupported d30v directories + +Tue Feb 18 17:32:42 1997 Martin M. Hunt <hunt@pizza.cygnus.com> + + * config.sub, configure.in: Add d30v target cpu. + +Thu Feb 13 22:04:44 1997 Klaus Kaempf <kkaempf@progis.de> + + * makefile.vms: New file. + * make-all.com: Remove. + +Wed Feb 12 12:54:18 1997 Jim Wilson <wilson@cygnus.com> + + * Makefile.in (EXTRA_GCC_FLAGS): Add LIBGCC2_DEBUG_CFLAGS. + +Sat Feb 8 20:36:49 1997 Michael Meissner <meissner@cygnus.com> + + * Makefile.in (all-itcl): The rule is all-itcl, not all-tcl. + +Tue Feb 4 11:39:29 1997 Tom Tromey <tromey@cygnus.com> + + * Makefile.in (ALL_MODULES): Added all-db. + (CROSS_CHECK_MODULES): Addec check-db. + (INSTALL_MODULES): Added install-db. + (CLEAN_MODULES): Added clean-db. + +Mon Feb 3 13:29:36 1997 Ian Lance Taylor <ian@cygnus.com> + + * config.guess: Merge with latest FSF sources. + +Tue Jan 28 09:20:37 1997 Tom Tromey <tromey@cygnus.com> + + * Makefile.in (ALL_MODULES): Added all-itcl. + (CROSS_CHECK_MODULES): Added check-itcl. + (INSTALL_MODULES): Added install-itcl. + (CLEAN_MODULES): Added clean-itcl. + +Thu Jan 23 01:44:27 1997 Geoffrey Noer <noer@cygnus.com> + + * configure.in: build gdb for mn10200 + +Fri Jan 17 15:32:15 1997 Doug Evans <dje@canuck.cygnus.com> + + * Makefile.in (all-target-winsup): Depend on all-target-libio. + +Mon Jan 13 22:46:54 1997 Michael Meissner <meissner@tiktok.cygnus.com> + + * configure.in (tic80-*-*): Turn off most targets right now. + +Fri Jan 3 16:04:03 1997 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (MAKEINFO): Check for the existence of the Makefile, + rather than the makeinfo program. + (do-info): Depend upon all-texinfo. + +Tue Dec 31 16:00:31 1996 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Remove uses of config/mh-linux. + + * config.sub, config.guess: Merge with latest FSF sources. + +Fri Dec 27 23:04:33 1996 Fred Fish <fnf@cygnus.com> + + * config.sub (case $basic_machine): Add tic80 entries. + +Fri Dec 27 12:07:59 1996 Ian Lance Taylor <ian@cygnus.com> + + * config.sub, config.guess: Merge with latest FSF sources. + +Wed Dec 18 22:46:39 1996 Stan Shebs <shebs@andros.cygnus.com> + + * mpw-build.in: Build ld before gcc, use NewFolderRecursive. + * mpw-config.in: Test for NewFolderRecursive. + * mpw-install: Use symbolic name for startup filename. + * mpw-README: Add various additional details. + +Wed Dec 18 13:11:46 1996 Jim Wilson <wilson@cygnus.com> + + * configure.in (mips*-sgi-irix6*): Remove binutils from noconfigdirs. + +Wed Dec 18 10:29:31 1996 Jeffrey A Law (law@cygnus.com) + + * configure.in: Do build gcc and the target libraries for + the mn10200. + +Wed Dec 4 16:53:05 1996 Geoffrey Noer <noer@cygnus.com> + + * configure.in: don't avoid building gdb for mn10300 any more + * Makefile.in: double-quote GCC_FOR_TARGET line in EXTRA_GCC_FLAGS + instead of single-quoting it. + +Tue Dec 3 23:26:50 1996 Jason Merrill <jason@yorick.cygnus.com> + + * configure.in: Don't use --with-stabs on IRIX 6. + +Tue Dec 3 09:05:25 1996 Doug Evans <dje@canuck.cygnus.com> + + * configure.in (m32r): Build gdb, libg++ now. + +Sun Dec 1 00:18:59 1996 Peter Schauer (pes@regent.e-technik.tu-muenchen.de) + + * configure.in (mips*-sgi-irix6*): Remove gdb and related + directories from noconfigdirs. + +Tue Nov 26 11:45:33 1996 Kim Knuttila <krk@cygnus.com> + + * config.sub (basic_machine): added mips16 configuration + +Sat Nov 23 19:26:22 1996 Michael Meissner <meissner@tiktok.cygnus.com> + + * config.sub: Handle d10v-unknown. + +Sat Nov 23 10:23:01 1996 Gavin Koch <gavin@cygnus.com> + + * config.sub: Handle v850-unknown. + +Thu Nov 21 16:19:44 1996 Geoffrey Noer <noer@cygnus.com> + + * Makefile.in: add findutils + * configure.in: add findutils to list of host_tools + +Wed Nov 20 10:09:01 1996 Jeffrey A Law (law@cygnus.com) + + * config.sub: Handle mn10200 and mn10300. + +Tue Nov 19 16:35:14 1996 Michael Meissner <meissner@tiktok.cygnus.com> + + * configure.in (d10v-*): Do not build librx. + +Mon Nov 18 13:28:41 1996 Jeffrey A Law (law@cygnus.com) + + * configure.in (mn10300): Build everything except gdb & libgloss. + +Wed Nov 13 14:59:46 1996 Per Bothner <bothner@deneb.cygnus.com> + + * config.guess: Patch for Dansk Data Elektronik servers, + from Niels Skou Olsen <nso@dde.dk>. + + For ncr, use /bin/uname rather than uname, since GNU uname does not + support -p. Suggested by Mark Mitchell <mmitchell@usa.net>. + + Patch for MIPS R4000 running System V, + from Eric S. Raymond <esr@snark.thyrsus.com>. + + Fix thinko for nextstep. + + Patch for OSF1 in i?86, from Dan Murphy <dlm@osf.org> via Harlan Stenn. + + Sat Jun 24 18:58:17 1995 Morten Welinder <terra+@cs.cmu.edu> + * config.guess: Guess mips-dec-mach_bsd4.3. + + Thu Oct 10 04:07:04 1996 Harlan Stenn <harlan@pfcs.com> + * config.guess (i?86-ncr-sysv*): Emit just enough of the minor + release numbers. + * config.guess (mips-mips-riscos*): Emit just enough of the + release number. + + Tue Oct 8 10:37:22 1996 Frank Vance <fvance@waii.com> + * config.guess (sparc-auspex-sunos*): Added. + (f300-fujitsu-*): Added. + + Wed Sep 25 22:00:35 1996 Jeff Woolsey <woolsey@jlw.com> + * config.guess: Recognize a Tadpole as a sparc. + +Wed Nov 13 00:53:09 1996 David J. MacKenzie <djm@churchy.gnu.ai.mit.edu> + + * config.guess: Don't assume that NextStep version is either 2 or + 3. NextStep 4 (aka OpenStep 4) has come out now. + +Mon Nov 11 23:52:03 1996 David J. MacKenzie <djm@churchy.gnu.ai.mit.edu> + + * config.guess: Support Cray T90 that reports itself as "CRAY TS". + From Rik Faith <faith@cs.unc.edu>. + +Fri Nov 8 11:34:58 1996 David J. MacKenzie <djm@geech.gnu.ai.mit.edu> + + * config.sub: Contributions from bug-gnu-utils to: + Support plain "hppa" (no version given) architecture, reported by + OpenStep. + OpenBSD like NetBSD. + LynxOs is not a hardware supplier. + + * config.guess: Contributions from bug-gnu-utils to add support for: + OpenBSD like NetBSD. + Stratus systems. + More Pyramid systems. + i[n>4]86 Intel chips. + M680[n>4]0 Motorola chips. + Use unknown instead of lynx for hardware manufacturer. + +Mon Nov 11 10:09:08 1996 Brendan Kehoe <brendan@lisa.cygnus.com> + + * install.sh (chmodcmd): Set to null if the DST directory already + exists. + +Mon Nov 11 10:43:41 1996 Michael Meissner <meissner@tiktok.cygnus.com> + + * configure.in (powerpc*-{eabi,elf,linux,rtem,sysv,solaris}*): Do + not use mt-ppc target Makefile fragment any more. + +Sun Nov 3 19:17:07 1996 Stu Grossman (grossman@critters.cygnus.com) + + * configure.in (*-*-windows): Exclude everything but those dirs + needed to build windows. + +Tue Oct 29 16:41:31 1996 Doug Evans <dje@canuck.cygnus.com> + + * Makefile.in (all-target-winsup): Depend on all-target-librx. + +Mon Oct 28 17:32:46 1996 Stu Grossman (grossman@critters.cygnus.com) + + * configure.in: Exclude mmalloc from i386-windows. + * config/mh-windows: Add rules for building MSVC makefiles. + +Thu Oct 24 09:22:46 1996 Stu Grossman (grossman@critters.cygnus.com) + + * Undo my previous change. + +Thu Oct 24 12:12:04 1996 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (EXTRA_GCC_FLAGS): Pass down GCC_FOR_TARGET + unconditionally. + (MAKEOVERRIDES): Define (revert this part of October 18 change). + +Thu Oct 24 09:02:07 1996 Stu Grossman (grossman@critters.cygnus.com) + + * Makefile.in (FLAGS_TO_PASS): Add $(HOST_FLAGS) to allow the + host to add it's own flags. + * config/mh-windows (HOST_FLAGS): Set srcroot, which is needed + for MSVC build procedure. + +Tue Oct 22 15:20:26 1996 Ian Lance Taylor <ian@cygnus.com> + + * configure: Handle GCC_FOR_TARGET like CC_FOR_TARGET. + +Fri Oct 18 13:37:13 1996 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (CC_FOR_TARGET): Check for xgcc, not Makefile. + (CXX_FOR_TARGET): Likewise. + (GCC_FOR_TARGET): Define. + (BASE_FLAGS_TO_PASS): Remove GCC_FOR_TARGET. + (EXTRA_GCC_FLAGS): Define GCC_FOR_TARGET based on whether + CC_FOR_TARGET was specified on the command line. + (MAKEOVERRIDES): Don't define. + +Thu Oct 17 10:27:56 1996 Doug Evans <dje@canuck.cygnus.com> + + * configure.in (m32r): Fix spelling of libg++ libs. + +Thu Oct 10 10:37:17 1996 Stan Shebs <shebs@andros.cygnus.com> + + * config.sub (-apple*): Remove, now redundant. + +Thu Oct 10 12:30:54 1996 Ian Lance Taylor <ian@cygnus.com> + + * configure: Don't get confused by CPU-VENDOR-linux-gnu. + + * configure: Rework yesterday's sed script patch. + + * config.sub: Merge with FSF. + +Wed Oct 9 17:24:59 1996 Per Bothner <bothner@deneb.cygnus.com> + + * config.guess: Merge from FSF. + + 1996-09-12 Richard Stallman <rms@ethanol.gnu.ai.mit.edu> + * config.guess: Use pc instead of unknown, for pc clone systems. + Change linux to linux-gnu. + + Mon Jul 15 23:51:11 1996 Karl Heuer <kwzh@gnu.ai.mit.edu> + * config.guess: Avoid non-portable tr syntax. + +Wed Oct 9 06:06:46 1996 Jeffrey A Law (law@cygnus.com) + + * test-build.mk (HOLES): Add "xargs" for gdb. + + * configure: Avoid hpux10.20 sed bug. + +Tue Oct 8 08:32:48 1996 Stu Grossman (grossman@critters.cygnus.com) + + * configure.in config/mh-windows: Add support for windows host + (that is a build done under the Microsoft build environment). + +Tue Oct 8 10:39:08 1996 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in: Replace all uses of srcroot with s, to shrink + command line lengths. + + Patches from Geoffrey Noer <noer@cygnus.com>: + * configure.in: If configuring for newlib, pass --with-newlib to + subdirectories. + * Makefile.in (CC_FOR_TARGET): If winsup/Makefile exists, pass a + -Bnewlib/ and -Lwinsup to gcc. + (CXX_FOR_TARGET): Likewise. + +Mon Oct 7 10:59:35 1996 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (ETC_SUPPORT): Add configure. + +Fri Oct 4 12:22:58 1996 Angela Marie Thomas (angela@cygnus.com) + + * configure.in: Use config/mh-dgux386 for i[345]86-dg-dgux + host configuration file. + +Thu Oct 3 09:28:25 1996 Jeffrey A Law (law@cygnus.com) + + * configure.in: Break mn10x00 support into separate + mn10200 and mn10300 configurations. + * config.sub: Likewise. + +Wed Oct 2 22:27:52 1996 Jeffrey A Law (law@cygnus.com) + + * configure.in: Add lots of stuff to noconfigdirs for + the mn10x00 targets. + + * config.sub, configure.in: Add mn10x00 support. + +Wed Oct 2 15:52:36 1996 Klaus Kaempf <kkaempf@progis.de> + + * make-all.com: Call conf-a-gas, not config-a-gas. + +Tue Oct 1 01:28:41 1996 James G. Smith <jsmith@cygnus.co.uk> + + * configure.in (noconfigdirs): Don't build libgloss for arm-coff + targets. + +Mon Sep 30 14:24:01 1996 Stan Shebs <shebs@andros.cygnus.com> + + * mpw-README: Add much more detail for native PowerMac. + * mpw-install: New file. + * mpw-configure: Add --norecursion and --help options. + * mpw-config.in: Translate readme and install files when + copying to objdir. + * mpw-build.in: Don't always depend on byacc and flex. + (install-only-top): New action. + +Fri Sep 27 17:39:44 1996 Stu Grossman (grossman@critters.cygnus.com) + + * configure.in: You can now configure GDB for the v850. + +Tue Sep 24 19:05:12 1996 Stan Shebs <shebs@andros.cygnus.com> + + * configure.in (noconfigdirs): Don't configure any C++ dirs + if targeting D10V. + +Tue Sep 17 12:15:31 1996 Ian Lance Taylor <ian@cygnus.com> + + * config.sub: Recognize mips64vr5000. + +Mon Sep 16 17:00:52 1996 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Use a single line for host_tools and native_only. + +Tue Sep 16 09:55:07 1997 Andrew Cagney <cagney@b1.cygnus.com> + + * Makefile.in (install-itcl): Install tcl first. + +Sun Sep 14 20:53:42 1997 Geoffrey Noer <noer@cygnus.com> + + * config/mh-cygwin32: ok to build split texinfo files + +Fri Sep 12 16:19:20 1997 Geoffrey Noer <noer@cygnus.com> + + * configure.in: remove bison from noconfigdirs for Cygwin32 host + +Mon Sep 9 12:21:30 1996 Doug Evans <dje@canuck.cygnus.com> + + * config.sub, configure.in: Add entries for m32r. + +Mon Sep 8 20:46:20 1997 Ian Lance Taylor <ian@cygnus.com> + + * config.guess: Merge with FSF. + +Thu Sep 5 13:52:47 1996 Tom Tromey <tromey@creche.cygnus.com> + + * Makefile.in (inet-install): Don't run install-gzip. + +Wed Sep 4 17:26:13 1996 Stu Grossman (grossman@critters.cygnus.com) + + * configure.in: Don't config lots of things for *-*-windows*. + +Sat Aug 31 11:45:57 1996 Stan Shebs <shebs@andros.cygnus.com> + + * mpw-config.in: Test for mpw-true, true, and null-command scripts. + (host_libs, host_tools): Copy from configure.in. + * mpw-configure: Don't complain about directories not found. + +Thu Aug 29 16:44:58 1996 Michael Meissner <meissner@tiktok.cygnus.com> + + * configure.in (i[345]86): Recognize i686 for pentium pro. + (i[3456]86-*-dgux*): Use config/mh-sysv for the host configuration + file. + + * config.guess (i[345]86): Ditto. + +Mon Aug 26 18:34:42 1996 Martin M. Hunt <hunt@pizza.cygnus.com> + + * configure.in (noconfigdirs): Removed gdb for D10V. + +Thu Aug 22 17:13:52 1996 Jeffrey A Law (law@cygnus.com) + + * configure.in: Remove ld, target-libio, target-libg++, and + target-libstdc++ from noconfigdirs. + +Wed Aug 21 18:56:38 1996 Fred Fish <fnf@cygnus.com> + + * configure: Fix three locations where shell scripts were + being run directly rather than with config_shell. + +Tue Aug 20 13:08:47 1996 J.T. Conklin <jtc@hippo.cygnus.com> + + * configure.in (v850-*-*): Set up initial $noconfigdirs. + * config.sub (basic_machine): Recognize v850. + +Thu Aug 15 12:19:33 1996 Stan Shebs <shebs@andros.cygnus.com> + + * mpw-configure: Handle multiple enable/disable options and + pass them down recursively, handle -c and -s flags appropriately + depending on choice of compiler, add escape mechanism for + quoted arguments to gC. + +Mon Aug 12 13:15:13 1996 Michael Meissner <meissner@tiktok.cygnus.com> + + * configure.in (powerpc*-*-*): For eabi, system V.4, Linux, and + solaris targets, use config/mt-ppc to set C{,XX}FLAGS_FOR_TARGETS + so that -mrelocatable-lib and -mno-eabi are used. + + * Makefile.in (CONFIGURE_TARGET_MODULES): If target compiler does + not support --print-multi-lib, don't abort. + +Sun Aug 11 20:51:50 1996 Stu Grossman (grossman@critters.cygnus.com) + + * config/mh-cygwin32 (CFLAGS): Define _WIN32 to be compatible + with normal Windows compilation environment. + +Thu Aug 8 12:18:59 1996 Klaus Kaempf <kkaempf@progis.de> + + * make-all.com: Run config-a-gas. + * setup.com: Don't copy subdirectory files around. + +Tue Jul 30 17:49:31 1996 Brendan Kehoe <brendan@cygnus.com> + + * configure.in (*-*-ose): Remove exclusion of libgloss for this + target, it now compiles correctly. + +Sat Jul 27 15:10:43 1996 Stan Shebs <shebs@andros.cygnus.com> + + * mpw-config.in: Generate Mac include for elf/dwarf2.h. + +Tue Jul 23 10:47:04 1996 Martin M. Hunt <hunt@pizza.cygnus.com> + + * configure.in (d10v-*-*): Remove ld from $noconfigdirs. + +Mon Jul 22 13:28:51 1996 Brendan Kehoe <brendan@lisa.cygnus.com> + + * configure.in (native_only): Add prms. + +Mon Jul 22 12:27:58 1996 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (GAS_SUPPORT_DIRS): Add make-all.com and setup.com. + (BINUTILS_SUPPORT_DIRS): Likewise. + +Thu Jul 18 12:55:40 1996 Michael Meissner <meissner@tiktok.cygnus.com> + + * configure.in (d10v-*-*): Don't configure ld or gdb until the + d10v support is added. + +Wed Jul 17 14:33:09 1996 Martin M. Hunt <hunt@pizza.cygnus.com> + + * configure.in (d10v-*-*): New target. + +Mon Jul 15 11:53:00 1996 Jeffrey A Law (law@cygnus.com) + + * config.guess (HP 9000/811): Recognize this as a PA1.1 + machine. + +Fri Jul 12 23:21:17 1996 Ken Raeburn <raeburn@cygnus.com> + + * Makefile.in (do-tar-gz): New target, split out from tail end of + taz target. Run each command separately, don't use pipes. + (taz): Use it. + +Fri Jul 12 12:08:04 1996 Stan Shebs <shebs@andros.cygnus.com> + + * mpw-configure: Look for g-mpw-make.sed in config/mpw. + * mpw-build.in: No builds should depend on building byacc or flex, + they are assumed to be installed already. + +Fri Jul 12 09:52:52 1996 Michael Meissner <meissner@tiktok.cygnus.com> + + * Makefile.in (CONFIGURE_TARGET_MODULES): Set r environment + variable that CC_FOR_TARGET needs. + +Thu Jul 11 10:09:45 1996 Michael Meissner <meissner@tiktok.cygnus.com> + + * Makefile.in (CONFIGURE_TARGET_MODULES): Determine if the multlib + options have changed since the last time the subdirectory was + configured, and if it has, reconfigure. + (CLEAN_TARGET_MODULES): Delete multilib.out and tmpmulti.out, which + CONFIGURE_TARGET_MODULES uses to remember the old multilib options. + +Wed Jul 10 18:56:59 1996 Doug Evans <dje@canuck.cygnus.com> + + * Makefile.in (ALL_MODULES,CROSS_CHECK_MODULES,INSTALL_MODULES, + CLEAN_MODULES): Add bash. + (all-bash): New target. + +Mon Jul 8 17:33:14 1996 Jim Wilson <wilson@cygnus.com> + + * configure.in (mips-sgi-irix6*): Use mh-irix6 instead of mh-irix5. + +Mon Jul 1 13:31:35 1996 Michael Meissner <meissner@tiktok.cygnus.com> + + * config.sub (basic_machine): Recognize d10v as a valid processor. + +Fri Jun 28 12:14:35 1996 Stan Shebs <shebs@andros.cygnus.com> + + * mpw-configure: Add support for --bindir. + * mpw-build.in: Use a GCC-specific build script for GCC actions. + +Wed Jun 26 17:20:12 1996 Geoffrey Noer <noer@cygnus.com> + + * configure.in: add bash, time, gawk to list of hosttools and things + to only build for native toolchains + +Tue Jun 25 23:09:03 1996 Jason Molenda (crash@godzilla.cygnus.co.jp) + + * Makefile.in (docdir): Remove. + +Tue Jun 25 19:00:08 1996 Jason Molenda (crash@godzilla.cygnus.co.jp) + + * Makefile.in (datadir): Set to $(prefix)/share. + +Mon Jun 24 23:26:07 1996 Geoffrey Noer <noer@cygnus.com> + + * configure.in: build diff and patch for cygwin32-hosted + toolchains. + +Mon Jun 24 15:01:12 1996 Joel Sherrill <joel@merlin.gcs.redstone.army.mil> + + * config.sub: Accept -rtems*. + +Sun Jun 23 22:41:54 1996 Geoffrey Noer <noer@cygnus.com> + + * configure.in: enable dosrel for cygwin32-hosted builds, + remove diff from the list of things not buildable + via Canadian Cross + +Sat Jun 22 11:39:01 1996 Jason Merrill <jason@yorick.cygnus.com> + + * Makefile.in (TARGET_SUBDIR): Move comment to previous line so we + don't get ". ". + +Fri Jun 21 17:24:48 1996 Jim Wilson <wilson@cygnus.com> + + * configure.in (mips*-sgi-irix6*): Set noconfigdirs appropriately. + +Thu Jun 20 16:57:40 1996 Ken Raeburn <raeburn@cygnus.com> + + * Makefile.in (taz): Handle case where tex3patch didn't even get + checked out. Also, if it was found, put the symlink in a new util + subdirectory. + +Thu Jun 20 12:20:33 1996 Michael Meissner <meissner@tiktok.cygnus.com> + + * config.guess (*:Linux:*:*): Add support for PowerPC Linux. + +Tue Jun 18 14:24:12 1996 Klaus Kaempf (kkaempf@progis.de) + + * config.sub: Recognize -openvms. + * configure.in (alpha*-*-*vms*): Set noconfigdirs. + * make-all.com, setup.com: New files. + +Mon Jun 17 16:34:46 1996 Jason Merrill <jason@yorick.cygnus.com> + + * Makefile.in (taz): tex3patch moved to texinfo/util. + +Sat Jun 15 17:13:25 1996 Geoffrey Noer <noer@cygnus.com> + + * configure: enable_gdbtk=no for cygwin32-hosted toolchains + * configure.in: remove make from disable-if-Can-Cross list + enable gdb if ${host} and ${target} are cygwin32 + +Fri Jun 7 18:16:52 1996 Harlan Stenn <harlan@pfcs.com> + + * config.guess (i?86-ncr-sysv*): Emit minor release numbers. + Recognize the NCR 4850 machine and NCR Pentium-based platforms. + +Wed Jun 5 00:09:17 1996 Per Bothner <bothner@wombat.gnu.ai.mit.edu> + + * config.guess: Combine mips-mips-riscos cases, and use cpp to + distinguish sysv/svr4/bsd variants. + Based on a patch from Harlan Stenn <harlan@pfcs.com>. + +Fri Jun 7 14:24:49 1996 Tom Tromey <tromey@creche.cygnus.com> + + * configure.in: Added copyright notice. + * move-if-change: Added copyright notice. + +Thu Jun 6 16:27:05 1996 Michael Meissner <meissner@tiktok.cygnus.com> + + * configure.in (powerpcle-*-solaris*): Until we get shared + libraries working, don't build gdb, sim, make, tcl, tk, or + expect. + +Tue Jun 4 20:41:45 1996 Per Bothner <bothner@deneb.cygnus.com> + + * config.guess: Merge with FSF: + + Mon Jun 3 08:49:14 1996 Karl Heuer <kwzh@gnu.ai.mit.edu> + * config.guess (*:Linux:*:*): Add guess for sparc-unknown-linux. + + Fri May 24 18:34:53 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> + * config.guess (AViiON:dgux:*:*): Fix typo in recognizing mc88110. + + Fri Apr 12 20:03:59 1996 Per Bothner <bothner@spiff.gnu.ai.mit.edu> + * config.guess: Combine two OSF1 rules. + Also recognize field test versions. From mjr@zk3.dec.com. + * config.guess (dgux): Use /usr/bin/uname rather than uname, + because GNU uname does not support -p. From pmr@pajato.com. + +Tue Jun 4 11:07:25 1996 Tom Tromey <tromey@csk3.cygnus.com> + + * Makefile.in (MAKEDIRS): Removed $(tooldir). + +Tue May 28 12:30:50 1996 Stan Shebs <shebs@andros.cygnus.com> + + * mpw-README: Document GCCIncludes. + +Sun May 26 15:16:27 1996 Fred Fish <fnf@cygnus.com> + + * configure.in (alpha-*-linux*): Set enable_shared to yes. + +Tue May 21 15:41:39 1996 Stan Shebs <shebs@andros.cygnus.com> + + * mpw-configure: Handle --enable-FOO and --disable-FOO. + +Mon May 20 10:12:29 1996 Geoffrey Noer <noer@cygnus.com> + + * configure.in (*-*-cygwin32): Configure make. + +Tue May 7 14:19:42 1996 Tom Tromey <tromey@snuffle.cygnus.com> + + * Makefile.in (inet-install): Quote value of INSTALL_MODULES. + +Fri May 3 08:57:17 1996 Tom Tromey <tromey@lisa.cygnus.com> + + * Makefile.in (all-inet): Depend on all-perl. + + * Makefile.in (inet-install): New target. + + * Makefile.in (all-inet): Depend on all-tcl. + (all-inet): Depend on all-send-pr. + +Tue Apr 30 13:55:51 1996 Michael Meissner <meissner@tiktok.cygnus.com> + + * configure.in (powerpcle-*-solaris*): Turn off tk and tcl + temporarily. + +Thu Apr 25 11:48:20 1996 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Don't configure --with-gnu-ld on AIX. + +Thu Apr 25 06:33:36 1996 Michael Meissner <meissner@wogglebug.tiac.net> + + * configure.in (powerpcle-*-solaris*): Turn off gdb temporarily. + +Tue Apr 23 09:07:39 1996 Tom Tromey <tromey@creche.cygnus.com> + + * Makefile.in (ALL_MODULES): Added all-inet. + (CROSS_CHECK_MODULES): Added check-inet. + (INSTALL_MODULES): Added install-inet. + (CLEAN_MODULES): Added clean-inet. + (all-indent): New target. + + * configure.in (host_tools): Added inet. + (native_only): Added inet. + (noconfigdirs): Added inet. + +Fri Apr 19 15:35:29 1996 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Don't configure libgloss if we are not configuring + newlib. + +Wed Apr 17 19:30:01 1996 Rob Savoye <rob@chinadoll.cygnus.com> + + * configure.in: Don't configure libgloss for unsupported + architectures. + +Tue Apr 16 11:17:05 1996 Michael Meissner <meissner@tiktok.cygnus.com> + + * Makefile.in (CLEAN_MODULES): Add clean-apache. + +Mon Apr 15 15:09:05 1996 Tom Tromey <tromey@creche.cygnus.com> + + * Makefile.in (ALL_MODULES): Include all-apache. + (CROSS_CHECK_MODULES): Include check-apache. + (INSTALL_MODULES): Include install-apache. + (all-apache): New target. + + * configure.in: Added apache everywhere perl is seen. + +Mon Apr 15 14:59:13 1996 Michael Meissner <meissner@tiktok.cygnus.com> + + * Makefile.in: Add support for clean-{module} and + clean-target-{module} rules. + +Wed Apr 10 21:37:41 PDT 1996 Marilyn E. Sander <msander@cygnus.com> + + * configure.in (*-*-ose) do not build libgloss. + +Mon Apr 8 16:16:20 1996 Michael Meissner <meissner@tiktok.cygnus.com> + + * config.guess (prep*:SunOS:5.*:*): Turn into + powerpele-unknown-solaris2. + +Mon Apr 8 14:45:41 1996 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Permit --enable-shared to specify a list of + directories. + +Fri Apr 5 08:17:57 1996 Jason Molenda (crash@phydeaux.cygnus.com) + + * configure.in (host==solaris): Pass only the first word of $CC + to /usr/bin/which when checking if we're using /usr/ccs/bin/cc. + +Fri Apr 5 03:16:13 1996 Jason Molenda (crash@phydeaux.cygnus.com) + + * Makefile.in (BASE_FLAGS_TO_PASS): pass down $(MAKE). + +Thu Mar 28 14:11:11 1996 Tom Tromey <tromey@creche.cygnus.com> + + * Makefile.in (ALL_MODULES): Include all-perl. + (CROSS_CHECK_MODULES): Include check-perl. + (INSTALL_MODULES): Include install-perl. + (ALL_X11_MODULES): Include all-guile. + (CHECK_X11_MODULES): Include check-guile. + (INSTALL_X11_MODULES): Include install-guile. + (all-perl): New target. + (all-guile): New target. + + * configure.in (host_tools): Include perl and guile. + (native_only): Include perl and guile. + (noconfigdirs): Don't build guile and perl; no ports have been + done. + +Tue Mar 26 21:18:50 1996 Andrew Cagney <cagney@kremvax.highland.com.au> + + * configure (--enable-*): Handle quoted option lists such as + --enable-sim-cflags='-g0 -O' better. + +Thu Mar 21 11:53:08 1996 Michael Meissner <meissner@tiktok.cygnus.com> + + * Makefile.in ({,inst}all-target): New rule so we can make and + install all of the target directories easily. + +Wed Mar 20 18:10:57 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * configure.in: Add missing global flag in sed substitution when + deleting `target-' from ${configdirs}. + +Thu Mar 14 19:15:06 1996 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (DO_X): Don't get confused if CC contains `=' in an + option. + + * configure.in (mips*-nec-sysvr4*): Use a host_makefile_frag of + config/mh-necv4. + + * install.sh: Correct misspelling of transformbasename. + + * config.guess: Recognize mips-*-sysv*. + +Mon Mar 11 15:36:42 1996 Dawn Perchik <dawn@critters.cygnus.com> + + * config.sub: Recognize mon960. + +Sun Mar 10 13:18:38 1996 Ian Lance Taylor <ian@cygnus.com> + + * configure: Restore Canadian Cross handling of BISON and LEX, + removed in Feb 20 change. + +Fri Mar 8 20:07:09 1996 Per Bothner <bothner@kalessin.cygnus.com> + + * README: Suggestions from Torbjorn Granlund <tege@matematik.su.se>: + Mention make install. Remove the old copyright date as well the + clumsy and rather pointless copyright on the README file. + +Fri Mar 8 17:51:35 1996 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in ($(CONFIGURE_TARGET_MODULES)): If there is a + Makefile after running symlink-tree, then run `make distclean' to + avoid clobbering any generated files in srcdir. + +Tue Mar 5 08:21:44 1996 J.T. Conklin <jtc@rtl.cygnus.com> + + * configure.in (m68k-*-netbsd*): Build everything now. + +Wed Feb 28 12:25:46 1996 Jason Merrill <jason@yorick.cygnus.com> + + * Makefile.in (taz): Fix quoting. + +Tue Feb 27 11:33:57 1996 Doug Evans <dje@charmed.cygnus.com> + + * configure.in (sparclet-*-*): Build everything now. + +Tue Feb 27 14:31:51 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * configure.in (m68k-*-linux*): New host. + +Mon Feb 26 14:32:44 1996 Ian Lance Taylor <ian@cygnus.com> + + * configure: Check for bison before byacc. + +Tue Feb 20 23:12:35 1996 Stu Grossman (grossman@critters.cygnus.com) + + * Makefile.in configure: Change the way LEX and BISON/YACC are + set. configure now defines DEFAULT_LEX and DEFAULT_YACC by + searching PATH. These are used as fallbacks by Makefile.in if + flex/bison/byacc aren't in objdir. + +Mon Feb 19 11:45:30 1996 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in: Make everything which depends upon all-bfd also + depend upon all-opcodes, in case --with-commonbfdlib is used. + +Thu Feb 15 19:50:50 1996 Michael Meissner <meissner@tiktok.cygnus.com> + + * configure.in (host *-*-cygwin32): Don't build gdb if we are + building NT native compilers on Unix. + +Thu Feb 15 17:42:25 1996 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Don't get CC from the host Makefile fragment if we + can find gcc in PATH, or if this is a Canadian Cross. Move the + Solaris test for /usr/ucb/cc to the post target script, just after + the compiler sanity test. + +Wed Feb 14 16:57:40 1996 Ian Lance Taylor <ian@cygnus.com> + + * config.sub: Merge with FSF. + +Tue Feb 13 14:27:48 1996 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (RPATH_ENVVAR): New variable. + (REALLY_SET_LIB_PATH): Use it. + * configure.in: On HP/UX, set RPATH_ENVVAR to SHLIB_PATH. + +Mon Feb 12 15:28:49 1996 Doug Evans <dje@charmed.cygnus.com> + + * config.sub, configure.in: Recognize sparclet cpu. + +Mon Feb 12 15:33:59 1996 Christian Bauernfeind <chrisbfd@theorie3.physik.uni-erlangen.de> + + * config.guess: Support m68k-cbm-sysv4. + +Sat Feb 10 12:06:42 1996 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * config.guess (*:Linux:*:*): Guess m68k-unknown-linux and + m68k-unknown-linuxaout from linker help string. Put quotes around + $ld_help_string. + +Thu Dec 7 09:03:24 1995 Tom Horsley <Tom.Horsley@mail.hcsc.com> + + * config.guess (powerpc-harris-powerunix): Add guess for port + to new target. + +Thu Feb 8 15:37:52 1996 Brendan Kehoe <brendan@lisa.cygnus.com> + + * config.guess (UNAME_VERSION): Recognize X4.x as an OSF version. + +Mon Feb 5 16:36:51 1996 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: If --enable-shared was used, set SET_LIB_PATH to + $(REALLY_SET_LIB_PATH) in Makefile. + * Makefile.in (SET_LIB_PATH): New variable. + (REALLY_SET_LIB_PATH): New variable. + ($(DO_X)): Use $(SET_LIB_PATH). + (install.all, gcc-no-fixedincludes, $(ALL_MODULES)): Likewise. + ($(NATIVE_CHECK_MODULES), $(CROSS_CHECK_MODULES)): Likewise. + ($(INSTALL_MODULES), $(CONFIGURE_TARGET_MODULES)): Likewise. + ($(ALL_TARGET_MODULES), $(CHECK_TARGET_MODULES)): Likewise. + ($(INSTALL_TARGET_MODULES), $(ALL_X11_MODULES)): Likewise. + ($(CHECK_X11_MODULES), $(INSTALL_X11_MODULES)): Likewise. + (all-gcc, all-bootstrap, check-gcc, install-gcc): Likewise. + (install-dosrel): Likewise. + (all-opcodes): Depend upon all-libiberty. + +Sun Feb 4 16:51:11 1996 Steve Chamberlain <sac@slash.cygnus.com> + + * config.guess (*:CYGWIN*): New + +Sat Feb 3 10:42:35 1996 Michael Meissner <meissner@tiktok.cygnus.com> + + * Makefile.in (all-target-winsup): All all-target-libiberty. + +Fri Feb 2 17:58:56 1996 Michael Meissner <meissner@tiktok.cygnus.com> + + * configure.in (noconfigdirs): Add missing # in front of comment. + +Thu Feb 1 14:38:13 1996 Geoffrey Noer <noer@cygnus.com> + + * configure.in: add second pass to things added to noconfigdirs + so *-gm-magic can exclude libgloss properly. + +Thu Feb 1 11:10:16 1996 Stan Shebs <shebs@andros.cygnus.com> + + * mpw-configure (extralibs_name, rez_name): Set correctly + for MWC68K compiler. + + * mpw-README: Add more info on the necessary build tools. + +Thu Feb 1 10:22:38 1996 Steve Chamberlain <sac@slash.cygnus.com> + + * configure.in, config.sub: Recognize cygwin32. + +Wed Jan 31 14:17:10 1996 Richard Henderson <rth@tamu.edu> + + * config.guess, config.sub: Recognize A/UX. + +Wed Jan 31 13:52:14 1996 Ian Lance Taylor <ian@cygnus.com> + + * config.sub: Merge with gcc/config.sub. + +Thu Jan 25 11:01:10 1996 Raymond Jou <rjou@mexican.cygnus.com> + + * mpw-build.in (do-binutils): Add build of stamps. + +Thu Jan 25 17:05:26 1996 James G. Smith <jsmith@cygnus.co.uk> + + * config.sub: Add recognition for mips64vr4100*-* targets. + +Wed Jan 24 12:47:55 1996 Brendan Kehoe <brendan@lisa.cygnus.com> + + * test-build.mk: Add checking of `hpux9' rather than just `hpux'. + Add creation of gconfigargs with `--enable-shared' turned on. + ($(host)-stamp-stage2-configured): Pass $(gconfigargs). + ($(host)-stamp-stage3-configured): Likewise. + (HOLES): Add chatr and ldd. + (i386-ncr-sysv4.3*): Add use of /usr/ccs/bin in the PATH and HOLE_DIRS. + +Wed Jan 24 20:32:30 1996 Torbjorn Granlund <tege@noisy.matematik.su.se> + + * configure: Pass --nfp to recursive configures. + +Mon Jan 22 10:41:56 1996 Steve Chamberlain <sac@slash.cygnus.com> + + * Makefile.in (DLLTOOL): New. + (DLLTOOL_FOR_TARGET): New. + (EXTRA_HOST_FLAGS): Pass down DLLTOOL. + (EXTRA_TARGET_FLAGS): Ditto. + (EXTRA_GCC_FLAGS): Ditto. + (CONFIGURE_TARGET_MODULES): Ditto. + (DO_X): Ditto. + * configure: Add DLLTOOL. + +Fri Jan 19 13:30:15 1996 Stan Shebs <shebs@andros.cygnus.com> + + SCO OpenServer 5 changes from Robert Lipe <robertl@dgii.com>: + * configure.in (i[345]86-*-sco3.2v5*): Use mh-sysv instead of + mh-sco, since old workarounds no longer needed, and don't + build ld, since libraries have weak symbols in COFF. + +Sun Jan 14 23:01:31 1996 Fred Fish <fnf@cygnus.com> + + * Makefile.in (CONFIGURE_TARGET_MODULES): Add missing ';'. + +Fri Jan 12 15:25:35 1996 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Make sure that ${CC} can be used to compile an + executable. + +Sat Jan 6 07:23:33 1996 Michael Meissner <meissner@wogglebug.tiac.net> + + * Makefile.in (all-gdb): Depend on $(GDB_TK). + * configure (GDB_TK): Set GDB_TK to either "all-tcl all-tk" or + nothing depending on whether gdbtk is being built. + +Wed Jan 3 17:54:41 1996 Doug Evans <dje@canuck.cygnus.com> + + * Makefile.in (newlib.tar.gz): Delete building of newlib's info files. + +Mon Jan 1 19:09:14 1996 Brendan Kehoe <brendan@rtl.cygnus.com> + + * configure.in (noconfigdirs): Put ld or gas in this early, if the + user specifically used --with-gnu-ld=no or --with-gnu-as=no. + +Sat Dec 30 16:08:57 1995 Doug Evans <dje@canuck.cygnus.com> + + * config-ml.in: Add support for + --disable-{softfloat,m68881,m68000,m68020} on m68*-*-*. + Simplify setting of multidirs from --disable-foo. + +Fri Dec 29 07:56:11 1995 Michael Meissner <meissner@tiktok.cygnus.com> + + * Makefile.in (EXTRA_GCC_FLAGS): If any of the make variables + LANGUAGES, BOOT_CFLAGS, STMP_FIXPROTO, LIMITS_H_TEST, + LIBGCC1_TEST, LIBGCC2_CFLAGS, LIBGCC2_INCLUDES, and ENQUIRE are + non-empty, pass them on to the GCC make. + (all-bootstrap): New rule that is like all-gcc, except it executes + the GCC bootstrap rule instead of the GCC all rule. + +Wed Dec 27 15:51:48 1995 Doug Evans <dje@canuck.cygnus.com> + + * config-ml.in (ml_realsrcdir): New, to account for ${subdir}. + +Tue Dec 26 11:45:31 1995 Michael Meissner <meissner@tiktok.cygnus.com> + + * config.guess (AViiON:dgux:*:*): Update from FSF to add pentium + DG/UX support. + +Fri Dec 15 10:01:27 1995 Stan Cox <coxs@dg-rtp.dg.com> + + * config.sub (i*86*) Change [345] to [3456] + +Wed Dec 20 17:41:40 1995 Brendan Kehoe <brendan@lisa.cygnus.com> + + * configure.in (noconfigdirs): Add gas or ld if --with-gnu-as=no or + --with-gnu-ld=no. + +Wed Dec 20 15:15:35 1995 Michael Meissner <meissner@tiktok.cygnus.com> + + * config-ml.in (rs6000*, powerpc*): Add switches to control which + AIX multilibs get built. + +Mon Dec 18 17:55:46 1995 Jason Molenda (crash@phydeaux.cygnus.com) + + * configure.in (i386-win32): Don't build expect if we're not + building the tcl subdir. + +Mon Dec 18 11:47:19 1995 Stan Shebs <shebs@andros.cygnus.com> + + * Makefile.in: (configure-target-examples, all-target-examples): + New targets, configure and build example programs. + +Fri Dec 15 16:13:03 1995 Stan Shebs <shebs@andros.cygnus.com> + + * mpw-configure: If an mpw-config.in generated a file mk.sed, + use it as input to sedit the generated MPW makefile. + * mpw-README: Add a suggestion about Gestalt.h. + +Wed Dec 13 16:43:51 1995 Ian Lance Taylor <ian@cygnus.com> + + * config.sub: Accept *-*-ieee*. + +Tue Dec 12 11:52:57 1995 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (local-distclean): Remove $(TARGET_SUBDIR). From + Ronald F. Guilmette <rfg@monkeys.com>. + +Mon Dec 11 15:31:58 1995 Jason Molenda (crash@phydeaux.cygnus.com) + + * configure.in (host==powerpc-pe): Add many directories to noconfigdirs + for powerpc-pe native. + (target==i386-win32): add tcl, make to noconfigdirs if canadian cross. + (target==powerpc-pe): duplicate i386-win32 entry. + +Sat Dec 9 14:58:28 1995 Jim Wilson <wilson@chestnut.cygnus.com> + + * configure.in (noconfigdirs): Exclude target-newlib for all versions + of vxworks, not just vxworks5.1. + +Mon Dec 4 12:05:40 1995 Stan Shebs <shebs@andros.cygnus.com> + + * mpw-configure: Add support for exec-prefix. + +Mon Dec 4 10:22:50 1995 Jeffrey A. Law <law@rtl.cygnus.com> + + * config.guess: Recognize HP model 816 machines as having + a PA1.1 processor. + +Mon Dec 4 12:38:15 1995 Ian Lance Taylor <ian@cygnus.com> + + * configure: Ignore new autoconf configure options. + +Thu Nov 30 14:45:25 1995 J.T. Conklin <jtc@rtl.cygnus.com> + + * config/mt-v810 (CC_FOR_TARGET): Add -ansi flag. NEC compiler + defaults to K&R mode, but doesn't have varargs.h, so we have to + compile in ANSI mode. + +Thu Nov 30 16:57:33 1995 Per Bothner <bothner@wombat.gnu.ai.mit.edu> + + * config.guess: Recognize Pentium under SCO. + From Robert Lipe <robertl@arnet.com>. + +Wed Nov 29 13:49:08 1995 J.T. Conklin <jtc@rtl.cygnus.com> + + * configure.in (noconfigdirs): Disable target-libio on v810-*-*. + * config/mt-v810 (CC_FOR_TARGET, AS_FOR_TARGET, AR_FOR_TARGET, + RANLIB_FOR_TARGET): Set as appropriate for NEC v810 toolchain. + +Wed Nov 29 12:12:01 1995 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Don't configure gas for alpha-dec-osf*. + +Tue Nov 28 17:16:48 1995 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Default to --with-stabs for some targets for which + it makes sense: mips*-*-*, alpha*-*-osf*, i[345]86*-*-sysv4* and + i[345]86*-*-unixware*. + +Mon Nov 27 13:44:15 1995 Ian Lance Taylor <ian@cygnus.com> + + * config-ml.in: Get list of multidirs using gcc --print-multi-lib + rather than basing it on the target. Simplify handling of options + controlling which directories to configure. Remove extraneous + slash in multi-clean target. + +Fri Nov 24 17:29:29 1995 Doug Evans <dje@deneb.cygnus.com> + + * config-ml.in: Prefix more variables with ml_ so they don't collide + with configure's. + +Wed Nov 22 11:27:02 1995 Ian Lance Taylor <ian@cygnus.com> + + * configure: Don't turn -v into --v. + +Tue Nov 21 16:48:02 1995 Doug Evans <dje@deneb.cygnus.com> + + * configure.in (targargs): Fix typo. + + * Makefile.in (DEVO_SUPPORT): Add symlink-tree. + +Tue Nov 21 14:08:28 1995 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Strip --host and --target options from + CONFIG_ARGUMENTS, and always configure for --host only. Add + --with-cross-host option when building with a cross-compiler. + * configure: Canonicalize the arguments put into config.status by + always using `=' for an option with an argument. Pass a presumed + --host or --target explicitly. + +Fri Nov 17 17:50:30 1995 Stan Shebs <shebs@andros.cygnus.com> + + * config.sub: Merge -macos*, -magic*, -pe*, and -win32 cases + into general OS recognition case. + +Fri Nov 17 17:42:25 1995 Jason Molenda (crash@phydeaux.cygnus.com) + + * configure.in (target_configdirs): add target-winsup only + for win32 target systems. + +Thu Nov 16 14:04:47 1995 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (all-target-libgloss): Depend upon + configure-target-newlib, since when libgloss is built it looks to + see if the newlib directory exists. + +Wed Nov 15 14:47:52 1995 Ken Raeburn <raeburn@cygnus.com> + + * Makefile.in (DEVO_SUPPORT): Use config-ml.in instead of + cfg-ml-*.in. + +Wed Nov 15 11:45:23 1995 Ian Lance Taylor <ian@cygnus.com> + + * configure: Handle LD and LD_FOR_TARGET when configuring a + Canadian Cross. + +Tue Nov 14 15:03:12 1995 Jason Molenda (crash@phydeaux.cygnus.com) + + * config/mh-i386win32: add LD_FOR_TARGET. + +Tue Nov 14 14:56:11 1995 Jason Molenda (crash@phydeaux.cygnus.com) + + * configure.in (target_libs): add target-winsup. + (target==i386-win32): add patch diff flex make to $noconfigdirs. + (target==ppcle-pe): remove ld from $noconfigdirs. + +Tue Nov 14 01:25:50 1995 Doug Evans <dje@canuck.cygnus.com> + + * Makefile.in (CONFIGURE_TARGET_MODULES): Pass --with-target-subdir. + Preserve relative path names in $srcdir. Build symlink tree if + configuring cross target dir and srcdir=. (= no VPATH support). + (configure-target-libg++): Depend on configure-target-librx. + * cfg-ml-com.in, cfg-ml-pos.in: Deleted. + * config-ml.in: New file. + * symlink-tree: New file. + * configure: Ensure srcdir="." if that's what it is. + +Mon Nov 13 12:34:20 1995 Stan Shebs <shebs@andros.cygnus.com> + + * mpw-README: Clarify some phrasing, add notes about CodeWarrior + includes and FLEX_SKELETON setting. + * mpw-configure (--with-gnu-ld): New option, controls whether + to use PPCLink or ld with PowerMac GCC. + * mpw-build.in (all-grez, do-grez, install-grez): New targets. + * mpw-config.in: Configure grez if targeting Mac. + + * config.sub: Accept pmac and pmac-mpw as names for PowerMacs, + accept mpw and mac-mpw as names for m68k Macs, change macos7 to + just macos. + * configure.in: Configure grez resource compiler if targeting Mac. + * Makefile.in (all-grez, install-grez): New targets. + +Wed Nov 8 17:33:51 1995 Jason Merrill <jason@yorick.cygnus.com> + + * configure: CXX defaults to gcc, not g++. If we find + gcc in the path, set CC to gcc -O2. + +Tue Nov 7 15:45:17 1995 Ian Lance Taylor <ian@cygnus.com> + + * configure: Default ${build} correctly. Avoid picking up extra + spaces when reading CC and CXX from Makefile. When doing a + Canadian Cross, use plausible default values for numerous + variables. + * configure.in: When doing a Canadian Cross, don't try to + configure tools whose configure script can't handle it. + +Mon Nov 6 19:32:17 1995 Jim Wilson <wilson@chestnut.cygnus.com> + + * cfg-ml-com.in (sh-*-*): Add m2 and ml/m2 to multidirs. + +Sun Nov 5 00:15:41 1995 Per Bothner <bothner@kalessin.cygnus.com> + + * configure: Remove dubious bug reporting address. + +Fri Nov 3 08:17:54 1995 Per Bothner <bothner@kalessin.cygnus.com> + + * Makefile.in ($(CONFIGURE_TARGET_MODULES)): If subdir has + configure script, run that instead of this directory's configure. + In either case, print a message that we're configuring the sub-dir. + +Thu Nov 2 23:23:36 1995 Per Bothner <bothner@kalessin.cygnus.com> + + * configure.in: Before checking for the existence of various files, + use sed to filter out "target-". + +Thu Nov 2 13:24:56 1995 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (DO_X): Split rule to decrease command line length + for systems with small ARG_MAX values. From phdm@info.ucl.ac.be + (Philippe De Muyter). + +Wed Nov 1 15:18:35 1995 Jason Molenda (crash@phydeaux.cygnus.com) + + * Makefile.in (all-patch): depend on all-libiberty. + +Wed Nov 1 12:23:20 1995 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: If the only directory in target_configdirs which + actually exists is libiberty, then set target_configdirs to empty, + to avoid trying to build a target libiberty in a gas or gdb + distribution. + +Tue Oct 31 17:52:39 1995 J.T. Conklin <jtc@slave.cygnus.com> + + * configure.in (host_makefile_frag): Use m68k-sun-sunos* instead + of m68k-sun-* when selecting mh-sun3 to avoid matching NetBSD/sun3 + systems. + +Tue Oct 31 16:57:32 1995 Jim Wilson <wilson@chestnut.cygnus.com> + + * configure.in (copy_dirs): Use sys-include instead of include + for --with-headers option. + +Tue Oct 31 10:29:36 1995 steve chamberlain <sac@slash.cygnus.com> + + * Makefile.in, configure.in: Make winsup builds work with + new scheme. + +Mon Oct 30 18:57:09 1995 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Build the linker on AIX. + +Mon Oct 30 12:27:16 1995 Per Bothner <bothner@kalessin.cygnus.com> + + * Makefile.in (CC_FOR_TARGET, CXX_FOR_TARGET): Add $(TARGET_SUBDIR) + where needed. + +Mon Oct 30 12:45:25 1995 Doug Evans <dje@cygnus.com> + + * Makefile.in (all-gcc): Fix typo. + +Sat Oct 28 10:27:59 1995 Per Bothner <bothner@kalessin.cygnus.com> + + * Makefile.in ($(CHECK_TARGET_MODULES)): Fix typo. + +Fri Oct 27 23:14:12 1995 Per Bothner <bothner@kalessin.cygnus.com> + + * configure.in: Rename libFOO to target-libFOO, and xiberty + to target-xiberty, to provide more flexibility. + (target_subdir): Define. Create if cross. + Set TARGET_SUBDIR in Makefile to ${target_subdir}. + * Makefile.in: Rename all-libFOO -> all-target-libFOO, all-xiberty + -> all-target-libiberty, configure-libFOO -> configure-target-libFOO, + check-libFOO -> check-target-libFOO, etc. + ($(DO_X)): Iterate over TARGET_CONFIGDIRS after SUBDIRS. + ($(CONFIGURE_TARGET_MODULES), $(CHECK_TARGET_MODULES), + $(ALL_TARGET_MODULES), $(INSTALL_TARGET_MODULES)): Update accordingly. + (configure-target-XXX): Depend on $(ALL_GCC), not all-gcc, to + allow ALL_GCC="" to only configure. + (DEVO_SUPPORT): Add cfg-ml-com.in and cfg-ml-pos.in. + (ETC_SUPPORT, ETC_SUPPORT_PFX): Merge; update 'taz' accordingly. + (LIBGXX_SUPPORT_DIRS): Remove xiberty. + +Sat Oct 28 01:53:49 1995 Ken Raeburn <raeburn@cygnus.com> + + * Makefile.in (taz): Build "info" in etc explicitly. + +Fri Oct 27 09:32:30 1995 Stu Grossman (grossman@cygnus.com) + + * configure.in: Make sure that CC is undefined (as opposed to + null) if toplevel/config/mh-{host} doesn't define it. Fixes a + problem with autoconf trying to configure on a host without GCC. + +Thu Oct 26 22:35:01 1995 Stan Shebs <shebs@andros.cygnus.com> + + * mpw-configure: Set host alias from choice of host compiler, + only use generic MPW Makefile sed if present, edit a file + named "hacked_Makefile.in" instead of "Makefile.in" if present. + * mpw-README: Add problem notes about CW6 and CW7. + +Thu Oct 26 05:45:10 1995 Ken Raeburn <raeburn@kr-pc.cygnus.com> + + * Makefile.in (taz): Use ";" instead of ";;". + +Wed Oct 25 15:18:24 1995 Per Bothner <bothner@kalessin.cygnus.com> + + * Makefile.in (taz): Grep for '^diststuff:' or '^info:' in + sub-directory Makefiles, instead of using DISTSTUFFDIRS and + DISTDOCDIRS. + (DISTSTUFFDIRS, DISTDOCDIRS): Removed - no longer used. + (newlib.tar.gz): Don't pass DISTDOCDIRS to recursive make. + +Wed Oct 25 14:43:55 1995 Per Bothner <bothner@kalessin.cygnus.com> + + * Makefile.in (DISTDOCDIRS): Remove ld gprof bnutils gas libg++ gdb + and gnats, because they are now subsumed by DISTSTUFFDIRS. + Move bfd to DISTSTUFFDIRS. + +Tue Oct 24 18:19:09 1995 Jason Molenda (crash@phydeaux.cygnus.com) + + * Makefile.in (X11_LIB): Removed. + (X11_FLAGS_TO_PASS): pass only X11_EXTRA_CFLAGS and X11_EXTRA_LIBS. + + * configure.in (host_makefile_frag): mh-aix & mh-sun removed. + +Sun Oct 22 13:04:42 1995 Michael Meissner <meissner@tiktok.cygnus.com> + + * cfg-ml-com.in (powerpc*): Shorten some of the multilib directory + names. + +Fri Oct 20 18:02:10 1995 Michael Meissner <meissner@tiktok.cygnus.com> + + * cfg-ml-com.in (powerpc*-eabi*): Add mcall-aixdesc varients. + +Thu Oct 19 10:40:57 1995 steve chamberlain <sac@slash.cygnus.com> + + * configure.in (i[345]86-*-win32): Always build newlib. + Don't configure cvs, autoconf or texinfo. + * Makefile.in (LD_FOR_TARGET): New. + (BASE_FLAGS_TO_PASS, EXTRA_TARGET_FLAGS, CONFIGURE_TARGET_MODULES): + Pass down LD_FOR_TARGET. + +Wed Oct 18 15:53:56 1995 steve chamberlain <sac@slash.cygnus.com> + + * winsup: New directory. + * Makefile.in: Build winsup. + * configure.in: Winsup is configured when target is win32. + Can only build win32 target GDB when native. + +Mon Oct 16 09:42:31 1995 Jeffrey A Law (law@cygnus.com) + + * config.guess: Recognize HP model 819 machines as having + a PA 1.1 processor. + +Mon Oct 16 10:49:43 1995 Ian Lance Taylor <ian@cygnus.com> + + * configure: Fix sed loop which substitutes for CC and CXX to + avoid bug found in various sed implementations. + +Wed Oct 11 16:16:20 1995 Michael Meissner <meissner@tiktok.cygnus.com> + + * cfg-ml-com.in (powerpc-*-eabisim): Delete separate rule for + simulator. Use standard powerpc-*-eabi*. + +Mon Oct 9 17:21:56 1995 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Stop putting gas and binutils in noconfigdirs for + powerpc-*-aix* and rs6000-*-*. + +Mon Oct 9 12:38:40 1995 Michael Meissner <meissner@cygnus.com> + + * cfg-ml-com.in (powerpc*-*-eabisim*): Add support for building + -mcall-aixdesc libraries. + +Fri Oct 6 16:17:57 1995 Ken Raeburn <raeburn@cygnus.com> + + Mon Sep 25 22:49:32 1995 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * config.sub (arm | armel | armeb): Fix shell syntax. + +Fri Oct 6 14:40:28 1995 Michael Meissner <meissner@tiktok.cygnus.com> + + * cfg-ml-com.in ({powerpc,rs6000}-ibm-aix*): Add multilibs for + -msoft-float and -mcpu=common support. + (powerpc*-*-eabisim*): Add support for building -mcall-aix + libraries. + +Thu Oct 5 13:26:37 1995 Brendan Kehoe <brendan@lisa.cygnus.com> + + * configure.in: Allow configuration and build of emacs19 for the alpha. + +Wed Oct 4 22:05:36 1995 Jason Molenda (crash@phydeaux.cygnus.com) + + * configure.in (CC): Get ^CC, not just any old CC, from + ${host_makefile_frag}. + +Wed Oct 4 21:55:00 1995 Jason Molenda (crash@phydeaux.cygnus.com) + + * configure.in (CC): Try to get CC from + ${srcdir}/${host_makefile_frag}, not ${host_makefile_frag}. + +Wed Oct 4 21:44:12 1995 Jason Molenda (crash@phydeaux.cygnus.com) + + * Makefile.in (TARGET_CONFIGDIRS): configure targetdirs + only if it exists in $(srcdir). + +Wed Oct 4 11:52:31 1995 Ian Lance Taylor <ian@cygnus.com> + + * configure: If CC and CXX are not set in the environment, set + them, based on either an existing Makefile or on searching for gcc + in PATH. Substitute for CC and CXX in Makefile. + * configure.in: Remove libm from target_libs. Separate + target_configdirs from configdirs. If CC is not set in + environment, try to get it from a host Makefile fragment. Rewrite + changes of configdirs to use skipdirs instead. A few minor + tweaks. Take directories out of target_configdirs as they are + taken out of configdirs. Remove existing Makefile files from + subdirectories. Substitute for TARGET_CONFIGDIRS and + CONFIG_ARGUMENTS in Makefile. + * Makefile.in (TARGET_CONFIGDIRS): New variable, automatically set + by configure.in. + (CONFIG_ARGUMENTS): Likewise. + (CONFIGURE_TARGET_MODULES): New variable. + ($(DO_X)): Loop over TARGET_CONFIGDIRS as well as SUBDIRS. + ($(CONFIGURE_TARGET_MODULES)): New target. + (configure-libg++, configure-libio): New targets. + (all-libg++): Depend upon configure-libg++. + (all-libio): Depend upon configure-libio. + (configure-libgloss, all-libgloss): New targets. + (configure-libstdc++): New target. + (all-libstdc++): Depend upon configure-libstdc++. + (configure-librx, all-librx): New targets. + (configure-newlib): New target. + (all-newlib): Depend upon configure-newlib + (configure-xiberty): New target. + (all-xiberty): Depend upon configure-xiberty. + +Sat Sep 30 04:32:59 1995 Jason Molenda (crash@phydeaux.cygnus.com) + + * configure.in (host i[345]86-*-win32): Expand the + noconfigdirs again. + +Thu Sep 28 21:18:49 1995 Stan Shebs <shebs@andros.cygnus.com> + + * mpw-configure: Fix sed command file name. + +Thu Sep 28 17:39:56 1995 steve chamberlain <sac@slash.cygnus.com> + + * configure.in (host i[345]86-*-win32): Reduce the + noconfigdirs again. + +Wed Sep 27 12:24:00 1995 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Don't configure ld and gdb for powerpc*-*-winnt* + or powerpc*-*-pe*, since they are not yet supported. + +Tue Sep 26 14:30:01 1995 Stan Shebs <shebs@andros.cygnus.com> + + Add PowerMac support and many other enhancements. + * mpw-configure: New option --cc to select compiler to use, + paste options set according to --cc into the generated + Makefile, generate the Makefile by sed'ing the Unix Makefile.in + if mpw-make.sed is present. + * mpw-config.in: Don't test for gC1, test for mpw-touch, + add forward includes for PowerPC include files. + * mpw-build.in: Build using Makefile.PPC if present. + (do-byacc, etc): Remove separate version resource builds. + (do-gas): Build "stamps" before "all". + (do-gcc): Build "stamps-h" and "stamps-c" before "all". + * mpw-README: Update to reflect --cc option, PowerMac support, + and recently-reported compatibility problems. + +Fri Sep 22 12:15:42 1995 Doug Evans <dje@deneb.cygnus.com> + + * cfg-ml-com.in (m68*-*-*): Only build multilibs for + embedded m68k systems (-aout, -coff, -elf, -vxworks). + (--with-multilib-top): Pass to recursive invocations. + +Tue Sep 19 13:51:05 1995 J.T. Conklin <jtc@blues.cygnus.com> + + * configure.in (noconfigdirs): Disable libg++ and libstdc++ on + v810-*-*. + +Mon Sep 18 23:08:26 1995 J.T. Conklin <jtc@rtl.cygnus.com> + + * configure.in (noconfigdirs): Disable bfd, binutils, gas, gcc, + gdb, ld and opcodes on v810-*-*. + +Sat Sep 16 18:31:08 PDT 1995 Angela Marie Thomas <angela@cygnus.com> + + * config/mh-ncrsvr43: Removed AR_FLAGS + +Tue Sep 12 18:03:31 1995 Ian Lance Taylor <ian@cygnus.com> + + * Makefile.in (DO_X): Change do-realclean to do-maintainer-clean. + (local-maintainer-clean): New target. + (maintainer-clean): New target. + (realclean): Just depend upon maintainer-clean. + +Fri Sep 8 17:11:14 1995 J.T. Conklin <jtc@rtl.cygnus.com> + + * configure.in (noconfigdirs): Disable gdb on m68k-*-netbsd*. + +Fri Sep 8 16:46:29 1995 Ian Lance Taylor <ian@cygnus.com> + + * configure.in: Build ld in mips*-*-bsd* case. + +Thu Sep 7 20:03:41 1995 Ken Raeburn <raeburn@cygnus.com> + + * config.sub: Accept -lites* OS. From Ian Dall. + +Fri Sep 1 08:06:58 1995 James G. Smith <jsmith@beauty.cygnus.com> + + * config.sub: recognise mips64vr4300 and mips64vr4300el as valid + targets. + +Wed Aug 30 21:06:50 1995 Jason Molenda (crash@phydeaux.cygnus.com) + + * configure.in: treat i386-win32 canadian cross the same as + i386-go32 canadian cross. + +Thu Aug 24 14:53:20 1995 Michael Meissner <meissner@tiktok.cygnus.com> + + * cfg-ml-com.in (powerpc*-*-eabisim): Add support for PowerPC + running under the simulator to build a reduced set of libraries. + (powerpc-*-eabiaix): Add fine grained multilib support added to + other powerpc targets yesterday. + +Wed Aug 23 09:41:56 1995 Michael Meissner <meissner@tiktok.cygnus.com> + + * cfg-ml-com.in (powerpc*): Add support for -disable-biendian, + -disable-softfloat, -disable-relocatable, -disable-aix, and + -disable-sysv to control which multilib libraries get built. + +Thu Aug 17 16:03:41 1995 Ken Raeburn <raeburn@kr-laptop.cygnus.com> + + * configure: Add Makefile.tem to list of files to remove in trap + handler. + +Mon Aug 14 19:27:56 1995 Per Bothner <bothner@kalessin.cygnus.com> + + * config.guess (*Linux*): Add missing "exit"s. + Also, need specific check for alpha-unknown-linux (uses COFF). + +Fri Aug 11 15:38:20 1995 Per Bothner <bothner@kalessin.cygnus.com> + + * config.guess: Merge with FSF: + + Wed Jun 28 17:57:27 1995 David Edelsohn <edelsohn@mhpcc.edu> + * config.guess (AIX4): More robust release numbering discovery. + + Thu Jun 22 19:01:24 1995 Kenneth Stailey (kstailey@eagle.dol-esa.gov) + * config.guess (i386-sequent-ptx): Properly get version number. + + Thu Jun 22 18:36:42 1995 Uwe Seimet (seimet@iris1.chemie.uni-kl.de) + * config.guess (mips:*:4*:UMIPS): New case. + +Mon Aug 7 09:21:35 1995 Doug Evans <dje@canuck.cygnus.com> + + * configure.in (i386-go32 host): Fix typo (deja-gnu -> dejagnu). + (i386-win32 host): Likewise. Don't build readline. + +Sat Aug 5 09:51:49 1995 Fred Fish <fnf@rtl.cygnus.com> + + * Makefile.in (GDBTK_SUPPORT_DIRS): Define and pass as part of + SUPPORT_FILES to submakes. + +Fri Aug 4 13:04:36 1995 Fred Fish <fnf@cygnus.com> + + * Makefile.in (GDB_SUPPORT_DIRS): Add utils. + (DEVO_SUPPORT): Add mpw-README, mpw-build.in, mpw-config.h and + mpw-configure. + +Wed Aug 2 16:32:40 1995 Ken Raeburn <raeburn@cygnus.com> + + * configure.in (appdirs): Use =, not ==, in test expression when + trying to build the text to print in the warning message for + Solaris users. + +Mon Jul 31 09:56:18 1995 steve chamberlain <sac@slash.cygnus.com> + + * cfg-ml-com.in (z8k-*-coff): Add 'std' multilib build. + +Fri Jul 28 00:16:31 1995 Jeffrey A. Law <law@rtl.cygnus.com> + + * config.guess: Recognize lynx-2.3. + +Thu Jul 27 15:47:59 1995 steve chamberlain <sac@slash.cygnus.com> + + * config.sub (z8ksim): Deleted + (z8k-*-coff): New, this is the one true name of the target. + +Thu Jul 27 14:33:33 1995 Doug Evans <dje@canuck.cygnus.com> + + * cfg-ml-pos.in (dotdot): Work around SunOS sed bug. + +Thu Jul 27 13:31:05 1995 Fred Fish (fnf@cygnus.com) + + * config.guess (*:Linux:*:*): First try asking the linker what the + default object file format is (elf, aout, or coff). Then if this + fails, try previous methods. + +Thu Jul 27 11:28:17 1995 J.T. Conklin <jtc@rtl.cygnus.com> + + * configure.in: Don't build newlib for *-*-vxworks5.1. + +Thu Jul 27 11:18:47 1995 Brendan Kehoe <brendan@lisa.cygnus.com> + + * configure.in: Don't build newlib for a29k-*-vxworks5.1. + * test-build.mk: Add setting of --with-headers for a29k-vxworks5.1. + +Tue Jul 25 21:25:39 1995 Doug Evans <dje@canuck.cygnus.com> + + * cfg-ml-pos.in (MULTITOP): Trim excess trailing "/.". + +Fri Jul 21 10:41:12 1995 Doug Evans <dje@canuck.cygnus.com> + + * cfg-ml-com.in: New file. + * cfg-ml-pos.in: New file. + +Wed Jul 19 00:37:27 1995 Jeffrey A. Law <law@rtl.cygnus.com> + + * COPYING.NEWLIB: Add HP free copyright to list. + +Tue Jul 18 10:58:51 1995 Michael Meissner <meissner@tiktok.cygnus.com> + + * config.sub: Recognize -eabi* for the system, not just -eabi. + +Mon Jul 3 13:44:51 1995 Steve Chamberlain <sac@slash.cygnus.com> + + * Makfile.in (DLLTOOL_FOR_TARGET): New name, pass it down. + * config.sub, configure.in (win32): New target and host. + +Wed Jun 28 23:57:08 1995 Steve Chamberlain <sac@slash.cygnus.com> + + * configure.in: Add i386-pe configuration. + +Fri Jun 23 14:28:44 1995 Stan Shebs <shebs@andros.cygnus.com> + + * mpw-build.in (install): Install GDB after LD. + +Thu Jun 22 17:10:53 1995 Stan Shebs <shebs@andros.cygnus.com> + + * mpw-config.in (elf/mips.h): Always forward-include, needed + for GDB to build. + +Wed Jun 21 15:17:30 1995 Rob Savoye <rob@darkstar.cygnus.com> + + * testsuite: New directory for customer acceptance and whole tool + chain tests. + +Wed Jun 21 16:50:29 1995 Ken Raeburn <raeburn@cujo.cygnus.com> + + * configure: If per-host line isn't found, but AC_OUTPUT is found + and a configure script exists, run it instead. + +Thu Jun 15 21:09:24 1995 Per Bothner <bothner@kalessin.cygnus.com> + + * config.guess: Update from FSF, for alpha-dec-winnt3.5 and Crays. + +Tue Jun 13 21:43:27 1995 Rob Savoye <rob@darkstar.cygnus.com> + + * configure: Set build_{cpu,vendor,os,alias} to host values when + --build isn't specified. + +Mon Jun 5 18:26:36 1995 Jason Merrill <jason@phydeaux.cygnus.com> + + * Makefile.in (PICFLAG, PICFLAG_FOR_TARGET): New macros. + (FLAGS_TO_PASS): Pass them. + (EXTRA_TARGET_FLAGS): Ditto. + + * config/m?-*pic: Define PICFLAG* instead of LIB*FLAGS*. + +Wed May 31 22:27:42 1995 Jim Wilson <wilson@chestnut.cygnus.com> + + * Makefile.in (all-libg++): Depend on all-libstdc++. + +Thu May 25 22:40:59 1995 J.T. Conklin <jtc@rtl.cygnus.com> + + * configure.in (noconfigdirs): Enable all packages for + i386-unknown-netbsd. + +Sat May 20 13:22:31 1995 Angela Marie Thomas <angela@cirdan.cygnus.com> + + * configure.in (noconfigdirs): Don't configure tk for i386-go32 + hosted builds (DOS builds) + +Thu May 18 18:08:49 1995 Ken Raeburn <raeburn@kr-laptop.cygnus.com> + + Changes for ARM based on patches from Richard Earnshaw: + * config.sub: Handle armeb and armel. + * configure.in: Omit arm linker only for riscix. + +Thu May 11 17:23:26 1995 Per Bothner <bothner@kalessin.cygnus.com> + + * config.guess: Update from FSF. + +Tue May 9 15:52:05 1995 Michael Meissner <meissner@cygnus.com> + + * config.sub: Recognize powerpcle as the little endian variant of + the PowerPC. Recgonize ppc as a PowerPC variant, and ppcle as a + powerpcle variant. Convert pentium into i586, not i486. Add p5 + alias for i586. Map new x86 variants p6, k5, nexgen into i586 + temporarily. + +Tue May 2 16:29:41 1995 Jeff Law (law@snake.cs.utah.edu) + + * configure.in (hppa*-*-lites*): Treat like hppa*-*-*elf*. + +Sun Apr 30 21:38:09 1995 Jeff Law (law@snake.cs.utah.edu) + + * config.sub: Accept -lites* as a basic system type. + +Thu Apr 27 11:33:29 1995 Michael Meissner (meissner@cygnus.com) + + * config.guess (*:Linux:*:*): Check for whether the pre-BFD linker is + installed, and if so return linuxoldld as the system name. + +Wed Apr 26 10:59:02 1995 Jeff Law (law@snake.cs.utah.edu) + + * config.guess: Add hppa1.1-hp-lites support. + +Tue Apr 25 11:08:11 1995 Rob Savoye <rob@darkstar.cygnus.com> + + * configure.in: Don't build newlib for m68k-vxworks5.1. + +Wed Apr 19 17:02:43 1995 Jim Wilson <wilson@chestnut.cygnus.com> + + * configure.in (mips-sgi-irix6): Use mh-irix5. + +Fri Apr 14 15:21:17 1995 Doug Evans <dje@chestnut.cygnus.com> + + * Makefile.in (all-gcc): Depend on all-ld (for libgcc1-test). + +Wed Apr 12 16:06:01 1995 Jason Merrill <jason@phydeaux.cygnus.com> + + * test-build.mk: Enable building of shared libraries on IRIX 5 and + OSF/1. Fix compiler flags. + * build-all.mk: Support Linux and OSF/1 3.0. Fix compiler flags. + +Tue Apr 11 18:55:40 1995 Doug Evans <dje@canuck.cygnus.com> + + * configure.in: Recognize --with-newlib. + (sparc-*-sunos4*): Build sim, dejagnu, expect, tcl if cross target. + +Mon Apr 10 14:38:20 1995 Jason Molenda (crash@phydeaux.cygnus.com) + + * Makefile.in: move {all,check,install}-gdb from *_MODULES + to *_X11_MODULES due to gdbtk needing X include files et al. + +Mon Apr 10 11:42:22 1995 Stan Shebs <shebs@andros.cygnus.com> + + Merge in support for Mac MPW as a host. + (Old change descriptions retained for informational value.) + + * mpw-config.in: Add generic include forwards for cpu-specific + include files in aout and elf directories. + + * mpw-configure: Added copyright. + * mpw-config.in: Check for presence of required build tools. + (target_libs): Add newlib. + (target_tools): Add examples. + (Read Me): Generate as "Read Me for MPW" instead. + * mpw-build.in: Base sub-builds on all-foo instead of do-foo. + (all-byacc, do-byacc, all-flex, do-flex, do-newlib): New actions. + (do-gas, do-gcc, do-gdb, do-ld): Build Version.r first. + + * mpw-configure: Remove subdir-specific makefile hackery, + delete mk.tmp after using it. + + * mpw-build.in (all): Display start and end times. + + * mpw-configure (host_canonical): Set. + (target_cpu): Always add to makefiles. + (ARCHDEFS, EMUL): Add to makefile only if nonempty. + (TM_FILE, XM_FILE, NM_FILE): No longer add to makefile. + (mpw-mh-mpw): Look for in srcdir and srcroot. + Use sed instead of mpw-edit-prefix to edit prefix definitions. + + * mpw-build.in: (install-only): New target. + + * mpw-configure (host_alias, target_alias): Rename from hostalias + and targetalias, add into generated Makefile. + (mk.tmp): If present, add into generated Makefile. + * mpw-build.in (all-gas): Build config.h first before gas proper. + + * mpw-configure (config.status): Write only if changed. + * mpw-config.in (readline): Configure it (not built, just used for + definitions). + + * mpw-config.in (elf/mips.h): Add a forward include. + + * mpw-config.in: Forward-include most .h files in include into + extra-include. + (readline): Don't build. + mpw-build.in (install): Install GDB. + + * mpw-configure (prefix, mpw_prefix): Handle it. + * mpw-config.in (mmalloc, readline): Don't configure. + * mpw-build.in (thisscript): Rename to ThisScript. + Use mpw-build instead of BuildProgram everywhere. + (mmalloc, readline): Don't build. + * mpw-README: New file, basic documentation about the MPW port. + + * mpw-config.in: Use forward-include to create include files. + + * mpw-configure: Add more things to the top of each configured + Makefile, including contents of config/mpw-mh-mpw. + * mpw-config.in (extra-include): Create this directory and fill it + with Posix-like include files when configuring. + + * config.sub (apple, mac, mpw): Add various aliases. + + * mpw-build.in: New file, top-level build script fragment for MPW. + * mpw-configure: New file, configure script for MPW. + * mpw-config.in: New file, config fragment for MPW. + +Fri Apr 7 19:33:16 1995 Jim Kingdon (kingdon@lioth.cygnus.com) + + * configure.in (host_libs): Remove glob, since it is gone from the + sources. + +Fri Mar 31 11:36:17 1995 Jason Molenda (crash@phydeaux.cygnus.com) + + * Makefile.in: define empty GDB_NLM_DEPS var. + + * configure.in(target_makefile_frag): use config/mt-netware + for netware targets. + +Thu Mar 30 13:51:43 1995 Ian Lance Taylor <ian@cygnus.com> + + * config.sub: Merge in recent FSF changes. Remove linux special + cases. + +Tue Mar 28 14:47:34 1995 Jason Molenda (crash@phydeaux.cygnus.com) + + build-all.mk,config/mh-solaris: revert these two changes: + + Tue Mar 30 10:03:09 1993 Ian Lance Taylor (ian@cygnus.com) + + * build-all.mk: Use CC=cc -Xs on Solaris. + + Mon Mar 29 19:59:26 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * config/mh-solaris: SunPRO C needs -Xs to be able to get a + working xmakefile for Emacs. + +Tue Mar 21 10:43:32 1995 Jim Kingdon (kingdon@lioth.cygnus.com) + + * glob/*: Removed. Schauer's 24 Feb 1994 readline change made us + stop using it. + * Makefile.in: Nuke all references to glob subdirectory. + +Thu Mar 16 13:35:30 1995 Jason Merrill <jason@phydeaux.cygnus.com> + + * configure.in: Fix --enable-shared logic in per-host. + +Mon Mar 13 12:33:15 1995 Ian Lance Taylor <ian@cygnus.com> + + * configure.in (*-hp-hpux[78]*): Use mh-hpux8. + +Mon Mar 6 10:21:58 1995 Jim Kingdon (kingdon@lioth.cygnus.com) + + * configure.in (noconfigdirs): Don't build gas on AIX, for + powerpc*-*-aix* as well as for rs6000*-*-aix*. + +Wed Mar 1 12:51:53 1995 Ian Lance Taylor <ian@cygnus.com> + + * configure: Fix --cache-file to work if the file argument is a + relative path. + +Tue Feb 28 17:36:07 1995 Ian Lance Taylor <ian@cygnus.com> + + * configure: If the --cache-file is used, pass it down to + configure in subdirectories. + +Mon Feb 27 12:52:46 1995 Kung Hsu <kung@mexican.cygnus.com> + + * config.sub: add vxworks29k configuration. + +Fri Feb 10 16:12:26 1995 Ken Raeburn <raeburn@cujo.cygnus.com> + + * Makefile.in (taz): Do "diststuff" part quietly. + +Sun Feb 5 14:16:35 1995 Doug Evans <dje@canuck.cygnus.com> + + * config.sub: Mini-merge with gcc/config.sub. + +Sat Feb 4 12:11:35 1995 Jim Wilson <wilson@chestnut.cygnus.com> + + * config.guess (IRIX): Sed - to _. + +Fri Feb 3 11:54:42 1995 J.T. Conklin <jtc@rtl.cygnus.com> + + * Makefile.in (source-vault, binary-vault): New targets. + +Thu Jan 26 13:00:11 1995 Michael Meissner <meissner@cygnus.com> + + * config.sub: Recognize -eabi as a basic system type. + +Thu Jan 12 13:13:23 1995 Jason Merrill <jason@phydeaux.cygnus.com> + + * configure.in (enable_shared stuff): Fix typo. + +Thu Jan 12 01:36:51 1995 deanm@medulla.LABS.TEK.COM (Dean Messing) + + * Makefile.in (BASE_FLAGS_TO_PASS): Fix typo in passing LIBCXXFLAGS*. + +Wed Jan 11 16:29:53 1995 Jason Merrill <jason@phydeaux.cygnus.com> + + * Makefile.in (LIBCXXFLAGS_FOR_TARGET): Add -fno-implicit-templates. + +Mon Jan 9 12:48:01 1995 Jim Kingdon <kingdon@lioth.cygnus.com> + + * configure.in (rs6000-*-*): Don't build gas. + +Wed Jan 4 23:53:49 1995 Ian Lance Taylor <ian@tweedledumb.cygnus.com> + + * Makefile.in: Use /x/x/ instead of /brokensed/brokensed/, to + reduce command line length. + (AS_FOR_TARGET): Check for as.new, not Makefile. + (NM_FOR_TARGET): Check for nm.new, not Makefile. + +Wed Jan 4 13:02:39 1995 Per Bothner <bothner@kalessin.cygnus.com> + + * config.guess: Merge from FSF. + +Thu Dec 15 17:11:37 1994 Ian Lance Taylor <ian@sanguine.cygnus.com> + + * configure: Don't use $ when handling program_suffix. + +Mon Dec 12 12:09:37 1994 Stu Grossman (grossman@cygnus.com) + + * configure.in: Configure tk for hppa/hpux. + +Fri Dec 2 15:55:38 1994 Per Bothner <bothner@kalessin.cygnus.com> + + * Makefile.in (LIBGXX_SUPPORT_DIRS): Add libstdc++. + +Tue Nov 29 19:37:56 1994 Per Bothner <bothner@kalessin.cygnus.com> + + * Makefile.in: Move -fno-implicit-template from CXXFLAGS + to LIBCXXFLAGS. Tests are better run without it. + +Wed Nov 23 10:29:25 1994 Brendan Kehoe (brendan@lisa.cygnus.com) + + * Makefile.in (all-ispell): Depend on all-emacs19 instead of all-emacs. + +Mon Nov 21 11:14:01 1994 J.T. Conklin <jtc@rtl.cygnus.com> + + * configure.in (*-*-netware*): Don't configure xiberty. + +Mon Nov 14 08:49:15 1994 Stu Grossman (grossman@cygnus.com) + + * configure.in: Remove tk from native_only list. + +Fri Nov 11 15:31:26 1994 Bill Cox (bill@rtl.cygnus.com) + + * build-all.mk: Add mips-ncd-elf target to sun4 targets + for special NCD build. + +Mon Nov 7 20:58:17 1994 Ken Raeburn <raeburn@cujo.cygnus.com> + + * Makefile.in (DEVO_SUPPORT): Remove configure.bat and + makeall.bat, they're only useful for binutils snapshots. + (binutils.tar.gz, gas+binutils.tar.gz): Add configure.bat and + makeall.bat to specified SUPPORT_FILES. + +Mon Nov 7 17:25:18 1994 Bill Cox (bill@cirdan.cygnus.com) + + * build-all.mk: Add Ericsson targets to sun4 and solaris + hosts. Add BNR's sun4 target to solaris host, so their + build-from-source will be tested in-house first. + +Sat Nov 5 18:43:30 1994 Jason Merrill (jason@phydeaux.cygnus.com) + + * Makefile.in (LIBCFLAGS): New variable. + (CFLAGS_FOR_TARGET): Ditto. + (LIBCFLAGS_FOR_TARGET): Ditto. + (LIBCXXFLAGS): Ditto. + (CXXFLAGS_FOR_TARGET): Ditto. + (LIBCXXFLAGS_FOR_TARGET): Ditto. + (BASE_FLAGS_TO_PASS): Pass them. + (EXTRA_TARGET_FLAGS): Ditto. + + * configure.in, config/m[th]-*pic: Support --enable-shared. + +Sat Nov 5 15:44:00 1994 Per Bothner <bothner@kalessin.cygnus.com> + + * configure.in (target_libs): Include libstdc++ again. + * config.guess: Update from FSF (for FreeBSD). + +Thu Nov 3 16:32:30 1994 Ken Raeburn <raeburn@cujo.cygnus.com> + + * Makefile.in (DEVO_SUPPORT): Include configure.bat and + makeall.bat. + (DISTDOCDIRS): Add `etc'. + (ETC_SUPPORT_PFX): New variable. + (taz): Include anything from etc starting with a word in + ETC_SUPPORT_PFX. + +Wed Oct 26 16:19:35 1994 Ian Lance Taylor <ian@sanguine.cygnus.com> + + * config.sub: Update for recent FSF changes. Remove obsolete + h8300hds entry. Add -windows* and -osx as basic os. Minor + spacing changes. + +Thu Oct 20 18:41:56 1994 Per Bothner <bothner@kalessin.cygnus.com> + + * configure.in (target_libs): Remove libstdc++ for libg++-2.6.1. + + * config.guess: Merge with FSF. + * configure.in: Match on i?86-ncr-sysv4.3, not i?86-ncr-sysv43. + +Thu Oct 20 19:26:56 1994 Ken Raeburn <raeburn@cujo.cygnus.com> + + * configure: Since the "trap 0" handler will override the exit + status on many systems, only use it for "exit 1", and make it set + a non-zero exit status; reset it before "exit 0". Also, check + exit status of config.sub, and error out if it failed. + +Wed Oct 19 18:49:55 1994 Rob Savoye (rob@cygnus.com) + + * Makefile.in: (ALL_TARGET_MODULES,INSTALL_TARGET_MODULES) Build + and install libgloss. + +Tue Oct 18 15:25:24 1994 Ian Lance Taylor <ian@sanguine.cygnus.com> + + * Makefile.in (all-binutils): Depend upon all-byacc. + + * configure.in: Don't build emacs on Irix 5. + +Mon Oct 17 16:22:12 1994 J.T. Conklin (jtc@phishhead.cygnus.com) + + * configure.in (*-*-netware*): Add libio. + +Thu Oct 13 15:51:20 1994 Jason Merrill (jason@phydeaux.cygnus.com) + + * Makefile.in (ALL_TARGET_MODULES): Add libstdc++. + (CHECK_TARGET_MODULES): Ditto. + (INSTALL_TARGET_MODULES): Ditto. + (TARGET_LIBS): Ditto. + (all-libstdc++): Note dependencies. + +Thu Oct 13 01:43:08 1994 Ken Raeburn <raeburn@cujo.cygnus.com> + + * Makefile.in (BINUTILS_SUPPORT_DIRS): Add gas. + +Tue Oct 11 12:12:29 1994 Jason Merrill (jason@phydeaux.cygnus.com) + + * Makefile.in (CXXFLAGS): Use -fno-implicit-templates instead of + -fexternal-templates. + + * configure.in (target_libs): Add libstdc++. + (noconfigdirs): Add libstdc++ as appropriate. + +Thu Oct 6 18:00:54 1994 Per Bothner (bothner@kalessin.cygnus.com) + + * config.guess: Update from FSF. + +Tue Oct 4 12:05:42 1994 Ian Lance Taylor <ian@sanguine.cygnus.com> + + * configure: Use ${config_shell} when running ${configsub}. + +Mon Oct 3 14:28:34 1994 Doug Evans <dje@canuck.cygnus.com> + + * config.sub: No longer recognize h8300h. + +Mon Oct 3 12:40:54 1994 Ian Lance Taylor <ian@sanguine.cygnus.com> + + * config.sub: Remove extraneous differences between config.sub and + gcc/config.sub. + +Sat Oct 1 00:23:12 1994 Ken Raeburn <raeburn@cujo.cygnus.com> + + * Makefile.in (DISTSTUFFDIRS): Add gas. + +Thu Sep 22 19:04:55 1994 Doug Evans (dje@canuck.cygnus.com) + + * COPYING.NEWLIB: New file. + +Mon Sep 19 18:25:40 1994 Per Bothner (bothner@kalessin.cygnus.com) + + * config.guess (HP-UX): Patch from Harlan Stenn + <harlan@landmark.com> to also emit release level. + +Wed Sep 7 13:15:25 1994 Jim Wilson (wilson@sphagnum.cygnus.com) + + * config.guess (sun4*:SunOS:*:*): Change '-JL' to '_JL'. + +Tue Sep 6 23:23:18 1994 Per Bothner (bothner@kalessin.cygnus.com) + + * config.sub: Merge nextstep cleanup from FSF. + +Mon Sep 5 05:01:30 1994 Ken Raeburn (raeburn@kr-pc.cygnus.com) + + * configure.in (arm-*-*): Don't configure ld for this target. + +Thu Sep 1 09:35:00 1994 J.T. Conklin (jtc@phishhead.cygnus.com) + + * configure.in (*-*-netware): don't configure libg++, libio, + librx, or newlib. + +Wed Aug 31 13:52:08 1994 Ian Lance Taylor (ian@sanguine.cygnus.com) + + * configure.in (alpha-dec-osf*): Use osf*, not osf1*. Don't + configure ld--it works, but it doesn't support shared libraries. + +Sun Aug 28 18:13:45 1994 Per Bothner (bothner@kalessin.cygnus.com) + + * config.guess (*-unknown-freebsd*): Get rid of possible + trailing "(Release)" in version string. + Patch from Paul Richards <paul@isl.cf.ac.uk>. + +Sat Aug 27 15:00:49 1994 Per Bothner (bothner@kalessin.cygnus.com) + + * config.guess: Fix i486-ncr-sysv43 -> i486-ncr-sysv4.3. + Fix type: *-next-neststep -> *-next-nextstep. + + * config.guess: Merge from FSF: + + Fri Aug 26 18:45:25 1994 Philippe De Muyter (phdm@info.ucl.ac.be) + + * config.guess: Recognize powerpc-ibm-aix3.2.5. + + Wed Apr 20 06:36:32 1994 Philippe De Muyter (phdm@info.ucl.ac.be) + + * config.guess: Recognize UnixWare 1.1 (UNAME_SYSTEM is SYSTEM_V + instead of UNIX_SV for UnixWare 1.0). + +Sat Aug 27 01:56:30 1994 Stu Grossman (grossman@cygnus.com) + + * Makefile.in (all-gdb): Add dependencies on all-gcc and all-ld + to make gdb/nlm/* build after the compiler and linker. + +Fri Aug 26 14:30:05 1994 Per Bothner (bothner@kalessin.cygnus.com) + + * config.guess (netbsd, freebsd, linux): Accept any machine, + not just i[34]86. + (m68k-atari-sysv4): Relocate to match FSF version. + + * config.guess: More merges from the FSF: + + Add a space before function call or macro invocation. + + Tue May 10 16:53:55 1994 Roland McGrath (roland@churchy.gnu.ai.mit.edu) + + * config.guess: Add trap cmd to remove dummy.c and dummy when + interrupted. + + Wed Apr 20 18:07:13 1994 Roland McGrath (roland@churchy.gnu.ai.mit.edu) + + * config.guess (dummy.c): Redirect stderr for `hostinfo' command. + (dummy): Redirect stderr from compilation of dummy.c. + + Sat Apr 9 14:59:28 1994 Christian Kranz (kranz@sent5.uni-duisburg.de) + + * config.guess: Distinguish between NeXTStep 2.1 and 3.x. + +Fri Aug 26 13:42:20 1994 Ken Raeburn (raeburn@kr-laptop.cygnus.com) + + * configure: Accept and ignore --cache*, for compatibility with + new autoconf. + +Fri Aug 26 13:05:27 1994 Per Bothner (bothner@kalessin.cygnus.com) + + * config.guess: Merge from FSF: + + Thu Aug 25 20:28:51 1994 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * config.guess (Pyramid*:OSx*:*:*): New case. + (PATH): Add /.attbin at end for finding uname. + (dummy.c): Handle i860-alliant-bsd. Follow whitespace conventions. + + Wed Aug 17 18:21:02 1994 Tor Egge (tegge@pvv.unit.no) + + * config.guess (M88*:DolphinOS:*:*): New case. + + Thu Aug 11 17:00:13 1994 Stan Cox (coxs@dg-rtp.dg.com) + + * config.guess (AViiON:dgux:*:*): Use TARGET_BINARY_INTERFACE + to select whether to use ELF or COFF. + + Sun Jul 24 16:20:53 1994 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * config.guess: Recognize i860-stardent-sysv and i860-unknown-sysv. + + Sun May 1 10:23:10 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * config.guess: Guess the OS version for HPUX. + + Tue Mar 1 21:53:03 1994 Karl Heuer (kwzh@hal.gnu.ai.mit.edu) + + * config.guess (UNAME_VERSION): Recognize aix3.2.4 and aix3.2.5. + +Fri Aug 26 11:19:08 1994 Ian Lance Taylor (ian@sanguine.cygnus.com) + + * configure.in: Recognize --with-headers, --with-libs, and + --without-newlib. + * Makefile.in (all-xiberty): Depend upon all-ld. + +Wed Aug 24 12:36:50 1994 Ian Lance Taylor (ian@sanguine.cygnus.com) + + * configure.in: Change i[34]86 to i[345]86. + +Mon Aug 22 10:58:33 1994 Ian Lance Taylor (ian@sanguine.cygnus.com) + + * configure (version): A few more tweaks to help message. + +Fri Aug 19 12:40:25 1994 Per Bothner (bothner@kalessin.cygnus.com) + + * Makefile.in: Remove (for now) librx as a host library, + now that we're building it for target. + +Fri Aug 19 10:49:17 1994 Ian Lance Taylor (ian@sanguine.cygnus.com) + + * configure: Fix up help message; from karl@owl.hq.ileaf.com + (Karl Berry). + +Tue Aug 16 16:11:08 1994 Per Bothner (bothner@kalessin.cygnus.com) + + * configure.in: Also configure librx. + +Mon Aug 15 16:51:45 1994 Per Bothner (bothner@kalessin.cygnus.com) + + * Makefile.in: Update various rules to reflect that librx + is now needed for libg++. + +Fri Aug 12 18:07:21 1994 Ian Lance Taylor (ian@sanguine.cygnus.com) + + * config.sub: Accept mips64orion and mips64orionel as a CPU name. + +Mon Aug 8 11:36:17 1994 Stan Shebs (shebs@andros.cygnus.com) + + * configure.in: Configure the examples directory. + +Thu Aug 4 16:12:36 1994 Ian Lance Taylor (ian@sanguine.cygnus.com) + + * configure: Simplify Jun 2 1994 change. + +Wed Aug 3 04:58:16 1994 D. V. Henkel-Wallace (gumby@cygnus.com) + + * change CC to /usr/latest/bin/gcc for lynx host builds, since + /bin/gcc isn't good enough to build gcc. + +Wed Jul 27 09:07:14 1994 Fred Fish (fnf@cygnus.com) + + * Makefile.in (GDB_SUPPORT_FILES): Remove + (setup-dirs-gdb, gdb.tar.gz, make-gdb.tar.gz): Remove old rules. + (gdb.tar.gz): Add new rule to use standard distribution building + mechanism. + +Mon Jul 25 11:10:06 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com) + + * configure.in: Warn about use of /usr/ucb/cc on Solaris. From + Bill Cox <bill@cygnus.com>. + +Sat Jul 23 12:19:46 1994 Per Bothner (bothner@kalessin.cygnus.com) + + * config.guess: Recognize ISC. Patch from kwzh@gnu.ai.mit.edu. + +Fri Jul 22 17:53:59 1994 Stu Grossman (grossman@cygnus.com) + + * configure: Search current dir first in .gdbinit. + +Fri Jul 22 11:28:30 1994 Per Bothner (bothner@kalessin.cygnus.com) + + * config.sub: Recognize freebsd (merged from gcc config.sub). + +Thu Jul 21 14:10:52 1994 Per Bothner (bothner@kalessin.cygnus.com) + + * config.sub: Refer to NeXT's operating system as nextstep. + + * config.sub (case $basic_machine): Re-order the cases, to match + the order in the FSF version (which is mostly alphabethical). + Merge in some additions and changes from the FSF. + +Sat Jul 16 12:03:08 1994 Stan Shebs (shebs@andros.cygnus.com) + + * config.guess: Recognize m68k-atari-sysv4 and m88k-harris-csux7. + * config.sub: Recognize cxux7. + * configure.in: Use mh-cxux for m88k-harris-cxux*. + +Mon Jul 11 14:37:39 1994 Per Bothner (bothner@kalessin.cygnus.com) + + * config.sub: Fix typo powerpc -> powerpc-*. + +Sat Jul 9 13:03:43 1994 Michael Tiemann (tiemann@blues.cygnus.com) + + * Makefile.in: `all-emacs19' depends on `all-byacc'. + + * Makefile.in: Add all-emacs19 and install-emacs19 rules (in + parallel with all-emacs and install-emacs). Top-level command + `make all-emacs19 CC=gcc' now behaves as `make all-emacs CC=gcc'. + +Thu Jun 30 16:53:42 1994 Ian Lance Taylor (ian@sanguine.cygnus.com) + + * test-build.mk ($(host)-stamp-stage2-installed): Remove + $(relbindir)/make before doing ``make install'', and use + $(GNU_MAKE) while doing it. Avoids problem on SunOS with + installing over running make binary. + ($(host)-stamp-stage3-installed): Likewise. + +Tue Jun 28 13:43:25 1994 Jim Kingdon (kingdon@lioth.cygnus.com) + + * config.guess: Recognize Mach. + +Mon Jun 27 16:41:14 1994 Ian Lance Taylor (ian@sanguine.cygnus.com) + + * configure: Check ${exec_prefixoption}, not ${exec_prefix}, to + see whether --exec-prefix was used. + +Sun Jun 26 21:15:54 1994 Per Bothner (bothner@kalessin.cygnus.com) + + * README: Explicitly mention libg++/README. (Zoo's idea.) + +Tue Jun 21 12:45:55 1994 Jim Kingdon (kingdon@lioth.cygnus.com) + + * Makefile.in: Add all-librx target similar to all-libproc. + +Wed Jun 8 23:11:55 1994 Stu Grossman (grossman@cygnus.com) + + * config.guess: Rearrange tests for Alpha-OSF1 to properly deal + with post 1.2 uname bogosity. + +Thu Jun 9 00:27:59 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com) + + * configure: Remove temporary files on receipt of a signal. + +Tue Jun 7 12:06:24 1994 Ian Lance Taylor (ian@cygnus.com) + + * configure: If there is a package_makefile_frag, remove + ${subdir}/Makefile.tem after copying it in. + +Mon Jun 6 21:35:02 1994 D. V. Henkel-Wallace (gumby@cygnus.com) + + * build_all.mk: support rs6000 lynx identifies itself as + rs6000-lynx-lynxos2.2.2. Also, use /usr/cygnus/progressive/bin/gcc + since /bin/gcc is too feeble to compile a modern gcc. + +Mon Jun 6 16:06:34 1994 Karen Christiansen (karen@cirdan.cygnus.com) + + * brought devo/test-build.mk update-to-date with progressive/ + test-build.mk. Add lynx targets and hppa flag info. + +Sat Jun 4 17:23:54 1994 Per Bothner (bothner@kalessin.cygnus.com) + + * configure.in: Use mh-ncrsvr43. Patch from + Tom McConnell <tmcconne@sedona.intel.com>. + +Fri Jun 3 17:47:24 1994 Per Bothner (bothner@kalessin.cygnus.com) + + * config.guess (i386-unknown-bsdi): No longer need to + check #if defined(__bsdi__) && defined(__i386__). + +Thu Jun 2 18:56:46 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com) + + * configure: Set program_transform_nameoption correctly. + +Thu Jun 2 10:57:06 1994 Karen Christiansen (karen@cirdan.cygnus.com) + + * brought build-all.mk update-to-date with progressive build-all.mk, + added new targets and hppa info. + +Thu Jun 2 00:12:44 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com) + + * configure: If config.guess result is a prefix of the user + specified target, assume a native build and use the user specified + target as the host alias. Remove SunOS patch suffix removal hack. + * configure.in: Remove SunOS patch suffix removal hack. + + * Makefile.in (CROSS_CHECK_MODULES): Remove check-flex, since it's + in NATIVE_CHECK_MODULES. + +Wed Jun 1 10:49:41 1994 Bill Cox (bill@rtl.cygnus.com) + + * Makefile.in: Rename HOST_ONLY to NATIVE. + * configure: Delete SunOs patch suffix from host_canonical + and build_canonical variables that are prepended to Makefiles. + * configure.in: Add comments for easier maintenance. + +Tue May 31 19:39:47 1994 Jim Kingdon (kingdon@lioth.cygnus.com) + + * Makefile.in: Add all-libproc target similar to all-gui. + +Tue May 31 17:16:33 1994 Tom Lord (lord@cygnus.com) + + * Makefile.in (CHECK_MODULES): split into + HOST_ONLY_CHECK_MODULES and CROSS_CHECK_MODULES. + +Tue May 31 16:36:36 1994 Paul Eggert (eggert@twinsun.com) + + * config.guess (i386-unknown-bsdi): New system to guess. + +Wed May 25 16:47:10 1994 Jim Kingdon (kingdon@lioth.cygnus.com) + + * Makefile.in: Add all-gui target (but not yet build by "all"). + +Thu May 26 08:53:19 1994 Bill Cox (bill@rtl.cygnus.com) + + * config.sub: Move deletion of patch suffix from here... + * configure.in: To here, at Ian's suggestion. The top- + level scripts might need to know of a patch level. + +Wed May 25 09:15:54 1994 Bill Cox (bill@rtl.cygnus.com) + + * config.sub: Strip off patch suffix so rtl is recognized + as a sunos4.1.3 machine, even though it's been patched. + +Fri May 20 08:25:49 1994 Steve Chamberlain (sac@deneb.cygnus.com) + + * Makefile.in (INSTALL_LAST): Delete. + (INSTALL_DOSREL): New. + +Thu May 19 17:12:12 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com) + + * configure.in: Use ld for i[34]86-*-sysv4* and sparc-*-solaris2*. + Don't set use_gnu_ld to no for *-*-sysv4; that only controls + whether we pass down --with-gnu-ld anyhow. + +Thu May 19 09:29:12 1994 Steve Chamberlain (sac@cygnus.com) + + * Makefile.in (INSTALL_LAST): Change operation so it works + on more flavors of make. + * configure.in (go32): Don't build libg++ or libio. + +Fri May 13 13:28:34 1994 Steve Chamberlain (sac@cygnus.com) + + * Makefile.in (Move HOST_PREFIX_1 and friends up so + they can be overriden by templates. + +Sat May 7 16:46:44 1994 Steve Chamberlain (sac@cygnus.com) + + * configure.in (target==go32): Don't build gdb. + * dosrel: New directory. + +Fri May 6 14:19:25 1994 Steve Chamberlain (sac@cygnus.com) + + * configure.in (host==go32): Configure dosrel too. + * Makefile.in (INTALL_TARGET): Call INSTALL_LAST last. + (HOST_CC, HOST_PREFIX, HOST_PREFIX_1): Undefine, they should + be set by incoming names or templates. + (INSTALL_LAST): New rule. + * config/mh-go32: New fragment. + +Thu May 5 17:35:05 1994 Stan Shebs (shebs@andros.cygnus.com) + + * config.sub (sparclitefrw, sparclitefrwcompat): Don't set the os. + +Thu May 5 20:06:45 1994 Ken Raeburn (raeburn@cujo.cygnus.com) + + * config/mh-lynxrs6k: Renamed from mh-lynxosrs6k, to make it + unique in 8.3 naming schemes. + * configure.in (appdirs): New variable. Currently empty, but will + be used in gas distribution. If nonempty, lists a set of + directories at least one of which must get configured, or top + level configuration is considered to have failed. + (rs6000-*-lynxos*): Use new file name. + +Thu May 5 13:38:36 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com) + + Eliminate XTRAFLAGS. + * Makefile.in (CC_FOR_TARGET): If newlib exists, refer to the + newlib include files using -idirafter, and also use -nostdinc. + (CXX_FOR_TARGET): Likewise. + (XTRAFLAGS): Removed. + (BASE_FLAGS_TO_PASS): Remove XTRAFLAGS_FOR_TARGET. + (EXTRA_HOST_FLAGS): Remove XTRAFLAGS. + (EXTRA_TARGET_FLAGS, EXTRA_GCC_FLAGS): Likewise. + ($(DO_X)): Don't pass down XTRAFLAGS. + +Thu May 5 00:16:36 1994 Ken Raeburn (raeburn@kr-pc.cygnus.com) + + * configure.in (mips*-dec-bsd*): New target; do build linker. + (mips*-*-bsd*): New target; don't build linker. + +Wed May 4 20:10:10 1994 D. V. Henkel-Wallace (gumby@cygnus.com) + + * configure.in: support rs6000-*-lynxos* configuration. + support sunos4 as a cross target. + + * config.sub: look for lynx*, not lynx since the OS version may + legitimately be part of the name. + +Tue May 3 21:48:11 1994 Ken Raeburn (raeburn@cujo.cygnus.com) + + * configure.in (i[34]86-*-sco*): Move to be with other i386 + targets. + (romp-*-*): New target. Skip various binary utilities. + (vax-*-*): New target. Don't build newlib. + (vax-*-vms): Renamed from *-*-vms. Don't build opcodes or newlib. + +Thu Apr 28 15:03:05 1994 David J. Mackenzie (djm@rtl.cygnus.com) + + * configure.in: Only set host_makefile_frag if config + directory exists. + +Wed Apr 27 12:14:30 1994 David J. Mackenzie (djm@rtl.cygnus.com) + + * install.sh: If $dstdir exists, don't check whether each + component does. + +Tue Apr 26 18:11:33 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com) + + * test-build.mk (HOLES): Add sleep; used by rcs/src/conf.sh. + +Mon Apr 25 15:06:34 1994 Stan Shebs (shebs@andros.cygnus.com) + + * configure.in (*-*-lynxos*): Don't configure newlib for either + native or cross Lynx. + +Sat Apr 16 11:58:16 1994 Doug Evans (dje@canuck.cygnus.com) + + * config.sub (sparc64-elf): Fix os. + (z8k): Remove duplicate. + +Thu Apr 14 23:33:17 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com) + + * Makefile.in (gcc-no-fixedincludes): Touch gcc/include/fixed, not + gcc/stmp-fixproto, to try to prevent fixproto from being run. + +Wed Apr 13 15:14:52 1994 Bill Cox (bill@cygnus.com) + + * configure: Make file links cleanly even if Lynx fails on + an NFS symlink (at least fail cleanly). + +Mon Apr 11 10:58:56 1994 Jim Wilson (wilson@sphagnum.cygnus.com) + + * test-build.mk (CC): For mips-sgi-irix4, change -XNh1500 to + -XNh2000. + +Sat Apr 9 15:10:45 1994 David J. Mackenzie (djm@rtl.cygnus.com) + + * configure: Unknown options are fatal again. + +Fri Apr 8 12:01:41 1994 David J. Mackenzie (djm@cygnus.com) + + * configure: Ignore --x-includes and --x-libraries, for Autoconf + compatibility. + +Thu Apr 7 17:31:43 1994 Doug Evans (dje@canuck.cygnus.com) + + * build-all.mk: Add `clean' target. + +Wed Apr 6 20:44:56 1994 Peter Schauer (pes@regent.e-technik.tu-muenchen.de) + + * config.guess: Add SINIX support. + * configure.in: Add mips-*-sysv4* support. + +Mon Apr 4 17:41:44 1994 Doug Evans (dje@canuck.cygnus.com) + + * build-all.mk: Document all useful targets. + If canonhost is sparc-sun-solaris2.3, change it to sparc-sun-solaris2. + If canonhost is mips-sgi-irix4.0.5H, change it to mips-sgi-irix4. + +Thu Mar 31 04:55:57 1994 David J. Mackenzie (djm@rtl.cygnus.com) + + * configure: Support --silent, --quiet. + +Wed Mar 30 21:37:38 1994 David J. Mackenzie (djm@rtl.cygnus.com) + + * configure: Support --disable-FEATURE. + +Tue Mar 29 19:15:05 1994 Jim Kingdon (kingdon@lioth.cygnus.com) + + * config.guess: Recognize NCR running SVR4.3. + +Mon Mar 28 14:55:15 1994 Per Bothner (bothner@kalessin.cygnus.com) + + * config.guess: Make BSDI generate i386-unknown-bsd386. + Patch from Paul Eggert <eggert@twinsun.com>. + +Mon Mar 28 12:54:52 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com) + + * configure.in (powerpc-*-aix*): Treat like rs6000-*-*. + +Sat Mar 26 11:25:48 1994 David J. Mackenzie (djm@rtl.cygnus.com) + + * configure: Make unrecognized options give nonfatal warnings + instead of fatal errors, and pass them to any subdirectory + configures in case they recognize them. + Make --x equivalent to --with-x. + +Fri Mar 25 21:52:10 1994 David J. Mackenzie (djm@rtl.cygnus.com) + + * configure: Add --enable-* options. Clean up usage message and + some comments. + +Thu Mar 24 09:12:53 1994 Doug Evans (dje@canuck.cygnus.com) + + * Makefile.in (NM_FOR_TARGET): Build tree version is now nm.new. + +Sun Mar 20 11:28:22 1994 Jeffrey A. Law (law@snake.cs.utah.edu) + + * configure.in (hppa*-*-*): Enable binutils. + +Sat Mar 19 11:50:16 1994 Jim Kingdon (kingdon@lioth.cygnus.com) + + * config.sub: Recognize cisco. + +Fri Mar 18 16:42:32 1994 Jason Merrill (jason@deneb.cygnus.com) + + * Makefile.in (CXXFLAGS): Add -fexternal-templates. + +Tue Mar 15 11:25:55 1994 Jim Kingdon (kingdon@lioth.cygnus.com) + + * config.guess: about target *-hitachi-hiuxwe2, don't print more + than one configuration name. Add comment. + +Sun Mar 6 23:13:38 1994 Hisashi MINAMINO (minamino@sra.co.jp) + + * config.guess: about target *-hitachi-hiuxwe2, fixed + machine guessing order. [Hitachi's CPU_IS_HP_MC68K + macro is incorrect.] + +Sun Mar 13 09:10:08 1994 Jim Kingdon (kingdon@lioth.cygnus.com) + + * Makefile.in (TAGS): Just build TAGS in each subdirectory, rather + than the "make ls" stuff which used to be here. + +Fri Mar 11 12:52:39 1994 Per Bothner (bothner@kalessin.cygnus.com) + + * config.guess: Recognize i[34]86-unknown-freebsd. + From Shawn M Carey <smcarey@rodan.syr.edu>. + +Thu Mar 3 14:24:21 1994 Per Bothner (bothner@kalessin.cygnus.com) + + * configure.in (noconfigdirs for alpha): Remove libg++ and libio. + +Wed Mar 2 13:28:48 1994 Jim Kingdon (kingdon@deneb.cygnus.com) + + * config.guess: Check for ptx. + +Mon Feb 28 16:46:50 1994 Kung Hsu (kung@mexican.cygnus.com) + + * config.sub: Add os9k checking. + +Thu Feb 24 07:09:04 1994 Jeffrey A. Law (law@snake.cs.utah.edu) + + * config.guess: Handle OSF1 running on HPPA processors + +Fri Feb 18 14:14:00 1994 Ken Raeburn (raeburn@rtl.cygnus.com) + + * configure: If subdir configure fails, print out a message with + subdirectory name, in case subdir's configure code didn't identify + itself. + +Fri Feb 18 12:50:15 1994 Doug Evans (dje@cygnus.com) + + * configure.in: Remove embedded newlines from configdirs. + Avoid mismatches of substrings. Fix matching strings at end + of configdirs. + +Fri Feb 11 15:33:33 1994 Stu Grossman (grossman at cygnus.com) + + * config.guess: Add Lynx/rs6000 config support. + +Tue Feb 8 13:41:09 1994 Ken Raeburn (raeburn@rtl.cygnus.com) + + * configure.in (alpha-dec-osf1*, alpha*-*-*): Build gas. + +Mon Feb 7 15:42:36 1994 Jeffrey A. Law (law@cygnus.com) + + * configure.in (hppa*-*-osf*): Treat this just like most other + PA configurations (eg no binutils or ld). + (hppa*-*-*elf*): These configurations have binutils and ld. + +Sun Feb 6 16:35:07 1994 Jeffrey A. Law (law@snake.cs.utah.edu) + + * config.sub (hiux): Fix typo. From m-kasahr@sramhc.sra.co.JP. + +Sat Feb 5 01:00:33 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com) + + * configure.in (rs6000-*-*): Build gas. + +Wed Feb 2 13:57:57 1994 Jeffrey A. Law (law@snake.cs.utah.edu) + + * Makefile.in: Avoid bug in losing hpux sed. + +Wed Feb 2 14:53:05 1994 Jim Kingdon (kingdon@lioth.cygnus.com) + + * Makefile.in, test-build.mk: Remove MUNCH_NM; it was only needed + for GDB and GDB has been fixed to not need it. + +Mon Jan 31 18:40:55 1994 Stu Grossman (grossman at cygnus.com) + + * config/mh-lynxosrs6k: Account for lack of ranlib! + +Sun Jan 30 17:58:06 1994 Ken Raeburn (raeburn@cujo.cygnus.com) + + * config.guess: Recognize vax hosts. + +Fri Jan 28 15:29:38 1994 Ken Raeburn (raeburn@cujo.cygnus.com) + + * configure (while loop): Don't use "break 2" inside case + statement -- the case statement isn't an enclosing loop. + +Mon Jan 24 18:40:06 1994 Per Bothner (bothner@kalessin.cygnus.com) + + * config.guess: Clean up NeXT support, to allow nextstep + on Intel machines. Make OS be nextstep. + +Sun Jan 23 18:47:22 1994 Richard Kenner (kenner@vlsi1.ultra.nyu.edu) + + * config.guess: Add alternate forms for Convex. + +Thu Jan 20 16:13:41 1994 Stu Grossman (grossman at cygnus.com) + + * configure: Completely rewrite option processing. Take + advantage of pattern-matching to avoid invoking test frequently. + Also clean up host and target defaulting logic. + +Mon Jan 17 15:06:56 1994 Ken Raeburn (raeburn@cujo.cygnus.com) + + * Makefile.in: Replace all occurrances of "rootme" with "r" and + "$${rootme}" with "$$r", to increase the likelihood that the do-* + commands (plus user environment) will fit SCO limits. + +Thu Jan 6 11:20:57 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com) + + * configure.in: Don't issue warnings about directories which are + not being configured if -norecursion is set. Correct test for + --with-gnu-as and --with-gnu-ld to not get confused by substring + matches. + + * configure.in: Don't build gas for alpha-dec-osf1*. + +Tue Jan 4 17:10:19 1994 Stu Grossman (grossman at cygnus.com) + + * configure: Back out Per's change of 12/19/1993. It changes the + behavior of configure in unexpected and confusing ways. + + Also, use different delim char when calculating + program_transform_name so that the name can contain slashes. + +Sat Jan 1 13:45:31 1994 Rob Savoye (rob@darkstar.cygnus.com) + + * configure.in, config.sub: Add support for VSTa micro-kernel. + +Sat Dec 25 20:00:47 1993 Jeffrey A. Law (law@snake.cs.utah.edu) + + * configure.in: Nuke hacks which were used to get a special + version of GAS for HPPA configurations. + +Sun Dec 19 20:40:44 1993 Per Bothner (bothner@kalessin.cygnus.com) + + * configure: If only ${target_alias} is given, use that + as the default for ${host_alias}. + * configure: Add missing back-slashes before nested quotes. + +Wed Dec 15 18:07:18 1993 david d `zoo' zuhn (zoo@andros.cygnus.com) + + * Makefile.in (BASE_FLAGS_TO_PASS): add YACC=$(BISON) + +Tue Dec 14 21:25:33 1993 Per Bothner (bothner@cygnus.com) + + * config.guess: Recognize some Tektronix configurations. + From Kaveh R. Ghazi <ghazi@noc.rutgers.edu>. + +Sat Dec 11 11:18:00 1993 Steve Chamberlain (sac@thepub.cygnus.com) + + * config.sub: Match any flavor of SH. + +Thu Dec 2 17:16:58 1993 Ken Raeburn (raeburn@cujo.cygnus.com) + + * configure.in: Don't try to configure newlib for Alpha. + +Thu Dec 2 14:35:54 1993 Ian Lance Taylor (ian@tweedledumb.cygnus.com) + + * configure.in: Don't build ld for Irix 5. Don't build gas, + libg++ or libio for any Alpha target. + + * configure.in (mips*-sgi-irix5*): New target; use mh-irix5. + * config/mh-irix5. New file for Irix 5. + +Wed Dec 1 17:00:33 1993 Jason Merrill (jason@deneb.cygnus.com) + + * Makefile.in (GZIPPROG): Renamed from GZIP, which gzip uses for + default arguments -- so it tried to compress itself. + +Tue Nov 30 13:45:15 1993 david d `zoo' zuhn (zoo@andros.cygnus.com) + + * configure.in (notsupp): ensure that a space is always at the end + of the configdirs list, since the grep checks for an explicit space + +Tue Nov 16 15:04:27 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) + + * configure.in (target i386-sysv4.2): don't build ld, since static + versions of many libraries are not available. + +Tue Nov 16 14:28:12 1993 Jim Kingdon (kingdon@lioth.cygnus.com) + + * config.guess: Recognize Apollos (using environment variables). + * configure.in: Don't configure ld, binutils, or gprof for Apollo. + +Thu Nov 11 12:03:50 1993 Jim Kingdon (kingdon@lioth.cygnus.com) + + * config.guess: Recognize Sony news mips running newsos. + +Wed Nov 10 16:57:00 1993 Mark Eichin (eichin@cygnus.com) + + * Makefile.in (all-cygnus, build-cygnus): "fi else" needs to be + "fi ; else" for bash. + +Tue Nov 9 15:54:01 1993 Mark Eichin (eichin@cygnus.com) + + * Makefile.in (BASE_FLAGS_TO_PASS): pass SHELL. + +Fri Nov 5 08:07:27 1993 D. V. Henkel-Wallace (gumby@blues.cygnus.com) + + * config.sub: accept unixware as an alias for svr4.2. + Fix some inconsistancies with the gcc version. + +Fri Nov 5 15:14:12 1993 Jim Kingdon (kingdon@lioth.cygnus.com) + + * Makefile.in (DISTDOCDIRS): Add gdb. + +Fri Nov 5 11:59:42 1993 Per Bothner (bothner@kalessin.cygnus.com) + + * Makefile.in (DISTDOCDIRS): Add libg++ and libio. + +Fri Nov 5 10:35:05 1993 Ken Raeburn (raeburn@rover.cygnus.com) + + * Makefile.in (taz): Only build "info" in DISTDOCDIRS. + (DISTDOCDIRS): Don't assume libg++ and gdb folks necessarily want + this now. + +Thu Nov 4 18:58:23 1993 Jim Kingdon (kingdon@lioth.cygnus.com) + + * config.sub: Accept hiux* as an OS name. + + * Makefile.in: Change RUNTEST_FLAGS back to RUNTESTFLAGS per + etc/make-stds.texi. The underscore came from gcc, and dje now + agrees that RUNTESTFLAGS is the correct name. + +Thu Nov 4 10:49:01 1993 Per Bothner (bothner@kalessin.cygnus.com) + + * install.sh: Remove 'set -e'. It makes any conditionals + in the script useless. + + * config.guess: Automatically recognize arm-acorn-riscix + Patch from Richard Earnshaw (rwe11@cl.cam.ac.uk). + +Thu Nov 04 08:08:04 1993 Jeffrey Wheat (cassidy@cygnus.com) + + * Makefile.in: Change RUNTESTFLAGS to RUNTEST_FLAGS + +Wed Nov 3 22:09:46 1993 Ken Raeburn (raeburn@rtl.cygnus.com) + + * Makefile.in (DISTDOCDIRS): New variable. + (taz): Edit local Makefile.in sooner, instead of proto-toplev + Makefile.in later. Build "info" and "dvi" in DISTDOCDIRS. + +Wed Nov 3 21:31:52 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) + + * configure.in (hppa target): check the source directory for the + pagas sub-directory + +Wed Nov 3 11:12:22 1993 Doug Evans (dje@canuck.cygnus.com) + + * config.sub: Allow -aout* and -elf*. + +Wed Nov 3 11:08:33 1993 Ken Raeburn (raeburn@rtl.cygnus.com) + + * configure.in: Don't build ld on i386-solaris2, same as for + sparc-solaris2. + +Tue Nov 2 14:21:25 1993 Per Bothner (bothner@kalessin.cygnus.com) + + * Makefile.in (taz): Add texinfo/lgpl.texinfo (for libg++). + +Tue Nov 2 13:38:30 1993 Peter Schauer (pes@regent.e-technik.tu-muenchen.de) + + * configure.in: Configure gdb for alpha. + +Mon Nov 1 10:42:54 1993 Jim Kingdon (kingdon@lioth.cygnus.com) + + * Makefile.in (CXXFLAGS): Add -O. + +Wed Oct 27 10:45:06 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) + + * config.guess: added support for DG Aviion + +Tue Oct 26 14:37:37 1993 Ken Raeburn (raeburn@rover.cygnus.com) + + * configure.in: Produce warning message for subdirectories not + configurable for this host/target combination. Don't try to + configure gdb for vms. + +Mon Oct 25 11:22:15 1993 Ken Raeburn (raeburn@rover.cygnus.com) + + * Makefile.in (taz): Replace "byacc" with "bison -y" in the + appropriate files before making "diststuff". + (DISTBISONFILES): New var: list of files to be edited. + (DISTSTUFFDIRS): Add binutils. + +Fri Oct 22 20:32:15 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) + + * config.sub: also handle mipsel and mips64el (for little endian mips) + +Fri Oct 22 07:59:20 1993 Jim Kingdon (kingdon@lioth.cygnus.com) + + * configure.in: Add * to end of all OS names. + +Thu Oct 21 11:38:28 1993 Stan Shebs (shebs@rtl.cygnus.com) + + * configure.in: Build newlib for LynxOS native. + +Wed Oct 20 09:56:12 1993 Jim Kingdon (kingdon@lioth.cygnus.com) + + * config.guess: Add support for delta 88k running SVR3. + + * configure.in: Add comment about HP compiler vs. emacs. + +Tue Oct 19 16:02:22 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) + + * configure.in: don't build ld on solaris2 (not a viable option + due to bugs in getpwnam & getpwuid) + +Tue Oct 19 15:13:56 1993 Ken Raeburn (raeburn@rtl.cygnus.com) + + * configure.in: Accept alpha-dec-osf1*, not just -osf1, since + config.guess will produce a full version number. + +Tue Oct 19 15:58:01 1993 Ian Lance Taylor (ian@tweedledumb.cygnus.com) + + * configure.in: Build linker and binutils for alpha-dec-osf1. + +Tue Oct 19 11:41:55 1993 Jim Kingdon (kingdon@lioth.cygnus.com) + + * Makefile.in: Remove -O from CXXFLAGS for consistency with CFLAGS, + and gdb/testsuite/Makefile.in. + +Sat Oct 9 18:39:07 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) + + * configure.in: recognize mips*- instead of mips- + +Fri Oct 8 14:15:39 1993 Ken Raeburn (raeburn@cygnus.com) + + * config.sub: Accept linux*coff and linux*elf as operating + systems. + +Tue Oct 7 14:24:41 1997 Ian Lance Taylor <ian@cygnus.com> + + * ltmain.sh: Handle symlinks in generated script. + +Thu Oct 7 12:57:19 1993 Ian Lance Taylor (ian@tweedledumb.cygnus.com) + + * config.sub: Recognize mips64, and mips3 as an alias for it. + +Wed Oct 6 13:54:21 1993 Peter Schauer (pes@regent.e-technik.tu-muenchen.de) + + * configure.in: Remove alpha-dec-osf*, no longer necessary now that + gdb knows how to handle OSF/1 shared libraries. + +Tue Oct 5 11:55:04 1993 Jim Kingdon (kingdon@lioth.cygnus.com) + + * configure.in: Recognize hppa*-*-hiux* (currently synonym for hpux). + * config.guess: Recognize Hitachi's HIUX. + * config.sub: Recognize h3050r* and hppahitachi. + Remove redundant cases for hp9k[23]*. + +Mon Oct 4 16:15:09 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) + + * configure.in: default to '--with-gnu-as' and '--with-gnu-ld' + if gas and ld are in the source tree and are in ${configdirs}. + If ${use_gnu_as} or ${use_gnu_ld} are 'no', then don't set the + --with options (but still pass them down on the command line, + if they were explicitly specified). + +Wed Oct 1 13:11:27 1997 Ian Lance Taylor <ian@cygnus.com> + + * configure: Handle autoconf style directory options: --bindir, + --datadir, --includedir, --infodir, --libdir, --libexecdir, + --mandir, --oldincludedir, --sbindir, --sharedstatedir, + --sysconfdir. + * Makefile.in (sbindir, libexecdir, sysconfdir): New variables. + (sharedstatedir, localstatedir, oldincludedir): New variables. + (BASE_FLAGS_TO_PASS): Pass down bindir, datadir, includedir, + infodir, libdir, libexecdir, localstatedir, mandir, oldincludedir, + sbindir, sharedstatedir, and sysconfdir. + +Fri Sep 24 19:11:13 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) + + * configure: substitute SHELL value in Makefile.in with + ${CONFIG_SHELL} + +Wed Sep 24 15:18:32 1997 Ian Lance Taylor <ian@cygnus.com> + + * ltmain.sh: Tweak shell pattern to avoid bug in NetBSD /bin/sh. + +Thu Sep 23 18:05:13 1993 Ian Lance Taylor (ian@tweedledumb.cygnus.com) + + * configure.in: Build gas, ld, and binutils for *-*-sysv4* and + *-*-solaris2* targets. + +Sun Sep 19 17:01:41 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) + + * Makefile.in: define M4, and pass it down to sub-makes; + all-autoconf now depends on all-m4 + +Sat Sep 18 00:38:23 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) + + * Makefile.in ({AR,RANLIB}_FOR_TARGET): make contingent on + presence of {ar,ranlib} instead of a configured directory + +Wed Sep 15 08:41:44 1993 Jim Kingdon (kingdon@cirdan.cygnus.com) + + * config.guess: Accept 34?? as well as 33?? for NCR. + +Mon Sep 13 12:28:43 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) + + * configure.in: grab mt-hppa for HPPA targets; use 'gas ' instead + of 'gas' in sed commands, since 'gash' is now in the tree as well. + +Fri Sep 10 11:23:52 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) + + * configure: grab values for $(CC) and $(CXX) from the + environment, so that someone can do "CC=gcc configure; make" and + have it work right (matching the way that autoconf works now) + + * configure.in, Makefile.in: add support for gash, the tcl + interface to Galaxy + + * config.guess: add NetBSD variants (hp300, x86) + +Thu Sep 9 16:48:52 1993 Jason Merrill (jason@deneb.cygnus.com) + + * install.sh: Support -d option (in the manner of SunOS 4 install, + as it is more deterministic than that of GNU install) + (chmodcmd): Set file to mode 755 by default (should also do default + chgrp and chown, but I don't feel like dealing with that now) + +Tue Sep 7 11:59:39 1993 Doug Evans (dje@canuck.cygnus.com) + + * config.sub: Remove h8300hhms alias. + +Tue Aug 31 11:00:09 1993 Jim Kingdon (kingdon@lioth.cygnus.com) + + * configure.in: Match *-*-solaris2* not *-sun-solaris2*. + +Mon Aug 30 18:29:10 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) + + * Makefile.in (gcc-no-fixedincludes): touch stmp-fixproto as well + as stmp-fixinc + +Wed Aug 25 16:35:59 1993 K. Richard Pixley (rich@sendai.cygnus.com) + + * config.sub: recognize m88110-bug-coff. + +Tue Aug 24 10:23:24 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) + + * Makefile.in (all-libio): all dependencies on the toolchain used + to build this (gcc, gas, ld, etc) + +Fri Aug 20 17:24:24 1993 Jim Kingdon (kingdon@lioth.cygnus.com) + + * config.guess: Deal with OSF/1 1.3 on alpha. + +Thu Aug 19 11:43:04 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) + + * install.sh: add some 'else true' clauses for portability + + * configure.in: don't build libio for h8[35]00-*-* targets + +Tue Aug 17 19:02:31 1993 Per Bothner (bothner@kalessin.cygnus.com) + + * Makefile.in: Add support for new libio. + +Sun Aug 15 20:48:55 1993 Jim Kingdon (kingdon@lioth.cygnus.com) + + * install.sh: If one command fails, don't try the rest. Don't try + to remove $dsttmp (via trap) unless we have already created it. + If $src doesn't exist, detect it and exit with an error. + + * config.guess: Recognize BSD on hp300. + +Wed Aug 11 18:35:13 1993 Per Bothner (bothner@kalessin.cygnus.com) + + * config.guess: Map (9000/[34]??:HP-UX:*:*) to m68k-hp-hpux. + Bug report from "Hamish (H.I.) Macdonald" <hamish@bnr.ca>. + +Wed Aug 11 15:37:51 1993 Jason Merrill (jason@deneb.cygnus.com) + + * Makefile.in (all-send-pr): depends on all-prms + +Wed Aug 11 16:56:03 1993 Jim Kingdon (kingdon@lioth.cygnus.com) + + * config.guess: Fix typo (9000/8??:4.3bsd -> 9000/7??:4.3bsd). + +Fri Aug 6 14:45:02 1993 Ian Lance Taylor (ian@tweedledumb.cygnus.com) + + * config.guess: From michael@mercury.cs.mun.ca (Michael Rendell): + Added test for mips-mips-riscos5. + +Thu Aug 5 15:45:08 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) + + * configure.in: use mh-hp300 for 68k HP hosts + +Mon Aug 2 11:56:53 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) + + * configure: add support for CONFIG_SHELL, so that you can use + some alternate shell for evaluating configure scripts + +Sun Aug 1 11:36:27 1993 Fred Fish (fnf@deneb.cygnus.com) + + * Makefile.in (make-gdb.tar.gz): Sed bug reporting address + in configure script to bug-gdb@prep.ai.mit.edu when building + distribution archive. + * Makefile.in (COMPRESS): Remove def. + * Makefile.in (gdb.tar.gz, make-gdb.tar.gz): Renamed from + gdb.tar.Z and make-gdb.tar.Z respectively. + * Makefile.in (make-gdb.tar.gz): Now only build gzip'd archive. + * Makefile.in (make-gdb.tar.gz): Minor changes to move closer + to convergence with 'taz' target in Makefile.in. + +Fri Jul 30 12:34:57 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) + + * install.sh (dsttmp): use trap to ensure that tmp files go + away on error conditions + +Wed Jul 28 11:57:36 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) + + * Makefile.in (BASE_FLAGS_TO_PASS): remove LOADLIBES + +Tue Jul 27 12:43:40 1993 Jim Kingdon (kingdon@lioth.cygnus.com) + + * Makefile.in (install-dirs): Deal with a prefix like /gnu; + its parent is '/' not ''. + + * Makefile.in (DEVO_SUPPORT): Add comments about ChangeLog. + +Fri Jul 23 09:53:37 1993 Jason Merrill (jason@wahini.cygnus.com) + + * configure: if ${newsrcdir}/configure doesn't exist, don't assume + that ${newsrcdir}/configure.in does. + +Tue Jul 20 11:28:50 1993 david d `zoo' zuhn (zoo@rtl.cygnus.com) + + * test-build.mk: support for CONFIG_SHELL + +Mon Jul 19 21:54:46 1993 Fred Fish (fnf@deneb.cygnus.com) + + * config.sub (netware): Add as a basic system type. + +Wed Jul 14 12:03:11 1993 K. Richard Pixley (rich@sendai.cygnus.com) + + * Makefile.in (Makefile): depend on configure.in. Also drop the + $(srcdir)/ from the dependency on Makefile.in. + +Tue Jul 13 20:10:58 1993 Doug Evans (dje@canuck.cygnus.com) + + * config.sub: Recognize h8300hhms as h8300h-hitachi-hms. + (h8300hhms is temporary until multi-libraries are implemented). + * configure.in: Handle h8300h too. + +Sun Jul 11 17:35:27 1993 Jim Kingdon (kingdon@lioth.cygnus.com) + + * config.guess: Recognize dpx/2 as m68k-bull-sysv3. + +Thu Jul 8 18:26:12 1993 John Gilmore (gnu@cygnus.com) + + * configure: Remove extraneous output when guessing host type. + * config.guess: Remove extraneous output when guessing using C + compiler rather than uname, or when guessing fails. + +Wed Jul 7 17:58:14 1993 david d `zoo' zuhn (zoo at rtl.cygnus.com) + + * Makefile.in: remove all.cross and install.cross targets + + * configure: remove CROSS=-DCROSS_COMPILE and ALL=all.cross + definitions + +Tue Jul 6 10:39:44 1993 Steve Chamberlain (sac@phydeaux.cygnus.com) + + * configure.in (target sh): Build gprof. + +Thu Jul 1 16:52:56 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * config.sub: change -solaris to -solaris2 + +Thu Jul 1 15:46:16 1993 Jim Kingdon (kingdon@lioth.cygnus.com) + + * configure.in: Use config/mh-riscos for mips-*-sysv*. + +Wed Jun 30 09:31:58 1993 Ian Lance Taylor (ian@cygnus.com) + + * configure: Correct error message for missing Makefile.in to + print correct directory. + +Tue Jun 29 13:52:16 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * install.sh: kludge around 386BSD shell bug + +Tue Jun 29 13:06:49 1993 Per Bothner (bothner@rtl.cygnus.com) + + * config.guess: Recognize NeXT. + * config.guess: Recognize i486-ncr-sysv4. + * Makefile.in (taz): rm $(TOOL)-$$VER before linking. + +Tue Jun 29 12:50:57 1993 Ian Lance Taylor (ian@cygnus.com) + + * Makefile.in (MAKEINFOFLAGS): New variable. + (FLAGS_TO_PASS): Pass MAKEINFO as MAKEINFO MAKEINFOFLAGS. + * build-all.mk, test-build.mk: Pass down --no-split as + MAKEINFOFLAGS when hosted on DOS. Compile DOS hosted without -g. + +Thu Jun 24 13:39:11 1993 Per Bothner (bothner@rtl.cygnus.com) + + * Makefile.in (DEVO_SUPPORT): Add COPYING COPYING.LIB install.sh. + +Wed Jun 23 12:59:21 1993 Per Bothner (bothner@rtl.cygnus.com) + + * Makefile.in (libg++.tar.z): New rule. + * Makefile.in (taz): Replace 'configure -rm' by 'make distclean'. + * Makefile.in (taz): Only do a single chmod. + +Fri Jun 18 12:03:10 1993 david d `zoo' zuhn (zoo at majipoor.cygnus.com) + + * install.sh: don't use dirname anymore (replaced with sed usage) + +Thu Jun 17 18:43:42 1993 Fred Fish (fnf@cygnus.com) + + * Makefile.in: Change extension for gzip'd files from '.z' to + '.gz' per new FSF standard usage. + +Thu Jun 17 16:58:50 1993 david d `zoo' zuhn (zoo at majipoor.cygnus.com) + + * configure: put quotes around the final value of program_transform_name + +Tue Jun 15 16:48:51 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * Makefile.in: new install.sh support; update install-info rules + +Wed Jun 9 12:31:34 1993 Ian Lance Taylor (ian@cygnus.com) + + * configure.in: Build diff for crosses, but not for go32 host. + + * configure.in: Build gprof only for native, and don't build it + for mips-*-*, rs6000-*-*, or i[34]86-*-sco*. + +Mon Jun 7 13:12:11 1993 david d `zoo' zuhn (zoo at deneb.cygnus.com) + + * configure.in: don't build gas,ld,binutils on for *-*-sysv4 + +Mon Jun 7 11:40:11 1993 Brendan Kehoe (brendan@lisa.cygnus.com) + + * configure.in (host_tools): Add prms. + +Fri Jun 4 13:30:42 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * Makefile.in: install gcc, do installation of $(INSTALL_MODULES) + with $(FLAGS_TO_PASS) on the command line + + * config.sub: Recognize lynx and lynxos + +Fri Jun 4 10:59:56 1993 Ian Lance Taylor (ian@cygnus.com) + + * config.sub: Accept -ecoff*, not just -ecoff. + +Thu Jun 3 17:38:54 1993 Ken Raeburn (raeburn@cambridge.cygnus.com) + + * Makefile.in (taz): Use .gz suffix instead of .z. + (binutils.tar.gz, gas+binutils.tar.gz, gas.tar.gz): Fixed target + names. + +Thu Jun 3 00:27:06 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * Makefile.in (vault-install): add an 'else true' (for Ultrix) + +Wed Jun 2 18:19:16 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * Makefile.in (install-no-fixedincludes): install gcc last, so + that rebuilds that might happen during 'make install' don't get + bogus gcc include files + +Wed Jun 2 16:14:10 1993 Ken Raeburn (raeburn@cambridge.cygnus.com) + + Change from Utah for HPPA support: + * config.guess: Recognize hppa1.x-hp-bsd. + +Wed Jun 2 11:53:33 1993 Per Bothner (bothner@rtl.cygnus.com) + + * config.guess: Add support for Motorola Delta 68k, up to r3v7. + Patch from pot@fly.cnuce.cnr.it (Francesco Potorti`). + +Tue Jun 1 17:48:42 1993 Rob Savoye (rob at darkstar.cygnus.com) + + * config.sub: Add support for rom68k and bug boot monitors. + +Mon May 31 09:36:37 1993 Jim Kingdon (kingdon@cygnus.com) + + * Makefile.in: Make all-opcodes depend on all-bfd. + +Thu May 27 08:05:31 1993 Ian Lance Taylor (ian@cygnus.com) + + * config.guess: Added special check for i[34]86-univel-sysv4*. + +Wed May 26 16:33:40 1993 Ian Lance Taylor (ian@cygnus.com) + + * config.guess: For i[34]86-unknown-sysv4 use UNAME_MACHINE for + the processor rather than assuming i486. + +Wed May 26 09:40:18 1993 Jim Kingdon (kingdon@lioth.cygnus.com) + + * config.guess: Recognize SunOS6 as Solaris3. + +Tue May 25 23:03:11 1993 Per Bothner (bothner@cygnus.com) + + * config.guess: Fix typo. Avoid #elif (not in K&R 1). + Recognize SunOS 5.* only (and not [6-9].*) as being Solaris2. + +Tue May 25 12:44:18 1993 Ian Lance Taylor (ian@cygnus.com) + + * build-all.mk (all-cross): New target for Canadian Cross. + Added Q2 go32 targets. + * test-build.mk: Configure go32 cross sparclite-aout and + mips-idt-ecoff -with-gnu-ld. Moved build binary directory from + PARTIAL_HOLE_DIRS to BUILD_HOLES_DIRS. + +Mon May 24 15:30:06 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * configure.in: fix Alpha GDB typo; also, don't build DejaGnu for + GO32 hosted toolchains + +Mon May 24 14:18:41 1993 Rob Savoye (rob at darkstar.cygnus.com) + + * configure: change so "-exec-prefix" gets passed down rather + than "-exec_prefix" so autoconf generated Makefiles get the + exec_prefix set right. + +Fri May 21 10:42:25 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * config.guess: get the Solaris2 minor version number + + * Makefile.in: add standards.texi and make-stds.texi to ETC_SUPPORT + +Fri May 21 06:20:52 1993 Brendan Kehoe (brendan@lisa.cygnus.com) + + * config.guess: Recognize some Sequent platforms. + +Thu May 20 14:33:48 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * Makefile.in: added the vault-install target + + * configure.in: actually use the Sun3 makefile fragment that's in + config, also added the release dir to configdirs + +Thu May 20 14:19:18 1993 Ken Raeburn (raeburn@cambridge.cygnus.com) + + * Makefile.in (taz): Fix modes on stuff in $(TOOL) dir also. + +Tue May 18 20:26:41 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * configure.in: remove some program from Alpha targetted toolchains + +Tue May 18 15:23:19 1993 Ken Raeburn (raeburn@cygnus.com) + + * Makefile.in (DISTSTUFFDIRS): Renamed from PROTODIRS. Add ld and + gprof. + (taz): Run "make diststuff" in those directories instead of "make + proto-dir". Look for "VERSION=" only at start of line in subdir + Makefile. Use "gzip -9" for compression. + (TEXINFO_SUPPORT, DIST_SUPPORT, BINUTILS_SUPPORT_DIRS): New vars. + (binutils.tar.z): New target. + +Mon May 17 17:01:15 1993 Ken Raeburn (raeburn@deneb.cygnus.com) + + * Makefile.in (taz): Include gpl.texinfo. + +Fri May 14 06:48:38 1993 Ken Raeburn (raeburn@deneb.cygnus.com) + + * Makefile.in (setup-dirs): Merged into "taz" target. + (taz): Only do `proto-dir' stuff if a directory is actually needed + for this target. + +Wed May 12 13:09:44 1993 Ian Lance Taylor (ian@cygnus.com) + + * Makefile.in (MUNCH_NM): New variable, defined to be $(NM). + (FLAGS_TO_PASS): Pass down MUNCH_NM. + (HOST_CC, HOST_PREFIX, HOST_PREFIX_1): New variables. + (EXTRA_GCC_FLAGS): Pass down HOST_* variables. + (gcc-no-fixedincludes): Correct for current gcc Makefile. + +Tue May 11 10:14:25 1993 Fred Fish (fnf@cygnus.com) + + * Makefile.in (make-gdb.tar.Z): Add configure, config.guess, + config.sub, and move-if-change to gdb testsuite distribution + archive, so the testsuite can be extracted, configured, and + run separately from the gdb distribution. Blow away the Chill + tests that require a Chill compiled executable, since GNU Chill + is not yet publically available. + +Mon May 10 17:22:26 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * test-build.mk: set environment variables in a single command, + instead of a list of assignments and exports + + * config.guess: recognize Alpha/OSF1 systems + +Mon May 10 14:55:51 1993 K. Richard Pixley (rich@rtl.cygnus.com) + + * configure: Change help message to prefer --options rather than + -options. + +Mon May 10 05:58:35 1993 Ken Raeburn (raeburn@kr-pc.cygnus.com) + + * config.sub: Convergent Tech. "miniframe" uses m68010, sez + zippy@ecst.csuchico.edu. + * config.guess: Recognize miniframe. + +Sun May 9 17:47:57 1993 Rob Savoye (rob at darkstar.cygnus.com) + + * Makefile.in: Use srcroot to find runtest rather than rootme. + Pass RUNTESTFLAGS and EXPECT down in BASE_FLAGS_TO_PASS. + +Fri May 7 14:55:59 1993 Ian Lance Taylor (ian@cygnus.com) + + * test-build.mk: Extensive additions to support building on a + machine other than the host. + +Wed May 5 08:35:04 1993 Ken Raeburn (raeburn@deneb.cygnus.com) + + * configure (tooldir): Fix for i386-aix again. + +Mon May 3 19:00:27 1993 Per Bothner (bothner@cygnus.com) + + * configure, Makefile.in: Change definition of $(tooldir) + to match the FSF. + +Fri Apr 30 15:55:21 1993 Fred Fish (fnf@cygnus.com) + + * config.guess: Recognize i[34]86/SVR4. + +Fri Apr 30 15:52:46 1993 Steve Chamberlain (sac@thepub.cygnus.com) + + * Makefile.in (all-gdb): gdb depends on sim. + +Thu Apr 29 23:30:48 1993 Fred Fish (fnf@cygnus.com) + + * Makefile.in (gdb.tar.Z): Make prototype gdb testsuite directory + at the same time we make the prototype gdb directory. + * Makefile.in (make-gdb.tar.Z): Make the testsuite distribution + files at the same time as the gdb base release distribution. + +Thu Apr 29 12:50:37 1993 Ian Lance Taylor (ian@cygnus.com) + + * Makefile.in (check): Use individual check targets rather than + DO_X rule. + (check-gcc): Added. + +Thu Apr 29 09:50:07 1993 Jim Kingdon (kingdon@cygnus.com) + + * config.sub: Use sysv3.2 not sysv32 for canonical OS + for System V release 3.2. + +Thu Apr 29 10:33:22 1993 Ken Raeburn (raeburn@cambridge.cygnus.com) + + * config.sub: Recognize hppaosf. + * configure.in: Do configure ld/binutils/gas for it. + +Tue Apr 27 06:25:34 1993 Ken Raeburn (raeburn@kr-pc.cygnus.com) + + * configure (tooldir): Alter syntax used to set this, for systems + where "\$" isn't handled right, like i386-aix. + +Thu Apr 22 08:17:35 1993 Ian Lance Taylor (ian@cygnus.com) + + * configure: Pass program-transform-name, not + program_transform_name, to recursive configures. + +Thu Apr 22 02:58:21 1993 Ken Raeburn (raeburn@cygnus.com) + + * Makefile.in (gas+binutils.tar.z): New rule for building snapshots + of gas+ld+binutils. + +Mon Apr 19 17:41:30 1993 Per Bothner (bothner@cygnus.com) + + * config.guess: Recognize AIX3.2 as distinct from 3.1. + +Sat Apr 17 17:19:50 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * configure.in: rename m88k-motorola-m88kbcs to m88k-motorola-sysv + + * config/mh-delta88: remove extraneous GCC references + +Tue Apr 13 16:52:16 1993 Brendan Kehoe (brendan@lisa.cygnus.com) + + * Makefile.in (PRMS): Set back to all-prms. + +Sat Apr 10 12:04:07 1993 Ian Lance Taylor (ian@cygnus.com) + + * test-build.mk: Pass -with-gnu-as for known MIPS native and MIPS + targets, rather than for MIPS hosts. + +Fri Apr 9 13:51:06 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * configure.in: add comment for --with-x default values + + * config.guess: handle Motorola Delta88 box for SVR3 and SVR4. + + * Makefile.in: add check-* targets for each of the directories in + the tree. Add a definition of RUNTEST that will use the one we + just built, if it exists. Pass this down via FLAGS_TO_PASS. + +Thu Apr 8 09:21:30 1993 Ian Lance Taylor (ian@cygnus.com) + + * configure.in: Removed obsolete references to bfd_target and + target_makefile_frag. + + * build-all.mk: Set assorted targets for Q2. + * config.sub: Recognize z8k-sim and h8300-hms. + * test-build.mk: Really don't pass host to configure. + (HOLES): Added uname. + +Wed Apr 7 15:48:19 1993 Ian Lance Taylor (ian@cygnus.com) + + * configure: Handle an empty program-prefix, program-suffix or + program-transform-name correctly. + +Tue Apr 6 13:48:41 1993 Ian Lance Taylor (ian@cygnus.com) + + * build-all.mk: -G 8 no longer required for MIPS targets. + * test-build.mk: Don't pass host argument to configure; make it + guess. + +Tue Apr 6 10:36:53 1993 Fred Fish (fnf@cygnus.com) + + * Makefile.in (gdb.tar.Z): Fix for building gzip'd distribution. + * Makefile.in (COMPRESS): New macro, like GZIP. + +Fri Apr 2 09:02:31 1993 Ian Lance Taylor (ian@cygnus.com) + + * test-build.mk: Use -with-gnu-as for mips-sgi-irix4 as well. + + * build-all.mk: Set GCC to gcc -O -G 8 for MIPS targets, since gcc + with gas currently defaults to -G 0. + +Thu Apr 1 08:25:42 1993 Ian Lance Taylor (ian@cygnus.com) + + * Makefile.in (all-flex): flex depends on byacc. + + * build-all.mk: If host not specified, use config.guess. Pass TAG + to test-build.mk as RELEASE_TAG. + * test-build.mk (configargs): New variable containing arguments to + pass to configure. Set to -with-gnu-as on mips-dec-ultrix. + (FLAGS_TO_PASS): Pass down RELEASE_TAG. + + * config.guess: Use /bin/uname when checking -X argument on SCO, + to avoid invoking GNU uname which doesn't understand -X. + + * test-build.mk: Don't use /usr/unsupported/bin/as on AIX. + + * configure.in: Build gas for mips-*-*. + +Wed Mar 31 21:20:58 1993 K. Richard Pixley (rich@rtl.cygnus.com) + + * Makefile.in (all.normal): insert missing backslash. + +Wed Mar 31 12:31:56 1993 Ian Lance Taylor (ian@cygnus.com) + + * build-all.mk, config/mh-irix4: Bump -XNh value to 1500 to match + gcc requirements. + + * Makefile.in: Complete overhaul to merge many almost identical + targets. + +Tue Mar 30 20:17:01 1993 Ken Raeburn (raeburn@cambridge.cygnus.com) + + * Makefile.in (setup-dirs-gdb): Renamed from setup-dirs. + (gdb.tar.Z): Adjusted. + + * Makefile.in (setup-dirs, taz): New targets; should be general + enough to adapt for gdb sometime. Build only .z file. + (gas.tar.z): New target. + +Tue Mar 30 10:03:09 1993 Ian Lance Taylor (ian@cygnus.com) + + * build-all.mk: Use CC=cc -Xs on Solaris. + +Mon Mar 29 19:59:26 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * config/mh-sun3: cc needs -J to compile cp-parse.c correctly + + * config/mh-solaris: SunPRO C needs -Xs to be able to get a + working xmakefile for Emacs. + +Thu Mar 25 15:14:30 1993 Fred Fish (fnf@cygnus.com) + + * Makefile.in: Incorporate changes suggested by wilson@cygnus.com + for handling BISON for FSF releases. + +Thu Mar 25 06:19:48 1993 Ken Raeburn (raeburn@kr-pc.cygnus.com) + + * configure: Actually implement the change zoo just documented. + +Wed Mar 24 13:02:44 1993 david d `zoo' zuhn (zoo at poseidon.cygnus.com) + + * configure: when using config.guess, only set target_alias when + it's not already been set (ie, on the command line) + +Mon Mar 22 23:07:39 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * Makefile.in: add installcheck target, set PRMS to install-prms + +Sun Mar 21 16:46:12 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * configure: add support for package_makefile_fragment, handle the + case where a directory has a configure.in file but no Makefile.in + more gracefully (with an actual understandable error message, even); + add support for --without (and add this to the usage message); also + explicitly add a --host=${host_alias} to the command line when + config.guess is used + +Sun Mar 21 12:11:58 1993 Jim Wilson (wilson@sphagnum.cygnus.com) + + * configure: Must use both --host and --target in recursive calls. + +Thu Mar 18 12:31:35 1993 Ian Lance Taylor (ian@cygnus.com) + + * Makefile.in: Change deja-gnu to dejagnu. + +Mon Mar 15 15:44:35 1993 Ian Lance Taylor (ian@cygnus.com) + + * configure.in (h8300-*-*, h8500-*-*): Don't build libg++. + +Fri Mar 12 18:30:14 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * configure.in: canonicalize all instances to *-*-solaris2*, + also strip out a number of tools to not build for go32 host + +Wed Mar 10 12:08:27 1993 K. Richard Pixley (rich@rtl.cygnus.com) + + * config.guess: add GPL. + + * Makefile.in, config.guess, config.sub, configure: bump + copyrights to 93. + +Wed Mar 10 07:12:48 1993 Ian Lance Taylor (ian@cygnus.com) + + * Makefile.in (do-info): Removed obsolete check for existence of + localenv file. + + * Makefile.in (MAKEOVERRIDES): Define to be empty. + +Wed Mar 10 03:11:56 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * Makefile.in: a couple of 'else true' for decstation, + support for TclX + + * configure.in: configure tclX too; don't remove Tk on RS/6000 anymore + +Tue Mar 9 16:06:12 1993 K. Richard Pixley (rich@cygnus.com) + + * Makefile.in (setup-dirs): change invocation of make to $(MAKE). + +Mon Mar 8 14:52:11 1993 Ken Raeburn (raeburn@cambridge) + + * config.guess: Recognize i386-ibm-aix (PS/2). + * configure.in: Use config/mh-aix386 file for it. + +Mon Mar 8 11:12:43 1993 Ian Lance Taylor (ian@cygnus.com) + + * Makefile.in (GCC_FOR_TARGET): Eliminated definition; use + CC_FOR_TARGET instead. + (BASE_FLAGS_TO_PASS): Pass GCC_FOR_TARGET=$(CC_FOR_TARGET). + +Wed Mar 3 16:00:28 1993 Steve Chamberlain (sac@ok.cygnus.com) + + * Makefile.in: Add sim to list of directories sent with gdb + +Wed Mar 3 11:42:39 1993 Ken Raeburn (raeburn@cygnus.com) + + * configure.in: Put back mips-dec-bsd* case. + +Tue Mar 2 21:15:58 1993 Fred Fish (fnf@cygnus.com) + + (Ultrix 2.2 support from Michael Rendell <michael@mercury.cs.mun.ca>) + * configure.in (vax-*-ultrix2*): Add Ultrix 2.2 triplet. + * config.guess: Change 'VAX*:ULTRIX:*:*' to 'VAX*:ULTRIX*:*:*'. + * config/mh-vaxult2: New file. + +Tue Mar 2 18:11:03 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * configure.in: remove no-op mips-dec-bsd* in "case $target" + + * Makefile.in (dir.info): only run gen-info-dir if it exists, + (install-info): install dir.info only if it exists, + (all-expect, install-expect): pass along X11_FLAGS_TO_PASS + +Tue Mar 2 09:01:30 1993 Ken Raeburn (raeburn@cygnus.com) + + * configure.in: For vms target, skip bfd, ld, binutils. Do build + gas for mips-dec-bsd. + +Tue Mar 2 08:35:24 1993 Ian Lance Taylor (ian@cygnus.com) + + * configure (makesrcdir): If ${srcdir} is relative and not ".", + and ${subdir} is not ".", set makesrcdir based on ${invsubdir}. + +Tue Feb 23 14:18:28 1993 Mike Werner (mtw@poseidon.cygnus.com) + + * configure.in: Added "dejagnu" to hosttools list. + +Mon Feb 22 23:28:38 1993 Per Bothner (bothner@rtl.cygnus.com) + + * config.sub, configure.in, config.guess: Add support + for Bosx, an AIX variant from Bull. + Patches from F.Pierresteguy@frcl.bull.fr. + +Sun Feb 21 11:15:22 1993 Mike Werner (mtw@poseidon.cygnus.com) + + * devo/dejagnu: Initial creation of devo/dejagnu. + Migrated dejagnu testcases and support files for testing software + tools to reside as subdirectories, currently called "testsuite", + within the directory of the software tool. Migrated all programs, + support libraries, etc. beloging to dejagnu proper from + devo/deja-gnu to devo/dejagnu. These files were moved "as is" + with no modifications. The changes to these files which will + allow them to configure, build, and execute properly will be made + in a future update. + +Fri Feb 19 20:19:39 1993 Brendan Kehoe (brendan@lisa.cygnus.com) + + * Makefile.in: Change send_pr to send-pr. + * configure.in: Likewise. + * send_pr: Renamed directory to send-pr. + +Fri Feb 19 19:00:13 1993 Per Bothner (bothner@cygnus.com) + + * Makefile.in: Add some extra semi-colons (needed if SHELL=bash). + +Fri Feb 19 00:59:33 1993 John Gilmore (gnu@cygnus.com) + + * README: Update for gdb-4.8 release. + * Makefile.in (gdb.tar.Z): Add texinfo/tex3patch. Build + gdb-xxx.tar.z (gzip'd) file also. + +Thu Feb 18 09:16:17 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * Makefile.in: make all-diff depend on all-libiberty + +Tue Feb 16 16:06:31 1993 K. Richard Pixley (rich@cygnus.com) + + * config.guess: add vax-ultrix in the spirit of mips-ultrix. + +Tue Feb 16 05:57:15 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * configure.in, Makefile.in: add hello, tar, gzip, recode, indent + +Tue Feb 16 00:58:20 1993 John Gilmore (gnu@cygnus.com) + + * Makefile.in (DEVO_SUPPORT): Remove etc directory + (ETC_SUPPORT): Only add the files GDB wants from etc/. + (gdb.tar.Z): Use ETC_SUPPORT. Use byacc when building the file. + +Thu Feb 11 20:14:28 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * Makefile.in: makeinfo binary is in a new location + +Tue Feb 9 12:42:27 1993 Ian Lance Taylor (ian@cygnus.com) + + * config.sub: Accept -ecoff as an OS. + + * Makefile.in: Various changes to eliminate a level of make + recursion and reduce the required command line length. + (BASE_FLAGS_TO_PASS): New variable holding flags passed to all + sub-makes. + (EXTRA_HOST_FLAGS, EXTRA_TARGET_FLAGS, EXTRA_GCC_FLAGS): New + variables holding settings for specific sub-makes. + (FLAGS_TO_PASS, TARGET_FLAGS_TO_PASS, GCC_FLAGS_TO_PASS): Rewrote + in terms of BASE_FLAGS_TO_PASS. + (TARGET_LIBS): New variable listing directories which use + TARGET_FLAGS_TO_PASS. + (subdir_do): Eliminated. + (do-*): New set of targets to replace subdir_do. + (various): All targets which used subdir_do now depend on do-*. + (local-clean): Renamed from do_clean. + (local-distclean): New target, dependency of distclean and + realclean. + (install-info): Don't create directories. Depend on dir.info + rather than calling make recursively. + (install-dir.info): Eliminated. + (install-info-dirs): Create all info directories here. + (dir.info): Depend upon do-install-info. + + * test-build.mk (HOLES): Added false. + +Sat Feb 6 14:05:09 1993 Per Bothner (bothner@rtl.cygnus.com) + + * config.guess: Recognize BSDI and BSDJ (Jolitz 386bsd). + +Thu Feb 4 20:49:18 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * Makefile.in (info): remove dependency on all-texinfo. The + problem was really in texinfo/C, not at this level. + +Thu Feb 4 13:38:41 1993 Ian Lance Taylor (ian@cygnus.com) + + * Makefile.in (info): Added dependency on all-texinfo (PR 2112). + +Thu Feb 4 01:50:53 1993 John Gilmore (gnu@cygnus.com) + + * Makefile.in (make-gdb.tar.Z): Change BISON to 'bison -y' for + GDB releases. + +Wed Feb 3 17:22:16 1993 Ken Raeburn (raeburn@cambridge.cygnus.com) + + * configure: Include srcdir in message about target of link not + being found. Don't convert `-' to `_' in `with' options being + passed to subdirs. + +Tue Feb 2 18:57:59 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * configure.in: add uudecode to host_tools + + * Makefile.in: added {all,install}-uudecode targets, added them to + the appropriate lists + +Tue Feb 2 11:45:53 1993 Ian Lance Taylor (ian@cygnus.com) + + * Makefile.in (all-gcc): Added dependency on all-gas. + + * configure.in (mips-*-*): Build ld and binutils. + +Mon Feb 1 12:35:41 1993 K. Richard Pixley (rich@rtl.cygnus.com) + + * configure: check return code from mkdir, print error message and + exit on failure. + +Sat Jan 30 16:40:28 1993 John Gilmore (gnu@cygnus.com) + + * Makefile.in (make-gdb.tar.Z): New location for texinfo.tex. + +Thu Jan 28 15:09:59 1993 Ian Lance Taylor (ian@cygnus.com) + + * test-build.mk (HOLES): Added tar, cpio and uudecode. + +Wed Jan 27 16:50:32 1993 Jim Wilson (wilson@sphagnum.cygnus.com) + + * config.sub (h8500): Recognize this as a cpu type. + +Sat Jan 23 20:32:01 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * configure: source directory missing is no longer a warning + + * configure.in: recognize irix[34]* instead of irix[34] + + * Makefile.in: define and pass down X11_LIB + + * config/mh-sco: define X11_LIB to the mess that SCO ODT requires + +Sat Jan 23 13:49:40 1993 Per Bothner (bothner@cygnus.com) + + * guess-systype: Renamed to ... + * config.guess: ... by popular request. + * configure.in, Makefile.in: Update accordingly. + +Thu Jan 21 12:20:55 1993 Per Bothner (bothner@cygnus.com) + + * guess-systype: Patches from John Eaton <jwe@che.utexas.edu>: + + Add Convex, Cray/Unicos, and Encore/Multimax support. + + Execute ./dummy instead of assuming . is in PATH. + +Tue Jan 19 17:18:06 1993 Per Bothner (bothner@cygnus.com) + + * guess-systype: New shell script. Attempts to guess the + canonical host name of the executing host. + Only a few hosts are supported so far. + * configure: Call guess-systype if no host is specified. + +Tue Jan 19 08:26:07 1993 Ian Lance Taylor (ian@cygnus.com) + + * Makefile.in (gcc-no-fixedincludes): Made to work with current + gcc Makefile. + + +Fri Jan 15 10:27:02 1993 Ian Lance Taylor (ian@cygnus.com) + + * Makefile.in (GCC_FLAGS_TO_PASS): New variable. + (all-gcc, install-gcc, subdir_do): Use it. + +Wed Jan 13 17:06:45 1993 Jim Wilson (wilson@sphagnum.cygnus.com) + + * Makefile.in: Rename uninstalled gcc driver from gcc to xgcc. + +Wed Jan 6 20:29:16 1993 Mike Werner (mtw@rtl.cygnus.com) + + * Makefile.in: Removed explicit setting of SUBDIRS. SUBDIRS is now + set exclusively by configure, using configure.in . + +Wed Jan 6 13:44:11 1993 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * test-build.mk: set $PATH for all builds + + * Makefile.in: pass TARGET_FLAGS_TO_PASS for xiberty and libm + +Wed Jan 6 11:02:10 1993 Fred Fish (fnf@cygnus.com) + + * Makefile.in (GCC_FOR_TARGET): Supply a default that matches + the one used in gcc/Makefile.in, so that a null expansion doesn't + override the one needed to build gcc with a native cc. + + +Tue Jan 5 07:55:12 1993 Ken Raeburn (raeburn@cambridge.cygnus.com) + + * configure: Accept -with arguments. + +Sun Jan 3 15:15:09 1993 Steve Chamberlain (sac@thepub.cygnus.com) + + * Makefile.in: added h8300sim + +Tue Dec 29 15:06:00 1992 Ian Lance Taylor (ian@cygnus.com) + + * config/mh-sco: Don't override BISON definition. + + * build-all.mk: If canonhost is i386-unknown-sco3.2v4, change it + to i386-sco3.2v4. Set TARGETS and CFLAGS for i386-sco3.2v4. + (all-cygnus, native, build-cygnus): Make + $(canonhost)-stamp-3stage-done, not $(host).... + * test-build.mk (stamp-3stage-compared): Use tail +10c for + i386-sco3.2v4. Added else true to if command. + +Mon Dec 28 12:08:56 1992 Ken Raeburn (raeburn@cygnus.com) + + * config.sub: (from FSF) Sequent uses a BSD-like OS. + +Mon Dec 28 08:32:06 1992 Minh Tran-Le (mtranle@paris.intellicorp.com) + + * configure.in (i[34]86-*-isc*): added; uses mh-sysv. + +Thu Dec 24 17:26:24 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * configure.in: don't remove binutils from Solaris builds + +Thu Dec 24 14:08:38 1992 david d`zoo' zuhn (zoo@cygnus.com) + + * Makefile.in: get rid of earlier definitions for *clean, + also handle the recursive info rule better + +Thu Dec 24 12:40:21 1992 Per Bothner (bothner@rtl.cygnus.com) + + * Makefile.in (mostlyclean, distclean, realclean): Fix to + do more-or-less the right thing. + +Wed Dec 16 10:25:31 1992 Ian Lance Taylor (ian@cygnus.com) + + * Makefile.in: Add lines defining CC and CXX, and use CXX rather + than gcc in definitions of CXX_FOR_BUILD and CXX_FOR_TARGET. + +Tue Dec 15 00:34:32 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * Makefile.in: change all $(host_cpu)-$(host_vendor)-$(host_os) to + $(host_canonical). + + * configure.in: split the configdirs list into 4 categories (native + v. cross, library v. tool) and handle the cross-only and native- + only in more reasonable (and correct!) way. + +Mon Dec 14 17:04:22 1992 Stu Grossman (grossman at cygnus.com) + + * configure.in (hppa*-*-*): Don't remove bfd and gdb from + configdirs anymore. + +Sun Dec 13 00:37:26 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * Makefile.in: extensive cleanup:: removed all of the explicit + clean-* targets, collapsed many wrappers around subdir_do into + one, added additional targets to satisfy standards.texi, deleted + some old targets, some changes for consistency + +Fri Dec 11 20:18:02 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * configure.in: handle some programs as cross-only, and others as + native only + + * test-build.mk: handle partial holes in a more generic manner + + * Makefile.in: m4 depends on libiberty + +Mon Dec 7 06:43:27 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * config/mh-sco: don't default $(CC) to gcc + +Thu Dec 3 21:52:11 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * configure.in: add m4, textutils, fileutils, sed, shellutils, + time, wdiff, and find to configdirs + + * Makefile.in: all, clean, and install rules for the new programs + added to configure.in + +Mon Nov 30 14:54:34 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * configure.in: use mh-sun for all *-sun-* hosts + + * config/mh-solaris: rework standard X location to use + $OPENWINHOME, if defined. + + * config/mh-sun: handle X11 include locations + + * config/mh-decstation: define NeedFunctionPrototypes to 0, to + work around dain-bramaged DECwindows include files + +Fri Nov 27 18:35:54 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * Makefile.in: define flags for X11 include files and library file + locations, pass them down to the programs that need this info + + * build-all.mk: added a 'native' target, to 3stage the native toolchain + + * config/{mh-hpux,mh-solaris}: define the "standard" locations for + the vendor supplied X11 headers and libraries + +Sun Nov 22 18:59:13 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * configure.in: start building libg++ for HP-UX targets + +Wed Nov 18 19:33:11 1992 John Gilmore (gnu@cygnus.com) + + * README: Update references to files moved into etc/. + +Sun Nov 15 09:36:08 1992 Fred Fish (fnf@cygnus.com) + + * config.sub (i386sol2, i486sol2): i[34]86-unknown-solaris2. + * configure.in (i[34]86-*-solaris2*): Use config/mh-sysv4. + +Thu Nov 12 08:50:42 1992 Ian Lance Taylor (ian@cygnus.com) + + * configure: accept dash as well as underscore in long option + names for FSF compatibility. + +Wed Nov 11 08:04:37 1992 Ian Lance Taylor (ian@cygnus.com) + + * config.sub: added -sco3.2v4 support from FSF. + +Sun Nov 8 21:14:30 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * configure.in: expand the section that adds or removes + directories from the list of programs to build, to handle native + vs. cross in addition to host v. native + +Sat Nov 7 18:52:27 1992 Per Bothner (bothner@rtl.cygnus.com) + + * Makefile.in: Replace C++ in macro names with CXX. + This is less likely to break ... + +Sat Nov 7 15:16:58 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * test-build.mk: add -w to GNU_MAKE + +Fri Nov 6 23:10:37 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * config.sub: remove 'sparc'-->'sparc-sun' default transformation, + add 'sparc' to list of recognized cpus. This needed to make + 'sparc-aout' expand to 'sparc-unknown-aout' instead of 'sparc-sun-aout'. + Delete some redundant ose68 variants. Recognize -wrs as an os, + then changes that into $CPU-wrs-vxworks. + + * configure.in: remove most references to gdbtest, regularize + target based program removal + + * test-build.mk: import from p3 tree (many fixes and changes) + +Fri Nov 6 20:59:00 1992 david d `zoo' zuhn (zoo@cygnus.com) + + * Makefile.in: added rules to handle tcl, tk, and expect + + * configure.in: handle those directories if they exist + +Thu Nov 5 14:35:41 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * config.sub: removed bogus hppabsd and hppahpux names, since + "hppa" is not a valid cpu (hppa1.1 or hppa1.0 are, though) + +Thu Oct 29 00:12:41 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * Makefile.in: all-gcc now depends on all-binutils. all-libg++ + depends upon all-xiberty + + * Makefile.in: changes from p3, including: + + Thu Oct 8 15:00:17 1992 Ian Lance Taylor (ian@cygnus.com) + + * Makefile.in (XTRAFLAGS): include newlib directories if + newlib/Makefile exists, rather than if host != target. + + Fri Sep 25 13:41:52 1992 Ian Lance Taylor (ian@cygnus.com) + + * Makefile.in: added -nostdinc to XTRAFLAGS if we are using gcc + from the same source tree and not building a cross-compiler. This + matters for the libg++ configuration if reconfiguring a tree that + has already been installed. + + Thu Sep 10 10:35:51 1992 Ian Lance Taylor (ian@cygnus.com) + + * Makefile.in: added -I for newlib/targ-include to XTRAFLAGS, to + pick up the machine and system specific header files. + + * Makefile.in: added AS_FOR_TARGET, passed down in + TARGET_FLAGS_TO_PASS. Added CC_FOR_BUILD, which is intended to be + the C compiler to use to create programs which are run in the + build environment, set it to default to $(CC), and passed it down + in FLAGS_TO_PASS and TARGET_FLAGS_TO_PASS. + + Mon Sep 7 22:34:42 1992 Ian Lance Taylor (ian@cirdan.cygnus.com) + + * Makefile.in: add $(host) = $(target) tests back to *_FOR_TARGET. + We need them for unusual native builds, like systems without + ranlib. + + * configure: also define $(host_canonical) and + $(target_canonical), which are the full, canonical names for the + given host and target + +Sun Nov 1 16:38:17 1992 Per Bothner (bothner@cygnus.com) + + * Makefile.in: Added separate definitions for C++. + +Fri Oct 30 11:37:52 1992 Fred Fish (fnf@cygnus.com) + + * configure.in (configdirs): Add deja-gnu. + +Fri Oct 23 00:39:18 1992 John Gilmore (gnu@cygnus.com) + + * README: Update for configure.texi and gdb-4.7 release. + +Wed Oct 21 21:54:27 1992 John Gilmore (gnu@cygnus.com) + + * Makefile.in: Move "all" target to top of file. + Previously, first target was ".PHONY" which caused BSD4.4 make + to build .PHONY when make was run without arguments. + +Mon Oct 19 01:17:54 1992 John Gilmore (gnu@cygnus.com) + + * Makefile.in: Add COPYING.LIB to GDB releases, now that there's + Library-copylefted code in libiberty. + +Tue Oct 13 01:22:32 1992 John Gilmore (gnu@cygnus.com) + + * config.sub: Replace m68kmote with plain old m68k. + +Fri Oct 9 03:14:24 1992 John Gilmore (gnu@cygnus.com) + + * Makefile.in: Remove space from blank line, avoid Make complaints. + +Thu Oct 8 18:41:45 1992 Ken Raeburn (raeburn@cygnus.com) + + * config.sub: Complain if no argument is given. Added support for + 386bsd as OS and target alias. + +Thu Oct 8 15:07:22 1992 Ian Lance Taylor (ian@cygnus.com) + + * Makefile.in (XTRAFLAGS): include newlib directories if + newlib/Makefile exists, rather than if host != target. + +Mon Oct 5 03:00:09 1992 Mark Eichin (eichin at tweedledumber.cygnus.com) + + * config.sub: recognize sparclite-wrs-vxworks. + + * Makefile.in (install-xiberty): added *-xiberty make rules (from + p3.) Added clean-xiberty to clean. + +Thu Oct 1 17:59:19 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * configure.in: use *-*-* instead of nested cases for host and target + +Tue Sep 29 14:11:18 1992 Ian Lance Taylor (ian@cygnus.com) + + * Makefile.in: added -nostdinc to XTRAFLAGS if we are using gcc + from the same source tree and not building a cross-compiler. This + matters for the libg++ configuration if reconfiguring a tree that + has already been installed. + +Sep 20 08:53:10 1992 Fred Fish (fnf@cygnus.com) + + * config.sub (i486v/i486v4): Merge in from FSF version. + +Fri Sep 18 00:32:00 1992 Mark Eichin (eichin@cygnus.com) + + * configure: only set PWD if it is already set. + +Thu Sep 17 23:05:53 1992 Mark Eichin (eichin@cygnus.com) + + * configure: just set PWD=`pwd` at the top, since Ultrix sh + doesn't have unset and all success paths (and most error paths) + out set it anyway. (Note: should change all uses of ${PWD=`pwd`} + to just ${PWD} to avoid confusion.) + +Tue Sep 15 16:00:54 1992 Ian Lance Taylor (ian@cygnus.com) + + * configure: always set $(tooldir) to $(libdir)/$(target_alias), + even for a native compilation. + +Tue Sep 15 02:22:56 1992 John Gilmore (gnu@cygnus.com) + + Changes to make the gdb.tar.Z rule work better. + + * Makefile.in (GDB_SUPPORT_DIRS): Add opcodes. + (DEVO_SUPPORT): Add configure.texi. + (bfd-ilrt.tar.Z): Remove ancient rule. + +Thu Sep 10 10:43:19 1992 Ian Lance Taylor (ian@cygnus.com) + + * Makefile.in: added -I for newlib/targ-include to XTRAFLAGS, to + pick up the machine and system specific header files. + + * configure.in, config.sub: added new target m68010-adobe-scout, + with alias of adobe68k. Changed configure.in to check for + -scout before -sco* to avoid a false match. + + * Makefile.in: added AS_FOR_TARGET, passed down in + TARGET_FLAGS_TO_PASS. Added CC_FOR_BUILD, which is intended to be + the C compiler to use to create programs which are run in the + build environment, set it to default to $(CC), and passed it down + in FLAGS_TO_PASS and TARGET_FLAGS_TO_PASS. + +Wed Sep 9 12:21:42 1992 Ian Lance Taylor (ian@cygnus.com) + + * Makefile.in: added TARGET_FLAGS_TO_PASS, CC_FOR_TARGET, + AR_FOR_TARGET, RANLIB_FOR_TARGET, NM_FOR_TARGET. Pass + TARGET_FLAGS_TO_PASS, which defines CC, AR, RANLIB and NM as the + FOR_TARGET variants, to newlib and libg++. + +Tue Sep 8 17:28:30 1992 Ken Raeburn (raeburn@cambridge.cygnus.com) + + * Makefile.in (all-gas, all-gdb): Require all-opcodes to be built + first. + +Wed Sep 2 02:50:05 1992 John Gilmore (gnu@cygnus.com) + + * config.sub: Accept `elf' as an environment. + +Tue Sep 1 15:48:30 1992 Steve Chamberlain (sac@thepub.cygnus.com) + + * Makefile.in (all-opcodes): cd into the right directory + +Sun Aug 30 21:12:11 1992 Ian Lance Taylor (ian@cygnus.com) + + * configure: added -program_transform_name option, used as + argument to sed when installing programs. + configure.texi: added documentation for -program_prefix, + -program_suffix and -program_transform_name. + +Thu Aug 27 21:59:44 1992 John Gilmore (gnu@cygnus.com) + + * config.sub: Accept i486 where i386 ok. + +Thu Aug 27 13:04:42 1992 Brendan Kehoe (brendan@rtl.cygnus.com) + + * config.sub: accept we32k + +Mon Aug 24 14:05:14 1992 Ian Lance Taylor (ian@cygnus.com) + + * config.sub, configure.in: accept OSE68000 and OSE68k. + + * Makefile.in: don't create all directories for ``make install''; + let the subdirectories create the ones they need. + +Tue Aug 11 23:13:17 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * COPYING: new file, GPL v2 + +Tue Aug 4 01:12:43 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * Makefile.in: use the new gen-info-dir, which needs a template + argument (which also lives in texinfo) + + * configure.texi, standards.texi: fix INFO-DIR-ENTRY + +Mon Aug 3 15:41:28 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * config/mh-solaris: removed the -xs from CFLAGS (let the people + with Sun's C compiler deal with it themselved) + +Mon Aug 3 00:34:17 1992 Fred Fish (fnf@cygnus.com) + + * config.sub (ncr3000): Change i386 to i486. + +Thu Jul 23 00:12:17 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * Makefile.in: add install-rcs, install-grep to + install-no-fixedincludes, removed install-bison and install-libgcc + +Tue Jul 21 01:01:50 1992 david d `zoo' zuhn (zoo@cygnus.com) + + * configure.in: grab the HPUX makefile fragment if on HPUX + +Mon Jul 20 11:02:09 1992 D. V. Henkel-Wallace (gumby@cygnus.com) + + * Makefile.in: eradicate bison spoor (ditto libgcc). + configure.in: recognise m68{k,000}-ericsson-OSE. + es1800 is alias for m68k-ericsson-OSE + +Sun Jul 19 17:49:02 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * configure.in: rearrange the parts that remove programs from + configdirs, based now on HOST==TARGET or by canonical triple. + +Fri Jul 17 22:52:49 1992 K. Richard Pixley (rich@rtl.cygnus.com) + + * test-build.mk: recurse explicitly with -f test-build.mk when + appropriate. predicate stage3 and comparison on the existence + of gcc. That is, if gcc isn't around, we aren't three-staging. + On very clean, also remove ...stamp-co. Build in-place before + doing other builds. + +Thu Jul 16 18:33:09 1992 Steve Chamberlain (sac@thepub.cygnus.com) + + * Makefile.in, configure.in: add tgas + +Thu Jul 16 16:05:28 1992 K. Richard Pixley (rich@rtl.cygnus.com) + + * Makefile.in: a number of changes merged in from progressive. + + * configure.in: add libm. + + * .cvsignore: ignore some stuff that comes from test-build.mk. + +Wed Jul 8 00:01:30 1992 Stu Grossman (grossman at cygnus.com) + + * config/mh-solaris: Use -xs when compiling so that Sun-C puts + a symbol-table into the executable. + +Tue Jul 7 00:24:52 1992 Fred Fish (fnf@cygnus.com) + + * config.sub: Add es1800 (m68k-ericsson-es1800). + +Tue Jun 30 20:24:41 1992 D. V. Henkel-Wallace (gumby@cygnus.com) + + * configure: Add program_suffix (parallel to program_prefix) + * Makefile.in: adjust directory-creating script for losing decstation + +Mon Jun 22 23:43:48 1992 Per Bothner (bothner@cygnus.com) + + * configure: Minor $subdir-related fixes. + +Mon Jun 22 18:30:26 1992 Steve Chamberlain (sac@thepub.cygnus.com) + + * configure: fix various problems with propogating + makefile_target_frag in subdirs. + * configure.in: config libgcc if its there + +Fri Jun 19 15:19:40 1992 Stu Grossman (grossman at cygnus.com) + + * config.sub: HPPA merge. + +Mon Jun 15 12:31:52 1992 Fred Fish (fnf@cygnus.com) + + * config/mh-ncr3000 (INSTALL): Don't use /usr/ucb/install, + it is broken on ncr 3000's. + +Sun Jun 14 10:29:19 1992 John Gilmore (gnu at cygnus.com) + + * Makefile.in: Replace all-bison with all-byacc in all + dependency lines for other tools (which now use byacc). + +Fri Jun 12 22:21:57 1992 John Gilmore (gnu at cygnus.com) + + * config.sub: Add sun4sol2 => sparc-sun-solaris2. + +Tue Jun 9 17:18:11 1992 Fred Fish (fnf at cygnus.com) + + * config/{mh-ncr3000, mh-sysv4}: Add INSTALL. + +Thu Jun 4 12:07:32 1992 Mark Eichin (eichin@cygnus.com) + + * Makefile.in: make gprof rules similar to byacc rules (instead of + vestigal $(unsubdir) that didn't work...) + +Thu Jun 4 00:37:05 1992 Per Bothner (bothner@rtl.cygnus.com) + + * config.sub: Add support for Linux. + * Makefile.in: Use $(FLAGS_TO_PASS) more consistently + (at least for libg++). + +Tue Jun 02 20:03:00 1992 david d `zoo' zuhn (zoo@cygnus.com) + + * configure.texi: fix doc for the -nfp option to configure + +Tue Jun 2 17:20:52 1992 Michael Tiemann (tiemann@cygnus.com) + + * Makefile.in (all-binutils): ar needs flex, so depend on all-flex. + +Sun May 31 15:04:08 1992 Mark Eichin (eichin at cygnus.com) + + * config.sub: changed [^-]+ to [^-][^-]* so that it works under + Sun sed. (BSD 4.3 sed doesn't handle [^-]+ either.) + * configure.in: added solaris* host_makefile_frag hook. + +Sun May 31 01:10:34 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * config.sub: changed recognition of m68000 so that various + m68k types can be specified via m680[01234]0 + +Sat May 30 21:01:06 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * config.sub (basic_machine): fix sed so that '-foo' isn't + completely substituted out while .+'-foo' loses the '-foo' + +Wed May 27 23:18:52 1992 Michael Tiemann (tiemann@rtl.cygnus.com) + + * config.sub ($os): Add -aout. + +Fri May 22 14:00:02 1992 Per Bothner (bothner@cygnus.com) + + * configure: If host_makefile_frag is absolute, don't + prefix ${invsubdir} (relevant to libg++ auto-configure). + +Thu May 21 18:00:09 1992 Michael Tiemann (tiemann@rtl.cygnus.com) + + * Makefile.in (tooldir): Define it. + (all-ld): Depend on all-flex. + +Sun May 10 21:45:59 1992 Per Bothner (bothner@rtl.cygnus.com) + + * Makefile.in (check): Fix libg++ special case. + +Fri May 8 08:31:41 1992 K. Richard Pixley (rich@cygnus.com) + + * configure: do not bury `pwd` into config.status, thus do fewer + pwd's. + + * configure: print the "Building in" message only when building in + other than "." AND verbose. + + * configure: remove -s, rework -v to better accommodate guested + configures. + + * standards.texi: updated to 3 may, fixed librid <-> libdir typo. + +Fri May 1 18:00:50 1992 K. Richard Pixley (rich@cygnus.com) + + * Makefile.in: macroize flags passed on recursion. remove + fileutils. + +Thu Apr 30 08:56:20 1992 K. Richard Pixley (rich@cygnus.com) + + * configure: get makesrcdir right for subdirs deeper than 1. + + * Makefile.in: pass INSTALL, INSTALL_DATA, INSTALL_PROGRAM on + install. + +Fri Apr 24 15:51:51 1992 K. Richard Pixley (rich@cygnus.com) + + * Makefile.in: don't print subdir_do or recursion lines. + +Fri Apr 24 15:22:04 1992 K. Richard Pixley (rich@cygnus.com) + + * standards.texi: added menu item. + + * Makefile.in: build and install standards.info. + + * standards.texi: new file. + +Wed Apr 22 18:06:55 1992 K. Richard Pixley (rich@rtl.cygnus.com) + + * configure: test for and move config.status pieces from + ${subdir}/. + +Wed Apr 22 14:38:34 1992 Fred Fish (fnf@cygnus.com) + + * config/mh-delta88, config/mh-ncr3000: Replace MINUS_G with + CFLAGS per new configuration strategy. + * configure: Test for existance of files before trying to mv + them, to avoid numerous non-existance messages. + +Tue Apr 21 12:31:33 1992 K. Richard Pixley (rich@cygnus.com) + + * configure: correct final line of config.status. + + * configure: patch from eggert. Avoids a protection problem if + the original Makefile.in is read only. + + * configure: use move-if-change from gcc to create config.status. + Some makefiles depend on config.status to tell if a directory + has been reconfigured for a different host. This change + prevents those directories from remaking everything in the case + where the reconfig was only intended to rebuild a Makefile. + + * configure: test for config.sub with "config.sub sun4" rather + than "config.sub ${host_alias}". Otherwise we can't tell a bad + host alias from a missing config.sub. + +Mon Apr 20 18:16:36 1992 K. Richard Pixley (rich@rtl.cygnus.com) + + * Makefile.in: explicitly pass CFLAGS on recursion. no longer pass + MINUS_G (this can be done with CFLAGS). Default CFLAGS to -g. + +Fri Apr 17 18:27:51 1992 Per Bothner (bothner@cygnus.com) + + * configure: mkdir ${subdir} as needed. + +Wed Apr 15 17:37:22 1992 K. Richard Pixley (rich@cygnus.com) + + * Makefile.in,configure.in: added autoconf. + +Wed Apr 15 17:27:34 1992 K. Richard Pixley (rich@rtl.cygnus.com) + + * Makefile.in: no longer pass against on recursion. + + * Makefile.in: added .NOEXPORT: so that stray makefile_frag + definitions are not inherited. + + * configure: correct makesrcdir when subdir is . + +Tue Apr 14 11:56:09 1992 Per Bothner (bothner@cygnus.com) + + * configure: Add support for 'subdirs' variable, which is + like 'configdirs', except that configure doesn't re-invoke + itself for subdirs, it just creates a Makefile for each subdir. + * configure.texi: Document subdirs. + +Mon Apr 13 18:50:16 1992 david d `zoo' zuhn (zoo at cirdan.cygnus.com) + + * configure.in: added flex to configdirs + +Mon Apr 13 18:43:55 1992 K. Richard Pixley (rich@cygnus.com) + + * Makefile.in: remove clean-stamps from clean. + +Sat Apr 11 03:52:03 1992 John Gilmore (gnu at cygnus.com) + + * configure.in: Add gdbtest to configdirs. + +Fri Apr 10 23:11:49 1992 Fred Fish (fnf@cygnus.com) + + * Makefile.in (MINUS_G): Add macro, default to -g, pass on + to recursive makes. + * configure.in: Recognize new ncr3000 config. + +Wed Apr 8 23:08:12 1992 K. Richard Pixley (rich@cygnus.com) + + * Makefile.in, configure.in: removed references to gdbm. + +Tue Apr 7 16:48:20 1992 Per Bothner (bothner@cygnus.com) + + * config.sub: Don't canonicalize os value + newsos* to bsd (readline needs to check for newsos). + (This fix was earlier made Jan 31, but got re-broken.) + +Mon Apr 6 14:34:08 1992 Stu Grossman (grossman at cygnus.com) + + * configure.in: sco is an os, not a vendor! + + * configure: Quote $( better. Keep various shells happy. + +Tue Mar 31 16:32:57 1992 K. Richard Pixley (rich@cygnus.com) + + * Makefile.in: eliminate stamp-files. + +Mon Mar 30 22:20:23 1992 K. Richard Pixley (rich@cygnus.com) + + * Makefile.in: add send_pr. remove "force" from .stmp-gprof rule. + Supress echoing of all the "if [ -d ... $(MAKE)" lines. + +Wed Mar 25 15:20:04 1992 Stu Grossman (grossman@cygnus.com) + + * config.sub: fix iris/iris3. + +Wed Mar 25 10:34:19 1992 K. Richard Pixley (rich@cygnus.com) + + * configure: re-add -rm. + +Tue Mar 24 23:50:16 1992 K. Richard Pixley (rich@cygnus.com) + + * Maskefile.in: add .stmp-rcs to all. + + * configure.in: remove gas from rs6000 build, use aix host fragment. + +Mon Mar 23 19:43:35 1992 K. Richard Pixley (rich@cygnus.com) + + * configure: pass down site_option during recursion. + +Thu Mar 19 16:49:36 1992 Stu Grossman (grossman at cygnus.com) + + * Makefile.in (all.cross): Add .stmp-bfd .stmp-readline. + +Wed Mar 18 15:29:33 1992 Mike Stump (mrs@cygnus.com) + + * configure: Change exec_prefix so that it really defaults to prefix. + +Sat Mar 14 17:20:38 1992 Fred Fish (fnf@cygnus.com) + + * Makefile.in, configure.in: Add support for mmalloc library. + +Fri Mar 13 18:44:18 1992 K. Richard Pixley (rich@cygnus.com) + + * Makefile.in: add stmp dependencies for a few more things. + +Thu Mar 12 04:56:24 1992 K. Richard Pixley (rich@cygnus.com) + + * configure: adjusted error message on objdir/srcdir configure + collision, per john's suggestion. + + * Makefile.in: add libiberty stmp to all and all.cross. + +Wed Mar 11 02:07:52 1992 K. Richard Pixley (rich@cygnus.com) + + * Makefile.in: remove force dependencies, add grep to all. + +Tue Mar 10 21:49:18 1992 K. Richard Pixley (rich@mars.cygnus.com) + + * Makefile.in: drop flex. make stamp files work. + + * configure: added test for conflicting configuration in srcdir, + remove trailing slashes from srcdir. Otherwise emacs gdb mode + gets cranky. use relative paths for configure and srcdir + whenever possible. Send some error messages to stderr that were + going to stdout. + +Tue Mar 10 18:01:55 1992 Per Bothner (bothner@cygnus.com) + + * Makefile.in: Fix libg++ rule to check for gcc directory + before using gcc/gcc. Also pass XTRAFLAGS. + +Thu Mar 5 21:45:07 1992 K. Richard Pixley (rich@sendai) + + * Makefile.in: added stmp-files so that directories aren't polled + when they are already built. + + * configure.texi: fixed a node pointer problem. + +Thu Mar 5 12:05:58 1992 Stu Grossman (grossman at cygnus.com) + + * config.sub configure.in config/mh-irix4 gdb/configure.in + gdb/mips-tdep.c gdb/mipsread.c gdb/procfs.c gdb/signame.h + gdb/tm-irix3.h gdb/tm-mips.h gdb/xm-irix4.h gdb/config/mt-irix3 + gdb/config/mh-irix4 texinfo/configure.in: Port to SGI Irix-4.x. + +Wed Mar 4 02:57:46 1992 K. Richard Pixley (rich@rtl.cygnus.com) + + * configure: -recurring becomes -silent. corrected help message + for -site= option. + + * Makefile.in: mkdir $(exec_prefix) and $(tooldir). + +Tue Mar 3 14:51:21 1992 K. Richard Pixley (rich@rtl.cygnus.com) + + * configure: when building Makefile for crosses, replace + tooldir and program_prefix. default srcdir from location of + config.sub. remove "for host in hosts" and "for target in + targets" loops. + +Wed Feb 26 19:48:25 1992 K. Richard Pixley (rich@rtl.cygnus.com) + + * Makefile.in: Do not pass bindir or mandir to cvs. + +Wed Feb 26 18:04:40 1992 K. Richard Pixley (rich@cygnus.com) + + * Makefile.in, configure.in: removed traces of namesubdir, + -subdirs, $(subdir), $(unsubdir), some rcs triggers. Forced + copyrights to '92, changed some from Cygnus to FSF. + + * configure.texi: remove most references to multiple hosts, + multiple targets, subdirs, etc. + + * configure.man: removed rcsid. reference config.sub not + config.subr. + + * Makefile.in: mkdir $(infodir) on install-info. + +Wed Feb 19 15:41:13 1992 John Gilmore (gnu at cygnus.com) + + * configure.texi: Explain better about .gdbinit and about + the environment that configure.in sections run in. + +Fri Feb 7 07:55:00 1992 John Gilmore (gnu at cygnus.com) + + * configure.in: Ultrix is only a decstation if it's a MIPS. + +Fri Jan 31 21:54:51 1992 John Gilmore (gnu at cygnus.com) + + * README: DOC.configure => cfg-paper.texi. + +Fri Jan 31 21:48:18 1992 Stu Grossman (grossman at cygnus.com) + + * config.sub (near case $os): Don't convert newsos* to bsd! + +Fri Jan 31 02:27:32 1992 John Gilmore (gnu at cygnus.com) + + * Makefile.in: Reinstall change from gdb-4.3 that reduces + the number of copies of COPYING that go into the GDB tar file. + +Thu Jan 30 16:17:30 1992 Stu Grossman (grossman at cygnus.com) + + * bfd/configure.in, config/mh-sco, gdb/config/mh-i386sco, + gdb/config/mt-i386v32, gdb/configure.in, readline/configure.in: + Fix SCO configuration stuff. + +Tue Jan 28 23:51:07 1992 Per Bothner (bothner at cygnus.com) + + * Makefile.in: For libg++, make sure the -I pointing + to the gcc directory goes *after* all the libg++-local -I flags. + Also, move just-gcc dependency from just-libg++ to all-libg++. + +Tue Jan 28 12:56:24 1992 Stu Grossman (grossman at cygnus.com) + + * configure: Change -x to -f to keep Ultrix /bin/test happy. + +Sat Jan 18 17:45:11 1992 Stu Grossman (grossman at cygnus.com) + + * Makefile.in (make-gdb.tar.Z): Remove texinfo targets. + +Sat Jan 18 17:03:21 1992 Fred Fish (fnf at cygnus.com) + + * config.sub: Add stratus configuration frags. Also + submitted to FSF. + +Sat Jan 18 15:35:29 1992 Stu Grossman (grossman at cygnus.com) + + * Makefile.in (DEV_SUPPORT): add configure.man. + + * config.sub(Decode manufacturer-specific): add -none*. + +Fri Jan 17 17:58:05 1992 Stu Grossman (grossman at cygnus.com) + + * Makefile.in: remove form feeds to make Sun's make happy. + (DEVO_SUPPORT): DOC.configure => cfg-paper.texi. + +Sat Jan 4 16:11:44 1992 John Gilmore (gnu at cygnus.com) + + * Makefile.in (AR_FLAGS): Make quieter. + +Thu Jan 2 22:57:12 1992 John Gilmore (gnu at cygnus.com) + + * configure.in: Add libg++. + * configure: When verbose, don't output the command line at each + level; it will be unremarkably the same as the previous version, + which will be the same as what the user typed. + +Fri Dec 27 16:26:47 1991 K. Richard Pixley (rich at cygnus.com) + + * configure.in, Makefile.in: fix clean-info, add flex. add + fileutils. + + * configure: be less sensitive to spaces in Makefile.in. Do not + look for sources in "..". Doing so breaks subdirectories that + might have their own configure. If a subdir has it's own + configure script, use it. + +Thu Dec 26 16:30:26 1991 K. Richard Pixley (rich at cygnus.com) + + * cfg-paper.texi: some changes suggested by rms. + +Thu Dec 26 10:13:36 1991 Fred Fish (fnf at cygnus.com) + + * config.sub: Merge in some small additions from the FSF version, + taken from the gcc distribution, to bring the Cygnus and FSF + versions into closer sync. + +Fri Dec 20 11:34:18 1991 Fred Fish (fnf at cygnus.com) + + * configure.in: Changed svr4 references to sysv4. + +Thu Dec 19 15:54:29 1991 K. Richard Pixley (rich at cygnus.com) + + * configure: added -V for version number option. + +Wed Dec 18 15:39:34 1991 K. Richard Pixley (rich at cygnus.com) + + * DOC.configure, cfg-paper.texi: revised, updated, and texinfo'd. + renamed from DOC.configure to cfg-paper.texi. + +Mon Dec 16 23:05:19 1991 K. Richard Pixley (rich at rtl.cygnus.com) + + * configure, config.subr, config.sub: config.subr is now + config.sub again. + +Fri Dec 13 01:17:06 1991 K. Richard Pixley (rich at cygnus.com) + + * configure.texi: new file, in progress. + + * Makefile.in: build info file and install the man page for + configure. + + * configure.man: new file, first cut. + + * configure: find config.subr again now that configuration "none" + has gone. removed all traces of the -ansi option. removed all + traces of the -languages option. + + * config.subr: resync from rms. + +Wed Dec 11 22:25:20 1991 K. Richard Pixley (rich at rtl.cygnus.com) + + * configure, config.sub, config.subr: merge config.sub into + config.subr, call the result config.subr, remove config.sub, use + config.subr. + + * Makefile.in: revised install for dir.info. + +Tue Dec 10 00:04:35 1991 K. Richard Pixley (rich at rtl.cygnus.com) + + * configure.in: add decstation host makefile frag. + + * Makefile.in: BISON now bison -y again. also install-gcc on + install. clean-gdbm on clean. infodir belongs in datadir. + Make directories for info install. Build dir.info here then + install it. + +Mon Dec 9 16:48:33 1991 K. Richard Pixley (rich at rtl.cygnus.com) + + * Makefile.in: fix for bad directory tests. + +Sat Dec 7 00:17:01 1991 K. Richard Pixley (rich at rtl.cygnus.com) + + * configure: \{1,2\} appears to be a sysv'ism. Use a different + regexp. -srcdir relative was being handled incorrectly. + + * Makefile.in: unwrapped some for loops so that parallel makes + work again and so one can focus one's attention on a particular + package. + +Fri Dec 6 00:22:08 1991 K. Richard Pixley (rich at rtl.cygnus.com) + + * configure: added PWD as a stand in for `pwd` (for speed). use + elif wherever possible. make -srcdir work without -objdir. + -objdir= commented out. + +Thu Dec 5 22:46:52 1991 K. Richard Pixley (rich at rtl.cygnus.com) + + * configure: +options become --options. -subdirs commented out. + added -host, -datadir. Renamed -destdir to -prefix. Comment in + Makefile now at top of generated Makefile. Removed cvs log + entries. added -srcdir. create .gdbinit only if there is one + in ${srcdir}. + + * Makefile.in: idestdir and ddestdir go away. Added copyrights + and shift gpl to v2. Added ChangeLog if it didn't exist. docdir + and mandir now keyed off datadir by default. + +Fri Nov 22 07:38:11 1991 K. Richard Pixley (rich at rtl.cygnus.com) + + * Freshly created ChangeLog. + + +Local Variables: +mode: change-log +left-margin: 8 +fill-column: 76 +version-control: never +End: diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in index 6669eb4c64f..f2867d8492c 100644 --- a/gcc/ada/Make-lang.in +++ b/gcc/ada/Make-lang.in @@ -170,7 +170,7 @@ GNATBIND_OBJS = \ ada/s-stoele.o ada/s-imgenu.o ada/s-strops.o ada/s-soflin.o ada/s-wchcon.o \ ada/s-wchjis.o ada/sdefault.o ada/switch.o ada/switch-b.o ada/stylesw.o \ ada/validsw.o ada/system.o ada/table.o ada/tree_io.o ada/types.o \ - ada/widechar.o ada/raise.o ada/exit.o ada/argv.o ada/init.o ada/final.o \ + ada/widechar.o ada/raise.o ada/exit.o ada/argv.o ada/init.o ada/adafinal.o \ ada/s-wchcnv.o ada/s-exctab.o ada/a-except.o ada/s-memory.o ada/s-traceb.o \ ada/tracebak.o ada/s-mastop.o ada/s-except.o ada/s-secsta.o ada/atree.o \ ada/scans.o ada/einfo.o ada/sinfo.o ada/scn.o ada/sinput.o ada/sinput-l.o \ @@ -230,11 +230,11 @@ cross-gnattools: force $(MAKE) -C ada $(FLAGS_TO_PASS) $(ADA_FLAGS_TO_PASS)\ ADA_INCLUDES="-I$(RTS_DIR)adainclude -I$(RTS_DIR)adalib" \ GNATMAKE="gnatmake" \ - GNATBIND="gnatbind" \ - GNATLINK="gnatlink" \ - LIBGNAT="" \ + GNATBIND="gnatbind" \ + GNATLINK="gnatlink" \ + LIBGNAT="" \ gnattools1-re gnattools2 - + rts-none: force $(MAKE) -C ada $(FLAGS_TO_PASS) GNATMAKE=../gnatmake rts-none @@ -366,23 +366,23 @@ $(srcdir)/ada/gnat_ug_wnt.texi : ada/doctools/xgnatug \ ada/doctools/xgnatug wnt $(srcdir)/ada/gnat_ug.texi $(srcdir)/ada/ug_words $(srcdir)/ada/gnat_ug_wnt.texi $(srcdir)/ada/gnat_ug_unx.info : $(srcdir)/ada/gnat_ug_unx.texi \ - $(srcdir)/doc/include/fdl.texi + $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi cd $(srcdir) && $(MAKEINFO) -I doc/include -I ada -o ada/gnat_ug_unx.info ada/gnat_ug_unx.texi $(srcdir)/ada/gnat_ug_vms.info : $(srcdir)/ada/gnat_ug_vms.texi \ - $(srcdir)/doc/include/fdl.texi + $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi cd $(srcdir) && $(MAKEINFO) -I doc/include -I ada -o ada/gnat_ug_vms.info ada/gnat_ug_vms.texi $(srcdir)/ada/gnat_ug_vxw.info : $(srcdir)/ada/gnat_ug_vxw.texi \ - $(srcdir)/doc/include/fdl.texi + $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi cd $(srcdir) && $(MAKEINFO) -I doc/include -I ada -o ada/gnat_ug_vxw.info ada/gnat_ug_vxw.texi $(srcdir)/ada/gnat_ug_wnt.info : $(srcdir)/ada/gnat_ug_wnt.texi \ - $(srcdir)/doc/include/fdl.texi + $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi cd $(srcdir) && $(MAKEINFO) -I doc/include -I ada -o ada/gnat_ug_wnt.info ada/gnat_ug_wnt.texi $(srcdir)/ada/gnat_rm.info : $(srcdir)/ada/gnat_rm.texi \ - $(srcdir)/doc/include/fdl.texi + $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi cd $(srcdir) && $(MAKEINFO) -I doc/include -I ada -o ada/gnat_rm.info ada/gnat_rm.texi $(srcdir)/ada/gnat-style.info : $(srcdir)/ada/gnat-style.texi \ @@ -394,53 +394,54 @@ ada.info: $(srcdir)/ada/gnat_ug_vms.info $(srcdir)/ada/gnat_ug_wnt.info \ $(srcdir)/ada/gnat_rm.info $(srcdir)/ada/gnat-style.info ada.install-info: - -rm -f $(infodir)/gnat_ug_*.info* - -rm -f $(infodir)/gnat_rm.info* - -rm -f $(infodir)/gnat-style.info* + -rm -f $(DESTDIR)$(infodir)/gnat_ug_*.info* + -rm -f $(DESTDIR)$(infodir)/gnat_rm.info* + -rm -f $(DESTDIR)$(infodir)/gnat-style.info* + $(MKDIR) $(DESTDIR)$(infodir) if [ -f $(srcdir)/ada/gnat_ug_unx.info ]; then \ for f in $(srcdir)/ada/gnat_ug_*.info* \ $(srcdir)/ada/gnat_rm.info* \ $(srcdir)/ada/gnat-style.info*; do \ realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \ - $(INSTALL_DATA) $$f $(infodir)/$$realfile; \ + $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$realfile; \ done; \ else true; fi -if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ - if [ -f $(infodir)/dir ] ; then \ + if [ -f $(DESTDIR)$(infodir)/dir ] ; then \ for f in gnat_ug_vms.info gnat_ug_wnt.info gnat_ug_unx.info \ gnat_ug_vxw.info gnat_rm.info gnat-style.info; do \ - if [ -f $(infodir)/$$f ]; then \ - install-info --dir-file=$(infodir)/dir $(infodir)/$$f; \ + if [ -f $(DESTDIR)$(infodir)/$$f ]; then \ + install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/$$f; \ else true; fi; \ done; \ else true; fi; \ else true; fi; - -chmod a-x $(infodir)/gnat_ug_vms.info* $(infodir)/gnat_ug_wnt.info* - -chmod a-x $(infodir)/gnat_ug_unx.info* $(infodir)/gnat_ug_vxw.info* - -chmod a-x $(infodir)/gnat_rm.info* $(infodir)/gnat-style.info* + -chmod a-x $(DESTDIR)$(infodir)/gnat_ug_vms.info* $(DESTDIR)$(infodir)/gnat_ug_wnt.info* + -chmod a-x $(DESTDIR)$(infodir)/gnat_ug_unx.info* $(DESTDIR)$(infodir)/gnat_ug_vxw.info* + -chmod a-x $(DESTDIR)$(infodir)/gnat_rm.info* $(DESTDIR)$(infodir)/gnat-style.info* ada/gnat_ug_unx.dvi : $(srcdir)/ada/gnat_ug_unx.texi \ - $(srcdir)/doc/include/fdl.texi + $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi s=`cd $(srcdir); ${PWD}`; \ cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_unx.dvi $$s/ada/gnat_ug_unx.texi ada/gnat_ug_vms.dvi : $(srcdir)/ada/gnat_ug_vms.texi \ - $(srcdir)/doc/include/fdl.texi + $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi s=`cd $(srcdir); ${PWD}`; \ cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_vms.dvi $$s/ada/gnat_ug_vms.texi ada/gnat_ug_vxw.dvi : $(srcdir)/ada/gnat_ug_vxw.texi \ - $(srcdir)/doc/include/fdl.texi + $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi s=`cd $(srcdir); ${PWD}`; \ cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_vxw.dvi $$s/ada/gnat_ug_vxw.texi ada/gnat_ug_wnt.dvi : $(srcdir)/ada/gnat_ug_wnt.texi \ - $(srcdir)/doc/include/fdl.texi + $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi s=`cd $(srcdir); ${PWD}`; \ cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_ug_wnt.dvi $$s/ada/gnat_ug_wnt.texi ada/gnat_rm.dvi : $(srcdir)/ada/gnat_rm.texi \ - $(srcdir)/doc/include/fdl.texi + $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi s=`cd $(srcdir); ${PWD}`; \ cd ada && $(TEXI2DVI) -c -I $$s/doc/include -o gnat_rm.dvi $$s/ada/gnat_rm.texi @@ -465,222 +466,201 @@ ada.install-normal: # likewise for gnatf, gnatchop, and gnatlink, gnatkr, gnatmake, gnat, # gnatprep, gnatbl, gnatls, gnatxref, gnatfind ada.install-common: + $(MKDIR) $(DESTDIR)$(bindir) -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatbind-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatbind$(exeext); \ - $(INSTALL_PROGRAM) gnatbind-cross$(exeext) $(bindir)/$(target_alias)-gnatbind$(exeext); \ - if [ -d $(tooldir)/bin/. ] ; then \ - rm -f $(tooldir)/bin/gnatbind$(exeext); \ - $(INSTALL_PROGRAM) gnatbind-cross$(exeext) $(tooldir)/bin/gnatbind$(exeext); \ - fi; \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatbind$(exeext); \ + $(INSTALL_PROGRAM) gnatbind-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatbind$(exeext); \ + if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \ + rm -f $(DESTDIR)$(tooldir)/bin/gnatbind$(exeext); \ + $(INSTALL_PROGRAM) gnatbind-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatbind$(exeext); \ + fi; \ else \ - $(RM) $(bindir)/gnatbind$(exeext); \ - $(INSTALL_PROGRAM) gnatbind$(exeext) $(bindir)/gnatbind$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatbind$(exeext); \ + $(INSTALL_PROGRAM) gnatbind$(exeext) $(DESTDIR)$(bindir)/gnatbind$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatbl-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatbl$(exeext); \ - $(INSTALL_PROGRAM) gnatbl-cross$(exeext) $(bindir)/$(target_alias)-gnatbl$(exeext); \ - if [ -d $(tooldir)/bin/. ] ; then \ - rm -f $(tooldir)/bin/gnatbl$(exeext); \ - $(INSTALL_PROGRAM) gnatbl-cross$(exeext) $(tooldir)/bin/gnatbl$(exeext); \ - fi; \ - else \ - $(RM) $(bindir)/gnatbl$(exeext); \ - $(INSTALL_PROGRAM) gnatbl$(exeext) $(bindir)/gnatbl$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ - then \ - if [ -f gnatchop-cross$(shext) ] ; \ - then \ - $(RM) $(bindir)/$(target_alias)-gnatchop$(shext); \ - $(INSTALL_PROGRAM) $(srcdir)/ada/gnatchop$(shext) $(bindir)/$(target_alias)-gnatchop$(shext); \ - if [ -d $(tooldir)/bin/. ] ; then \ - rm -f $(tooldir)/bin/gnatchop$(shext); \ - $(INSTALL_PROGRAM) gnatchop$(shext) $(tooldir)/bin/gnatchop$(exeext); \ - fi; \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatbl$(exeext); \ + $(INSTALL_PROGRAM) gnatbl-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatbl$(exeext); \ + if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \ + rm -f $(DESTDIR)$(tooldir)/bin/gnatbl$(exeext); \ + $(INSTALL_PROGRAM) gnatbl-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatbl$(exeext); \ + fi; \ else \ - $(RM) $(bindir)/gnatchop$(shext); \ - $(INSTALL_PROGRAM) $(srcdir)/ada/gnatchop$(shext) $(bindir)/gnatchop$(shext); \ + $(RM) $(DESTDIR)$(bindir)/gnatbl$(exeext); \ + $(INSTALL_PROGRAM) gnatbl$(exeext) $(DESTDIR)$(bindir)/gnatbl$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatchop-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatchop$(exeext); \ - $(INSTALL_PROGRAM) gnatchop-cross$(exeext) $(bindir)/$(target_alias)-gnatchop$(exeext); \ - if [ -d $(tooldir)/bin/. ] ; then \ - rm -f $(tooldir)/bin/gnatchop$(exeext); \ - $(INSTALL_PROGRAM) gnatchop-cross$(exeext) $(tooldir)/bin/gnatchop$(exeext); \ - fi; \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatchop$(exeext); \ + $(INSTALL_PROGRAM) gnatchop-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatchop$(exeext); \ + if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \ + rm -f $(DESTDIR)$(tooldir)/bin/gnatchop$(exeext); \ + $(INSTALL_PROGRAM) gnatchop-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatchop$(exeext); \ + fi; \ else \ - $(RM) $(bindir)/gnatchop$(exeext); \ - $(INSTALL_PROGRAM) gnatchop$(exeext) $(bindir)/gnatchop$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatchop$(exeext); \ + $(INSTALL_PROGRAM) gnatchop$(exeext) $(DESTDIR)$(bindir)/gnatchop$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnat-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnat$(exeext); \ - $(INSTALL_PROGRAM) gnat-cross$(exeext) $(bindir)/$(target_alias)-gnat$(exeext); \ - if [ -d $(tooldir)/bin/. ] ; then \ - rm -f $(tooldir)/bin/gnat$(exeext); \ - $(INSTALL_PROGRAM) gnat-cross$(exeext) $(tooldir)/bin/gnat$(exeext); \ - fi; \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnat$(exeext); \ + $(INSTALL_PROGRAM) gnat-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnat$(exeext); \ + if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \ + rm -f $(DESTDIR)$(tooldir)/bin/gnat$(exeext); \ + $(INSTALL_PROGRAM) gnat-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnat$(exeext); \ + fi; \ else \ - $(RM) $(bindir)/gnat$(exeext); \ - $(INSTALL_PROGRAM) gnat$(exeext) $(bindir)/gnat$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnat$(exeext); \ + $(INSTALL_PROGRAM) gnat$(exeext) $(DESTDIR)$(bindir)/gnat$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatkr-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatkr$(exeext); \ - $(INSTALL_PROGRAM) gnatkr-cross$(exeext) $(bindir)/$(target_alias)-gnatkr$(exeext); \ - if [ -d $(tooldir)/bin/. ] ; then \ - rm -f $(tooldir)/bin/gnatkr$(exeext); \ - $(INSTALL_PROGRAM) gnatkr-cross$(exeext) $(tooldir)/bin/gnatkr$(exeext); \ - fi; \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatkr$(exeext); \ + $(INSTALL_PROGRAM) gnatkr-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatkr$(exeext); \ + if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \ + rm -f $(DESTDIR)$(tooldir)/bin/gnatkr$(exeext); \ + $(INSTALL_PROGRAM) gnatkr-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatkr$(exeext); \ + fi; \ else \ - $(RM) $(bindir)/gnatkr$(exeext); \ - $(INSTALL_PROGRAM) gnatkr$(exeext) $(bindir)/gnatkr$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatkr$(exeext); \ + $(INSTALL_PROGRAM) gnatkr$(exeext) $(DESTDIR)$(bindir)/gnatkr$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatlink-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatlink$(exeext); \ - $(INSTALL_PROGRAM) gnatlink-cross$(exeext) $(bindir)/$(target_alias)-gnatlink$(exeext); \ - if [ -d $(tooldir)/bin/. ] ; then \ - rm -f $(tooldir)/bin/gnatlink$(exeext); \ - $(INSTALL_PROGRAM) gnatlink-cross$(exeext) $(tooldir)/bin/gnatlink$(exeext); \ - fi; \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatlink$(exeext); \ + $(INSTALL_PROGRAM) gnatlink-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatlink$(exeext); \ + if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \ + rm -f $(DESTDIR)$(tooldir)/bin/gnatlink$(exeext); \ + $(INSTALL_PROGRAM) gnatlink-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatlink$(exeext); \ + fi; \ else \ - $(RM) $(bindir)/gnatlink$(exeext); \ - $(INSTALL_PROGRAM) gnatlink$(exeext) $(bindir)/gnatlink$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatlink$(exeext); \ + $(INSTALL_PROGRAM) gnatlink$(exeext) $(DESTDIR)$(bindir)/gnatlink$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatls-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatls$(exeext); \ - $(INSTALL_PROGRAM) gnatls-cross$(exeext) $(bindir)/$(target_alias)-gnatls$(exeext); \ - if [ -d $(tooldir)/bin/. ] ; then \ - rm -f $(tooldir)/bin/gnatls$(exeext); \ - $(INSTALL_PROGRAM) gnatls-cross$(exeext) $(tooldir)/bin/gnatls$(exeext); \ - fi; \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatls$(exeext); \ + $(INSTALL_PROGRAM) gnatls-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatls$(exeext); \ + if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \ + rm -f $(DESTDIR)$(tooldir)/bin/gnatls$(exeext); \ + $(INSTALL_PROGRAM) gnatls-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatls$(exeext); \ + fi; \ else \ - $(RM) $(bindir)/gnatls$(exeext); \ - $(INSTALL_PROGRAM) gnatls$(exeext) $(bindir)/gnatls$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatls$(exeext); \ + $(INSTALL_PROGRAM) gnatls$(exeext) $(DESTDIR)$(bindir)/gnatls$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatmake-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatmake$(exeext); \ - $(INSTALL_PROGRAM) gnatmake-cross$(exeext) $(bindir)/$(target_alias)-gnatmake$(exeext); \ - if [ -d $(tooldir)/bin/. ] ; then \ - rm -f $(tooldir)/bin/gnatmake$(exeext); \ - $(INSTALL_PROGRAM) gnatmake-cross$(exeext) $(tooldir)/bin/gnatmake$(exeext); \ - fi; \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatmake$(exeext); \ + $(INSTALL_PROGRAM) gnatmake-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatmake$(exeext); \ + if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \ + rm -f $(DESTDIR)$(tooldir)/bin/gnatmake$(exeext); \ + $(INSTALL_PROGRAM) gnatmake-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatmake$(exeext); \ + fi; \ else \ - $(RM) $(bindir)/gnatmake$(exeext); \ - $(INSTALL_PROGRAM) gnatmake$(exeext) $(bindir)/gnatmake$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatmake$(exeext); \ + $(INSTALL_PROGRAM) gnatmake$(exeext) $(DESTDIR)$(bindir)/gnatmake$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatmem-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatmem$(exeext); \ - $(INSTALL_PROGRAM) gnatmem-cross$(exeext) $(bindir)/$(target_alias)-gnatmem$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatmem$(exeext); \ + $(INSTALL_PROGRAM) gnatmem-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatmem$(exeext); \ else \ - $(RM) $(bindir)/gnatmem$(exeext); \ - $(INSTALL_PROGRAM) gnatmem$(exeext) $(bindir)/gnatmem$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatmem$(exeext); \ + $(INSTALL_PROGRAM) gnatmem$(exeext) $(DESTDIR)$(bindir)/gnatmem$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatname-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatname$(exeext); \ - $(INSTALL_PROGRAM) gnatname-cross$(exeext) $(bindir)/$(target_alias)-gnatname$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatname$(exeext); \ + $(INSTALL_PROGRAM) gnatname-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatname$(exeext); \ else \ - $(RM) $(bindir)/gnatname$(exeext); \ - $(INSTALL_PROGRAM) gnatname$(exeext) $(bindir)/gnatname$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatname$(exeext); \ + $(INSTALL_PROGRAM) gnatname$(exeext) $(DESTDIR)$(bindir)/gnatname$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatprep-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatprep$(exeext); \ - $(INSTALL_PROGRAM) gnatprep-cross$(exeext) $(bindir)/$(target_alias)-gnatprep$(exeext); \ - if [ -d $(tooldir)/bin/. ] ; then \ - rm -f $(tooldir)/bin/gnatprep$(exeext); \ - $(INSTALL_PROGRAM) gnatprep-cross$(exeext) $(tooldir)/bin/gnatprep$(exeext); \ - fi; \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatprep$(exeext); \ + $(INSTALL_PROGRAM) gnatprep-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatprep$(exeext); \ + if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \ + rm -f $(DESTDIR)$(tooldir)/bin/gnatprep$(exeext); \ + $(INSTALL_PROGRAM) gnatprep-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatprep$(exeext); \ + fi; \ else \ - $(RM) $(bindir)/gnatprep$(exeext); \ - $(INSTALL_PROGRAM) gnatprep$(exeext) $(bindir)/gnatprep$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatprep$(exeext); \ + $(INSTALL_PROGRAM) gnatprep$(exeext) $(DESTDIR)$(bindir)/gnatprep$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatpsta-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatpsta$(exeext); \ - $(INSTALL_PROGRAM) gnatpsta-cross$(exeext) $(bindir)/$(target_alias)-gnatpsta$(exeext); \ - if [ -d $(tooldir)/bin/. ] ; then \ - rm -f $(tooldir)/bin/gnatpsta$(exeext); \ - $(INSTALL_PROGRAM) gnatpsta-cross$(exeext) $(tooldir)/bin/gnatpsta$(exeext); \ - fi; \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatpsta$(exeext); \ + $(INSTALL_PROGRAM) gnatpsta-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatpsta$(exeext); \ + if [ -d $(DESTDIR)$(tooldir)/bin/. ] ; then \ + rm -f $(DESTDIR)$(tooldir)/bin/gnatpsta$(exeext); \ + $(INSTALL_PROGRAM) gnatpsta-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatpsta$(exeext); \ + fi; \ else \ - $(RM) $(bindir)/gnatpsta$(exeext); \ - $(INSTALL_PROGRAM) gnatpsta$(exeext) $(bindir)/gnatpsta$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatpsta$(exeext); \ + $(INSTALL_PROGRAM) gnatpsta$(exeext) $(DESTDIR)$(bindir)/gnatpsta$(exeext); \ fi ; \ fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatxref-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatxref$(exeext); \ - $(INSTALL_PROGRAM) gnatxref-cross$(exeext) $(bindir)/$(target_alias)-gnatxref$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatxref$(exeext); \ + $(INSTALL_PROGRAM) gnatxref-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatxref$(exeext); \ else \ - $(RM) $(bindir)/gnatxref$(exeext); \ - $(INSTALL_PROGRAM) gnatxref$(exeext) $(bindir)/gnatxref$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatxref$(exeext); \ + $(INSTALL_PROGRAM) gnatxref$(exeext) $(DESTDIR)$(bindir)/gnatxref$(exeext); \ fi ; \ - fi + fi -if [ -f gnat1$(exeext) ] ; \ then \ if [ -f gnatfind-cross$(exeext) ] ; \ then \ - $(RM) $(bindir)/$(target_alias)-gnatfind$(exeext); \ - $(INSTALL_PROGRAM) gnatfind-cross$(exeext) $(bindir)/$(target_alias)-gnatfind$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatfind$(exeext); \ + $(INSTALL_PROGRAM) gnatfind-cross$(exeext) $(DESTDIR)$(bindir)/$(target_alias)-gnatfind$(exeext); \ else \ - $(RM) $(bindir)/gnatfind$(exeext); \ - $(INSTALL_PROGRAM) gnatfind$(exeext) $(bindir)/gnatfind$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatfind$(exeext); \ + $(INSTALL_PROGRAM) gnatfind$(exeext) $(DESTDIR)$(bindir)/gnatfind$(exeext); \ fi ; \ fi - -if [ -f gnat1$(exeext) ] ; \ - then \ - if [ -f gnatchop$(exeext) ] ; \ - then \ - $(RM) $(bindir)/gnatchop$(exeext); \ - $(INSTALL_PROGRAM) gnatchop$(exeext) $(bindir)/gnatchop$(exeext); \ - fi ; \ # # Gnatlbr is only used on VMS. # @@ -688,8 +668,8 @@ ada.install-common: then \ if [ -f gnatlbr$(exeext) ] ; \ then \ - $(RM) $(bindir)/gnatlbr$(exeext); \ - $(INSTALL_PROGRAM) gnatlbr$(exeext) $(bindir)/gnatlbr$(exeext); \ + $(RM) $(DESTDIR)$(bindir)/gnatlbr$(exeext); \ + $(INSTALL_PROGRAM) gnatlbr$(exeext) $(DESTDIR)$(bindir)/gnatlbr$(exeext); \ fi ; \ fi # @@ -697,8 +677,11 @@ ada.install-common: # -if [ -f gnat1$(exeext) ] ; \ then \ - $(RM) $(bindir)/gnatdll$(exeext); \ - $(INSTALL_PROGRAM) gnatdll$(exeext) $(bindir)/gnatdll$(exeext); \ + if [ -f gnatdll$(exeext) ] ; \ + then \ + $(RM) $(DESTDIR)$(bindir)/gnatdll$(exeext); \ + $(INSTALL_PROGRAM) gnatdll$(exeext) $(DESTDIR)$(bindir)/gnatdll$(exeext); \ + fi ; \ fi # # Finally, install the library @@ -715,46 +698,54 @@ ada.install-info: ada.install-man: ada.uninstall: - -$(RM) $(bindir)/gnatbind$(exeext) - -$(RM) $(bindir)/gnatbl$(exeext) - -$(RM) $(bindir)/gnatchop$(exeext) - -$(RM) $(bindir)/gnat$(exeext) - -$(RM) $(bindir)/gnatdll$(exeext) - -$(RM) $(bindir)/gnatkr$(exeext) - -$(RM) $(bindir)/gnatlink$(exeext) - -$(RM) $(bindir)/gnatls$(exeext) - -$(RM) $(bindir)/gnatmake$(exeext) - -$(RM) $(bindir)/gnatmem$(exeext) - -$(RM) $(bindir)/gnatname$(exeext) - -$(RM) $(bindir)/gnatprep$(exeext) - -$(RM) $(bindir)/gnatpsta$(exeext) - -$(RM) $(bindir)/$(target_alias)-gnatbind$(exeext) - -$(RM) $(bindir)/$(target_alias)-gnatbl$(exeext) - -$(RM) $(bindir)/$(target_alias)-gnatchop$(exeext) - -$(RM) $(bindir)/$(target_alias)-gnat$(exeext) - -$(RM) $(bindir)/$(target_alias)-gnatkr(exeext) - -$(RM) $(bindir)/$(target_alias)-gnatlink$(exeext) - -$(RM) $(bindir)/$(target_alias)-gnatls$(exeext) - -$(RM) $(bindir)/$(target_alias)-gnatmake$(exeext) - -$(RM) $(bindir)/$(target_alias)-gnatmem$(exeext) - -$(RM) $(bindir)/$(target_alias)-gnatname$(exeext) - -$(RM) $(bindir)/$(target_alias)-gnatprep$(exeext) - -$(RM) $(bindir)/$(target_alias)-gnatpsta$(exeext) - -$(RM) $(tooldir)/bin/gnatbind$(exeext) - -$(RM) $(tooldir)/bin/gnatbl$(exeext) - -$(RM) $(tooldir)/bin/gnatchop$(exeext) - -$(RM) $(tooldir)/bin/gnat$(exeext) - -$(RM) $(tooldir)/bin/gnatdll$(exeext) - -$(RM) $(tooldir)/bin/gnatkr$(exeext) - -$(RM) $(tooldir)/bin/gnatlink$(exeext) - -$(RM) $(tooldir)/bin/gnatls$(exeext) - -$(RM) $(tooldir)/bin/gnatmake$(exeext) - -$(RM) $(tooldir)/bin/gnatmem$(exeext) - -$(RM) $(tooldir)/bin/gnatname$(exeext) - -$(RM) $(tooldir)/bin/gnatprep$(exeext) - -$(RM) $(tooldir)/bin/gnatpsta$(exeext) -# Gnatlbr and Gnatchop are only used on VMS - -$(RM) $(bindir)/gnatlbr$(exeext) $(bindir)/gnatchop$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatbind$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatbl$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatchop$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnat$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatfind$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatdll$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatkr$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatlbr$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatlink$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatls$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatmake$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatmem$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatname$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatprep$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatpsta$(exeext) + -$(RM) $(DESTDIR)$(bindir)/gnatxref$(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatbind$(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatbl$(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatchop$(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnat$(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatfind$(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatdll$(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatkr(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatlbr$(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatlink$(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatls$(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatmake$(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatmem$(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatname$(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatprep$(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatpsta$(exeext) + -$(RM) $(DESTDIR)$(bindir)/$(target_alias)-gnatxref$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatbind$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatbl$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatchop$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnat$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatfind$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatdll$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatkr$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatlbr$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatlink$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatls$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatmake$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatmem$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatname$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatprep$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatpsta$(exeext) + -$(RM) $(DESTDIR)$(tooldir)/bin/gnatxref$(exeext) # Clean hooks: # A lot of the ancillary files are deleted by the main makefile. @@ -978,7 +969,7 @@ ada/adaint.o : ada/adaint.c $(CONFIG_H) $(SYSTEM_H) ada/adaint.h ada/argv.o : ada/argv.c $(CONFIG_H) $(SYSTEM_H) ada/adaint.h ada/cstreams.o : ada/cstreams.c $(CONFIG_H) $(SYSTEM_H) ada/adaint.h ada/exit.o : ada/exit.c $(CONFIG_H) $(SYSTEM_H) ada/adaint.h -ada/final.o : ada/final.c $(CONFIG_H) $(SYSTEM_H) ada/raise.h +ada/adafinal.o : ada/adafinal.c $(CONFIG_H) $(SYSTEM_H) ada/raise.h ada/link.o : ada/link.c ada/cio.o : ada/cio.c $(CONFIG_H) $(SYSTEM_H) ada/adaint.h diff --git a/gcc/ada/Makefile.in b/gcc/ada/Makefile.in index e4e6bb2e508..f6e26d36a54 100644 --- a/gcc/ada/Makefile.in +++ b/gcc/ada/Makefile.in @@ -875,7 +875,7 @@ ifeq ($(strip $(filter-out lynxos,$(osys))),) endif endif -ifeq ($(strip $(filter-out rtems,$(osys))),) +ifeq ($(strip $(filter-out rtems rtemself rtemsaout rtemscoff,$(osys))),) LIBGNAT_TARGET_PAIRS = \ a-intnam.ads<4rintnam.ads \ s-inmaop.adb<7sinmaop.adb \ @@ -886,7 +886,7 @@ ifeq ($(strip $(filter-out rtems,$(osys))),) s-parame.adb<5rparame.adb \ s-taprop.adb<7staprop.adb \ s-taspri.ads<7staspri.ads \ - s-tpopsp.adb<5atpopsp.adb + s-tpopsp.adb<5rtpopsp.adb endif ifeq ($(strip $(filter-out go32 msdos,$(osys))),) @@ -1021,10 +1021,10 @@ endif LIBGNAT_SRCS = ada.h adaint.c adaint.h argv.c cio.c cstreams.c \ errno.c exit.c cal.c \ raise.h raise.c sysdep.c types.h aux-io.c init.c \ - final.c tracebak.c expect.c mkdir.c $(EXTRA_LIBGNAT_SRCS) + adafinal.c tracebak.c expect.c mkdir.c $(EXTRA_LIBGNAT_SRCS) LIBGNAT_OBJS = adaint.o argv.o cio.o cstreams.o errno.o exit.o \ - raise.o sysdep.o aux-io.o init.o cal.o final.o \ + raise.o sysdep.o aux-io.o init.o cal.o adafinal.o \ tracebak.o expect.o mkdir.o $(EXTRA_LIBGNAT_OBJS) # NOTE ??? - when the -I option for compiling Ada code is made to work, @@ -1711,38 +1711,38 @@ install-gnatlib: ../stamp-gnatlib # Create the directory before deleting it, in case the directory is # a list of directories (as it may be on VMS). This ensures we are # deleting the right one. - -$(MKDIR) $(ADA_RTL_OBJ_DIR) - -$(MKDIR) $(ADA_INCLUDE_DIR) - $(RMDIR) $(ADA_RTL_OBJ_DIR) - $(RMDIR) $(ADA_INCLUDE_DIR) - -$(MKDIR) $(ADA_RTL_OBJ_DIR) - -$(MKDIR) $(ADA_INCLUDE_DIR) - -$(INSTALL_DATA) ada/rts/Makefile.adalib $(ADA_RTL_OBJ_DIR) + -$(MKDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR) + -$(MKDIR) $(DESTDIR)$(ADA_INCLUDE_DIR) + $(RMDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR) + $(RMDIR) $(DESTDIR)$(ADA_INCLUDE_DIR) + -$(MKDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR) + -$(MKDIR) $(DESTDIR)$(ADA_INCLUDE_DIR) + -$(INSTALL_DATA) ada/rts/Makefile.adalib $(DESTDIR)$(ADA_RTL_OBJ_DIR) for file in ada/rts/*.ali; do \ - $(INSTALL_DATA) $$file $(ADA_RTL_OBJ_DIR); \ + $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \ done -for file in ada/rts/*$(arext);do \ - $(INSTALL_DATA) $$file $(ADA_RTL_OBJ_DIR); \ + $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \ done ifeq ($(strip $(filter-out alpha% dec vms% openvms% alphavms%,$(targ))),) -for file in ada/rts/lib*$(soext);do \ - $(INSTALL_DATA) $$file $(ADA_RTL_OBJ_DIR); \ + $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \ done else -for file in ada/rts/lib*-**$(soext);do \ - $(INSTALL_DATA) $$file $(ADA_RTL_OBJ_DIR); \ + $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \ done endif - -$(LN_S) $(ADA_RTL_OBJ_DIR)/libgnat-*$(soext) \ - $(ADA_RTL_OBJ_DIR)/libgnat$(soext) - -$(LN_S) $(ADA_RTL_OBJ_DIR)/libgnarl-*$(soext) \ - $(ADA_RTL_OBJ_DIR)/libgnarl$(soext) + -( cd $(DESTDIR)$(ADA_RTL_OBJ_DIR) && \ + $(LN_S) libgnat-*$(soext) libgnat$(soext) ) + -( cd $(DESTDIR)$(ADA_RTL_OBJ_DIR) && \ + $(LN_S) libgnarl-*$(soext) libgnarl$(soext) ) # This copy must be done preserving the date on the original file. for file in ada/rts/*.adb ada/rts/*.ads; do \ - $(INSTALL_DATA_DATE) $$file $(ADA_INCLUDE_DIR); \ + $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_INCLUDE_DIR); \ done - cd $(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb - cd $(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads + cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb + cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads ../stamp-gnatlib2: $(RM) rts/s-*.ali @@ -1854,7 +1854,7 @@ prepare-rts: endif install-rts: force - $(CP) -r rts-$(RTS_NAME) $(libsubdir)/ + $(CP) -r rts-$(RTS_NAME) $(DESTDIR)$(libsubdir)/ rts-none: force $(MAKE) $(FLAGS_TO_PASS) prepare-rts \ @@ -2088,7 +2088,7 @@ deftarg.o : deftarg.c errno.o : errno.c exit.o : raise.h exit.c expect.o : expect.c -final.o : raise.h final.c +adafinal.o : raise.h adafinal.c gmem.o : gmem.c link.o : link.c mkdir.o : mkdir.c @@ -2131,7 +2131,7 @@ force: # Gnatlbr is only used on VMS -GNATLBR_RTL_C_OBJS = adaint.o argv.o cio.o cstreams.o exit.o final.o init.o \ +GNATLBR_RTL_C_OBJS = adaint.o argv.o cio.o cstreams.o exit.o adafinal.o init.o \ raise.o sysdep.o tracebak.o GNATLBR_C_OBJS = $(GNATLBR_RTL_C_OBJS) diff --git a/gcc/ada/final.c b/gcc/ada/adafinal.c index 2074b6f4c8b..06e1f462a46 100644 --- a/gcc/ada/final.c +++ b/gcc/ada/adafinal.c @@ -2,7 +2,7 @@ * * * GNAT COMPILER COMPONENTS * * * - * F I N A L * + * A D A F I N A L * * * * * * C Implementation File * diff --git a/gcc/ada/adaint.h b/gcc/ada/adaint.h index 2b5f01a7427..59389c60726 100644 --- a/gcc/ada/adaint.h +++ b/gcc/ada/adaint.h @@ -31,6 +31,10 @@ * * ****************************************************************************/ +#if defined(__rtems__) +#include <stdio.h> +#endif + #include <dirent.h> extern int __gnat_max_path_len; diff --git a/gcc/ada/gnat_rm.texi b/gcc/ada/gnat_rm.texi index d1df13cc409..71e5256e3b1 100644 --- a/gcc/ada/gnat_rm.texi +++ b/gcc/ada/gnat_rm.texi @@ -8,7 +8,7 @@ @c o @c G N A T _ RM o @c o -@c $Revision: 1.3.8.1 $ +@c $Revision: 1.8.18.1 $ @c o @c Copyright (C) 1995-2002 Free Software Foundation o @c o @@ -22,27 +22,14 @@ @setchapternewpage odd @syncodeindex fn cp +@include gcc-common.texi + @dircategory GNU Ada tools @direntry * GNAT Reference Manual: (gnat_rm). Reference Manual for GNU Ada tools. @end direntry -@titlepage - - -@title GNAT Reference Manual -@subtitle GNAT, The GNU Ada 95 Compiler -@ifset vxworks -@title Version 3.16w -@end ifset -@ifclear vxworks -@subtitle Version 3.16w -@end ifclear -@author Ada Core Technologies, Inc. - -@page -@vskip 0pt plus 1filll - +@copying Copyright @copyright{} 1995-2001, Free Software Foundation Permission is granted to copy, distribute and/or modify this document @@ -52,8 +39,21 @@ with the Invariant Sections being ``GNU Free Documentation License'', with the Front-Cover Texts being ``GNAT Reference Manual'', and with no Back-Cover Texts. A copy of the license is included in the section entitled ``GNU Free Documentation License''. +@end copying + +@titlepage +@title GNAT Reference Manual +@subtitle GNAT, The GNU Ada 95 Compiler +@subtitle GNAT Version for GCC @value{version-GCC} +@author Ada Core Technologies, Inc. + +@page +@vskip 0pt plus 1filll + +@insertcopying + @end titlepage @ifnottex @node Top, About This Guide, (dir), (dir) @@ -64,25 +64,11 @@ GNAT Reference Manual GNAT, The GNU Ada 95 Compiler -@ifset vxworks -Version 3.16w -@end ifset -@ifclear vxworks -Version 3.16w -@end ifclear +GNAT Version for GCC @value{version-GCC} Ada Core Technologies, Inc. - -Copyright @copyright{} 1995-2001, Free Software Foundation - -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 -or any later version published by the Free Software Foundation; -with the Invariant Sections being ``GNU Free Documentation License'', with the -Front-Cover Texts being ``GNAT Reference Manual'', and with no Back-Cover Texts. -A copy of the license is included in the section entitled ``GNU -Free Documentation License''. +@insertcopying @menu diff --git a/gcc/ada/gnat_ug.texi b/gcc/ada/gnat_ug.texi index 784adb45dd1..8faa273706a 100644 --- a/gcc/ada/gnat_ug.texi +++ b/gcc/ada/gnat_ug.texi @@ -78,6 +78,31 @@ @syncodeindex fn cp @c %**end of header +@copying +Copyright @copyright{} 1995-2002, Free Software Foundation + +Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU Free Documentation License, Version 1.1 +or any later version published by the Free Software Foundation; +with the Invariant Sections being ``GNU Free Documentation License'', with the +Front-Cover Texts being +@ifset vms +``GNAT User's Guide for OpenVMS Alpha'', +@end ifset +@ifset wnt +``GNAT User's Guide for Windows NT'', +@end ifset +@ifset unx +``GNAT User's Guide for Unix Platforms'', +@end ifset +@ifset vxworks +``GNAT User's Guide for Cross Platforms'', +@end ifset +and with no Back-Cover Texts. +A copy of the license is included in the section entitled ``GNU +Free Documentation License''. +@end copying + @titlepage @ifset vms @@ -108,28 +133,7 @@ @page @vskip 0pt plus 1filll -Copyright @copyright{} 1995-2002, Free Software Foundation - -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 -or any later version published by the Free Software Foundation; -with the Invariant Sections being ``GNU Free Documentation License'', with the -Front-Cover Texts being -@ifset vms -``GNAT User's Guide for OpenVMS Alpha'', -@end ifset -@ifset wnt -``GNAT User's Guide for Windows NT'', -@end ifset -@ifset unx -``GNAT User's Guide for Unix Platforms'', -@end ifset -@ifset vxworks -``GNAT User's Guide for Cross Platforms'', -@end ifset -and with no Back-Cover Texts. -A copy of the license is included in the section entitled ``GNU -Free Documentation License''. +@insertcopying @end titlepage @@ -159,28 +163,7 @@ GNAT Version for GCC @value{version-GCC} Ada Core Technologies, Inc. -Copyright @copyright{} 1995-2002, Free Software Foundation - -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 -or any later version published by the Free Software Foundation; -with the Invariant Sections being ``GNU Free Documentation License'', with the -Front-Cover Texts being -@ifset vms -``GNAT User's Guide for OpenVMS Alpha'', -@end ifset -@ifset wnt -``GNAT User's Guide for Windows NT'', -@end ifset -@ifset unx -``GNAT User's Guide for Unix Platforms'', -@end ifset -@ifset vxworks -``GNAT User's Guide for Cross Platforms'', -@end ifset -and with no Back-Cover Texts. -A copy of the license is included in the section entitled ``GNU -Free Documentation License''. +@insertcopying @menu * About This Guide:: diff --git a/gcc/ada/gnat_ug_unx.texi b/gcc/ada/gnat_ug_unx.texi index 2aae3d87ea6..b567e31b101 100644 --- a/gcc/ada/gnat_ug_unx.texi +++ b/gcc/ada/gnat_ug_unx.texi @@ -64,6 +64,20 @@ @syncodeindex fn cp @c %**end of header +@copying +Copyright @copyright{} 1995-2002, Free Software Foundation + +Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU Free Documentation License, Version 1.1 +or any later version published by the Free Software Foundation; +with the Invariant Sections being ``GNU Free Documentation License'', with the +Front-Cover Texts being +``GNAT User's Guide for Unix Platforms'', +and with no Back-Cover Texts. +A copy of the license is included in the section entitled ``GNU +Free Documentation License''. +@end copying + @titlepage @@ -80,17 +94,7 @@ @page @vskip 0pt plus 1filll -Copyright @copyright{} 1995-2002, Free Software Foundation - -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 -or any later version published by the Free Software Foundation; -with the Invariant Sections being ``GNU Free Documentation License'', with the -Front-Cover Texts being -``GNAT User's Guide for Unix Platforms'', -and with no Back-Cover Texts. -A copy of the license is included in the section entitled ``GNU -Free Documentation License''. +@insertcopying @end titlepage @@ -109,17 +113,7 @@ GNAT Version for GCC @value{version-GCC} Ada Core Technologies, Inc. -Copyright @copyright{} 1995-2002, Free Software Foundation - -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 -or any later version published by the Free Software Foundation; -with the Invariant Sections being ``GNU Free Documentation License'', with the -Front-Cover Texts being -``GNAT User's Guide for Unix Platforms'', -and with no Back-Cover Texts. -A copy of the license is included in the section entitled ``GNU -Free Documentation License''. +@insertcopying @menu * About This Guide:: diff --git a/gcc/ada/gnat_ug_vms.texi b/gcc/ada/gnat_ug_vms.texi index 647e0e30aed..5c6834fc3a7 100644 --- a/gcc/ada/gnat_ug_vms.texi +++ b/gcc/ada/gnat_ug_vms.texi @@ -64,6 +64,20 @@ @syncodeindex fn cp @c %**end of header +@copying +Copyright @copyright{} 1995-2002, Free Software Foundation + +Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU Free Documentation License, Version 1.1 +or any later version published by the Free Software Foundation; +with the Invariant Sections being ``GNU Free Documentation License'', with the +Front-Cover Texts being +``GNAT User's Guide for OpenVMS Alpha'', +and with no Back-Cover Texts. +A copy of the license is included in the section entitled ``GNU +Free Documentation License''. +@end copying + @titlepage @title GNAT User's Guide @@ -80,17 +94,7 @@ @page @vskip 0pt plus 1filll -Copyright @copyright{} 1995-2002, Free Software Foundation - -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 -or any later version published by the Free Software Foundation; -with the Invariant Sections being ``GNU Free Documentation License'', with the -Front-Cover Texts being -``GNAT User's Guide for OpenVMS Alpha'', -and with no Back-Cover Texts. -A copy of the license is included in the section entitled ``GNU -Free Documentation License''. +@insertcopying @end titlepage @@ -109,17 +113,7 @@ GNAT Version for GCC @value{version-GCC} Ada Core Technologies, Inc. -Copyright @copyright{} 1995-2002, Free Software Foundation - -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 -or any later version published by the Free Software Foundation; -with the Invariant Sections being ``GNU Free Documentation License'', with the -Front-Cover Texts being -``GNAT User's Guide for OpenVMS Alpha'', -and with no Back-Cover Texts. -A copy of the license is included in the section entitled ``GNU -Free Documentation License''. +@insertcopying @menu * About This Guide:: diff --git a/gcc/ada/gnat_ug_vxw.texi b/gcc/ada/gnat_ug_vxw.texi index 5c7ac9300e6..6ea120e46ec 100644 --- a/gcc/ada/gnat_ug_vxw.texi +++ b/gcc/ada/gnat_ug_vxw.texi @@ -64,6 +64,20 @@ @syncodeindex fn cp @c %**end of header +@copying +Copyright @copyright{} 1995-2002, Free Software Foundation + +Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU Free Documentation License, Version 1.1 +or any later version published by the Free Software Foundation; +with the Invariant Sections being ``GNU Free Documentation License'', with the +Front-Cover Texts being +``GNAT User's Guide for Cross Platforms'', +and with no Back-Cover Texts. +A copy of the license is included in the section entitled ``GNU +Free Documentation License''. +@end copying + @titlepage @@ -80,17 +94,7 @@ @page @vskip 0pt plus 1filll -Copyright @copyright{} 1995-2002, Free Software Foundation - -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 -or any later version published by the Free Software Foundation; -with the Invariant Sections being ``GNU Free Documentation License'', with the -Front-Cover Texts being -``GNAT User's Guide for Cross Platforms'', -and with no Back-Cover Texts. -A copy of the license is included in the section entitled ``GNU -Free Documentation License''. +@insertcopying @end titlepage @@ -109,17 +113,7 @@ GNAT Version for GCC @value{version-GCC} Ada Core Technologies, Inc. -Copyright @copyright{} 1995-2002, Free Software Foundation - -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 -or any later version published by the Free Software Foundation; -with the Invariant Sections being ``GNU Free Documentation License'', with the -Front-Cover Texts being -``GNAT User's Guide for Cross Platforms'', -and with no Back-Cover Texts. -A copy of the license is included in the section entitled ``GNU -Free Documentation License''. +@insertcopying @menu * About This Guide:: diff --git a/gcc/ada/gnat_ug_wnt.texi b/gcc/ada/gnat_ug_wnt.texi index 102823d5377..7a3faa56a54 100644 --- a/gcc/ada/gnat_ug_wnt.texi +++ b/gcc/ada/gnat_ug_wnt.texi @@ -64,6 +64,20 @@ @syncodeindex fn cp @c %**end of header +@copying +Copyright @copyright{} 1995-2002, Free Software Foundation + +Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU Free Documentation License, Version 1.1 +or any later version published by the Free Software Foundation; +with the Invariant Sections being ``GNU Free Documentation License'', with the +Front-Cover Texts being +``GNAT User's Guide for Windows NT'', +and with no Back-Cover Texts. +A copy of the license is included in the section entitled ``GNU +Free Documentation License''. +@end copying + @titlepage @@ -80,17 +94,7 @@ @page @vskip 0pt plus 1filll -Copyright @copyright{} 1995-2002, Free Software Foundation - -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 -or any later version published by the Free Software Foundation; -with the Invariant Sections being ``GNU Free Documentation License'', with the -Front-Cover Texts being -``GNAT User's Guide for Windows NT'', -and with no Back-Cover Texts. -A copy of the license is included in the section entitled ``GNU -Free Documentation License''. +@insertcopying @end titlepage @@ -109,17 +113,7 @@ GNAT Version for GCC @value{version-GCC} Ada Core Technologies, Inc. -Copyright @copyright{} 1995-2002, Free Software Foundation - -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 -or any later version published by the Free Software Foundation; -with the Invariant Sections being ``GNU Free Documentation License'', with the -Front-Cover Texts being -``GNAT User's Guide for Windows NT'', -and with no Back-Cover Texts. -A copy of the license is included in the section entitled ``GNU -Free Documentation License''. +@insertcopying @menu * About This Guide:: diff --git a/gcc/ada/init.c b/gcc/ada/init.c index 04b7aea05aa..105df0d3264 100644 --- a/gcc/ada/init.c +++ b/gcc/ada/init.c @@ -1635,6 +1635,22 @@ __gnat_initialize () #endif } +/***************************************/ +/* __gnat_initialize (RTEMS version) */ +/***************************************/ + +#elif defined(__rtems__) + +extern void __gnat_install_handler (); + +/* For RTEMS, each bsp will provide a custom __gnat_install_handler (). */ + +void +__gnat_initialize () +{ + __gnat_install_handler (); +} + #else /* For all other versions of GNAT, the initialize routine and handler diff --git a/gcc/alias.c b/gcc/alias.c index 45e868ca963..b9810f07c44 100644 --- a/gcc/alias.c +++ b/gcc/alias.c @@ -1,5 +1,6 @@ /* Alias analysis for GNU C - Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 + Free Software Foundation, Inc. Contributed by John Carr (jfc@mit.edu). This file is part of GCC. @@ -785,7 +786,8 @@ find_base_value (src) { /* If we're inside init_alias_analysis, use new_reg_base_value to reduce the number of relaxation iterations. */ - if (new_reg_base_value && new_reg_base_value[regno]) + if (new_reg_base_value && new_reg_base_value[regno] + && REG_N_SETS (regno) == 1) return new_reg_base_value[regno]; if (reg_base_value[regno]) diff --git a/gcc/basic-block.h b/gcc/basic-block.h index 10c895408f2..0d546e32ab5 100644 --- a/gcc/basic-block.h +++ b/gcc/basic-block.h @@ -1,5 +1,5 @@ /* Define control and data flow tables, and regsets. - Copyright (C) 1987, 1997, 1998, 1999, 2000, 2001, 2002 + Copyright (C) 1987, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GCC. @@ -26,6 +26,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "sbitmap.h" #include "varray.h" #include "partition.h" +#include "hard-reg-set.h" /* Head of register set linked list. */ typedef bitmap_head regset_head; @@ -799,6 +800,7 @@ extern void fixup_abnormal_edges PARAMS ((void)); extern bool can_hoist_insn_p PARAMS ((rtx, rtx, regset)); extern rtx hoist_insn_after PARAMS ((rtx, rtx, rtx, rtx)); extern rtx hoist_insn_to_edge PARAMS ((rtx, edge, rtx, rtx)); +extern bool control_flow_insn_p PARAMS ((rtx)); /* In dominance.c */ diff --git a/gcc/c-parse.in b/gcc/c-parse.in index eab176a62f7..59e399bc3b4 100644 --- a/gcc/c-parse.in +++ b/gcc/c-parse.in @@ -28,9 +28,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA /* To whomever it may concern: I have heard that such a thing was once written by AT&T, but I have never seen it. */ -ifobjc -%expect 32 /* shift/reduce conflicts, and 1 reduce/reduce conflict. */ -end ifobjc ifc %expect 10 /* shift/reduce conflicts, and no reduce/reduce conflicts. */ end ifc diff --git a/gcc/c-semantics.c b/gcc/c-semantics.c index 994b4625da5..d1bc8f7c3f9 100644 --- a/gcc/c-semantics.c +++ b/gcc/c-semantics.c @@ -729,7 +729,7 @@ genrtl_asm_stmt (cv_qualifier, string, output_operands, emit_line_note (input_filename, lineno); if (asm_input_p) - expand_asm (string); + expand_asm (string, cv_qualifier != NULL_TREE); else c_expand_asm_operands (string, output_operands, input_operands, clobbers, cv_qualifier != NULL_TREE, diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c index c63344d6682..a5af6f0444f 100644 --- a/gcc/c-typeck.c +++ b/gcc/c-typeck.c @@ -6618,13 +6618,18 @@ process_init_element (value) bit_position (constructor_fields), DECL_SIZE (constructor_fields)); - constructor_unfilled_fields = TREE_CHAIN (constructor_fields); - /* Skip any nameless bit fields. */ - while (constructor_unfilled_fields != 0 - && DECL_C_BIT_FIELD (constructor_unfilled_fields) - && DECL_NAME (constructor_unfilled_fields) == 0) - constructor_unfilled_fields = - TREE_CHAIN (constructor_unfilled_fields); + /* If the current field was the first one not yet written out, + it isn't now, so update. */ + if (constructor_unfilled_fields == constructor_fields) + { + constructor_unfilled_fields = TREE_CHAIN (constructor_fields); + /* Skip any nameless bit fields. */ + while (constructor_unfilled_fields != 0 + && DECL_C_BIT_FIELD (constructor_unfilled_fields) + && DECL_NAME (constructor_unfilled_fields) == 0) + constructor_unfilled_fields = + TREE_CHAIN (constructor_unfilled_fields); + } } constructor_fields = TREE_CHAIN (constructor_fields); @@ -6857,9 +6862,9 @@ simple_asm_stmt (expr) { tree stmt; - stmt = add_stmt (build_stmt (ASM_STMT, NULL_TREE, expr, - NULL_TREE, NULL_TREE, - NULL_TREE)); + /* Simple asm statements are treated as volatile. */ + stmt = add_stmt (build_stmt (ASM_STMT, ridpointers[(int) RID_VOLATILE], + expr, NULL_TREE, NULL_TREE, NULL_TREE)); ASM_INPUT_P (stmt) = 1; return stmt; } diff --git a/gcc/calls.c b/gcc/calls.c index 41725b57769..811d6897d04 100644 --- a/gcc/calls.c +++ b/gcc/calls.c @@ -1,6 +1,6 @@ /* Convert function calls to rtl insns, for GNU C compiler. Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998 - 1999, 2000, 2001 Free Software Foundation, Inc. + 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GCC. @@ -227,6 +227,7 @@ static int check_sibcall_argument_overlap PARAMS ((rtx, struct arg_data *)); static int combine_pending_stack_adjustment_and_call PARAMS ((int, struct args_size *, int)); +static tree fix_unsafe_tree PARAMS ((tree)); #ifdef REG_PARM_STACK_SPACE static rtx save_fixed_argument_area PARAMS ((int, rtx, int *, int *)); @@ -2081,6 +2082,35 @@ check_sibcall_argument_overlap (insn, arg) return insn != NULL_RTX; } +static tree +fix_unsafe_tree (t) + tree t; +{ + switch (unsafe_for_reeval (t)) + { + case 0: /* Safe. */ + break; + + case 1: /* Mildly unsafe. */ + t = unsave_expr (t); + break; + + case 2: /* Wildly unsafe. */ + { + tree var = build_decl (VAR_DECL, NULL_TREE, + TREE_TYPE (t)); + SET_DECL_RTL (var, + expand_expr (t, NULL_RTX, VOIDmode, EXPAND_NORMAL)); + t = var; + } + break; + + default: + abort (); + } + return t; +} + /* Generate all the code for a function call and return an rtx for its value. Store the value in TARGET (specified as an rtx) if convenient. @@ -2522,35 +2552,16 @@ expand_call (exp, target, ignore) for (; i != end; i += inc) { - switch (unsafe_for_reeval (args[i].tree_value)) - { - case 0: /* Safe. */ - break; - - case 1: /* Mildly unsafe. */ - args[i].tree_value = unsave_expr (args[i].tree_value); - break; - - case 2: /* Wildly unsafe. */ - { - tree var = build_decl (VAR_DECL, NULL_TREE, - TREE_TYPE (args[i].tree_value)); - SET_DECL_RTL (var, - expand_expr (args[i].tree_value, NULL_RTX, - VOIDmode, EXPAND_NORMAL)); - args[i].tree_value = var; - } - break; - - default: - abort (); - } + args[i].tree_value = fix_unsafe_tree (args[i].tree_value); /* We need to build actparms for optimize_tail_recursion. We can safely trash away TREE_PURPOSE, since it is unused by this function. */ if (try_tail_recursion) actparms = tree_cons (NULL_TREE, args[i].tree_value, actparms); } + /* Do the same for the function address if it is an expression. */ + if (!fndecl) + TREE_OPERAND (exp, 0) = fix_unsafe_tree (TREE_OPERAND (exp, 0)); /* Expanding one of those dangerous arguments could have added cleanups, but otherwise give it a whirl. */ if (any_pending_cleanups (1)) @@ -4131,7 +4142,7 @@ emit_library_call_value_1 (retval, orgfun, value, fn_type, outmode, nargs, p) { rtx insns; - if (valreg == 0 || GET_CODE (valreg) == PARALLEL) + if (valreg == 0) { insns = get_insns (); end_sequence (); @@ -4140,9 +4151,18 @@ emit_library_call_value_1 (retval, orgfun, value, fn_type, outmode, nargs, p) else { rtx note = 0; - rtx temp = gen_reg_rtx (GET_MODE (valreg)); + rtx temp; int i; + if (GET_CODE (valreg) == PARALLEL) + { + temp = gen_reg_rtx (outmode); + emit_group_store (temp, valreg, outmode); + valreg = temp; + } + + temp = gen_reg_rtx (GET_MODE (valreg)); + /* Construct an "equal form" for the value which mentions all the arguments in order as well as the function name. */ for (i = 0; i < nargs; i++) @@ -4176,6 +4196,12 @@ emit_library_call_value_1 (retval, orgfun, value, fn_type, outmode, nargs, p) if (value != mem_value) emit_move_insn (value, mem_value); } + else if (GET_CODE (valreg) == PARALLEL) + { + if (value == 0) + value = gen_reg_rtx (outmode); + emit_group_store (value, valreg, outmode); + } else if (value != 0) emit_move_insn (value, valreg); else diff --git a/gcc/cfganal.c b/gcc/cfganal.c index 7aeef93accd..3831c5f4768 100644 --- a/gcc/cfganal.c +++ b/gcc/cfganal.c @@ -1,6 +1,6 @@ /* Control flow graph analysis code for GNU compiler. Copyright (C) 1987, 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001 Free Software Foundation, Inc. + 1999, 2000, 2001, 2003 Free Software Foundation, Inc. This file is part of GCC. @@ -223,10 +223,14 @@ set_edge_can_fallthru_flag () { edge e; - /* The FALLTHRU edge is also CAN_FALLTHRU edge. */ for (e = bb->succ; e; e = e->succ_next) - if (e->flags & EDGE_FALLTHRU) - e->flags |= EDGE_CAN_FALLTHRU; + { + e->flags &= ~EDGE_CAN_FALLTHRU; + + /* The FALLTHRU edge is also CAN_FALLTHRU edge. */ + if (e->flags & EDGE_FALLTHRU) + e->flags |= EDGE_CAN_FALLTHRU; + } /* If the BB ends with an invertable condjump all (2) edges are CAN_FALLTHRU edges. */ @@ -320,10 +324,11 @@ flow_call_edges_add (blocks) for (e = bb->succ; e; e = e->succ_next) if (e->dest == EXIT_BLOCK_PTR) - break; - - insert_insn_on_edge (gen_rtx_USE (VOIDmode, const0_rtx), e); - commit_edge_insertions (); + { + insert_insn_on_edge (gen_rtx_USE (VOIDmode, const0_rtx), e); + commit_edge_insertions (); + break; + } } } diff --git a/gcc/cfgbuild.c b/gcc/cfgbuild.c index 9ac758b2809..795ae1719dc 100644 --- a/gcc/cfgbuild.c +++ b/gcc/cfgbuild.c @@ -1,6 +1,6 @@ /* Control flow graph building code for GNU compiler. Copyright (C) 1987, 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GCC. @@ -57,7 +57,6 @@ static void make_eh_edge PARAMS ((sbitmap *, basic_block, rtx)); static void find_bb_boundaries PARAMS ((basic_block)); static void compute_outgoing_frequencies PARAMS ((basic_block)); static bool inside_basic_block_p PARAMS ((rtx)); -static bool control_flow_insn_p PARAMS ((rtx)); /* Return true if insn is something that should be contained inside basic block. */ @@ -95,7 +94,7 @@ inside_basic_block_p (insn) /* Return true if INSN may cause control flow transfer, so it should be last in the basic block. */ -static bool +bool control_flow_insn_p (insn) rtx insn; { diff --git a/gcc/combine.c b/gcc/combine.c index 4d24807e486..a67a07281b0 100644 --- a/gcc/combine.c +++ b/gcc/combine.c @@ -6734,7 +6734,7 @@ make_compound_operation (x, in_code) || (GET_MODE_SIZE (mode) > GET_MODE_SIZE (GET_MODE (XEXP (tem, 0))))) { - if (! INTEGRAL_MODE_P (mode)) + if (! SCALAR_INT_MODE_P (mode)) break; tem = gen_rtx_fmt_e (GET_CODE (tem), mode, XEXP (tem, 0)); } diff --git a/gcc/config.gcc b/gcc/config.gcc index 3e889ae2280..5e293284079 100644 --- a/gcc/config.gcc +++ b/gcc/config.gcc @@ -1,5 +1,5 @@ # GCC build-, host- and target-specific configuration file. -# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. #This file is part of GCC. @@ -779,8 +779,11 @@ hppa1.1-*-rtems*) xm_defines=POSIX target_cpu_default="(MASK_JUMP_IN_DELAY | MASK_PORTABLE_RUNTIME | MASK_GAS | MASK_NO_SPACE_REGS | MASK_SOFT_FLOAT)" tm_file="${tm_file} pa/pa32-regs.h dbxelf.h elfos.h pa/elf.h pa/pa-pro-end.h libgloss.h pa/rtems.h rtems.h" - tmake_file="pa/t-bsd pa/t-pro" + tmake_file="pa/t-bsd pa/t-pro t-rtems" xmake_file="pa/x-ada" + if test x$enable_threads = xyes; then + thread_file='rtems' + fi ;; hppa1.0-*-osf*) tm_file="${tm_file} pa/pa32-regs.h pa/som.h pa/pa-osf.h" @@ -894,7 +897,7 @@ hppa*64*-*-hpux11*) tmake_file="pa/t-pa64 pa/t-pa-hpux" xmake_file="pa/x-ada" target_cpu_default="(MASK_PA_11|MASK_PA_20|MASK_GAS)" - + extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o" if test x$gnu_ld = xyes then target_cpu_default="${target_cpu_default}|MASK_GNU_LD" @@ -907,7 +910,6 @@ hppa*64*-*-hpux11*) # tmake_file="${tmake_file} pa/t-dce-thr" # fi install_headers_dir=install-headers-cpio - use_collect2=yes ;; hppa1.1-*-hpux11* | hppa2*-*-hpux11*) target_cpu_default="MASK_PA_11" @@ -2055,7 +2057,7 @@ powerpc-*-eabi*) powerpc-*-rtems*) xm_defines=POSIX tm_file="${tm_file} dbxelf.h elfos.h svr4.h freebsd-spec.h rs6000/sysv4.h rs6000/eabi.h rs6000/rtems.h rtems.h" - tmake_file="rs6000/t-ppcgas t-rtems rs6000/t-ppccomm" + tmake_file="rs6000/t-rtems t-rtems rs6000/t-ppccomm" if test x$enable_threads = xyes; then thread_file='rtems' fi diff --git a/gcc/config/alpha/alpha.c b/gcc/config/alpha/alpha.c index d6a9f6bc661..58febe6bcd1 100644 --- a/gcc/config/alpha/alpha.c +++ b/gcc/config/alpha/alpha.c @@ -1,6 +1,6 @@ /* Subroutines used for code generation on the DEC Alpha. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002 Free Software Foundation, Inc. + 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Contributed by Richard Kenner (kenner@vlsi1.ultra.nyu.edu) This file is part of GNU CC. @@ -1920,18 +1920,22 @@ alpha_encode_section_info (decl, first) { char *newstr; size_t len; + char want_prefix = (is_local ? '@' : '%'); + char other_prefix = (is_local ? '%' : '@'); - if (symbol_str[0] == (is_local ? '@' : '%')) + if (symbol_str[0] == want_prefix) { if (symbol_str[1] == encoding) return; symbol_str += 2; } + else if (symbol_str[0] == other_prefix) + symbol_str += 2; len = strlen (symbol_str) + 1; newstr = alloca (len + 2); - newstr[0] = (is_local ? '@' : '%'); + newstr[0] = want_prefix; newstr[1] = encoding; memcpy (newstr + 2, symbol_str, len); diff --git a/gcc/config/alpha/alpha.md b/gcc/config/alpha/alpha.md index c878366b846..d8ae52fe997 100644 --- a/gcc/config/alpha/alpha.md +++ b/gcc/config/alpha/alpha.md @@ -1,6 +1,6 @@ ;; Machine description for DEC Alpha for GNU C compiler ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -;; 2000, 2001, 2002 Free Software Foundation, Inc. +;; 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ;; Contributed by Richard Kenner (kenner@vlsi1.ultra.nyu.edu) ;; ;; This file is part of GNU CC. @@ -5331,10 +5331,12 @@ fadd,fmul,fcpys,fdiv,fsqrt,misc,mvi,ftoi,itof,multi,none" [(match_dup 0)] "operands[0] = split_small_symbolic_operand (operands[0]);") +;; Accepts any symbolic, not just global, since function calls that +;; don't go via bsr still use !literal in hopes of linker relaxation. (define_insn "movdi_er_high_g" [(set (match_operand:DI 0 "register_operand" "=r") (unspec:DI [(match_operand:DI 1 "register_operand" "r") - (match_operand:DI 2 "global_symbolic_operand" "") + (match_operand:DI 2 "symbolic_operand" "") (match_operand 3 "const_int_operand" "")] UNSPEC_LITERAL))] "TARGET_EXPLICIT_RELOCS" diff --git a/gcc/config/alpha/t-osf4 b/gcc/config/alpha/t-osf4 index e9c451b9c04..0525d617662 100644 --- a/gcc/config/alpha/t-osf4 +++ b/gcc/config/alpha/t-osf4 @@ -17,6 +17,6 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ $(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME) # $(slibdir) double quoted to protect it from expansion while building # libgcc.mk. We want this delayed until actual install time. -SHLIB_INSTALL = $(INSTALL_DATA) $(SHLIB_NAME) $$(slibdir)/$(SHLIB_SONAME); \ - rm -f $$(slibdir)/$(SHLIB_NAME); \ - $(LN_S) $(SHLIB_SONAME) $$(slibdir)/$(SHLIB_NAME) +SHLIB_INSTALL = $(INSTALL_DATA) $(SHLIB_NAME) $$(DESTDIR)$$(slibdir)/$(SHLIB_SONAME); \ + rm -f $$(DESTDIR)$$(slibdir)/$(SHLIB_NAME); \ + $(LN_S) $(SHLIB_SONAME) $$(DESTDIR)$$(slibdir)/$(SHLIB_NAME) diff --git a/gcc/config/arc/t-arc b/gcc/config/arc/t-arc index 688603b5d31..bbf4257c7b9 100644 --- a/gcc/config/arc/t-arc +++ b/gcc/config/arc/t-arc @@ -62,10 +62,10 @@ stmp-multilib-arc: stmp-multilib install-multilib-arc: install-multilib for i in `$(GCC_FOR_TARGET) --print-multi-lib`; do \ dir=`echo $$i | sed -e 's/;.*$$//'`; \ - rm -f $(libsubdir)/$${dir}/crtinit.o; \ - $(INSTALL_DATA) $${dir}/crtinit.o $(libsubdir)/$${dir}/crtinit.o; \ - chmod a-x $(libsubdir)/$${dir}/crtinit.o; \ - rm -f $(libsubdir)/$${dir}/crtfini.o; \ - $(INSTALL_DATA) $${dir}/crtfini.o $(libsubdir)/$${dir}/crtfini.o; \ - chmod a-x $(libsubdir)/$${dir}/crtfini.o; \ + rm -f $(DESTDIR)$(libsubdir)/$${dir}/crtinit.o; \ + $(INSTALL_DATA) $${dir}/crtinit.o $(DESTDIR)$(libsubdir)/$${dir}/crtinit.o; \ + chmod a-x $(DESTDIR)$(libsubdir)/$${dir}/crtinit.o; \ + rm -f $(DESTDIR)$(libsubdir)/$${dir}/crtfini.o; \ + $(INSTALL_DATA) $${dir}/crtfini.o $(DESTDIR)$(libsubdir)/$${dir}/crtfini.o; \ + chmod a-x $(DESTDIR)$(libsubdir)/$${dir}/crtfini.o; \ done diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index a6203c3fbe3..0eb12e632c1 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -8149,10 +8149,14 @@ arm_compute_initial_elimination_offset (from, to) reg_mask = reg_mask & ~ (reg_mask & - reg_mask); } - if (regs_ever_live[LR_REGNUM] - /* If a stack frame is going to be created, the LR will - be saved as part of that, so we do not need to allow - for it here. */ + if ((regs_ever_live[LR_REGNUM] + /* If optimizing for size, then we save the link register if + any other integer register is saved. This gives a smaller + return sequence. */ + || (optimize_size && call_saved_registers > 0)) + /* But if a stack frame is going to be created, the LR will + be saved as part of that, so we do not need to allow for + it here. */ && ! frame_pointer_needed) call_saved_registers += 4; diff --git a/gcc/config/arm/t-netbsd b/gcc/config/arm/t-netbsd index 511b0151116..76e431bfb11 100644 --- a/gcc/config/arm/t-netbsd +++ b/gcc/config/arm/t-netbsd @@ -16,9 +16,9 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ $(LN_S) $(SHLIB_NAME) $(SHLIB_SONAME) # $(slibdir) double quoted to protect it from expansion while building # libgcc.mk. We want this delayed until actual install time. -SHLIB_INSTALL = $(INSTALL_DATA) $(SHLIB_NAME) $$(slibdir)/$(SHLIB_SONAME); \ - rm -f $$(slibdir)/$(SHLIB_NAME); \ - $(LN_S) $(SHLIB_SONAME) $$(slibdir)/$(SHLIB_NAME) +SHLIB_INSTALL = $(INSTALL_DATA) $(SHLIB_NAME) $$(DESTDIR)$$(slibdir)/$(SHLIB_SONAME); \ + rm -f $$(DESTDIR)$$(slibdir)/$(SHLIB_NAME); \ + $(LN_S) $(SHLIB_SONAME) $$(DESTDIR)$$(slibdir)/$(SHLIB_NAME) # Don't build enquire ENQUIRE= diff --git a/gcc/config/c4x/c4x.h b/gcc/config/c4x/c4x.h index 94cca09b597..7d5cb7b2968 100644 --- a/gcc/config/c4x/c4x.h +++ b/gcc/config/c4x/c4x.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler. TMS320C[34]x - Copyright (C) 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, + 2003 Free Software Foundation, Inc. Contributed by Michael Hayes (m.hayes@elec.canterbury.ac.nz) and Herman Ten Brugge (Haj.Ten.Brugge@net.HCC.nl). @@ -22,10 +22,10 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "hwint.h" - /* RUN-TIME TARGET SPECIFICATION. */ +#include "hwint.h" + #define C4x 1 #define TARGET_CPU_CPP_BUILTINS() \ @@ -93,23 +93,21 @@ #define ASM_SPEC "\ %{!mcpu=30:%{!mcpu=31:%{!mcpu=32:%{!mcpu=33:%{!mcpu=40:%{!mcpu=44:\ -%{!m30:%{!m40:-m40}}}}}}}} \ -%{mcpu=30:-m30} \ -%{mcpu=31:-m31} \ -%{mcpu=32:-m32} \ -%{mcpu=33:-m33} \ -%{mcpu=40:-m40} \ -%{mcpu=44:-m44} \ -%{m30:-m30} \ -%{m31:-m31} \ -%{m32:-m32} \ -%{m33:-m33} \ -%{m40:-m40} \ -%{m44:-m44} \ -%{mmemparm:-p} %{mregparm:-r} \ -%{!mmemparm:%{!mregparm:-r}} \ -%{mbig:-b} %{msmall:-s} \ -%{!msmall:%{!mbig:-b}}" +%{!m30:%{!m31:%{!m32:%{!m33:%{!m40:%{!m44:-m40}}}}}}}}}}}} \ +%{mcpu=30} \ +%{mcpu=31} \ +%{mcpu=32} \ +%{mcpu=33} \ +%{mcpu=40} \ +%{mcpu=44} \ +%{m30} \ +%{m31} \ +%{m32} \ +%{m33} \ +%{m40} \ +%{m44} \ +%{mmemparm} %{mregparm} %{!mmemparm:%{!mregparm:-mregparm}} \ +%{mbig} %{msmall} %{!msmall:%{!mbig:-mbig}}" /* Define linker options. */ @@ -153,7 +151,7 @@ #define C30_FLAG 0x0100000 /* Emit C30 code. */ #define C31_FLAG 0x0200000 /* Emit C31 code. */ #define C32_FLAG 0x0400000 /* Emit C32 code. */ -#define C33_FLAG 0x0400000 /* Emit C33 code. */ +#define C33_FLAG 0x0800000 /* Emit C33 code. */ #define C40_FLAG 0x1000000 /* Emit C40 code. */ #define C44_FLAG 0x2000000 /* Emit C44 code. */ diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index 7997a46e7a5..90d959c0f7e 100644 --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -100,7 +100,6 @@ Boston, MA 02111-1307, USA. */ name, that also takes an argument, needs to be modified so the prefix is different, otherwise a '*' after the shorter option will match with the longer one. */ -/* Ignore -dynamic for now */ #define TARGET_OPTION_TRANSLATE_TABLE \ { "-all_load", "-Zall_load" }, \ { "-allowable_client", "-Zallowable_client" }, \ @@ -111,7 +110,7 @@ Boston, MA 02111-1307, USA. */ { "-weak_reference_mismatches", "-Zweak_reference_mismatches" }, \ { "-dependency-file", "-MF" }, \ { "-dylib_file", "-Zdylib_file" }, \ - { "-dynamic", " " }, \ + { "-dynamic", "-Zdynamic" }, \ { "-dynamiclib", "-Zdynamiclib" }, \ { "-exported_symbols_list", "-Zexported_symbols_list" }, \ { "-seg_addr_table_filename", "-Zseg_addr_table_filename" }, \ @@ -174,7 +173,7 @@ Boston, MA 02111-1307, USA. */ /* Machine dependent cpp options. */ #undef CPP_SPEC -#define CPP_SPEC "%{static:-D__STATIC__}%{!static:-D__DYNAMIC__}" +#define CPP_SPEC "%{static:%{!dynamic:-D__STATIC__}}%{!static:-D__DYNAMIC__}" /* This is mostly a clone of the standard LINK_COMMAND_SPEC, plus precomp, libtool, and fat build additions. Also we @@ -234,6 +233,7 @@ Boston, MA 02111-1307, USA. */ %{Zbind_at_load:-bind_at_load} \ %{Zarch_errors_fatal:-arch_errors_fatal} \ %{Zdylib_file*:-dylib_file %*} \ + %{Zdynamic:-dynamic}\ %{Zexported_symbols_list*:-exported_symbols_list %*} \ %{Zflat_namespace:-flat_namespace} \ %{headerpad_max_install_names*} \ diff --git a/gcc/config/fp-bit.c b/gcc/config/fp-bit.c index 7ec20ecf9f2..aeb40e44c18 100644 --- a/gcc/config/fp-bit.c +++ b/gcc/config/fp-bit.c @@ -1,6 +1,6 @@ /* This is a software floating point library which can be used for targets without hardware floating point. - Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002 + Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is free software; you can redistribute it and/or modify it @@ -130,6 +130,10 @@ void __lttf2 (void) { abort(); } const fp_number_type __thenan_sf = { CLASS_SNAN, 0, 0, {(fractype) 0} }; #elif defined L_thenan_df const fp_number_type __thenan_df = { CLASS_SNAN, 0, 0, {(fractype) 0} }; +#elif defined L_thenan_tf +const fp_number_type __thenan_tf = { CLASS_SNAN, 0, 0, {(fractype) 0} }; +#elif defined TFLOAT +extern const fp_number_type __thenan_tf; #elif defined FLOAT extern const fp_number_type __thenan_sf; #else @@ -141,7 +145,9 @@ static fp_number_type * nan (void) { /* Discard the const qualifier... */ -#ifdef FLOAT +#ifdef TFLOAT + return (fp_number_type *) (& __thenan_tf); +#elif defined FLOAT return (fp_number_type *) (& __thenan_sf); #else return (fp_number_type *) (& __thenan_df); @@ -180,7 +186,7 @@ flip_sign ( fp_number_type * x) extern FLO_type pack_d ( fp_number_type * ); -#if defined(L_pack_df) || defined(L_pack_sf) +#if defined(L_pack_df) || defined(L_pack_sf) || defined(L_pack_tf) FLO_type pack_d ( fp_number_type * src) { @@ -316,24 +322,92 @@ pack_d ( fp_number_type * src) dst.bits.exp = exp; dst.bits.sign = sign; #else +# if defined TFLOAT && defined HALFFRACBITS + { + halffractype high, low; + + high = (fraction >> (FRACBITS - HALFFRACBITS)); + high &= (((fractype)1) << HALFFRACBITS) - 1; + high |= ((fractype) (exp & ((1 << EXPBITS) - 1))) << HALFFRACBITS; + high |= ((fractype) (sign & 1)) << (HALFFRACBITS | EXPBITS); + + low = (halffractype)fraction & + ((((halffractype)1) << (FRACBITS - HALFFRACBITS)) - 1); + + if (exp == EXPMAX || exp == 0 || low == 0) + low = 0; + else + { + exp -= HALFFRACBITS + 1; + + while (exp > 0 + && low < ((halffractype)1 << HALFFRACBITS)) + { + low <<= 1; + exp--; + } + + if (exp <= 0) + { + halffractype roundmsb, round; + + exp = -exp + 1; + + roundmsb = (1 << (exp - 1)); + round = low & ((roundmsb << 1) - 1); + + low >>= exp; + exp = 0; + + if (round > roundmsb || (round == roundmsb && (low & 1))) + { + low++; + if (low >= ((halffractype)1 << HALFFRACBITS)) + /* We don't shift left, since it has just become the + smallest normal number, whose implicit 1 bit is + now indicated by the non-zero exponent. */ + exp++; + } + } + + low &= ((halffractype)1 << HALFFRACBITS) - 1; + low |= ((fractype) (exp & ((1 << EXPBITS) - 1))) << HALFFRACBITS; + low |= ((fractype) (sign & 1)) << (HALFFRACBITS | EXPBITS); + } + + dst.value_raw = (((fractype) high) << HALFSHIFT) | low; + } +# else dst.value_raw = fraction & ((((fractype)1) << FRACBITS) - (fractype)1); dst.value_raw |= ((fractype) (exp & ((1 << EXPBITS) - 1))) << FRACBITS; dst.value_raw |= ((fractype) (sign & 1)) << (FRACBITS | EXPBITS); +# endif #endif #if defined(FLOAT_WORD_ORDER_MISMATCH) && !defined(FLOAT) +#ifdef TFLOAT + { + qrtrfractype tmp1 = dst.words[0]; + qrtrfractype tmp2 = dst.words[1]; + dst.words[0] = dst.words[3]; + dst.words[1] = dst.words[2]; + dst.words[2] = tmp2; + dst.words[3] = tmp1; + } +#else { halffractype tmp = dst.words[0]; dst.words[0] = dst.words[1]; dst.words[1] = tmp; } #endif +#endif return dst.value; } #endif -#if defined(L_unpack_df) || defined(L_unpack_sf) +#if defined(L_unpack_df) || defined(L_unpack_sf) || defined(L_unpack_tf) void unpack_d (FLO_union_type * src, fp_number_type * dst) { @@ -347,8 +421,15 @@ unpack_d (FLO_union_type * src, fp_number_type * dst) #if defined(FLOAT_WORD_ORDER_MISMATCH) && !defined(FLOAT) FLO_union_type swapped; +#ifdef TFLOAT + swapped.words[0] = src->words[3]; + swapped.words[1] = src->words[2]; + swapped.words[2] = src->words[1]; + swapped.words[3] = src->words[0]; +#else swapped.words[0] = src->words[1]; swapped.words[1] = src->words[0]; +#endif src = &swapped; #endif @@ -357,9 +438,42 @@ unpack_d (FLO_union_type * src, fp_number_type * dst) exp = src->bits.exp; sign = src->bits.sign; #else - fraction = src->value_raw & ((((fractype)1) << FRACBITS) - (fractype)1); +# if defined TFLOAT && defined HALFFRACBITS + { + halffractype high, low; + + high = src->value_raw >> HALFSHIFT; + low = src->value_raw & (((fractype)1 << HALFSHIFT) - 1); + + fraction = high & ((((fractype)1) << HALFFRACBITS) - 1); + fraction <<= FRACBITS - HALFFRACBITS; + exp = ((int)(high >> HALFFRACBITS)) & ((1 << EXPBITS) - 1); + sign = ((int)(high >> (((HALFFRACBITS + EXPBITS))))) & 1; + + if (exp != EXPMAX && exp != 0 && low != 0) + { + int lowexp = ((int)(low >> HALFFRACBITS)) & ((1 << EXPBITS) - 1); + int shift; + fractype xlow; + + xlow = low & ((((fractype)1) << HALFFRACBITS) - 1); + if (lowexp) + xlow |= (((halffractype)1) << HALFFRACBITS); + else + lowexp = 1; + shift = (FRACBITS - HALFFRACBITS) - (exp - lowexp); + if (shift > 0) + xlow <<= shift; + else if (shift < 0) + xlow >>= -shift; + fraction += xlow; + } + } +# else + fraction = src->value_raw & ((((fractype)1) << FRACBITS) - 1); exp = ((int)(src->value_raw >> FRACBITS)) & ((1 << EXPBITS) - 1); sign = ((int)(src->value_raw >> (FRACBITS + EXPBITS))) & 1; +# endif #endif dst->sign = sign; @@ -427,7 +541,7 @@ unpack_d (FLO_union_type * src, fp_number_type * dst) } #endif /* L_unpack_df || L_unpack_sf */ -#if defined(L_addsub_sf) || defined(L_addsub_df) +#if defined(L_addsub_sf) || defined(L_addsub_df) || defined(L_addsub_tf) static fp_number_type * _fpadd_parts (fp_number_type * a, fp_number_type * b, @@ -611,7 +725,7 @@ sub (FLO_type arg_a, FLO_type arg_b) } #endif /* L_addsub_sf || L_addsub_df */ -#if defined(L_mul_sf) || defined(L_mul_df) +#if defined(L_mul_sf) || defined(L_mul_df) || defined(L_mul_tf) static inline __attribute__ ((__always_inline__)) fp_number_type * _fpmul_parts ( fp_number_type * a, fp_number_type * b, @@ -660,7 +774,7 @@ _fpmul_parts ( fp_number_type * a, /* Calculate the mantissa by multiplying both numbers to get a twice-as-wide number. */ { -#if defined(NO_DI_MODE) +#if defined(NO_DI_MODE) || defined(TFLOAT) { fractype x = a->fraction.ll; fractype ylow = b->fraction.ll; @@ -723,13 +837,9 @@ _fpmul_parts ( fp_number_type * a, #endif } - tmp->normal_exp = a->normal_exp + b->normal_exp; + tmp->normal_exp = a->normal_exp + b->normal_exp + + FRAC_NBITS - (FRACBITS + NGARDS); tmp->sign = a->sign != b->sign; -#ifdef FLOAT - tmp->normal_exp += 2; /* ??????????????? */ -#else - tmp->normal_exp += 4; /* ??????????????? */ -#endif while (high >= IMPLICIT_2) { tmp->normal_exp++; @@ -803,7 +913,7 @@ multiply (FLO_type arg_a, FLO_type arg_b) } #endif /* L_mul_sf || L_mul_df */ -#if defined(L_div_sf) || defined(L_div_df) +#if defined(L_div_sf) || defined(L_div_df) || defined(L_div_tf) static inline __attribute__ ((__always_inline__)) fp_number_type * _fpdiv_parts (fp_number_type * a, fp_number_type * b) @@ -913,7 +1023,8 @@ divide (FLO_type arg_a, FLO_type arg_b) } #endif /* L_div_sf || L_div_df */ -#if defined(L_fpcmp_parts_sf) || defined(L_fpcmp_parts_df) +#if defined(L_fpcmp_parts_sf) || defined(L_fpcmp_parts_df) \ + || defined(L_fpcmp_parts_tf) /* according to the demo, fpcmp returns a comparison with 0... thus a<b -> -1 a==b -> 0 @@ -998,7 +1109,7 @@ __fpcmp_parts (fp_number_type * a, fp_number_type * b) } #endif -#if defined(L_compare_sf) || defined(L_compare_df) +#if defined(L_compare_sf) || defined(L_compare_df) || defined(L_compoare_tf) CMPtype compare (FLO_type arg_a, FLO_type arg_b) { @@ -1020,7 +1131,7 @@ compare (FLO_type arg_a, FLO_type arg_b) /* These should be optimized for their specific tasks someday. */ -#if defined(L_eq_sf) || defined(L_eq_df) +#if defined(L_eq_sf) || defined(L_eq_df) || defined(L_eq_tf) CMPtype _eq_f2 (FLO_type arg_a, FLO_type arg_b) { @@ -1041,7 +1152,7 @@ _eq_f2 (FLO_type arg_a, FLO_type arg_b) } #endif /* L_eq_sf || L_eq_df */ -#if defined(L_ne_sf) || defined(L_ne_df) +#if defined(L_ne_sf) || defined(L_ne_df) || defined(L_ne_tf) CMPtype _ne_f2 (FLO_type arg_a, FLO_type arg_b) { @@ -1062,7 +1173,7 @@ _ne_f2 (FLO_type arg_a, FLO_type arg_b) } #endif /* L_ne_sf || L_ne_df */ -#if defined(L_gt_sf) || defined(L_gt_df) +#if defined(L_gt_sf) || defined(L_gt_df) || defined(L_gt_tf) CMPtype _gt_f2 (FLO_type arg_a, FLO_type arg_b) { @@ -1083,7 +1194,7 @@ _gt_f2 (FLO_type arg_a, FLO_type arg_b) } #endif /* L_gt_sf || L_gt_df */ -#if defined(L_ge_sf) || defined(L_ge_df) +#if defined(L_ge_sf) || defined(L_ge_df) || defined(L_ge_tf) CMPtype _ge_f2 (FLO_type arg_a, FLO_type arg_b) { @@ -1103,7 +1214,7 @@ _ge_f2 (FLO_type arg_a, FLO_type arg_b) } #endif /* L_ge_sf || L_ge_df */ -#if defined(L_lt_sf) || defined(L_lt_df) +#if defined(L_lt_sf) || defined(L_lt_df) || defined(L_lt_tf) CMPtype _lt_f2 (FLO_type arg_a, FLO_type arg_b) { @@ -1124,7 +1235,7 @@ _lt_f2 (FLO_type arg_a, FLO_type arg_b) } #endif /* L_lt_sf || L_lt_df */ -#if defined(L_le_sf) || defined(L_le_df) +#if defined(L_le_sf) || defined(L_le_df) || defined(L_le_tf) CMPtype _le_f2 (FLO_type arg_a, FLO_type arg_b) { @@ -1147,7 +1258,7 @@ _le_f2 (FLO_type arg_a, FLO_type arg_b) #endif /* ! US_SOFTWARE_GOFAST */ -#if defined(L_unord_sf) || defined(L_unord_df) +#if defined(L_unord_sf) || defined(L_unord_df) || defined(L_unord_tf) CMPtype _unord_f2 (FLO_type arg_a, FLO_type arg_b) { @@ -1165,7 +1276,7 @@ _unord_f2 (FLO_type arg_a, FLO_type arg_b) } #endif /* L_unord_sf || L_unord_df */ -#if defined(L_si_to_sf) || defined(L_si_to_df) +#if defined(L_si_to_sf) || defined(L_si_to_df) || defined(L_si_to_tf) FLO_type si_to_float (SItype arg_a) { @@ -1193,7 +1304,7 @@ si_to_float (SItype arg_a) else in.fraction.ll = arg_a; - while (in.fraction.ll < (1LL << (FRACBITS + NGARDS))) + while (in.fraction.ll < ((fractype)1 << (FRACBITS + NGARDS))) { in.fraction.ll <<= 1; in.normal_exp -= 1; @@ -1203,7 +1314,7 @@ si_to_float (SItype arg_a) } #endif /* L_si_to_sf || L_si_to_df */ -#if defined(L_usi_to_sf) || defined(L_usi_to_df) +#if defined(L_usi_to_sf) || defined(L_usi_to_df) || defined(L_usi_to_tf) FLO_type usi_to_float (USItype arg_a) { @@ -1220,12 +1331,12 @@ usi_to_float (USItype arg_a) in.normal_exp = FRACBITS + NGARDS; in.fraction.ll = arg_a; - while (in.fraction.ll > (1LL << (FRACBITS + NGARDS))) + while (in.fraction.ll > ((fractype)1 << (FRACBITS + NGARDS))) { in.fraction.ll >>= 1; in.normal_exp += 1; } - while (in.fraction.ll < (1LL << (FRACBITS + NGARDS))) + while (in.fraction.ll < ((fractype)1 << (FRACBITS + NGARDS))) { in.fraction.ll <<= 1; in.normal_exp -= 1; @@ -1235,7 +1346,7 @@ usi_to_float (USItype arg_a) } #endif -#if defined(L_sf_to_si) || defined(L_df_to_si) +#if defined(L_sf_to_si) || defined(L_df_to_si) || defined(L_tf_to_si) SItype float_to_si (FLO_type arg_a) { @@ -1263,8 +1374,8 @@ float_to_si (FLO_type arg_a) } #endif /* L_sf_to_si || L_df_to_si */ -#if defined(L_sf_to_usi) || defined(L_df_to_usi) -#ifdef US_SOFTWARE_GOFAST +#if defined(L_sf_to_usi) || defined(L_df_to_usi) || defined(L_tf_to_usi) +#if defined US_SOFTWARE_GOFAST || defined(L_tf_to_usi) /* While libgcc2.c defines its own __fixunssfsi and __fixunsdfsi routines, we also define them for GOFAST because the ones in libgcc2.c have the wrong names and I'd rather define these here and keep GOFAST CYG-LOC's @@ -1303,7 +1414,7 @@ float_to_usi (FLO_type arg_a) #endif /* US_SOFTWARE_GOFAST */ #endif /* L_sf_to_usi || L_df_to_usi */ -#if defined(L_negate_sf) || defined(L_negate_df) +#if defined(L_negate_sf) || defined(L_negate_df) || defined(L_negate_tf) FLO_type negate (FLO_type arg_a) { @@ -1359,6 +1470,21 @@ sf_to_df (SFtype arg_a) } #endif /* L_sf_to_df */ +#if defined(L_sf_to_tf) && defined(TMODES) +TFtype +sf_to_tf (SFtype arg_a) +{ + fp_number_type in; + FLO_union_type au; + + au.value = arg_a; + unpack_d (&au, &in); + + return __make_tp (in.class, in.sign, in.normal_exp, + ((UTItype) in.fraction.ll) << F_T_BITOFF); +} +#endif /* L_sf_to_df */ + #endif /* ! FLOAT_ONLY */ #endif /* FLOAT */ @@ -1402,5 +1528,84 @@ df_to_sf (DFtype arg_a) } #endif /* L_df_to_sf */ +#if defined(L_df_to_tf) && defined(TMODES) \ + && !defined(FLOAT) && !defined(TFLOAT) +TFtype +df_to_tf (DFtype arg_a) +{ + fp_number_type in; + FLO_union_type au; + + au.value = arg_a; + unpack_d (&au, &in); + + return __make_tp (in.class, in.sign, in.normal_exp, + ((UTItype) in.fraction.ll) << D_T_BITOFF); +} +#endif /* L_sf_to_df */ + +#ifdef TFLOAT +#if defined(L_make_tf) +TFtype +__make_tp(fp_class_type class, + unsigned int sign, + int exp, + UTItype frac) +{ + fp_number_type in; + + in.class = class; + in.sign = sign; + in.normal_exp = exp; + in.fraction.ll = frac; + return pack_d (&in); +} +#endif /* L_make_tf */ + +#if defined(L_tf_to_df) +DFtype +tf_to_df (TFtype arg_a) +{ + fp_number_type in; + UDItype sffrac; + FLO_union_type au; + + au.value = arg_a; + unpack_d (&au, &in); + + sffrac = in.fraction.ll >> D_T_BITOFF; + + /* We set the lowest guard bit in SFFRAC if we discarded any non + zero bits. */ + if ((in.fraction.ll & (((UTItype) 1 << D_T_BITOFF) - 1)) != 0) + sffrac |= 1; + + return __make_dp (in.class, in.sign, in.normal_exp, sffrac); +} +#endif /* L_tf_to_df */ + +#if defined(L_tf_to_sf) +SFtype +tf_to_sf (TFtype arg_a) +{ + fp_number_type in; + USItype sffrac; + FLO_union_type au; + + au.value = arg_a; + unpack_d (&au, &in); + + sffrac = in.fraction.ll >> F_T_BITOFF; + + /* We set the lowest guard bit in SFFRAC if we discarded any non + zero bits. */ + if ((in.fraction.ll & (((UTItype) 1 << F_T_BITOFF) - 1)) != 0) + sffrac |= 1; + + return __make_fp (in.class, in.sign, in.normal_exp, sffrac); +} +#endif /* L_tf_to_sf */ +#endif /* TFLOAT */ + #endif /* ! FLOAT */ #endif /* !EXTENDED_FLOAT_STUBS */ diff --git a/gcc/config/fp-bit.h b/gcc/config/fp-bit.h index 03e2ff60993..247ef335610 100644 --- a/gcc/config/fp-bit.h +++ b/gcc/config/fp-bit.h @@ -1,5 +1,5 @@ /* Header file for fp-bit.c. */ -/* Copyright (C) 2000 +/* Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. This file is part of GNU CC. @@ -87,12 +87,22 @@ Boston, MA 02111-1307, USA. */ #endif #endif /* ! FINE_GRAINED_LIBRARIES */ +#if __LDBL_MANT_DIG__ == 113 || __LDBL_MANT_DIG__ == 106 +# define TMODES +#endif + typedef float SFtype __attribute__ ((mode (SF))); typedef float DFtype __attribute__ ((mode (DF))); +#ifdef TMODES +typedef float TFtype __attribute__ ((mode (TF))); +#endif typedef int HItype __attribute__ ((mode (HI))); typedef int SItype __attribute__ ((mode (SI))); typedef int DItype __attribute__ ((mode (DI))); +#ifdef TMODES +typedef int TItype __attribute__ ((mode (TI))); +#endif /* The type of the result of a fp compare */ #ifndef CMPtype @@ -102,16 +112,68 @@ typedef int DItype __attribute__ ((mode (DI))); typedef unsigned int UHItype __attribute__ ((mode (HI))); typedef unsigned int USItype __attribute__ ((mode (SI))); typedef unsigned int UDItype __attribute__ ((mode (DI))); +#ifdef TMODES +typedef unsigned int UTItype __attribute__ ((mode (TI))); +#endif #define MAX_USI_INT (~(USItype)0) #define MAX_SI_INT ((SItype) (MAX_USI_INT >> 1)) #define BITS_PER_SI (4 * BITS_PER_UNIT) +#ifdef TMODES +#define MAX_UDI_INT (~(UDItype)0) +#define MAX_DI_INT ((DItype) (MAX_UDI_INT >> 1)) +#define BITS_PER_DI (8 * BITS_PER_UNIT) +#endif #ifdef FLOAT_ONLY #define NO_DI_MODE #endif -#ifdef FLOAT +#ifdef TFLOAT +# ifndef TMODES +# error "TFLOAT requires long double to have 113 bits of mantissa" +# endif + +# define PREFIXFPDP tp +# define PREFIXSFDF tf +# define NGARDS 10L /* Is this right? */ +# define GARDROUND 0x1ff +# define GARDMASK 0x3ff +# define GARDMSB 0x200 +# define FRAC_NBITS 128 + +# if __LDBL_MANT_DIG__ == 113 /* IEEE quad */ +# define EXPBITS 15 +# define EXPBIAS 16383 +# define EXPMAX (0x7fff) +# define QUIET_NAN ((TItype)0x8 << 108) +# define FRACHIGH ((TItype)0x8 << 124) +# define FRACHIGH2 ((TItype)0xc << 124) +# define FRACBITS 112 +# endif + +# if __LDBL_MANT_DIG__ == 106 /* IBM extended (double+double) */ +# define EXPBITS 11 +# define EXPBIAS 1023 +# define EXPMAX (0x7ff) +# define QUIET_NAN ((TItype)0x8 << (48 + 64)) +# define FRACHIGH ((TItype)0x8 << 124) +# define FRACHIGH2 ((TItype)0xc << 124) +# define FRACBITS 105 +# define HALFFRACBITS 52 +# define HALFSHIFT 64 +# endif + +# define pack_d __pack_t +# define unpack_d __unpack_t +# define __fpcmp_parts __fpcmp_parts_t + typedef UTItype fractype; + typedef UDItype halffractype; + typedef USItype qrtrfractype; +#define qrtrfractype qrtrfractype + typedef TFtype FLO_type; + typedef TItype intfrac; +#elif defined FLOAT # define NGARDS 7L # define GARDROUND 0x3f # define GARDMASK 0x7f @@ -157,7 +219,9 @@ typedef unsigned int UDItype __attribute__ ((mode (DI))); #endif /* FLOAT */ #ifdef US_SOFTWARE_GOFAST -# ifdef FLOAT +# ifdef TFLOAT +# error "GOFAST TFmode not supported" +# elif defined FLOAT # define add fpadd # define sub fpsub # define multiply fpmul @@ -170,8 +234,8 @@ typedef unsigned int UDItype __attribute__ ((mode (DI))); # define float_to_usi fptoui # define negate __negsf2 # define sf_to_df fptodp -# define dptofp dptofp -#else +# define sf_to_tf __extendsftf2 +# else # define add dpadd # define sub dpsub # define multiply dpmul @@ -184,9 +248,30 @@ typedef unsigned int UDItype __attribute__ ((mode (DI))); # define float_to_usi dptoul # define negate __negdf2 # define df_to_sf dptofp +# define df_to_tf __extenddftf2 # endif /* FLOAT */ #else -# ifdef FLOAT +# ifdef TFLOAT +# define add __addtf3 +# define sub __subtf3 +# define multiply __multf3 +# define divide __divtf3 +# define compare __cmptf2 +# define _eq_f2 __eqtf2 +# define _ne_f2 __netf2 +# define _gt_f2 __gttf2 +# define _ge_f2 __getf2 +# define _lt_f2 __lttf2 +# define _le_f2 __letf2 +# define _unord_f2 __unordtf2 +# define usi_to_float __floatunsitf +# define si_to_float __floatsitf +# define float_to_si __fixtfsi +# define float_to_usi __fixunstfsi +# define negate __negtf2 +# define tf_to_sf __trunctfsf2 +# define tf_to_df __trunctfdf2 +# elif defined FLOAT # define add __addsf3 # define sub __subsf3 # define multiply __mulsf3 @@ -205,7 +290,8 @@ typedef unsigned int UDItype __attribute__ ((mode (DI))); # define float_to_usi __fixunssfsi # define negate __negsf2 # define sf_to_df __extendsfdf2 -#else +# define sf_to_tf __extendsftf2 +# else # define add __adddf3 # define sub __subdf3 # define multiply __muldf3 @@ -224,6 +310,7 @@ typedef unsigned int UDItype __attribute__ ((mode (DI))); # define float_to_usi __fixunsdfsi # define negate __negdf2 # define df_to_sf __truncdfsf2 +# define df_to_tf __extenddftf2 # endif /* FLOAT */ #endif /* US_SOFTWARE_GOFAST */ @@ -241,10 +328,15 @@ typedef unsigned int UDItype __attribute__ ((mode (DI))); */ #define F_D_BITOFF (52+8-(23+7)) +#ifdef TMODES +# define F_T_BITOFF (__LDBL_MANT_DIG__-1+10-(23+7)) +# define D_T_BITOFF (__LDBL_MANT_DIG__-1+10-(52+8)) +#endif + #define NORMAL_EXPMIN (-(EXPBIAS)+1) -#define IMPLICIT_1 (1LL<<(FRACBITS+NGARDS)) -#define IMPLICIT_2 (1LL<<(FRACBITS+1+NGARDS)) +#define IMPLICIT_1 ((fractype)1<<(FRACBITS+NGARDS)) +#define IMPLICIT_2 ((fractype)1<<(FRACBITS+1+NGARDS)) /* common types */ @@ -282,7 +374,11 @@ typedef union fractype value_raw; #ifndef FLOAT +# ifdef qrtrfractype + qrtrfractype qwords[4]; +# else halffractype words[2]; +# endif #endif #ifdef FLOAT_BIT_ORDER_MISMATCH @@ -317,82 +413,82 @@ FLO_union_type; /* Prototypes */ -#if defined(L_pack_df) || defined(L_pack_sf) +#if defined(L_pack_df) || defined(L_pack_sf) || defined(L_pack_tf) extern FLO_type pack_d (fp_number_type *); #endif extern void unpack_d (FLO_union_type *, fp_number_type *); -#if defined(L_addsub_sf) || defined(L_addsub_df) +#if defined(L_addsub_sf) || defined(L_addsub_df) || defined(L_addsub_tf) extern FLO_type add (FLO_type, FLO_type); extern FLO_type sub (FLO_type, FLO_type); #endif -#if defined(L_mul_sf) || defined(L_mul_df) +#if defined(L_mul_sf) || defined(L_mul_df) || defined(L_mul_tf) extern FLO_type multiply (FLO_type, FLO_type); #endif -#if defined(L_div_sf) || defined(L_div_df) +#if defined(L_div_sf) || defined(L_div_df) || defined(L_div_tf) extern FLO_type divide (FLO_type, FLO_type); #endif extern int __fpcmp_parts (fp_number_type *, fp_number_type *); -#if defined(L_compare_sf) || defined(L_compare_df) +#if defined(L_compare_sf) || defined(L_compare_df) || defined(L_compare_tf) extern CMPtype compare (FLO_type, FLO_type); #endif #ifndef US_SOFTWARE_GOFAST -#if defined(L_eq_sf) || defined(L_eq_df) +#if defined(L_eq_sf) || defined(L_eq_df) || defined(L_eq_tf) extern CMPtype _eq_f2 (FLO_type, FLO_type); #endif -#if defined(L_ne_sf) || defined(L_ne_df) +#if defined(L_ne_sf) || defined(L_ne_df) || defined(L_ne_tf) extern CMPtype _ne_f2 (FLO_type, FLO_type); #endif -#if defined(L_gt_sf) || defined(L_gt_df) +#if defined(L_gt_sf) || defined(L_gt_df) || defined(L_gt_tf) extern CMPtype _gt_f2 (FLO_type, FLO_type); #endif -#if defined(L_ge_sf) || defined(L_ge_df) +#if defined(L_ge_sf) || defined(L_ge_df) || defined(L_ge_tf) extern CMPtype _ge_f2 (FLO_type, FLO_type); #endif -#if defined(L_lt_sf) || defined(L_lt_df) +#if defined(L_lt_sf) || defined(L_lt_df) || defined(L_lt_tf) extern CMPtype _lt_f2 (FLO_type, FLO_type); #endif -#if defined(L_le_sf) || defined(L_le_df) +#if defined(L_le_sf) || defined(L_le_df) || defined(L_le_tf) extern CMPtype _le_f2 (FLO_type, FLO_type); #endif -#if defined(L_unord_sf) || defined(L_unord_df) +#if defined(L_unord_sf) || defined(L_unord_df) || defined(L_unord_tf) extern CMPtype _unord_f2 (FLO_type, FLO_type); #endif #endif /* ! US_SOFTWARE_GOFAST */ -#if defined(L_si_to_sf) || defined(L_si_to_df) +#if defined(L_si_to_sf) || defined(L_si_to_df) || defined(L_si_to_tf) extern FLO_type si_to_float (SItype); #endif -#if defined(L_sf_to_si) || defined(L_df_to_si) +#if defined(L_sf_to_si) || defined(L_df_to_si) || defined(L_tf_to_si) extern SItype float_to_si (FLO_type); #endif -#if defined(L_sf_to_usi) || defined(L_df_to_usi) +#if defined(L_sf_to_usi) || defined(L_df_to_usi) || defined(L_tf_to_usi) #ifdef US_SOFTWARE_GOFAST extern USItype float_to_usi (FLO_type); #endif #endif -#if defined(L_usi_to_sf) || defined(L_usi_to_df) +#if defined(L_usi_to_sf) || defined(L_usi_to_df) || defined(L_usi_to_tf) extern FLO_type usi_to_float (USItype); #endif -#if defined(L_negate_sf) || defined(L_negate_df) +#if defined(L_negate_sf) || defined(L_negate_df) || defined(L_negate_tf) extern FLO_type negate (FLO_type); #endif @@ -405,6 +501,9 @@ extern DFtype __make_dp (fp_class_type, unsigned int, int, UDItype); #if defined(L_sf_to_df) extern DFtype sf_to_df (SFtype); #endif +#if defined(L_sf_to_tf) && defined(TMODES) +extern TFtype sf_to_tf (SFtype); +#endif #endif /* ! FLOAT_ONLY */ #endif /* FLOAT */ @@ -416,6 +515,25 @@ extern DFtype __make_dp (fp_class_type, unsigned int, int, UDItype); #if defined(L_df_to_sf) extern SFtype df_to_sf (DFtype); #endif +#if defined(L_df_to_tf) && defined(TMODES) +extern TFtype df_to_tf (DFtype); +#endif #endif /* ! FLOAT */ +#ifdef TMODES +extern DFtype __make_dp (fp_class_type, unsigned int, int, UDItype); +extern TFtype __make_tp (fp_class_type, unsigned int, int, UTItype); +#ifdef TFLOAT +#if defined(L_tf_to_sf) +extern SFtype tf_to_sf (TFtype); +#endif +#if defined(L_tf_to_df) +extern DFtype tf_to_df (TFtype); +#endif +#if defined(L_di_to_tf) +extern TFtype di_to_df (DItype); +#endif +#endif /* TFLOAT */ +#endif /* TMODES */ + #endif /* ! GCC_FP_BIT_H */ diff --git a/gcc/config/h8300/h8300-protos.h b/gcc/config/h8300/h8300-protos.h index aac56220393..5d77e426236 100644 --- a/gcc/config/h8300/h8300-protos.h +++ b/gcc/config/h8300/h8300-protos.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler. Hitachi H8/300 version generating coff - Copyright (C) 2000 Free SoftwareFoundation, Inc. + Copyright (C) 2000, 2002, 2003 Free SoftwareFoundation, Inc. Contributed by Steve Chamberlain (sac@cygnus.com), Jim Wilson (wilson@cygnus.com), and Doug Evans (dje@cygnus.com). @@ -59,6 +59,9 @@ extern int small_call_insn_operand PARAMS ((rtx, enum machine_mode)); extern int jump_address_operand PARAMS ((rtx, enum machine_mode)); extern int bit_operand PARAMS ((rtx, enum machine_mode)); extern int bit_memory_operand PARAMS ((rtx, enum machine_mode)); +extern int stack_pointer_operand PARAMS ((rtx, enum machine_mode)); +extern int const_int_gt_2_operand PARAMS ((rtx, enum machine_mode)); +extern int const_int_ge_8_operand PARAMS ((rtx, enum machine_mode)); extern int bit_operator PARAMS ((rtx, enum machine_mode)); extern int nshift_operator PARAMS ((rtx, enum machine_mode)); diff --git a/gcc/config/h8300/h8300.c b/gcc/config/h8300/h8300.c index eac88bde469..60585d58144 100644 --- a/gcc/config/h8300/h8300.c +++ b/gcc/config/h8300/h8300.c @@ -1,6 +1,6 @@ /* Subroutines for insn-output.c for Hitachi H8/300. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002 Free Software Foundation, Inc. + 2001, 2002, 2003 Free Software Foundation, Inc. Contributed by Steve Chamberlain (sac@cygnus.com), Jim Wilson (wilson@cygnus.com), and Doug Evans (dje@cygnus.com). @@ -1755,6 +1755,8 @@ notice_update_cc (body, insn) rtx body; rtx insn; { + rtx set; + switch (get_attr_cc (insn)) { case CC_NONE: @@ -1777,7 +1779,10 @@ notice_update_cc (body, insn) that's ok because alter_cond will change tests to use EQ/NE. */ CC_STATUS_INIT; cc_status.flags |= CC_OVERFLOW_UNUSABLE | CC_NO_CARRY; - cc_status.value1 = recog_data.operand[0]; + set = single_set (insn); + cc_status.value1 = SET_SRC (set); + if (SET_DEST (set) != cc0_rtx) + cc_status.value2 = SET_DEST (set); break; case CC_SET_ZNV: @@ -1786,9 +1791,10 @@ notice_update_cc (body, insn) alter_cond will change tests to use EQ/NE. */ CC_STATUS_INIT; cc_status.flags |= CC_NO_CARRY; - cc_status.value1 = recog_data.operand[0]; - if (GET_CODE (body) == SET && REG_P (SET_SRC (body))) - cc_status.value2 = SET_SRC (body); + set = single_set (insn); + cc_status.value1 = SET_SRC (set); + if (SET_DEST (set) != cc0_rtx) + cc_status.value2 = SET_DEST (set); break; case CC_COMPARE: @@ -1804,6 +1810,40 @@ notice_update_cc (body, insn) } } +/* Return nonzero if X is a stack pointer. */ + +int +stack_pointer_operand (x, mode) + rtx x; + enum machine_mode mode ATTRIBUTE_UNUSED; +{ + return x == stack_pointer_rtx; +} + +/* Return nonzero if X is a constant whose absolute value is greater + than 2. */ + +int +const_int_gt_2_operand (x, mode) + rtx x; + enum machine_mode mode ATTRIBUTE_UNUSED; +{ + return (GET_CODE (x) == CONST_INT + && abs (INTVAL (x)) > 2); +} + +/* Return nonzero if X is a constant whose absolute value is no + smaller than 8. */ + +int +const_int_ge_8_operand (x, mode) + rtx x; + enum machine_mode mode ATTRIBUTE_UNUSED; +{ + return (GET_CODE (x) == CONST_INT + && abs (INTVAL (x)) >= 8); +} + /* Recognize valid operators for bit instructions. */ int diff --git a/gcc/config/h8300/h8300.h b/gcc/config/h8300/h8300.h index 21f3eeb689b..232038df080 100644 --- a/gcc/config/h8300/h8300.h +++ b/gcc/config/h8300/h8300.h @@ -1074,7 +1074,7 @@ struct cum_arg #define ASM_APP_OFF "; #NO_APP\n" #define FILE_ASM_OP "\t.file\n" -#define IDENT_ASM_OP "\t.ident\n" +#define IDENT_ASM_OP "\t.ident\t" /* The assembler op to get a word, 2 bytes for the H8/300, 4 for H8/300H. */ #define ASM_WORD_OP \ diff --git a/gcc/config/h8300/h8300.md b/gcc/config/h8300/h8300.md index de6edc9b4d2..40520cfbbcf 100644 --- a/gcc/config/h8300/h8300.md +++ b/gcc/config/h8300/h8300.md @@ -1,6 +1,6 @@ ;; GCC machine description for Hitachi H8/300 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -;; 2001, 2002 Free Software Foundation, Inc. +;; 2001, 2002, 2003 Free Software Foundation, Inc. ;; Contributed by Steve Chamberlain (sac@cygnus.com), ;; Jim Wilson (wilson@cygnus.com), and Doug Evans (dje@cygnus.com). @@ -117,7 +117,8 @@ (plus:HI (reg:HI SP_REG) (const_int -2))) (set (mem:QI (plus:HI (reg:HI SP_REG) (const_int -1))) (match_operand:QI 0 "register_operand" "r"))])] - "TARGET_H8300" + "TARGET_H8300 + && REGNO (operands[0]) != SP_REG" "mov.w\\t%T0,@-r7" [(set_attr "length" "2") (set_attr "cc" "clobber")]) @@ -127,7 +128,8 @@ (plus:SI (reg:SI SP_REG) (const_int -4))) (set (mem:QI (plus:SI (reg:SI SP_REG) (const_int -3))) (match_operand:QI 0 "register_operand" "r"))])] - "TARGET_H8300H || TARGET_H8300S" + "(TARGET_H8300H || TARGET_H8300S) + && REGNO (operands[0]) != SP_REG" "mov.l\\t%S0,@-er7" [(set_attr "length" "4") (set_attr "cc" "clobber")]) @@ -209,7 +211,8 @@ (define_expand "pushhi1_h8300" [(set (mem:HI (pre_dec:HI (reg:HI SP_REG))) (match_operand:HI 0 "register_operand" ""))] - "TARGET_H8300" + "TARGET_H8300 + && REGNO (operands[0]) != SP_REG" "") (define_insn "pushhi1_h8300hs" @@ -217,7 +220,8 @@ (plus:SI (reg:SI SP_REG) (const_int -4))) (set (mem:HI (plus:SI (reg:SI SP_REG) (const_int -2))) (match_operand:HI 0 "register_operand" "r"))])] - "TARGET_H8300H || TARGET_H8300S" + "(TARGET_H8300H || TARGET_H8300S) + && REGNO (operands[0]) != SP_REG" "mov.l\\t%S0,@-er7" [(set_attr "length" "4") (set_attr "cc" "clobber")]) @@ -776,6 +780,35 @@ [(set_attr "length" "2,2,2,4,2") (set_attr "cc" "none_0hit,none_0hit,clobber,clobber,set_zn")]) +;; This splitter is very important to make the stack adjustment +;; interrupt-safe. The combination of add.b and addx is unsafe! +;; +;; We apply this split after the peephole2 pass so that we won't end +;; up creating too many adds/subs when a scratch register is +;; available, which is actually a common case because stack unrolling +;; tends to happen immediately after a function call. + +(define_split + [(set (match_operand:HI 0 "stack_pointer_operand" "") + (plus:HI (match_dup 0) + (match_operand 1 "const_int_gt_2_operand" "")))] + "TARGET_H8300 && flow2_completed" + [(const_int 0)] + "split_adds_subs (HImode, operands); DONE;") + +(define_peephole2 + [(match_scratch:HI 2 "r") + (set (match_operand:HI 0 "stack_pointer_operand" "") + (plus:HI (match_dup 0) + (match_operand:HI 1 "const_int_ge_8_operand" "")))] + "TARGET_H8300" + [(set (match_dup 2) + (match_dup 1)) + (set (match_dup 0) + (plus:HI (match_dup 0) + (match_dup 2)))] + "") + (define_insn "*addhi3_h8300hs" [(set (match_operand:HI 0 "register_operand" "=r,r,r,r,r") (plus:HI (match_operand:HI 1 "register_operand" "%0,0,0,0,0") @@ -1800,7 +1833,7 @@ "@ mov.b #0,%x0\;sub.w %e0,%e0 mov.b %R1,%w0\;mov.b #0,%x0\;sub.w %e0,%e0" - [(set_attr "length" "4,6") + [(set_attr "length" "4,8") (set_attr "cc" "clobber,clobber")]) (define_expand "zero_extendhisi2" @@ -2112,7 +2145,7 @@ ;; Normal loads with a 32bit destination. ;; -(define_insn "" +(define_insn "*extzv_1_r_h8300" [(set (match_operand:SI 0 "register_operand" "=&r") (zero_extract:SI (match_operand:HI 1 "register_operand" "r") (const_int 1) @@ -2121,9 +2154,9 @@ && INTVAL (operands[2]) < 16" "* return output_simode_bld (0, operands);" [(set_attr "cc" "clobber") - (set_attr "length" "6")]) + (set_attr "length" "8")]) -(define_insn "" +(define_insn "*extzv_1_r_h8300hs" [(set (match_operand:SI 0 "register_operand" "=r") (zero_extract:SI (match_operand:SI 1 "register_operand" "r") (const_int 1) @@ -2132,13 +2165,13 @@ && INTVAL (operands[2]) < 16" "* return output_simode_bld (0, operands);" [(set_attr "cc" "clobber") - (set_attr "length" "6")]) + (set_attr "length" "8")]) ;; ;; Inverted loads with a 32bit destination. ;; -(define_insn "" +(define_insn "*extzv_1_r_inv_h8300" [(set (match_operand:SI 0 "register_operand" "=&r") (zero_extract:SI (xor:HI (match_operand:HI 1 "register_operand" "r") (match_operand:HI 3 "const_int_operand" "n")) @@ -2149,9 +2182,9 @@ && (1 << INTVAL (operands[2])) == INTVAL (operands[3])" "* return output_simode_bld (1, operands);" [(set_attr "cc" "clobber") - (set_attr "length" "6")]) + (set_attr "length" "8")]) -(define_insn "" +(define_insn "*extzv_1_r_inv_h8300hs" [(set (match_operand:SI 0 "register_operand" "=r") (zero_extract:SI (xor:SI (match_operand:SI 1 "register_operand" "r") (match_operand 3 "const_int_operand" "n")) @@ -2162,7 +2195,7 @@ && (1 << INTVAL (operands[2])) == INTVAL (operands[3])" "* return output_simode_bld (1, operands);" [(set_attr "cc" "clobber") - (set_attr "length" "6")]) + (set_attr "length" "8")]) (define_expand "insv" [(set (zero_extract:HI (match_operand:HI 0 "general_operand" "") diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 42f6d93d3c3..b535c6dd7d3 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -1,6 +1,6 @@ /* Subroutines used for code generation on IA-32. Copyright (C) 1988, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, - 2002 Free Software Foundation, Inc. + 2002, 2003 Free Software Foundation, Inc. This file is part of GNU CC. @@ -4516,6 +4516,10 @@ ix86_expand_prologue () CALL_INSN_FUNCTION_USAGE (insn) = gen_rtx_EXPR_LIST (VOIDmode, gen_rtx_USE (VOIDmode, arg0), CALL_INSN_FUNCTION_USAGE (insn)); + + /* Don't allow scheduling pass to move insns across __alloca + call. */ + emit_insn (gen_blockage (const0_rtx)); } if (use_mov) { @@ -7484,12 +7488,12 @@ output_fp_compare (insn, operands, eflags_p, unordered_p) if (unordered_p) return "ucomiss\t{%1, %0|%0, %1}"; else - return "comiss\t{%1, %0|%0, %y}"; + return "comiss\t{%1, %0|%0, %1}"; else if (unordered_p) return "ucomisd\t{%1, %0|%0, %1}"; else - return "comisd\t{%1, %0|%0, %y}"; + return "comisd\t{%1, %0|%0, %1}"; } if (! STACK_TOP_P (cmp_op0)) @@ -9219,11 +9223,11 @@ ix86_expand_int_movcc (operands) /* On x86_64 the lea instruction operates on Pmode, so we need to get arithmetics done in proper mode to match. */ if (diff == 1) - tmp = out; + tmp = copy_rtx (out); else { rtx out1; - out1 = out; + out1 = copy_rtx (out); tmp = gen_rtx_MULT (mode, out1, GEN_INT (diff & ~1)); nops++; if (diff & 1) @@ -9241,9 +9245,9 @@ ix86_expand_int_movcc (operands) && (GET_CODE (tmp) != SUBREG || SUBREG_REG (tmp) != out)) { if (nops == 1) - out = force_operand (tmp, out); + out = force_operand (tmp, copy_rtx (out)); else - emit_insn (gen_rtx_SET (VOIDmode, out, tmp)); + emit_insn (gen_rtx_SET (VOIDmode, copy_rtx (out), copy_rtx (tmp))); } if (out != operands[0]) emit_move_insn (operands[0], copy_rtx (out)); @@ -12197,7 +12201,11 @@ ix86_init_mmx_sse_builtins () size_t i; tree pchar_type_node = build_pointer_type (char_type_node); + tree pcchar_type_node = build_pointer_type ( + build_type_variant (char_type_node, 1, 0)); tree pfloat_type_node = build_pointer_type (float_type_node); + tree pcfloat_type_node = build_pointer_type ( + build_type_variant (float_type_node, 1, 0)); tree pv2si_type_node = build_pointer_type (V2SI_type_node); tree pv2di_type_node = build_pointer_type (V2DI_type_node); tree pdi_type_node = build_pointer_type (long_long_unsigned_type_node); @@ -12270,8 +12278,8 @@ ix86_init_mmx_sse_builtins () = build_function_type_list (void_type_node, V8QI_type_node, V8QI_type_node, pchar_type_node, NULL_TREE); - tree v4sf_ftype_pfloat - = build_function_type_list (V4SF_type_node, pfloat_type_node, NULL_TREE); + tree v4sf_ftype_pcfloat + = build_function_type_list (V4SF_type_node, pcfloat_type_node, NULL_TREE); /* @@@ the type is bogus */ tree v4sf_ftype_v4sf_pv2si = build_function_type_list (V4SF_type_node, @@ -12326,7 +12334,11 @@ ix86_init_mmx_sse_builtins () = build_function_type_list (V2SI_type_node, V2SF_type_node, V2SF_type_node, NULL_TREE); tree pint_type_node = build_pointer_type (integer_type_node); + tree pcint_type_node = build_pointer_type ( + build_type_variant (integer_type_node, 1, 0)); tree pdouble_type_node = build_pointer_type (double_type_node); + tree pcdouble_type_node = build_pointer_type ( + build_type_variant (double_type_node, 1, 0)); tree int_ftype_v2df_v2df = build_function_type_list (integer_type_node, V2DF_type_node, V2DF_type_node, NULL_TREE); @@ -12338,8 +12350,8 @@ ix86_init_mmx_sse_builtins () tree ti_ftype_ti_ti = build_function_type_list (intTI_type_node, intTI_type_node, intTI_type_node, NULL_TREE); - tree void_ftype_pvoid - = build_function_type_list (void_type_node, ptr_type_node, NULL_TREE); + tree void_ftype_pcvoid + = build_function_type_list (void_type_node, const_ptr_type_node, NULL_TREE); tree v2di_ftype_di = build_function_type_list (V2DI_type_node, long_long_unsigned_type_node, NULL_TREE); @@ -12394,8 +12406,8 @@ ix86_init_mmx_sse_builtins () = build_function_type_list (void_type_node, V16QI_type_node, V16QI_type_node, pchar_type_node, NULL_TREE); - tree v2df_ftype_pdouble - = build_function_type_list (V2DF_type_node, pdouble_type_node, NULL_TREE); + tree v2df_ftype_pcdouble + = build_function_type_list (V2DF_type_node, pcdouble_type_node, NULL_TREE); tree v2df_ftype_v2df_v2df = build_function_type_list (V2DF_type_node, V2DF_type_node, V2DF_type_node, NULL_TREE); @@ -12454,16 +12466,16 @@ ix86_init_mmx_sse_builtins () V16QI_type_node, V16QI_type_node, NULL_TREE); tree int_ftype_v16qi = build_function_type_list (integer_type_node, V16QI_type_node, NULL_TREE); - tree v16qi_ftype_pchar - = build_function_type_list (V16QI_type_node, pchar_type_node, NULL_TREE); + tree v16qi_ftype_pcchar + = build_function_type_list (V16QI_type_node, pcchar_type_node, NULL_TREE); tree void_ftype_pchar_v16qi = build_function_type_list (void_type_node, pchar_type_node, V16QI_type_node, NULL_TREE); - tree v4si_ftype_pchar - = build_function_type_list (V4SI_type_node, pchar_type_node, NULL_TREE); - tree void_ftype_pchar_v4si + tree v4si_ftype_pcint + = build_function_type_list (V4SI_type_node, pcint_type_node, NULL_TREE); + tree void_ftype_pcint_v4si = build_function_type_list (void_type_node, - pchar_type_node, V4SI_type_node, NULL_TREE); + pcint_type_node, V4SI_type_node, NULL_TREE); tree v2di_ftype_v2di = build_function_type_list (V2DI_type_node, V2DI_type_node, NULL_TREE); @@ -12539,8 +12551,6 @@ ix86_init_mmx_sse_builtins () /* Add the remaining MMX insns with somewhat more complicated types. */ def_builtin (MASK_MMX, "__builtin_ia32_mmx_zero", di_ftype_void, IX86_BUILTIN_MMX_ZERO); def_builtin (MASK_MMX, "__builtin_ia32_emms", void_ftype_void, IX86_BUILTIN_EMMS); - def_builtin (MASK_MMX, "__builtin_ia32_ldmxcsr", void_ftype_unsigned, IX86_BUILTIN_LDMXCSR); - def_builtin (MASK_MMX, "__builtin_ia32_stmxcsr", unsigned_ftype_void, IX86_BUILTIN_STMXCSR); def_builtin (MASK_MMX, "__builtin_ia32_psllw", v4hi_ftype_v4hi_di, IX86_BUILTIN_PSLLW); def_builtin (MASK_MMX, "__builtin_ia32_pslld", v2si_ftype_v2si_di, IX86_BUILTIN_PSLLD); def_builtin (MASK_MMX, "__builtin_ia32_psllq", di_ftype_di_di, IX86_BUILTIN_PSLLQ); @@ -12566,6 +12576,8 @@ ix86_init_mmx_sse_builtins () def_builtin (MASK_MMX, "__builtin_ia32_packssdw", v4hi_ftype_v2si_v2si, IX86_BUILTIN_PACKSSDW); def_builtin (MASK_MMX, "__builtin_ia32_packuswb", v8qi_ftype_v4hi_v4hi, IX86_BUILTIN_PACKUSWB); + def_builtin (MASK_SSE1, "__builtin_ia32_ldmxcsr", void_ftype_unsigned, IX86_BUILTIN_LDMXCSR); + def_builtin (MASK_SSE1, "__builtin_ia32_stmxcsr", unsigned_ftype_void, IX86_BUILTIN_STMXCSR); def_builtin (MASK_SSE1, "__builtin_ia32_cvtpi2ps", v4sf_ftype_v4sf_v2si, IX86_BUILTIN_CVTPI2PS); def_builtin (MASK_SSE1, "__builtin_ia32_cvtps2pi", v2si_ftype_v4sf, IX86_BUILTIN_CVTPS2PI); def_builtin (MASK_SSE1, "__builtin_ia32_cvtsi2ss", v4sf_ftype_v4sf_int, IX86_BUILTIN_CVTSI2SS); @@ -12578,9 +12590,9 @@ ix86_init_mmx_sse_builtins () def_builtin (MASK_SSE1 | MASK_3DNOW_A, "__builtin_ia32_maskmovq", void_ftype_v8qi_v8qi_pchar, IX86_BUILTIN_MASKMOVQ); - def_builtin (MASK_SSE1, "__builtin_ia32_loadaps", v4sf_ftype_pfloat, IX86_BUILTIN_LOADAPS); - def_builtin (MASK_SSE1, "__builtin_ia32_loadups", v4sf_ftype_pfloat, IX86_BUILTIN_LOADUPS); - def_builtin (MASK_SSE1, "__builtin_ia32_loadss", v4sf_ftype_pfloat, IX86_BUILTIN_LOADSS); + def_builtin (MASK_SSE1, "__builtin_ia32_loadaps", v4sf_ftype_pcfloat, IX86_BUILTIN_LOADAPS); + def_builtin (MASK_SSE1, "__builtin_ia32_loadups", v4sf_ftype_pcfloat, IX86_BUILTIN_LOADUPS); + def_builtin (MASK_SSE1, "__builtin_ia32_loadss", v4sf_ftype_pcfloat, IX86_BUILTIN_LOADSS); def_builtin (MASK_SSE1, "__builtin_ia32_storeaps", void_ftype_pfloat_v4sf, IX86_BUILTIN_STOREAPS); def_builtin (MASK_SSE1, "__builtin_ia32_storeups", void_ftype_pfloat_v4sf, IX86_BUILTIN_STOREUPS); def_builtin (MASK_SSE1, "__builtin_ia32_storess", void_ftype_pfloat_v4sf, IX86_BUILTIN_STORESS); @@ -12648,9 +12660,9 @@ ix86_init_mmx_sse_builtins () def_builtin (MASK_SSE2, "__builtin_ia32_movq2dq", v2di_ftype_di, IX86_BUILTIN_MOVQ2DQ); def_builtin (MASK_SSE2, "__builtin_ia32_movdq2q", di_ftype_v2di, IX86_BUILTIN_MOVDQ2Q); - def_builtin (MASK_SSE2, "__builtin_ia32_loadapd", v2df_ftype_pdouble, IX86_BUILTIN_LOADAPD); - def_builtin (MASK_SSE2, "__builtin_ia32_loadupd", v2df_ftype_pdouble, IX86_BUILTIN_LOADUPD); - def_builtin (MASK_SSE2, "__builtin_ia32_loadsd", v2df_ftype_pdouble, IX86_BUILTIN_LOADSD); + def_builtin (MASK_SSE2, "__builtin_ia32_loadapd", v2df_ftype_pcdouble, IX86_BUILTIN_LOADAPD); + def_builtin (MASK_SSE2, "__builtin_ia32_loadupd", v2df_ftype_pcdouble, IX86_BUILTIN_LOADUPD); + def_builtin (MASK_SSE2, "__builtin_ia32_loadsd", v2df_ftype_pcdouble, IX86_BUILTIN_LOADSD); def_builtin (MASK_SSE2, "__builtin_ia32_storeapd", void_ftype_pdouble_v2df, IX86_BUILTIN_STOREAPD); def_builtin (MASK_SSE2, "__builtin_ia32_storeupd", void_ftype_pdouble_v2df, IX86_BUILTIN_STOREUPD); def_builtin (MASK_SSE2, "__builtin_ia32_storesd", void_ftype_pdouble_v2df, IX86_BUILTIN_STORESD); @@ -12701,21 +12713,21 @@ ix86_init_mmx_sse_builtins () def_builtin (MASK_SSE2, "__builtin_ia32_setpd1", v2df_ftype_double, IX86_BUILTIN_SETPD1); def_builtin (MASK_SSE2, "__builtin_ia32_setpd", v2df_ftype_double_double, IX86_BUILTIN_SETPD); def_builtin (MASK_SSE2, "__builtin_ia32_setzeropd", ti_ftype_void, IX86_BUILTIN_CLRPD); - def_builtin (MASK_SSE2, "__builtin_ia32_loadpd1", v2df_ftype_pdouble, IX86_BUILTIN_LOADPD1); - def_builtin (MASK_SSE2, "__builtin_ia32_loadrpd", v2df_ftype_pdouble, IX86_BUILTIN_LOADRPD); + def_builtin (MASK_SSE2, "__builtin_ia32_loadpd1", v2df_ftype_pcdouble, IX86_BUILTIN_LOADPD1); + def_builtin (MASK_SSE2, "__builtin_ia32_loadrpd", v2df_ftype_pcdouble, IX86_BUILTIN_LOADRPD); def_builtin (MASK_SSE2, "__builtin_ia32_storepd1", void_ftype_pdouble_v2df, IX86_BUILTIN_STOREPD1); def_builtin (MASK_SSE2, "__builtin_ia32_storerpd", void_ftype_pdouble_v2df, IX86_BUILTIN_STORERPD); - def_builtin (MASK_SSE2, "__builtin_ia32_clflush", void_ftype_pvoid, IX86_BUILTIN_CLFLUSH); + def_builtin (MASK_SSE2, "__builtin_ia32_clflush", void_ftype_pcvoid, IX86_BUILTIN_CLFLUSH); def_builtin (MASK_SSE2, "__builtin_ia32_lfence", void_ftype_void, IX86_BUILTIN_LFENCE); def_builtin (MASK_SSE2, "__builtin_ia32_mfence", void_ftype_void, IX86_BUILTIN_MFENCE); - def_builtin (MASK_SSE2, "__builtin_ia32_loaddqa", v16qi_ftype_pchar, IX86_BUILTIN_LOADDQA); - def_builtin (MASK_SSE2, "__builtin_ia32_loaddqu", v16qi_ftype_pchar, IX86_BUILTIN_LOADDQU); - def_builtin (MASK_SSE2, "__builtin_ia32_loadd", v4si_ftype_pchar, IX86_BUILTIN_LOADD); + def_builtin (MASK_SSE2, "__builtin_ia32_loaddqa", v16qi_ftype_pcchar, IX86_BUILTIN_LOADDQA); + def_builtin (MASK_SSE2, "__builtin_ia32_loaddqu", v16qi_ftype_pcchar, IX86_BUILTIN_LOADDQU); + def_builtin (MASK_SSE2, "__builtin_ia32_loadd", v4si_ftype_pcint, IX86_BUILTIN_LOADD); def_builtin (MASK_SSE2, "__builtin_ia32_storedqa", void_ftype_pchar_v16qi, IX86_BUILTIN_STOREDQA); def_builtin (MASK_SSE2, "__builtin_ia32_storedqu", void_ftype_pchar_v16qi, IX86_BUILTIN_STOREDQU); - def_builtin (MASK_SSE2, "__builtin_ia32_stored", void_ftype_pchar_v4si, IX86_BUILTIN_STORED); + def_builtin (MASK_SSE2, "__builtin_ia32_stored", void_ftype_pcint_v4si, IX86_BUILTIN_STORED); def_builtin (MASK_SSE2, "__builtin_ia32_movq", v2di_ftype_v2di, IX86_BUILTIN_MOVQ); def_builtin (MASK_SSE1, "__builtin_ia32_setzero128", v2di_ftype_void, IX86_BUILTIN_CLRTI); diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md index befbfe49569..00ea4a1856f 100644 --- a/gcc/config/i386/i386.md +++ b/gcc/config/i386/i386.md @@ -1,5 +1,6 @@ ;; GCC machine description for IA-32 and x86-64. -;; Copyright (C) 1988, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +;; Copyright (C) 1988, 1994, 1995, 1996, 1997, 1998, 1999, 2000, +;; 2001, 2002, 2003 ;; Free Software Foundation, Inc. ;; Mostly by William Schelter. ;; x86_64 support added by Jan Hubicka @@ -16734,7 +16735,7 @@ (define_split [(set (match_operand 0 "register_operand" "") (if_then_else (match_operator 1 "comparison_operator" - [(match_operand 4 "register_operand" "") + [(match_operand 4 "nonimmediate_operand" "") (match_operand 5 "nonimmediate_operand" "")]) (match_operand 2 "nonmemory_operand" "") (match_operand 3 "nonmemory_operand" "")))] @@ -16746,13 +16747,16 @@ (subreg:TI (match_dup 7) 0)))] { PUT_MODE (operands[1], GET_MODE (operands[0])); - if (!sse_comparison_operator (operands[1], VOIDmode)) + if (!sse_comparison_operator (operands[1], VOIDmode) + || !rtx_equal_p (operands[0], operands[4])) { rtx tmp = operands[5]; operands[5] = operands[4]; operands[4] = tmp; PUT_CODE (operands[1], swap_condition (GET_CODE (operands[1]))); } + if (!rtx_equal_p (operands[0], operands[4])) + abort (); if (const0_operand (operands[2], GET_MODE (operands[0]))) { operands[7] = operands[3]; @@ -19805,17 +19809,17 @@ (define_insn "ldmxcsr" [(unspec_volatile [(match_operand:SI 0 "memory_operand" "m")] UNSPECV_LDMXCSR)] - "TARGET_MMX" + "TARGET_SSE" "ldmxcsr\t%0" - [(set_attr "type" "mmx") + [(set_attr "type" "sse") (set_attr "memory" "load")]) (define_insn "stmxcsr" [(set (match_operand:SI 0 "memory_operand" "=m") (unspec_volatile:SI [(const_int 0)] UNSPECV_STMXCSR))] - "TARGET_MMX" + "TARGET_SSE" "stmxcsr\t%0" - [(set_attr "type" "mmx") + [(set_attr "type" "sse") (set_attr "memory" "store")]) (define_expand "sfence" diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h index ae346e6d518..b6b575665ca 100644 --- a/gcc/config/i386/linux64.h +++ b/gcc/config/i386/linux64.h @@ -116,17 +116,17 @@ Boston, MA 02111-1307, USA. */ (FS)->regs.reg[0].how = REG_SAVED_OFFSET; \ (FS)->regs.reg[0].loc.offset = (long)&sc_->rax - new_cfa_; \ (FS)->regs.reg[1].how = REG_SAVED_OFFSET; \ - (FS)->regs.reg[1].loc.offset = (long)&sc_->rbx - new_cfa_; \ + (FS)->regs.reg[1].loc.offset = (long)&sc_->rdx - new_cfa_; \ (FS)->regs.reg[2].how = REG_SAVED_OFFSET; \ (FS)->regs.reg[2].loc.offset = (long)&sc_->rcx - new_cfa_; \ (FS)->regs.reg[3].how = REG_SAVED_OFFSET; \ - (FS)->regs.reg[3].loc.offset = (long)&sc_->rdx - new_cfa_; \ + (FS)->regs.reg[3].loc.offset = (long)&sc_->rbx - new_cfa_; \ (FS)->regs.reg[4].how = REG_SAVED_OFFSET; \ - (FS)->regs.reg[4].loc.offset = (long)&sc_->rbp - new_cfa_; \ + (FS)->regs.reg[4].loc.offset = (long)&sc_->rsi - new_cfa_; \ (FS)->regs.reg[5].how = REG_SAVED_OFFSET; \ - (FS)->regs.reg[5].loc.offset = (long)&sc_->rsi - new_cfa_; \ + (FS)->regs.reg[5].loc.offset = (long)&sc_->rdi - new_cfa_; \ (FS)->regs.reg[6].how = REG_SAVED_OFFSET; \ - (FS)->regs.reg[6].loc.offset = (long)&sc_->rdi - new_cfa_; \ + (FS)->regs.reg[6].loc.offset = (long)&sc_->rbp - new_cfa_; \ (FS)->regs.reg[8].how = REG_SAVED_OFFSET; \ (FS)->regs.reg[8].loc.offset = (long)&sc_->r8 - new_cfa_; \ (FS)->regs.reg[9].how = REG_SAVED_OFFSET; \ @@ -143,6 +143,8 @@ Boston, MA 02111-1307, USA. */ (FS)->regs.reg[14].loc.offset = (long)&sc_->r14 - new_cfa_; \ (FS)->regs.reg[15].how = REG_SAVED_OFFSET; \ (FS)->regs.reg[15].loc.offset = (long)&sc_->r15 - new_cfa_; \ + (FS)->regs.reg[16].how = REG_SAVED_OFFSET; \ + (FS)->regs.reg[16].loc.offset = (long)&sc_->rip - new_cfa_; \ (FS)->retaddr_column = 16; \ goto SUCCESS; \ } while (0) diff --git a/gcc/config/i386/scodbx.h b/gcc/config/i386/scodbx.h deleted file mode 100644 index 7da93053256..00000000000 --- a/gcc/config/i386/scodbx.h +++ /dev/null @@ -1,84 +0,0 @@ -/* Definitions for Intel 386 running SCO Unix System V, - using dbx-in-coff encapsulation. - Copyright (C) 1992, 1995, 1996, 1999 Free Software Foundation, Inc. - -This file is part of GNU CC. - -GNU CC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU CC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - -#include "i386/svr3dbx.h" - -/* Overridden defines for SCO systems from sco.h. */ - -/* By default, target has a 80387, uses IEEE compatible arithmetic, - and returns float values in the 387, ie, - (TARGET_80387 | TARGET_FLOAT_RETURNS_IN_80387) - - SCO's software emulation of a 387 fails to handle the `fucomp' - opcode. fucomp is only used when generating IEEE compliant code. - So don't make TARGET_IEEE_FP default for SCO. */ - -#undef TARGET_SUBTARGET_DEFAULT -#define TARGET_SUBTARGET_DEFAULT (MASK_80387 | MASK_FLOAT_RETURNS) - -/* Use crt1.o as a startup file and crtn.o as a closing file. */ - -#undef STARTFILE_SPEC -#define STARTFILE_SPEC \ - "%{!r:%{!z:svr3.ifile%s}%{z:svr3z.ifile%s}}\ - %{pg:gcrt1.o%s}%{!pg:%{p:mcrt1.o%s}%{!p:crt1.o%s}}" - -/* Library spec, including SCO international language support. */ - -#undef LIB_SPEC -#define LIB_SPEC \ - "%{p:-L/usr/lib/libp}%{pg:-L/usr/lib/libp} %{scointl:libintl.a%s} -lc" - -/* Specify predefined symbols in preprocessor. */ - -#undef CPP_PREDEFINES -#define CPP_PREDEFINES "-Dunix -DM_UNIX -DM_I386 -DM_COFF -DM_WORDSWAP -Asystem=svr3" - -#undef CPP_SPEC -#define CPP_SPEC "%(cpp_cpu) %{scointl:-DM_INTERNAT}" - -/* This spec is used for telling cpp whether char is signed or not. */ - -#undef SIGNED_CHAR_SPEC -#if DEFAULT_SIGNED_CHAR -#define SIGNED_CHAR_SPEC \ - "%{funsigned-char:-D__CHAR_UNSIGNED__ -D_CHAR_UNSIGNED}" -#else -#define SIGNED_CHAR_SPEC \ - "%{!fsigned-char:-D__CHAR_UNSIGNED__ -D_CHAR_UNSIGNED}" -#endif - -/* caller has to pop the extra argument passed to functions that return - structures. */ - -#undef RETURN_POPS_ARGS -#define RETURN_POPS_ARGS(FUNDECL,FUNTYPE,SIZE) \ - ((FUNDECL) && TREE_CODE (FUNDECL) == IDENTIFIER_NODE ? 0 \ - : (TARGET_RTD \ - && (TYPE_ARG_TYPES (FUNTYPE) == 0 \ - || (TREE_VALUE (tree_last (TYPE_ARG_TYPES (FUNTYPE))) \ - == void_type_node))) ? (SIZE) \ - : 0) -/* On other 386 systems, the last line looks like this: - : (aggregate_value_p (TREE_TYPE (FUNTYPE))) ? GET_MODE_SIZE (Pmode) : 0) */ - -/* Handle #pragma pack. */ -#define HANDLE_SYSV_PRAGMA diff --git a/gcc/config/i386/t-sco5gas b/gcc/config/i386/t-sco5gas index 2d0b48a6292..edeb554eea0 100644 --- a/gcc/config/i386/t-sco5gas +++ b/gcc/config/i386/t-sco5gas @@ -1,6 +1,6 @@ # The pushl in CTOR initialization interferes with frame pointer elimination. CRTSTUFF_T_CFLAGS = -fPIC -fno-omit-frame-pointer -CRTSTUFF_T_CFLAGS_S = -mcoff -fno-omit-frame-pointer +CRTSTUFF_T_CFLAGS_S = -fno-omit-frame-pointer # # I am still a little unsure of the multilib architecture. The following diff --git a/gcc/config/i386/xm-dgux.h b/gcc/config/i386/xm-dgux.h deleted file mode 100644 index 881c5c7be9d..00000000000 --- a/gcc/config/i386/xm-dgux.h +++ /dev/null @@ -1,4 +0,0 @@ -/* Configuration for GCC for Intel i386 running DG/ux */ - -/* looks just like sysv4 for now */ -#include "xm-svr4.h" diff --git a/gcc/config/i386/xm-sun.h b/gcc/config/i386/xm-sun.h deleted file mode 100644 index 6c0f0a25630..00000000000 --- a/gcc/config/i386/xm-sun.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Configuration for GNU C-compiler for Intel 80386 running SunOS 4.0. - Copyright (C) 1988, 1997 Free Software Foundation, Inc. - -This file is part of GNU CC. - -GNU CC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU CC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - -#define USG diff --git a/gcc/config/i386/xm-sysv3.h b/gcc/config/i386/xm-sysv3.h deleted file mode 100644 index 9a655443ff5..00000000000 --- a/gcc/config/i386/xm-sysv3.h +++ /dev/null @@ -1,3 +0,0 @@ -/* Configuration for GCC for Intel i386 running System V Release 3. */ - -#include "xm-svr3.h" diff --git a/gcc/config/i386/xmmintrin.h b/gcc/config/i386/xmmintrin.h index 4136e901795..5dbe5c4af75 100644 --- a/gcc/config/i386/xmmintrin.h +++ b/gcc/config/i386/xmmintrin.h @@ -1586,13 +1586,13 @@ _mm_ucomineq_sd (__m128d __A, __m128d __B) static __inline __m128i _mm_load_si128 (__m128i const *__P) { - return (__m128i) __builtin_ia32_loaddqa (__P); + return (__m128i) __builtin_ia32_loaddqa ((char const *)__P); } static __inline __m128i _mm_loadu_si128 (__m128i const *__P) { - return (__m128i) __builtin_ia32_loaddqu (__P); + return (__m128i) __builtin_ia32_loaddqu ((char const *)__P); } static __inline __m128i @@ -1604,13 +1604,13 @@ _mm_loadl_epi64 (__m128i const *__P) static __inline void _mm_store_si128 (__m128i *__P, __m128i __B) { - __builtin_ia32_storedqa (__P, (__v16qi)__B); + __builtin_ia32_storedqa ((char *)__P, (__v16qi)__B); } static __inline void _mm_storeu_si128 (__m128i *__P, __m128i __B) { - __builtin_ia32_storedqu (__P, (__v16qi)__B); + __builtin_ia32_storedqu ((char *)__P, (__v16qi)__B); } static __inline void diff --git a/gcc/config/ia64/aix.h b/gcc/config/ia64/aix.h index c9dca9c4f12..5eb2334cb6a 100644 --- a/gcc/config/ia64/aix.h +++ b/gcc/config/ia64/aix.h @@ -134,12 +134,14 @@ do { \ #define STANDARD_STARTFILE_PREFIX "/usr/lib/ia64l64/" #endif +/* It is illegal to have relocations in shared segments on AIX. + Pretend flag_pic is always set. */ #undef TARGET_ASM_SELECT_SECTION -#define TARGET_ASM_SELECT_SECTION ia64_aix_select_section +#define TARGET_ASM_SELECT_SECTION ia64_rwreloc_select_section #undef TARGET_ASM_UNIQUE_SECTION -#define TARGET_ASM_UNIQUE_SECTION ia64_aix_unique_section +#define TARGET_ASM_UNIQUE_SECTION ia64_rwreloc_unique_section #undef TARGET_ASM_SELECT_RTX_SECTION -#define TARGET_ASM_SELECT_RTX_SECTION ia64_aix_select_rtx_section +#define TARGET_ASM_SELECT_RTX_SECTION ia64_rwreloc_select_rtx_section /* Override ia64/sysv4.h setting with that used by AIX5. */ #undef WCHAR_TYPE diff --git a/gcc/config/ia64/crtbegin.asm b/gcc/config/ia64/crtbegin.asm index 75ffc3d906c..cb49e10bc56 100644 --- a/gcc/config/ia64/crtbegin.asm +++ b/gcc/config/ia64/crtbegin.asm @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc. Contributed by Jes Sorensen, <Jes.Sorensen@cern.ch> The GNU C Library is free software; you can redistribute it and/or @@ -61,6 +61,7 @@ __dso_handle: .section .init_array,"a","progbits" data8 @fptr(__do_jv_register_classes) + data8 @fptr(__do_global_ctors_aux) #else /* !HAVE_INITFINI_ARRAY */ /* diff --git a/gcc/config/ia64/crtend.asm b/gcc/config/ia64/crtend.asm index 17c3be41d89..303f30cbce8 100644 --- a/gcc/config/ia64/crtend.asm +++ b/gcc/config/ia64/crtend.asm @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2001 Free Software Foundation, Inc. +/* Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc. Contributed by Jes Sorensen, <Jes.Sorensen@cern.ch> The GNU C Library is free software; you can redistribute it and/or @@ -33,12 +33,7 @@ __DTOR_END__: __JCR_END__: data8 0 -#ifdef HAVE_INITFINI_ARRAY - -.section .init_array,"a","progbits" - data8 @fptr(__do_global_ctors_aux) - -#else /* !HAVE_INITFINI_ARRAY */ +#ifndef HAVE_INITFINI_ARRAY /* * Fragment of the ELF _init routine that invokes our dtor cleanup. * @@ -71,6 +66,12 @@ __JCR_END__: .text .align 16 +#ifdef HAVE_INITFINI_ARRAY + /* This is referenced from crtbegin.o. */ + .globl __do_global_ctors_aux# + .type __do_global_ctors_aux#,@function + .hidden __do_global_ctors_aux# +#endif .proc __do_global_ctors_aux# __do_global_ctors_aux: /* diff --git a/gcc/config/ia64/hpux.h b/gcc/config/ia64/hpux.h index 1e6f699835b..0d5a457ed0d 100644 --- a/gcc/config/ia64/hpux.h +++ b/gcc/config/ia64/hpux.h @@ -167,3 +167,14 @@ do { \ #undef TEXT_SECTION_ASM_OP #define TEXT_SECTION_ASM_OP "\t.section\t.text,\t\"ax\",\t\"progbits\"" + +/* It is illegal to have relocations in shared segments on HPUX. + Pretend flag_pic is always set. */ +#undef TARGET_ASM_SELECT_SECTION +#define TARGET_ASM_SELECT_SECTION ia64_rwreloc_select_section +#undef TARGET_ASM_UNIQUE_SECTION +#define TARGET_ASM_UNIQUE_SECTION ia64_rwreloc_unique_section +#undef TARGET_ASM_SELECT_RTX_SECTION +#define TARGET_ASM_SELECT_RTX_SECTION ia64_rwreloc_select_rtx_section +#undef TARGET_SECTION_TYPE_FLAGS +#define TARGET_SECTION_TYPE_FLAGS ia64_rwreloc_section_type_flags diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c index 10f06665999..082cdadfe24 100644 --- a/gcc/config/ia64/ia64.c +++ b/gcc/config/ia64/ia64.c @@ -166,13 +166,16 @@ static void ia64_output_mi_thunk PARAMS ((FILE *, tree, HOST_WIDE_INT, static void ia64_select_rtx_section PARAMS ((enum machine_mode, rtx, unsigned HOST_WIDE_INT)); -static void ia64_aix_select_section PARAMS ((tree, int, - unsigned HOST_WIDE_INT)) +static void ia64_rwreloc_select_section PARAMS ((tree, int, + unsigned HOST_WIDE_INT)) ATTRIBUTE_UNUSED; -static void ia64_aix_unique_section PARAMS ((tree, int)) +static void ia64_rwreloc_unique_section PARAMS ((tree, int)) ATTRIBUTE_UNUSED; -static void ia64_aix_select_rtx_section PARAMS ((enum machine_mode, rtx, - unsigned HOST_WIDE_INT)) +static void ia64_rwreloc_select_rtx_section PARAMS ((enum machine_mode, rtx, + unsigned HOST_WIDE_INT)) + ATTRIBUTE_UNUSED; +static unsigned int ia64_rwreloc_section_type_flags + PARAMS ((tree, const char *, int)) ATTRIBUTE_UNUSED; static void ia64_hpux_add_extern_decl PARAMS ((const char *name)) @@ -8180,34 +8183,28 @@ ia64_select_rtx_section (mode, x, align) default_elf_select_rtx_section (mode, x, align); } -/* It is illegal to have relocations in shared segments on AIX. +/* It is illegal to have relocations in shared segments on AIX and HPUX. Pretend flag_pic is always set. */ static void -ia64_aix_select_section (exp, reloc, align) +ia64_rwreloc_select_section (exp, reloc, align) tree exp; int reloc; unsigned HOST_WIDE_INT align; { - int save_pic = flag_pic; - flag_pic = 1; - default_elf_select_section (exp, reloc, align); - flag_pic = save_pic; + default_elf_select_section_1 (exp, reloc, align, true); } static void -ia64_aix_unique_section (decl, reloc) +ia64_rwreloc_unique_section (decl, reloc) tree decl; int reloc; { - int save_pic = flag_pic; - flag_pic = 1; - default_unique_section (decl, reloc); - flag_pic = save_pic; + default_unique_section_1 (decl, reloc, true); } static void -ia64_aix_select_rtx_section (mode, x, align) +ia64_rwreloc_select_rtx_section (mode, x, align) enum machine_mode mode; rtx x; unsigned HOST_WIDE_INT align; @@ -8218,6 +8215,16 @@ ia64_aix_select_rtx_section (mode, x, align) flag_pic = save_pic; } +static unsigned int +ia64_rwreloc_section_type_flags (decl, name, reloc) + tree decl; + const char *name; + int reloc; +{ + return default_section_type_flags_1 (decl, name, reloc, true); +} + + /* Output the assembler code for a thunk function. THUNK_DECL is the declaration for the thunk function itself, FUNCTION is the decl for the target function. DELTA is an immediate constant offset to be diff --git a/gcc/config/ia64/t-hpux b/gcc/config/ia64/t-hpux index d8201f9d5e1..7b42fe519a2 100644 --- a/gcc/config/ia64/t-hpux +++ b/gcc/config/ia64/t-hpux @@ -40,9 +40,9 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ $(LN_S) @shlib_base_name@.so @shlib_base_name@.so.0 # $(slibdir) double quoted to protect it from expansion while building # libgcc.mk. We want this delayed until actual install time. -SHLIB_INSTALL = $(INSTALL_DATA) @shlib_base_name@.so $$(slibdir)/@shlib_base_name@.so.0; \ - rm -f $$(slibdir)/@shlib_base_name@.so; \ - $(LN_S) @shlib_base_name@.so.0 $$(slibdir)/@shlib_base_name@.so; \ - chmod +x $$(slibdir)/@shlib_base_name@.so +SHLIB_INSTALL = $(INSTALL_DATA) @shlib_base_name@.so $$(DESTDIR)$$(slibdir)/@shlib_base_name@.so.0; \ + rm -f $$(DESTDIR)$$(slibdir)/@shlib_base_name@.so; \ + $(LN_S) @shlib_base_name@.so.0 $$(DESTDIR)$$(slibdir)/@shlib_base_name@.so; \ + chmod +x $$(DESTDIR)$$(slibdir)/@shlib_base_name@.so SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk diff --git a/gcc/config/ip2k/ip2k.c b/gcc/config/ip2k/ip2k.c index c0a643ae1d1..fa543205fc9 100644 --- a/gcc/config/ip2k/ip2k.c +++ b/gcc/config/ip2k/ip2k.c @@ -1,6 +1,6 @@ /* Subroutines used for code generation on Ubicom IP2022 Communications Controller. - Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Contributed by Red Hat, Inc and Ubicom, Inc. This file is part of GNU CC. @@ -72,6 +72,11 @@ static void mdr_try_wreg_elim PARAMS ((rtx)); static int ip2k_check_can_adjust_stack_ref PARAMS ((rtx, int)); static void ip2k_adjust_stack_ref PARAMS ((rtx *, int)); static int ip2k_xexp_not_uses_reg_for_mem PARAMS ((rtx, unsigned int)); +static tree ip2k_handle_progmem_attribute PARAMS ((tree *, tree, tree, int, + bool *)); +static tree ip2k_handle_fndecl_attribute PARAMS ((tree *, tree, tree, int, + bool *)); +const struct attribute_spec ip2k_attribute_table[]; /* Initialize the GCC target structure. */ @@ -90,6 +95,9 @@ static int ip2k_xexp_not_uses_reg_for_mem PARAMS ((rtx, unsigned int)); #undef TARGET_ENCODE_SECTION_INFO #define TARGET_ENCODE_SECTION_INFO encode_section_info +#undef TARGET_ATTRIBUTE_TABLE +#define TARGET_ATTRIBUTE_TABLE ip2k_attribute_table + struct gcc_target targetm = TARGET_INITIALIZER; /* Commands in the functions prologues in the compiled file. */ @@ -3143,51 +3151,82 @@ class_likely_spilled_p(c) || c == PTR_REGS); } -/* Only `progmem' attribute valid for type. */ +/* Valid attributes: + progmem - put data to program memory; + naked - don't generate function prologue/epilogue and `ret' command. -int -valid_machine_type_attribute(type, attributes, identifier, args) - tree type ATTRIBUTE_UNUSED; - tree attributes ATTRIBUTE_UNUSED; - tree identifier; - tree args ATTRIBUTE_UNUSED; -{ - return is_attribute_p ("progmem", identifier); -} + Only `progmem' attribute valid for type. */ -/* If IDENTIFIER with arguments ARGS is a valid machine specific - attribute for DECL return 1. - Valid attributes: - progmem - put data to program memory; - naked - don't generate function prologue/epilogue and `ret' command. */ +const struct attribute_spec ip2k_attribute_table[] = +{ + /* { name, min_len, max_len, decl_req, type_req, fn_type_req, handler } */ + { "progmem", 0, 0, false, false, false, ip2k_handle_progmem_attribute }, + { "naked", 0, 0, true, false, false, ip2k_handle_fndecl_attribute }, + { NULL, 0, 0, false, false, false, NULL } +}; -int -valid_machine_decl_attribute (decl, attributes, attr, args) - tree decl; - tree attributes ATTRIBUTE_UNUSED; - tree attr; +/* Handle a "progmem" attribute; arguments as in + struct attribute_spec.handler. */ +static tree +ip2k_handle_progmem_attribute (node, name, args, flags, no_add_attrs) + tree *node; + tree name; tree args ATTRIBUTE_UNUSED; + int flags ATTRIBUTE_UNUSED; + bool *no_add_attrs; { - if (is_attribute_p ("naked", attr)) - return TREE_CODE (decl) == FUNCTION_DECL; - - if (is_attribute_p ("progmem", attr) - && (TREE_STATIC (decl) || DECL_EXTERNAL (decl))) + if (DECL_P (*node)) { - /* Data stored in program RAM or FLASH must be word aligned or - it won't be directly addressable. */ - if (DECL_ALIGN (decl) < FUNCTION_BOUNDARY) - DECL_ALIGN (decl) = FUNCTION_BOUNDARY; + if (TREE_CODE (*node) == TYPE_DECL) + { + /* This is really a decl attribute, not a type attribute, + but try to handle it for GCC 3.0 backwards compatibility. */ + + tree type = TREE_TYPE (*node); + tree attr = tree_cons (name, args, TYPE_ATTRIBUTES (type)); + tree newtype = build_type_attribute_variant (type, attr); - if (DECL_INITIAL (decl) == NULL_TREE) + TYPE_MAIN_VARIANT (newtype) = TYPE_MAIN_VARIANT (type); + TREE_TYPE (*node) = newtype; + *no_add_attrs = true; + } + else if (TREE_STATIC (*node) || DECL_EXTERNAL (*node)) { - warning ("Only initialized variables can be placed into " - "program memory area."); - return 0; + if (DECL_INITIAL (*node) == NULL_TREE && !DECL_EXTERNAL (*node)) + { + warning ("only initialized variables can be placed into " + "program memory area"); + *no_add_attrs = true; + } + } + else + { + warning ("`%s' attribute ignored", IDENTIFIER_POINTER (name)); + *no_add_attrs = true; } - return 1; } - return 0; + + return NULL_TREE; +} + +/* Handle an attribute requiring a FUNCTION_DECL; arguments as in + struct attribute_spec.handler. */ +static tree +ip2k_handle_fndecl_attribute (node, name, args, flags, no_add_attrs) + tree *node; + tree name; + tree args ATTRIBUTE_UNUSED; + int flags ATTRIBUTE_UNUSED; + bool *no_add_attrs; +{ + if (TREE_CODE (*node) != FUNCTION_DECL) + { + warning ("`%s' attribute only applies to functions", + IDENTIFIER_POINTER (name)); + *no_add_attrs = true; + } + + return NULL_TREE; } /* Encode section information about tree DECL. */ diff --git a/gcc/config/ip2k/ip2k.h b/gcc/config/ip2k/ip2k.h index 00be9c4408d..af148904dd9 100644 --- a/gcc/config/ip2k/ip2k.h +++ b/gcc/config/ip2k/ip2k.h @@ -1,7 +1,7 @@ /* Definitions of target machine for GNU compiler, For Ubicom IP2022 Communications Controller - Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Contributed by Red Hat, Inc and Ubicom, Inc. This file is part of GNU CC. @@ -2349,18 +2349,6 @@ do { \ of arguments that the function accepts. Some people think a larger threshold should be used on RISC machines. */ -#define VALID_MACHINE_DECL_ATTRIBUTE(DECL, ATTRIBUTES, IDENTIFIER, ARGS) \ - valid_machine_decl_attribute (DECL, ATTRIBUTES, IDENTIFIER, ARGS) -/* If defined, a C expression whose value is nonzero if IDENTIFIER - with arguments ARGS is a valid machine specific attribute for DECL. - The attributes in ATTRIBUTES have previously been assigned to DECL. */ - -#define VALID_MACHINE_TYPE_ATTRIBUTE(TYPE, ATTRIBUTES, IDENTIFIER, ARGS) \ - valid_machine_type_attribute(TYPE, ATTRIBUTES, IDENTIFIER, ARGS) -/* If defined, a C expression whose value is nonzero if IDENTIFIER - with arguments ARGS is a valid machine specific attribute for TYPE. - The attributes in ATTRIBUTES have previously been assigned to TYPE. */ - #define DOLLARS_IN_IDENTIFIERS 0 /* Define this macro to control use of the character `$' in identifier names. 0 means `$' is not allowed by default; 1 means it is diff --git a/gcc/config/m68hc11/m68hc11-protos.h b/gcc/config/m68hc11/m68hc11-protos.h index c4a3fef0429..7b1ca5654c8 100644 --- a/gcc/config/m68hc11/m68hc11-protos.h +++ b/gcc/config/m68hc11/m68hc11-protos.h @@ -42,18 +42,6 @@ extern void m68hc11_function_arg_advance PARAMS((CUMULATIVE_ARGS*, #endif #ifdef RTX_CODE -extern rtx m68hc11_compare_op0; -extern rtx m68hc11_compare_op1; -extern GTY(()) rtx m68hc11_soft_tmp_reg; -extern GTY(()) rtx ix_reg; -extern GTY(()) rtx iy_reg; -extern GTY(()) rtx d_reg; -extern GTY(()) rtx da_reg; -extern GTY(()) rtx stack_push_word; -extern GTY(()) rtx stack_pop_word; -extern GTY(()) rtx z_reg; -extern GTY(()) rtx z_reg_qi; - extern void m68hc11_initialize_trampoline PARAMS((rtx, rtx, rtx)); extern rtx m68hc11_expand_compare_and_branch PARAMS((enum rtx_code, diff --git a/gcc/config/m68hc11/m68hc11.c b/gcc/config/m68hc11/m68hc11.c index ac16b527a97..7edfd24a8c6 100644 --- a/gcc/config/m68hc11/m68hc11.c +++ b/gcc/config/m68hc11/m68hc11.c @@ -1,5 +1,5 @@ /* Subroutines for code generation on Motorola 68HC11 and 68HC12. - Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Contributed by Stephane Carrez (stcarrez@nerim.fr) This file is part of GNU CC. @@ -64,9 +64,10 @@ static int go_if_legitimate_address_internal PARAMS((rtx, enum machine_mode, int)); static int register_indirect_p PARAMS((rtx, enum machine_mode, int)); static rtx m68hc11_expand_compare PARAMS((enum rtx_code, rtx, rtx)); -static int m68hc11_autoinc_compatible_p PARAMS ((rtx, rtx)); static int must_parenthesize PARAMS ((rtx)); static int m68hc11_shift_cost PARAMS ((enum machine_mode, rtx, int)); +static int autoinc_mode PARAMS ((rtx)); +static int m68hc11_make_autoinc_notes PARAMS ((rtx*, void*)); static int m68hc11_auto_inc_p PARAMS ((rtx)); static tree m68hc11_handle_fntype_attribute PARAMS ((tree *, tree, tree, int, bool *)); const struct attribute_spec m68hc11_attribute_table[]; @@ -79,8 +80,6 @@ static void m68hc11_asm_out_constructor PARAMS ((rtx, int)); static void m68hc11_asm_out_destructor PARAMS ((rtx, int)); static void m68hc11_encode_section_info PARAMS((tree, int)); -rtx m68hc11_soft_tmp_reg; - /* Must be set to 1 to produce debug messages. */ int debug_m6811 = 0; @@ -89,11 +88,12 @@ extern FILE *asm_out_file; rtx ix_reg; rtx iy_reg; rtx d_reg; -rtx da_reg; -rtx stack_push_word; -rtx stack_pop_word; +rtx m68hc11_soft_tmp_reg; +static GTY(()) rtx stack_push_word; +static GTY(()) rtx stack_pop_word; +static GTY(()) rtx z_reg; +static GTY(()) rtx z_reg_qi; static int regs_inited = 0; -rtx z_reg; /* Set to 1 by expand_prologue() when the function is an interrupt handler. */ int current_function_interrupt; @@ -335,7 +335,6 @@ create_regs_rtx () ix_reg = gen_rtx (REG, HImode, HARD_X_REGNUM); iy_reg = gen_rtx (REG, HImode, HARD_Y_REGNUM); d_reg = gen_rtx (REG, HImode, HARD_D_REGNUM); - da_reg = gen_rtx (REG, QImode, HARD_A_REGNUM); m68hc11_soft_tmp_reg = gen_rtx (REG, HImode, SOFT_TMP_REGNUM); stack_push_word = gen_rtx (MEM, HImode, @@ -1654,7 +1653,7 @@ expand_prologue () emit_insn (gen_addhi3 (stack_pointer_rtx, stack_pointer_rtx, GEN_INT (-size))); } - else if (size > 8) + else if ((!optimize_size && size > 8) || (optimize_size && size > 10)) { rtx insn; @@ -1742,7 +1741,7 @@ expand_epilogue () emit_insn (gen_addhi3 (stack_pointer_rtx, stack_pointer_rtx, GEN_INT (size))); } - else if (size > 8) + else if ((!optimize_size && size > 8) || (optimize_size && size > 10)) { rtx insn; @@ -4103,8 +4102,6 @@ struct replace_info int z_loaded_with_sp; }; -rtx z_reg_qi; - static int m68hc11_check_z_replacement PARAMS ((rtx, struct replace_info *)); static void m68hc11_find_z_replacement PARAMS ((rtx, struct replace_info *)); static void m68hc11_z_replacement PARAMS ((rtx)); @@ -4338,7 +4335,13 @@ m68hc11_check_z_replacement (insn, info) info->z_died = 1; info->need_save_z = 0; } - else + else if (TARGET_M6812 && side_effects_p (src)) + { + info->last = 0; + info->must_restore_reg = 0; + return 0; + } + else { info->save_before_last = 1; } @@ -4415,7 +4418,13 @@ m68hc11_check_z_replacement (insn, info) info->z_died = 1; info->need_save_z = 0; } - else + else if (TARGET_M6812 && side_effects_p (src)) + { + info->last = 0; + info->must_restore_reg = 0; + return 0; + } + else { info->save_before_last = 1; } @@ -5058,6 +5067,11 @@ m68hc11_reorg (first) int split_done = 0; rtx insn; + compute_bb_for_insn (); + + /* ??? update_life_info_in_dirty_blocks fails to terminate during + non-optimizing bootstrap. */ + // update_life_info (NULL, UPDATE_LIFE_GLOBAL_RM_NOTES, PROP_DEATH_NOTES); z_replacement_completed = 0; z_reg = gen_rtx (REG, HImode, HARD_Z_REGNUM); @@ -5073,9 +5087,6 @@ m68hc11_reorg (first) z_replacement_completed = 1; m68hc11_reassign_regs (first); - if (optimize) - compute_bb_for_insn (); - /* After some splitting, there are some oportunities for CSE pass. This happens quite often when 32-bit or above patterns are split. */ if (optimize > 0 && split_done) @@ -5174,7 +5185,7 @@ m68hc11_memory_move_cost (mode, class, in) else { if (GET_MODE_SIZE (mode) <= 2) - return COSTS_N_INSNS (2); + return COSTS_N_INSNS (3); else return COSTS_N_INSNS (4); } @@ -5506,7 +5517,10 @@ m68hc11_asm_file_start (out, main_file) const char *main_file; { fprintf (out, ";;;-----------------------------------------\n"); - fprintf (out, ";;; Start MC68HC11 gcc assembly output\n"); + fprintf (out, ";;; Start %s gcc assembly output\n", + TARGET_M6811 + ? "MC68HC11" + : TARGET_M68S12 ? "MC68HCS12" : "MC68HC12"); fprintf (out, ";;; gcc compiler %s\n", version_string); print_options (out); fprintf (out, ";;;-----------------------------------------\n"); @@ -5536,3 +5550,5 @@ m68hc11_asm_out_destructor (symbol, priority) default_dtor_section_asm_out_destructor (symbol, priority); fprintf (asm_out_file, "\t.globl\t__do_global_dtors\n"); } + +#include "gt-m68hc11.h" diff --git a/gcc/config/m68hc11/m68hc11.h b/gcc/config/m68hc11/m68hc11.h index bdd3fe198f9..ce5f4b8180a 100644 --- a/gcc/config/m68hc11/m68hc11.h +++ b/gcc/config/m68hc11/m68hc11.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler. Motorola 68HC11 and 68HC12. - Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Contributed by Stephane Carrez (stcarrez@nerim.fr) This file is part of GNU CC. @@ -43,13 +43,22 @@ Note: /* Compile and assemble for a 68hc11 unless there is a -m68hc12 option. */ #ifndef ASM_SPEC -#define ASM_SPEC "%{m68hc12:-m68hc12}%{!m68hc12:-m68hc11}" +#define ASM_SPEC \ +"%{m68hc12:-m68hc12}" \ +"%{m68hcs12:-m68hcs12}" \ +"%{!m68hc12:%{!m68hcs12:-m68hc11}} " \ +"%{mshort:-mshort}%{!mshort:-mlong} " \ +"%{fshort-double:-mshort-double}%{!fshort-double:-mlong-double}" #endif /* We need to tell the linker the target elf format. Just pass an emulation option. This can be overriden by -Wl option of gcc. */ #ifndef LINK_SPEC -#define LINK_SPEC "%{m68hc12:-m m68hc12elf}%{!m68hc12:-m m68hc11elf} %{mrelax:-relax}" +#define LINK_SPEC \ +"%{m68hc12:-m m68hc12elf}" \ +"%{m68hcs12:-m m68hc12elf}" \ +"%{!m68hc12:%{!m68hcs12:-m m68hc11elf}} " \ +"%{!mnorelax:%{!m68hc12:%{!m68hcs12:-relax}}}" #endif #ifndef LIB_SPEC @@ -65,7 +74,8 @@ Note: "%{mshort:-D__HAVE_SHORT_INT__ -D__INT__=16}\ %{!mshort:-D__INT__=32}\ %{m68hc12:-Dmc6812 -DMC6812 -Dmc68hc12}\ - %{!m68hc12:-Dmc6811 -DMC6811 -Dmc68hc11}\ + %{m68hcs12:-Dmc6812 -DMC6812 -Dmc68hcs12}\ + %{!m68hc12:%{!m68hcs12:-Dmc6811 -DMC6811 -Dmc68hc11}}\ %{fshort-double:-D__HAVE_SHORT_DOUBLE__}\ %{mlong-calls:-D__USE_RTC__}" #endif @@ -119,14 +129,16 @@ extern short *reg_renumber; /* def in local_alloc.c */ #define MASK_AUTO_INC_DEC 0004 #define MASK_M6811 0010 #define MASK_M6812 0020 -#define MASK_NO_DIRECT_MODE 0040 -#define MASK_MIN_MAX 0100 -#define MASK_LONG_CALLS 0200 +#define MASK_M68S12 0040 +#define MASK_NO_DIRECT_MODE 0100 +#define MASK_MIN_MAX 0200 +#define MASK_LONG_CALLS 0400 #define TARGET_OP_TIME (optimize && optimize_size == 0) #define TARGET_SHORT (target_flags & MASK_SHORT) #define TARGET_M6811 (target_flags & MASK_M6811) #define TARGET_M6812 (target_flags & MASK_M6812) +#define TARGET_M68S12 (target_flags & MASK_M68S12) #define TARGET_AUTO_INC_DEC (target_flags & MASK_AUTO_INC_DEC) #define TARGET_MIN_MAX (target_flags & MASK_MIN_MAX) #define TARGET_NO_DIRECT_MODE (target_flags & MASK_NO_DIRECT_MODE) @@ -178,10 +190,14 @@ extern short *reg_renumber; /* def in local_alloc.c */ N_("Compile for a 68HC11")}, \ { "68hc12", MASK_M6812, \ N_("Compile for a 68HC12")}, \ + { "68hcs12", MASK_M6812 | MASK_M68S12, \ + N_("Compile for a 68HCS12")}, \ { "6811", MASK_M6811, \ N_("Compile for a 68HC11")}, \ { "6812", MASK_M6812, \ N_("Compile for a 68HC12")}, \ + { "68S12", MASK_M6812 | MASK_M68S12, \ + N_("Compile for a 68HCS12")}, \ { "", TARGET_DEFAULT, 0 }} /* This macro is similar to `TARGET_SWITCHES' but defines names of @@ -214,7 +230,7 @@ extern const char *m68hc11_soft_reg_count; #endif /* Print subsidiary information on the compiler version in use. */ -#define TARGET_VERSION fprintf (stderr, " (MC68HC11/MC68HC12)") +#define TARGET_VERSION fprintf (stderr, " (MC68HC11/MC68HC12/MC68HCS12)") /* Sometimes certain combinations of command options do not make sense on a particular target machine. You can define a macro @@ -1751,3 +1767,10 @@ extern int z_replacement_completed; extern int current_function_interrupt; extern int current_function_trap; extern int current_function_far; + +extern GTY(()) rtx m68hc11_compare_op0; +extern GTY(()) rtx m68hc11_compare_op1; +extern GTY(()) rtx m68hc11_soft_tmp_reg; +extern GTY(()) rtx ix_reg; +extern GTY(()) rtx iy_reg; +extern GTY(()) rtx d_reg; diff --git a/gcc/config/m68hc11/m68hc11.md b/gcc/config/m68hc11/m68hc11.md index a71e4f3f0f5..c00c86a4ae1 100644 --- a/gcc/config/m68hc11/m68hc11.md +++ b/gcc/config/m68hc11/m68hc11.md @@ -6393,18 +6393,18 @@ if (ret_size && ret_size <= 2) { - emit_insn (gen_rtx (PARALLEL, VOIDmode, - gen_rtvec (2, gen_rtx_RETURN (VOIDmode), - gen_rtx_USE (VOIDmode, - gen_rtx_REG (HImode, 1))))); + emit_jump_insn (gen_rtx (PARALLEL, VOIDmode, + gen_rtvec (2, gen_rtx_RETURN (VOIDmode), + gen_rtx_USE (VOIDmode, + gen_rtx_REG (HImode, 1))))); DONE; } if (ret_size) { - emit_insn (gen_rtx (PARALLEL, VOIDmode, - gen_rtvec (2, gen_rtx_RETURN (VOIDmode), - gen_rtx_USE (VOIDmode, - gen_rtx_REG (SImode, 0))))); + emit_jump_insn (gen_rtx (PARALLEL, VOIDmode, + gen_rtvec (2, gen_rtx_RETURN (VOIDmode), + gen_rtx_USE (VOIDmode, + gen_rtx_REG (SImode, 0))))); DONE; } }") diff --git a/gcc/config/m68hc11/m68hc12.h b/gcc/config/m68hc11/m68hc12.h index ba56c172993..f98a0d0761f 100644 --- a/gcc/config/m68hc11/m68hc12.h +++ b/gcc/config/m68hc11/m68hc12.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler, for m68hc12. - Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc. - Contributed by Stephane Carrez (stcarrez@worldnet.fr). + Copyright (C) 1999, 2000, 2001, 2003 Free Software Foundation, Inc. + Contributed by Stephane Carrez (stcarrez@nerim.fr). This file is part of GNU CC. @@ -20,18 +20,26 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* Compile and assemble for a 68hc12 unless there is a -m68hc11 option. */ -#define ASM_SPEC "%{m68hc11:-m68hc11}%{!m68hc11:-m68hc12}" +#define ASM_SPEC \ +"%{m68hc11:-m68hc11}" \ +"%{m68hcs12:-m68hcs12}" \ +"%{!m68hc11:%{!m68hcs12:-m68hc12}}" #define LIB_SPEC "" #define CC1_SPEC "" /* We need to tell the linker the target elf format. Just pass an emulation option. This can be overriden by -Wl option of gcc. */ -#define LINK_SPEC "%{m68hc11:-m m68hc11elf}%{!m68hc11:-m m68hc12elf}" +#define LINK_SPEC \ +"%{m68hc11:-m m68hc11elf}" \ +"%{m68hcs12:-m m68hc12elf}" \ +"%{!m68hc11:%{!m68hcs12:-m m68hc11elf}} %{mrelax:-relax}" #define CPP_SPEC \ "%{mshort:-D__HAVE_SHORT_INT__ -D__INT__=16}\ %{!mshort:-D__INT__=32}\ %{m68hc11:-Dmc6811 -DMC6811 -Dmc68hc11}\ + %{!m68hc11:%{!m68hc12:-Dmc6812 -DMC6812 -Dmc68hc12}}\ + %{m68hcs12:-Dmc6812 -DMC6812 -Dmc68hcs12}\ %{!m68hc11:-Dmc6812 -DMC6812 -Dmc68hc12}\ %{fshort-double:-D__HAVE_SHORT_DOUBLE__}" diff --git a/gcc/config/m68k/coff.h b/gcc/config/m68k/coff.h index 88720d78157..13cb4ae5c55 100644 --- a/gcc/config/m68k/coff.h +++ b/gcc/config/m68k/coff.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler. m68k series COFF object files and debugging, version. - Copyright (C) 1994, 1996, 1997, 2000 Free Software Foundation, Inc. + Copyright (C) 1994, 1996, 1997, 2000, 2002 Free Software Foundation, Inc. This file is part of GNU CC. @@ -55,12 +55,17 @@ Boston, MA 02111-1307, USA. */ /* config/m68k.md has an explicit reference to the program counter, prefix this by the register prefix. */ -#define ASM_RETURN_CASE_JUMP \ - do { \ - if (TARGET_5200) \ - return "ext%.l %0\n\tjmp %%pc@(2,%0:l)"; \ - else \ - return "jmp %%pc@(2,%0:w)"; \ +#define ASM_RETURN_CASE_JUMP \ + do { \ + if (TARGET_5200) \ + { \ + if (ADDRESS_REG_P (operands[0])) \ + return "jmp %%pc@(2,%0:l)"; \ + else \ + return "ext%.l %0\n\tjmp %%pc@(2,%0:l)"; \ + } \ + else \ + return "jmp %%pc@(2,%0:w)"; \ } while (0) /* Here are the new register names. */ diff --git a/gcc/config/m68k/linux.h b/gcc/config/m68k/linux.h index bf80cea9f9c..7693af1815a 100644 --- a/gcc/config/m68k/linux.h +++ b/gcc/config/m68k/linux.h @@ -194,12 +194,17 @@ Boston, MA 02111-1307, USA. */ /* Use the default action for outputting the case label. */ #undef ASM_OUTPUT_CASE_LABEL -#define ASM_RETURN_CASE_JUMP \ - do { \ - if (TARGET_5200) \ - return "ext%.l %0\n\tjmp %%pc@(2,%0:l)"; \ - else \ - return "jmp %%pc@(2,%0:w)"; \ +#define ASM_RETURN_CASE_JUMP \ + do { \ + if (TARGET_5200) \ + { \ + if (ADDRESS_REG_P (operands[0])) \ + return "jmp %%pc@(2,%0:l)"; \ + else \ + return "ext%.l %0\n\tjmp %%pc@(2,%0:l)"; \ + } \ + else \ + return "jmp %%pc@(2,%0:w)"; \ } while (0) /* This is how to output an assembler line that says to advance the diff --git a/gcc/config/m68k/m68k.md b/gcc/config/m68k/m68k.md index 969e5dc3099..c772b5d6a34 100644 --- a/gcc/config/m68k/m68k.md +++ b/gcc/config/m68k/m68k.md @@ -1,5 +1,5 @@ ;;- Machine description for GNU compiler, Motorola 68000 Version -;; Copyright (C) 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001 +;; Copyright (C) 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002 ;; Free Software Foundation, Inc. ;; This file is part of GNU CC. @@ -6973,17 +6973,33 @@ #ifdef SGS #ifdef ASM_OUTPUT_CASE_LABEL if (TARGET_5200) - return \"ext%.l %0\;jmp 6(%%pc,%0.l)\"; + { + if (ADDRESS_REG_P (operands[0])) + return \"jmp 6(%%pc,%0.l)\"; + else + return \"ext%.l %0\;jmp 6(%%pc,%0.l)\"; + } else return \"jmp 6(%%pc,%0.w)\"; #else if (TARGET_5200) { + if (ADDRESS_REG_P (operands[0])) + { +#ifdef CRDS + return \"jmp 2(pc,%0.l)\"; +#else + return \"jmp 2(%%pc,%0.l)\"; +#endif /* end !CRDS */ + } + else + { #ifdef CRDS - return \"ext%.l %0\;jmp 2(pc,%0.l)\"; + return \"ext%.l %0\;jmp 2(pc,%0.l)\"; #else - return \"extl %0\;jmp 2(%%pc,%0.l)\"; + return \"extl %0\;jmp 2(%%pc,%0.l)\"; #endif /* end !CRDS */ + } } else { @@ -6997,11 +7013,22 @@ #else /* not SGS */ if (TARGET_5200) { + if (ADDRESS_REG_P (operands[0])) + { #ifdef MOTOROLA - return \"ext%.l %0\;jmp (2,pc,%0.l)\"; + return \"jmp (2,pc,%0.l)\"; #else - return \"extl %0\;jmp pc@(2,%0:l)\"; + return \"jmp pc@(2,%0:l)\"; #endif + } + else + { +#ifdef MOTOROLA + return \"ext%.l %0\;jmp (2,pc,%0.l)\"; +#else + return \"extl %0\;jmp pc@(2,%0:l)\"; +#endif + } } else { diff --git a/gcc/config/m68k/m68kelf.h b/gcc/config/m68k/m68kelf.h index 7866a239209..e5145c9d70c 100644 --- a/gcc/config/m68k/m68kelf.h +++ b/gcc/config/m68k/m68kelf.h @@ -1,7 +1,7 @@ /* m68kelf support, derived from m68kv4.h */ /* Target definitions for GNU compiler for mc680x0 running System V.4 - Copyright (C) 1991, 1993, 2000 Free Software Foundation, Inc. + Copyright (C) 1991, 1993, 2000, 2002 Free Software Foundation, Inc. Written by Ron Guilmette (rfg@netcom.com) and Fred Fish (fnf@cygnus.com). @@ -73,12 +73,17 @@ Boston, MA 02111-1307, USA. */ /* config/m68k.md has an explicit reference to the program counter, prefix this by the register prefix. */ -#define ASM_RETURN_CASE_JUMP \ - do { \ - if (TARGET_5200) \ - return "ext%.l %0\n\tjmp %%pc@(2,%0:l)"; \ - else \ - return "jmp %%pc@(2,%0:w)"; \ +#define ASM_RETURN_CASE_JUMP \ + do { \ + if (TARGET_5200) \ + { \ + if (ADDRESS_REG_P (operands[0])) \ + return "jmp %%pc@(2,%0:l)"; \ + else \ + return "ext%.l %0\n\tjmp %%pc@(2,%0:l)"; \ + } \ + else \ + return "jmp %%pc@(2,%0:w)"; \ } while (0) /* How to refer to registers in assembler output. diff --git a/gcc/config/m68k/mot3300.h b/gcc/config/m68k/mot3300.h index fb7dffa8fc7..e035148ebdc 100644 --- a/gcc/config/m68k/mot3300.h +++ b/gcc/config/m68k/mot3300.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler, SysV68 Motorola 3300 Delta Series. - Copyright (C) 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000 + Copyright (C) 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2002 Free Software Foundation, Inc. Contributed by Abramo and Roberto Bagnara (bagnara@dipisa.di.unipi.it) based on Alex Crain's 3B1 definitions. @@ -437,12 +437,17 @@ Boston, MA 02111-1307, USA. */ #define ASM_OUTPUT_CASE_FETCH(file, labelno, regname)\ asm_fprintf (file, "12(%Rpc,%s.", regname) -#define ASM_RETURN_CASE_JUMP \ - do { \ - if (TARGET_5200) \ - return "ext%.l %0\n\tjmp 8(%%pc,%0.l)"; \ - else \ - return "jmp 8(%%pc,%0.w)"; \ +#define ASM_RETURN_CASE_JUMP \ + do { \ + if (TARGET_5200) \ + { \ + if (ADDRESS_REG_P (operands[0])) \ + return "jmp 8(%%pc,%0.l)"; \ + else \ + return "ext%.l %0\n\tjmp 8(%%pc,%0.l)"; \ + } \ + else \ + return "jmp 8(%%pc,%0.w)"; \ } while (0) #else /* USE_GAS */ diff --git a/gcc/config/m68k/netbsd-elf.h b/gcc/config/m68k/netbsd-elf.h index f9576da2905..342de6e4d91 100644 --- a/gcc/config/m68k/netbsd-elf.h +++ b/gcc/config/m68k/netbsd-elf.h @@ -11,7 +11,7 @@ This file is part of GNU CC. GNU CC is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 1, or (at your option) +the Free Software Foundation; either version 2, or (at your option) any later version. GNU CC is distributed in the hope that it will be useful, @@ -215,15 +215,18 @@ while (0) /* Use the default action for outputting the case label. */ #undef ASM_OUTPUT_CASE_LABEL -#define ASM_RETURN_CASE_JUMP \ -do \ - { \ - if (TARGET_5200) \ - return "ext%.l %0\n\tjmp %%pc@(2,%0:l)"; \ - else \ - return "jmp %%pc@(2,%0:w)"; \ - } \ -while (0) +#define ASM_RETURN_CASE_JUMP \ + do { \ + if (TARGET_5200) \ + { \ + if (ADDRESS_REG_P (operands[0])) \ + return "jmp %%pc@(2,%0:l)"; \ + else \ + return "ext%.l %0\n\tjmp %%pc@(2,%0:l)"; \ + } \ + else \ + return "jmp %%pc@(2,%0:w)"; \ + } while (0) /* This is how to output an assembler line that says to advance the diff --git a/gcc/config/m68k/pbb.h b/gcc/config/m68k/pbb.h index 6eef2acaf47..68c8d09ead5 100644 --- a/gcc/config/m68k/pbb.h +++ b/gcc/config/m68k/pbb.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler. Citicorp/TTI Unicom PBB version (using GAS with a %-register prefix) - Copyright (C) 1987, 1988, 1990, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1987, 1988, 1990, 1996, 1997, 2002 Free Software Foundation, Inc. This file is part of GNU CC. @@ -109,12 +109,17 @@ Boston, MA 02111-1307, USA. */ && ! find_equiv_reg (0, get_last_insn (), 0, 0, 0, 8, Pmode)) \ asm_fprintf (FILE, "\tmovl %Rd0,%Ra0\n"); } -#define ASM_RETURN_CASE_JUMP \ - do { \ - if (TARGET_5200) \ - return "ext%.l %0\n\tjmp %%pc@(2,%0:l)"; \ - else \ - return "jmp %%pc@(2,%0:w)"; \ +#define ASM_RETURN_CASE_JUMP \ + do { \ + if (TARGET_5200) \ + { \ + if (ADDRESS_REG_P (operands[0])) \ + return "jmp %%pc@(2,%0:l)"; \ + else \ + return "ext%.l %0\n\tjmp %%pc@(2,%0:l)"; \ + } \ + else \ + return "jmp %%pc@(2,%0:w)"; \ } while (0) /* Although the gas we use can create .ctor and .dtor sections from N_SETT diff --git a/gcc/config/m68k/t-crtstuff b/gcc/config/m68k/t-crtstuff index b05764de726..a8bdb502d66 100644 --- a/gcc/config/m68k/t-crtstuff +++ b/gcc/config/m68k/t-crtstuff @@ -1,8 +1,10 @@ +EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crti.o crtn.o + # Add flags here as required. CRTSTUFF_T_CFLAGS = # Assemble startup files. $(T)crti.o: $(srcdir)/config/m68k/crti.s $(GCC_PASSES) - $(GCC_FOR_TARGET) -c -o $(T)crti.o $(srcdir)/config/m68k/crti.s + $(GCC_FOR_TARGET) $(MULTILIB_CFLAGS) -c -o $(T)crti.o $(srcdir)/config/m68k/crti.s $(T)crtn.o: $(srcdir)/config/m68k/crtn.s $(GCC_PASSES) - $(GCC_FOR_TARGET) -c -o $(T)crtn.o $(srcdir)/config/m68k/crtn.s + $(GCC_FOR_TARGET) $(MULTILIB_CFLAGS) -c -o $(T)crtn.o $(srcdir)/config/m68k/crtn.s diff --git a/gcc/config/mips/_tilib.c b/gcc/config/mips/_tilib.c new file mode 100644 index 00000000000..a0526797470 --- /dev/null +++ b/gcc/config/mips/_tilib.c @@ -0,0 +1,161 @@ +/* A few TImode functions needed for TFmode emulated arithmetic. + Copyright 2002, 2003 Free Software Foundation, Inc. + Contributed by Alexandre Oliva <aoliva@redhat.com> + +This file is part of GCC. + +GCC is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GCC is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GCC; see the file COPYING. If not, write to +the Free Software Foundation, 59 Temple Place - Suite 330, +Boston, MA 02111-1307, USA. */ + + +#include "tconfig.h" +#include "tsystem.h" + +#ifndef LIBGCC2_WORDS_BIG_ENDIAN +#define LIBGCC2_WORDS_BIG_ENDIAN WORDS_BIG_ENDIAN +#endif + +#if _MIPS_SIM == 2 /* N32 */ || _MIPS_SIM == 3 /* 64 */ + +typedef int TItype __attribute__ ((mode (TI))); +typedef int DItype __attribute__ ((mode (DI))); +typedef int SItype __attribute__ ((mode (SI))); + +typedef unsigned int UDItype __attribute__ ((mode (DI))); + +typedef union +{ + struct TIstruct { +#if LIBGCC2_WORDS_BIG_ENDIAN + DItype high, low; +#else + DItype low, high; +#endif + } s; + TItype ll; +} TIunion; + +TItype __negti2 (TItype); +TItype __ashlti3 (TItype, int); +#if 0 +TItype __ashrti3 (TItype, int); +#endif +TItype __lshrti3 (TItype, int); + +TItype +__negti2 (TItype u) +{ + TIunion w; + TIunion uu; + + uu.ll = u; + + w.s.low = -uu.s.low; + w.s.high = -uu.s.high - ((UDItype) w.s.low > 0); + + return w.ll; +} + +TItype +__ashlti3 (TItype u, int b) +{ + TIunion w; + int bm; + TIunion uu; + + if (b == 0) + return u; + + uu.ll = u; + + bm = (sizeof (DItype) * BITS_PER_UNIT) - b; + if (bm <= 0) + { + w.s.low = 0; + w.s.high = (UDItype) uu.s.low << -bm; + } + else + { + UDItype carries = (UDItype) uu.s.low >> bm; + + w.s.low = (UDItype) uu.s.low << b; + w.s.high = ((UDItype) uu.s.high << b) | carries; + } + + return w.ll; +} + +#if 0 +TItype +__ashrti3 (TItype u, int b) +{ + TIunion w; + int bm; + TIunion uu; + + if (b == 0) + return u; + + uu.ll = u; + + bm = (sizeof (DItype) * BITS_PER_UNIT) - b; + if (bm <= 0) + { + /* w.s.high = 1..1 or 0..0 */ + w.s.high = uu.s.high >> (sizeof (DItype) * BITS_PER_UNIT - 1); + w.s.low = uu.s.high >> -bm; + } + else + { + UDItype carries = (UDItype) uu.s.high << bm; + + w.s.high = uu.s.high >> b; + w.s.low = ((UDItype) uu.s.low >> b) | carries; + } + + return w.ll; +} +#endif + +TItype +__lshrti3 (TItype u, int b) +{ + TIunion w; + int bm; + TIunion uu; + + if (b == 0) + return u; + + uu.ll = u; + + bm = (sizeof (DItype) * BITS_PER_UNIT) - b; + if (bm <= 0) + { + w.s.high = 0; + w.s.low = (UDItype) uu.s.high >> -bm; + } + else + { + UDItype carries = (UDItype) uu.s.high << bm; + + w.s.high = (UDItype) uu.s.high >> b; + w.s.low = ((UDItype) uu.s.low >> b) | carries; + } + + return w.ll; +} + +#endif /* N32 or N64 */ diff --git a/gcc/config/mips/iris6.h b/gcc/config/mips/iris6.h index ddfea8f1473..314f98ca43c 100644 --- a/gcc/config/mips/iris6.h +++ b/gcc/config/mips/iris6.h @@ -1,5 +1,5 @@ /* Definitions of target machine for GNU compiler. Iris version 6. - Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002 + Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GNU CC. @@ -509,3 +509,5 @@ do { \ %{shared:-hidden_symbol __do_global_ctors,__do_global_ctors_1,__do_global_dtors} \ -_SYSTYPE_SVR4 -woff 131 \ %{mabi=32: -32}%{mabi=n32: -n32}%{mabi=64: -64}%{!mabi*: -n32}" + +#define MIPS_TFMODE_FORMAT ibm_extended_format diff --git a/gcc/config/mips/mips.c b/gcc/config/mips/mips.c index 2dcf69d3f43..f27bd607af4 100644 --- a/gcc/config/mips/mips.c +++ b/gcc/config/mips/mips.c @@ -4321,9 +4321,11 @@ mips_arg_info (cum, mode, type, named, info) is a double, but $f14 if it is a single. Otherwise, on a 32-bit double-float machine, each FP argument must start in a new register pair. */ - even_reg_p = ((mips_abi == ABI_O64 && mode == SFmode) || FP_INC > 1); + even_reg_p = (GET_MODE_SIZE (mode) > UNITS_PER_HWFPVALUE + || (mips_abi == ABI_O64 && mode == SFmode) + || FP_INC > 1); } - else if (!TARGET_64BIT) + else if (!TARGET_64BIT || LONG_DOUBLE_TYPE_SIZE == 128) { if (GET_MODE_CLASS (mode) == MODE_INT || GET_MODE_CLASS (mode) == MODE_FLOAT) @@ -4635,7 +4637,7 @@ mips_setup_incoming_varargs (cum, mode, type, no_rtl) rtx ptr = plus_constant (virtual_incoming_args_rtx, off); emit_move_insn (gen_rtx_MEM (mode, ptr), gen_rtx_REG (mode, FP_ARG_FIRST + i)); - off += UNITS_PER_FPVALUE; + off += UNITS_PER_HWFPVALUE; } } } @@ -4712,6 +4714,15 @@ mips_va_start (valist, nextarg) { const CUMULATIVE_ARGS *cum = ¤t_function_args_info; + /* ARG_POINTER_REGNUM is initialized to STACK_POINTER_BOUNDARY, but + since the stack is aligned for a pair of argument-passing slots, + and the beginning of a variable argument list may be an odd slot, + we have to decrease its alignment. */ + if (cfun && cfun->emit->regno_pointer_align) + while (((current_function_pretend_args_size * BITS_PER_UNIT) + & (REGNO_POINTER_ALIGN (ARG_POINTER_REGNUM) - 1)) != 0) + REGNO_POINTER_ALIGN (ARG_POINTER_REGNUM) /= 2; + if (mips_abi == ABI_EABI) { int gpr_save_area_size; @@ -4909,9 +4920,9 @@ mips_va_arg (valist, type) off = build (COMPONENT_REF, TREE_TYPE (f_foff), valist, f_foff); /* When floating-point registers are saved to the stack, - each one will take up UNITS_PER_FPVALUE bytes, regardless + each one will take up UNITS_PER_HWFPVALUE bytes, regardless of the float's precision. */ - rsize = UNITS_PER_FPVALUE; + rsize = UNITS_PER_HWFPVALUE; } else { @@ -4930,7 +4941,7 @@ mips_va_arg (valist, type) bytes (= PARM_BOUNDARY bits). RSIZE can sometimes be smaller than that, such as in the combination -mgp64 -msingle-float -fshort-double. Doubles passed in registers will then take - up UNITS_PER_FPVALUE bytes, but those passed on the stack + up UNITS_PER_HWFPVALUE bytes, but those passed on the stack take up UNITS_PER_WORD bytes. */ osize = MAX (rsize, UNITS_PER_WORD); @@ -5007,7 +5018,10 @@ mips_va_arg (valist, type) that alignments <= UNITS_PER_WORD are preserved by the va_arg increment mechanism. */ - if (TARGET_64BIT) + if ((mips_abi == ABI_N32 || mips_abi == ABI_64) + && TYPE_ALIGN (type) > 64) + align = 16; + else if (TARGET_64BIT) align = 8; else if (TYPE_ALIGN (type) > 32) align = 8; @@ -5365,6 +5379,10 @@ override_options () else mips16 = 0; +#ifdef MIPS_TFMODE_FORMAT + real_format_for_mode[TFmode - QFmode] = &MIPS_TFMODE_FORMAT; +#endif + mips_print_operand_punct['?'] = 1; mips_print_operand_punct['#'] = 1; mips_print_operand_punct['&'] = 1; @@ -7085,7 +7103,7 @@ save_restore_insns (store_p, large_reg, large_offset) /* Pick which pointer to use as a base register. */ fp_offset = cfun->machine->frame.fp_sp_offset; end_offset = fp_offset - (cfun->machine->frame.fp_reg_size - - UNITS_PER_FPVALUE); + - UNITS_PER_HWFPVALUE); if (fp_offset < 0 || end_offset < 0) internal_error @@ -7140,7 +7158,7 @@ save_restore_insns (store_p, large_reg, large_offset) else emit_move_insn (reg_rtx, mem_rtx); - fp_offset -= UNITS_PER_FPVALUE; + fp_offset -= UNITS_PER_HWFPVALUE; } } } @@ -8271,11 +8289,26 @@ mips_function_value (valtype, func, mode) } mclass = GET_MODE_CLASS (mode); - if (mclass == MODE_FLOAT && GET_MODE_SIZE (mode) <= UNITS_PER_FPVALUE) + if (mclass == MODE_FLOAT && GET_MODE_SIZE (mode) <= UNITS_PER_HWFPVALUE) reg = FP_RETURN; + else if (mclass == MODE_FLOAT && mode == TFmode) + /* long doubles are really split between f0 and f2, not f1. Eek. + Use DImode for each component, since GCC wants integer modes + for subregs. */ + return gen_rtx_PARALLEL + (VOIDmode, + gen_rtvec (2, + gen_rtx_EXPR_LIST (VOIDmode, + gen_rtx_REG (DImode, FP_RETURN), + GEN_INT (0)), + gen_rtx_EXPR_LIST (VOIDmode, + gen_rtx_REG (DImode, FP_RETURN + 2), + GEN_INT (GET_MODE_SIZE (mode) / 2)))); + + else if (mclass == MODE_COMPLEX_FLOAT - && GET_MODE_SIZE (mode) <= UNITS_PER_FPVALUE * 2) + && GET_MODE_SIZE (mode) <= UNITS_PER_HWFPVALUE * 2) { enum machine_mode cmode = GET_MODE_INNER (mode); diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h index 3b784c8883d..c904ff6b1bc 100644 --- a/gcc/config/mips/mips.h +++ b/gcc/config/mips/mips.h @@ -1,6 +1,6 @@ /* Definitions of target machine for GNU compiler. MIPS version. Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998 - 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Contributed by A. Lichnewsky (lich@inria.inria.fr). Changed by Michael Meissner (meissner@osf.org). 64 bit r4000 support by Ian Lance Taylor (ian@cygnus.com) and @@ -1487,8 +1487,14 @@ do { \ the next available register. */ #define FP_INC (TARGET_FLOAT64 || TARGET_SINGLE_FLOAT ? 1 : 2) -/* The largest size of value that can be held in floating-point registers. */ -#define UNITS_PER_FPVALUE (TARGET_SOFT_FLOAT ? 0 : FP_INC * UNITS_PER_FPREG) +/* The largest size of value that can be held in floating-point + registers and moved with a single instruction. */ +#define UNITS_PER_HWFPVALUE (TARGET_SOFT_FLOAT ? 0 : FP_INC * UNITS_PER_FPREG) + +/* The largest size of value that can be held in floating-point + registers. */ +#define UNITS_PER_FPVALUE \ + (TARGET_SOFT_FLOAT ? 0 : (LONG_DOUBLE_TYPE_SIZE / BITS_PER_UNIT)) /* The number of bytes in a double. */ #define UNITS_PER_DOUBLE (TYPE_PRECISION (double_type_node) / BITS_PER_UNIT) @@ -1535,7 +1541,21 @@ do { \ /* A C expression for the size in bits of the type `long double' on the target machine. If you don't define this, the default is two words. */ -#define LONG_DOUBLE_TYPE_SIZE 64 +#define LONG_DOUBLE_TYPE_SIZE \ + (mips_abi == ABI_N32 || mips_abi == ABI_64 ? 128 : 64) + +/* long double is not a fixed mode, but the idea is that, if we + support long double, we also want a 128-bit integer type. */ +#define MAX_FIXED_MODE_SIZE LONG_DOUBLE_TYPE_SIZE + +#ifdef IN_LIBGCC2 +#if (defined _ABIN32 && _MIPS_SIM == _ABIN32) \ + || (defined _ABI64 && _MIPS_SIM == _ABI64) +# define LIBGCC2_LONG_DOUBLE_TYPE_SIZE 128 +# else +# define LIBGCC2_LONG_DOUBLE_TYPE_SIZE 64 +# endif +#endif /* Width in bits of a pointer. See also the macro `Pmode' defined below. */ @@ -1562,7 +1582,7 @@ do { \ #define STRUCTURE_SIZE_BOUNDARY 8 /* There is no point aligning anything to a rounder boundary than this. */ -#define BIGGEST_ALIGNMENT 64 +#define BIGGEST_ALIGNMENT LONG_DOUBLE_TYPE_SIZE /* Set this nonzero if move instructions will actually fail to work when given unaligned data. */ @@ -2624,7 +2644,9 @@ extern enum reg_class mips_char_to_class[256]; On the MIPS, R2 R3 and F0 F2 are the only register thus used. Currently, R2 and F0 are only implemented here (C has no complex type) */ -#define FUNCTION_VALUE_REGNO_P(N) ((N) == GP_RETURN || (N) == FP_RETURN) +#define FUNCTION_VALUE_REGNO_P(N) ((N) == GP_RETURN || (N) == FP_RETURN \ + || (LONG_DOUBLE_TYPE_SIZE == 128 && FP_RETURN != GP_RETURN \ + && (N) == FP_RETURN + 2)) /* 1 if N is a possible register number for function argument passing. We have no FP argument registers when soft-float. When FP registers @@ -4663,3 +4685,32 @@ while (0) /* Generate calls to memcpy, etc., not bcopy, etc. */ #define TARGET_MEM_FUNCTIONS + +/* Since the bits of the _init and _fini function is spread across + many object files, each potentially with its own GP, we must assume + we need to load our GP. We don't preserve $gp or $ra, since each + init/fini chunk is supposed to initialize $gp, and crti/crtn + already take care of preserving $ra and, when appropriate, $gp. */ +#if _MIPS_SIM == _MIPS_SIM_ABI32 +#define CRT_CALL_STATIC_FUNCTION(SECTION_OP, FUNC) \ + asm (SECTION_OP "\n\ + .set noreorder\n\ + bal 1f\n\ + nop\n\ +1: .cpload $31\n\ + .set reorder\n\ + jal " USER_LABEL_PREFIX #FUNC "\n\ + " TEXT_SECTION_ASM_OP); +#endif /* Switch to #elif when we're no longer limited by K&R C. */ +#if (defined _ABIN32 && _MIPS_SIM == _ABIN32) \ + || (defined _ABI64 && _MIPS_SIM == _ABI64) +#define CRT_CALL_STATIC_FUNCTION(SECTION_OP, FUNC) \ + asm (SECTION_OP "\n\ + .set noreorder\n\ + bal 1f\n\ + nop\n\ +1: .set reorder\n\ + .cpsetup $31, $2, 1b\n\ + jal " USER_LABEL_PREFIX #FUNC "\n\ + " TEXT_SECTION_ASM_OP); +#endif diff --git a/gcc/config/mips/mips.md b/gcc/config/mips/mips.md index cc6cda53dba..77dd9a7de82 100644 --- a/gcc/config/mips/mips.md +++ b/gcc/config/mips/mips.md @@ -6413,16 +6413,16 @@ move\\t%0,%z4\\n\\ }") (define_insn "movdf_internal1" - [(set (match_operand:DF 0 "nonimmediate_operand" "=f,f,f,R,To,*f,*d,*d,*d,*d,*R,*T") - (match_operand:DF 1 "general_operand" "f,R,To,fG,fG,*d,*f,*d*G,*R,*T,*d,*d"))] + [(set (match_operand:DF 0 "nonimmediate_operand" "=f,f,f,f,R,To,*f,*d,*d,*d,*d,*R,*T") + (match_operand:DF 1 "general_operand" "f,G,R,To,fG,fG,*d,*f,*d*G,*R,*T,*d,*d"))] "TARGET_HARD_FLOAT && !(TARGET_FLOAT64 && !TARGET_64BIT) && TARGET_DOUBLE_FLOAT && (register_operand (operands[0], DFmode) || nonmemory_operand (operands[1], DFmode))" "* return mips_move_2words (operands, insn); " - [(set_attr "type" "move,load,load,store,store,xfer,xfer,move,load,load,store,store") - (set_attr "mode" "DF") - (set_attr "length" "4,8,16,8,16,8,8,8,8,16,8,16")]) + [(set_attr "type" "move,move,load,load,store,store,xfer,xfer,move,load,load,store,store") + (set_attr "mode" "DF") + (set_attr "length" "4,8,8,16,8,16,8,8,8,8,16,8,16")]) (define_insn "movdf_internal1a" [(set (match_operand:DF 0 "nonimmediate_operand" "=f,f,R,R,To,To,*d,*d,*To,*R,*d") diff --git a/gcc/config/mips/rtems.h b/gcc/config/mips/rtems.h index ae27293e8ad..5573bcd5c53 100644 --- a/gcc/config/mips/rtems.h +++ b/gcc/config/mips/rtems.h @@ -1,5 +1,5 @@ /* Definitions for rtems targeting a MIPS using ELF. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. Contributed by Joel Sherrill (joel@OARcorp.com). This file is part of GNU CC. @@ -24,5 +24,6 @@ Boston, MA 02111-1307, USA. */ #define TARGET_OS_CPP_BUILTINS() \ do { \ builtin_define ("__rtems__"); \ + builtin_define ("__USE_INIT_FINI__"); \ builtin_assert ("system=rtems"); \ } while (0) diff --git a/gcc/config/mips/t-iris5-6 b/gcc/config/mips/t-iris5-6 index d0440bc5ca1..4321b526c41 100644 --- a/gcc/config/mips/t-iris5-6 +++ b/gcc/config/mips/t-iris5-6 @@ -20,11 +20,11 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ # $(slibdir) double quoted to protect it from expansion while building # libgcc.mk. We want this delayed until actual install time. SHLIB_INSTALL = \ - $$(SHELL) $$(srcdir)/mkinstalldirs $$(slibdir)$(SHLIB_SLIBDIR_QUAL); \ + $$(SHELL) $$(srcdir)/mkinstalldirs $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL); \ $(INSTALL_DATA) $(SHLIB_NAME) \ - $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \ - rm -f $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \ + $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \ + rm -f $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \ $(LN_S) $(SHLIB_SONAME) \ - $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK) + $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK) SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver diff --git a/gcc/config/mips/t-iris6 b/gcc/config/mips/t-iris6 index 1d61c244bf1..a1be0b9c9ed 100644 --- a/gcc/config/mips/t-iris6 +++ b/gcc/config/mips/t-iris6 @@ -18,3 +18,16 @@ CRTSTUFF_T_CFLAGS=-g1 # This is only needed in the static libgcc as a band-aid until gcc correctly # implements the N32/N64 ABI structure passing conventions LIB2FUNCS_STATIC_EXTRA = $(srcdir)/config/mips/irix6-libc-compat.c + +LIB2FUNCS_EXTRA = $(srcdir)/config/mips/_tilib.c + +TPBIT = tp-bit.c + +tp-bit.c: $(srcdir)/config/fp-bit.c + echo '#ifdef __MIPSEL__' > tp-bit.c + echo '# define FLOAT_BIT_ORDER_MISMATCH' >> tp-bit.c + echo '#endif' >> tp-bit.c + echo '#if __LDBL_MANT_DIG__ == 106' >> tp-bit.c + echo '# define TFLOAT' >> tp-bit.c + cat $(srcdir)/config/fp-bit.c >> tp-bit.c + echo '#endif' >> tp-bit.c diff --git a/gcc/config/pa/pa-hpux11.h b/gcc/config/pa/pa-hpux11.h index 0bc7f1010a5..fd8a51e074d 100644 --- a/gcc/config/pa/pa-hpux11.h +++ b/gcc/config/pa/pa-hpux11.h @@ -117,3 +117,21 @@ Boston, MA 02111-1307, USA. */ #define SIZE_TYPE "long unsigned int" #define PTRDIFF_TYPE "long int" + +/* HP-UX 11.0 and above provides initialization and finalization function + support from linker command line. We don't need to invoke __main to run + constructors. We also don't need chatr to determine the dependencies of + dynamically linked executables and shared libraries. */ +#undef LDD_SUFFIX +#undef PARSE_LDD_OUTPUT +#undef HAS_INIT_SECTION +#define HAS_INIT_SECTION 1 +#undef LD_INIT_SWITCH +#define LD_INIT_SWITCH "+init" +#undef LD_FINI_SWITCH +#define LD_FINI_SWITCH "+fini" + +/* The HP-UX 11.X SOM linker (ld32) can successfully link shared libraries + with secondary definition (weak) symbols. */ +#undef TARGET_SOM_SDEF +#define TARGET_SOM_SDEF 1 diff --git a/gcc/config/pa/pa.c b/gcc/config/pa/pa.c index 0d5f111a41a..7ad06c574c8 100644 --- a/gcc/config/pa/pa.c +++ b/gcc/config/pa/pa.c @@ -121,6 +121,10 @@ static void pa_globalize_label PARAMS ((FILE *, const char *)) ATTRIBUTE_UNUSED; static void pa_asm_output_mi_thunk PARAMS ((FILE *, tree, HOST_WIDE_INT, HOST_WIDE_INT, tree)); +#if !defined(USE_COLLECT2) +static void pa_asm_out_constructor PARAMS ((rtx, int)); +static void pa_asm_out_destructor PARAMS ((rtx, int)); +#endif static void copy_fp_args PARAMS ((rtx)) ATTRIBUTE_UNUSED; static int length_fp_args PARAMS ((rtx)) ATTRIBUTE_UNUSED; static struct deferred_plabel *get_plabel PARAMS ((const char *)) @@ -203,6 +207,13 @@ static size_t n_deferred_plabels = 0; #undef TARGET_ASM_CAN_OUTPUT_MI_THUNK #define TARGET_ASM_CAN_OUTPUT_MI_THUNK default_can_output_mi_thunk_no_vcall +#if !defined(USE_COLLECT2) +#undef TARGET_ASM_CONSTRUCTOR +#define TARGET_ASM_CONSTRUCTOR pa_asm_out_constructor +#undef TARGET_ASM_DESTRUCTOR +#define TARGET_ASM_DESTRUCTOR pa_asm_out_destructor +#endif + struct gcc_target targetm = TARGET_INITIALIZER; void @@ -6330,7 +6341,7 @@ output_millicode_call (insn, call_dest) xoperands[1] = gen_label_rtx (); output_asm_insn ("ldo %0-%1(%2),%2", xoperands); ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L", - CODE_LABEL_NUMBER (xoperands[3])); + CODE_LABEL_NUMBER (xoperands[1])); } else /* ??? This branch may not reach its target. */ @@ -6668,7 +6679,7 @@ output_call (insn, call_dest, sibcall) xoperands[1] = gen_label_rtx (); output_asm_insn ("ldo %0-%1(%%r2),%%r2", xoperands); ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L", - CODE_LABEL_NUMBER (xoperands[3])); + CODE_LABEL_NUMBER (xoperands[1])); } else /* ??? This branch may not reach its target. */ @@ -6903,6 +6914,46 @@ fmpyaddoperands (operands) return 1; } +#if !defined(USE_COLLECT2) +static void +pa_asm_out_constructor (symbol, priority) + rtx symbol; + int priority; +{ + if (!function_label_operand (symbol, VOIDmode)) + hppa_encode_label (symbol); + +#ifdef CTORS_SECTION_ASM_OP + default_ctor_section_asm_out_constructor (symbol, priority); +#else +# ifdef TARGET_ASM_NAMED_SECTION + default_named_section_asm_out_constructor (symbol, priority); +# else + default_stabs_asm_out_constructor (symbol, priority); +# endif +#endif +} + +static void +pa_asm_out_destructor (symbol, priority) + rtx symbol; + int priority; +{ + if (!function_label_operand (symbol, VOIDmode)) + hppa_encode_label (symbol); + +#ifdef DTORS_SECTION_ASM_OP + default_dtor_section_asm_out_destructor (symbol, priority); +#else +# ifdef TARGET_ASM_NAMED_SECTION + default_named_section_asm_out_destructor (symbol, priority); +# else + default_stabs_asm_out_destructor (symbol, priority); +# endif +#endif +} +#endif + /* Returns 1 if the 6 operands specified in OPERANDS are suitable for use in fmpysub instructions. */ int diff --git a/gcc/config/pa/pa.h b/gcc/config/pa/pa.h index 860b7590d98..5cfe901328a 100644 --- a/gcc/config/pa/pa.h +++ b/gcc/config/pa/pa.h @@ -206,6 +206,11 @@ extern int target_flags; not for external calls. */ #define TARGET_LONG_PIC_PCREL_CALL 0 +/* Define to a C expression evaluating to true to use SOM secondary + definition symbols for weak support. Linker support for secondary + definition symbols is buggy prior to HP-UX 11.X. */ +#define TARGET_SOM_SDEF 0 + /* Macro to define tables used to set the flags. This is a list in braces of target switches with each switch being { "NAME", VALUE, "HELP_STRING" }. VALUE is the bits to set, diff --git a/gcc/config/pa/pa.md b/gcc/config/pa/pa.md index 640196b067d..5488d1d647e 100644 --- a/gcc/config/pa/pa.md +++ b/gcc/config/pa/pa.md @@ -4135,7 +4135,7 @@ emit_insn (gen_umulsidi3 (cross_product2, op2l, op1r)); /* Emit a multiply for the low sub-word. */ - emit_insn (gen_umulsidi3 (low_product, op2r, op1r)); + emit_insn (gen_umulsidi3 (low_product, copy_rtx (op2r), copy_rtx (op1r))); /* Sum the cross products and shift them into proper position. */ emit_insn (gen_adddi3 (cross_scratch, cross_product1, cross_product2)); diff --git a/gcc/config/pa/pa32-regs.h b/gcc/config/pa/pa32-regs.h index f5c6aaa615c..ac23a69173a 100644 --- a/gcc/config/pa/pa32-regs.h +++ b/gcc/config/pa/pa32-regs.h @@ -259,7 +259,6 @@ enum reg_class { NO_REGS, R1_REGS, GENERAL_REGS, FPUPPER_REGS, FP_REGS, : (REGNO) < 32 ? GENERAL_REGS \ : (REGNO) < 56 ? FP_REGS \ : (REGNO) < 88 ? FPUPPER_REGS \ - : (REGNO) < 88 ? FPUPPER_REGS \ : SHIFT_REGS) /* Get reg_class from a letter such as appears in the machine description. */ @@ -267,7 +266,6 @@ enum reg_class { NO_REGS, R1_REGS, GENERAL_REGS, FPUPPER_REGS, FP_REGS, #define REG_CLASS_FROM_LETTER(C) \ ((C) == 'f' ? FP_REGS : \ (C) == 'y' ? FPUPPER_REGS : \ - (C) == 'y' ? FPUPPER_REGS : \ (C) == 'x' ? FP_REGS : \ (C) == 'q' ? SHIFT_REGS : \ (C) == 'a' ? R1_REGS : \ diff --git a/gcc/config/pa/pa64-hpux.h b/gcc/config/pa/pa64-hpux.h index aa7dac75382..cc6850b64b2 100644 --- a/gcc/config/pa/pa64-hpux.h +++ b/gcc/config/pa/pa64-hpux.h @@ -112,6 +112,13 @@ do { \ #define DATA_SECTION_ASM_OP "\t.data" #define BSS_SECTION_ASM_OP "\t.section\t.bss" +#define JCR_SECTION_NAME ".jcr" + +#define HP_INIT_ARRAY_SECTION_ASM_OP "\t.section\t.init" +#define GNU_INIT_ARRAY_SECTION_ASM_OP "\t.section\t.init_array" +#define HP_FINI_ARRAY_SECTION_ASM_OP "\t.section\t.fini" +#define GNU_FINI_ARRAY_SECTION_ASM_OP "\t.section\t.fini_array" + #undef ASM_OUTPUT_ALIGNED_COMMON #define ASM_OUTPUT_ALIGNED_COMMON(FILE, NAME, SIZE, ALIGN) \ do { \ @@ -224,55 +231,175 @@ do { \ } while (0) #undef TEXT_SECTION_ASM_OP -#define TEXT_SECTION_ASM_OP "\t.SUBSPA $CODE$\n" +#define TEXT_SECTION_ASM_OP "\t.SUBSPA $CODE$\n" #undef READONLY_DATA_SECTION_ASM_OP -#define READONLY_DATA_SECTION_ASM_OP "\t.SUBSPA $LIT$\n" +#define READONLY_DATA_SECTION_ASM_OP "\t.SUBSPA $LIT$\n" #undef DATA_SECTION_ASM_OP -#define DATA_SECTION_ASM_OP "\t.SUBSPA $DATA$\n" +#define DATA_SECTION_ASM_OP "\t.SUBSPA $DATA$\n" #undef BSS_SECTION_ASM_OP -#define BSS_SECTION_ASM_OP "\t.SUBSPA $BSS$\n" +#define BSS_SECTION_ASM_OP "\t.SUBSPA $BSS$\n" + +/* We provide explicit defines for CTORS_SECTION_ASM_OP and + DTORS_SECTION_ASM_OP since we don't yet have support for + named sections with the HP assembler. */ +#undef CTORS_SECTION_ASM_OP +#define CTORS_SECTION_ASM_OP "\t.SUBSPA \\.ctors,QUAD=1,ALIGN=8,ACCESS=31" +#undef DTORS_SECTION_ASM_OP +#define DTORS_SECTION_ASM_OP "\t.SUBSPA \\.dtors,QUAD=1,ALIGN=8,ACCESS=31" + +#define HP_INIT_ARRAY_SECTION_ASM_OP \ + "\t.SUBSPA \\.init,QUAD=1,ALIGN=8,ACCESS=31" +#define GNU_INIT_ARRAY_SECTION_ASM_OP \ + "\t.SUBSPA \\.init_array,QUAD=1,ALIGN=8,ACCESS=31" +#define HP_FINI_ARRAY_SECTION_ASM_OP \ + "\t.SUBSPA \\.fini,QUAD=1,ALIGN=8,ACCESS=31" +#define GNU_FINI_ARRAY_SECTION_ASM_OP \ + "\t.SUBSPA \\.fini_array,QUAD=1,ALIGN=8,ACCESS=31" #endif /* USING_ELFOS_H */ -/* For the time being, we aren't using init sections. `P' relocations - are currently used for function references. However, P relocations are - treated as data references and data references are bound by dld.sl - immediately at program startup. This causes an abort due to undefined - weak symbols in crtbegin.o (e.g., __register_frame_info). Possibly - Q relocations might avoid this problem but the GNU assembler doesn't - support them. */ +/* The following defines, used to run constructors and destructors with + the SOM linker under HP-UX 11, are not needed. */ +#undef HAS_INIT_SECTION +#undef LD_INIT_SWITCH +#undef LD_FINI_SWITCH + +/* The following STARTFILE_SPEC and ENDFILE_SPEC defines provide the + magic needed to run initializers and finalizers. */ +#undef STARTFILE_SPEC +#define STARTFILE_SPEC \ + "%{!shared: %{!symbolic: crt0.o%s}} %{static:crtbeginT.o%s} \ + %{!static:%{!shared:crtbegin.o%s} %{shared:crtbeginS.o%s}}" +#undef ENDFILE_SPEC +#define ENDFILE_SPEC "%{!shared:crtend.o%s} %{shared:crtendS.o%s}" + +/* Since HP uses the .init and .fini sections for array initializers + and finalizers, we need different defines for INIT_SECTION_ASM_OP + and FINI_SECTION_ASM_OP. With the implementation adopted below, + the sections are not actually used. However, we still must provide + defines to select the proper code path. */ #undef INIT_SECTION_ASM_OP +#define INIT_SECTION_ASM_OP #undef FINI_SECTION_ASM_OP +#define FINI_SECTION_ASM_OP + +/* We are using array initializers and don't want calls in the INIT + and FINI sections. */ +#undef CRT_CALL_STATIC_FUNCTION +#define CRT_CALL_STATIC_FUNCTION(SECTION_OP, FUNC) + +/* The init_priority attribute is not supported with HP ld. This could be + supported if collect2 was used with LD_INIT_SWITCH. Unfortunately, this + approach doesn't work with GNU ld since HP-UX doesn't support DT_INIT, + and therefore the -init and -fini GNU ld switches. */ +#undef SUPPORTS_INIT_PRIORITY +#define SUPPORTS_INIT_PRIORITY (TARGET_GNU_LD ? 1 : 0) + +/* We use DTOR_LIST_BEGIN to carry a bunch of hacks to allow us to use + the init and fini array sections with both the HP and GNU linkers. + The linkers setup the required dynamic entries in the dynamic segment + and the dynamic linker does the calls. This approach avoids using + collect2. + + The first hack is to implement __do_global_ctors_aux in crtbegin as + it needs to be the first entry in the init array so that it is called + last. HP got the order of the init array backwards. The DT_INIT_ARRAY + is supposed to be executed in the same order as the addresses appear in + the array. DT_FINI_ARRAY is supposed to be executed in the opposite + order. + + The second hack is stubs for __cxa_finalize and _Jv_RegisterClasses. + The HP implementation of undefined weak symbols is broken. The linker + and dynamic loader both search for undefined weak symbols contrary the + generic System V ABI. An undefined weak symbol should resolve to a + value of 0 rather than causing an error. The prototypes for + __cxa_finalize and _Jv_RegisterClasses in crtstuff.c are weak when + weak is supported (GNU as), so in theory a strong define should override + the stub functions provided here. + + The final hack is a set of plabels to implement the effect of + CRT_CALL_STATIC_FUNCTION. HP-UX 11 only supports DI_INIT_ARRAY and + DT_FINI_ARRAY and they put the arrays in .init and .fini, rather than + in .init_array and .fini_array. The standard defines for .init and + .fini have the execute flag set. So, the assembler has to be hacked + to munge the standard flags for these sections to make them agree + with what the HP linker expects. With the GNU linker, we need to + used the .init_array and .fini_array sections. So, we set up for + both just in case. Once we have built the table, the linker does + the rest of the work. + + The order is significant. Placing __do_global_ctors_aux first in + the list, results in it being called last. User specified initializers, + either using the linker +init command or a plabel, run before the + initializers specified here. */ + +/* We need a __cxa_finalize stub if CRTSTUFFS_O is defined. */ +#ifdef CRTSTUFFS_O +#define PA_CXA_FINALIZE_STUB \ +extern void __cxa_finalize (void *) TARGET_ATTRIBUTE_WEAK; \ +void \ +__cxa_finalize (void *p __attribute__((unused))) {} +#else +#define PA_CXA_FINALIZE_STUB +#endif -#define EH_FRAME_IN_DATA_SECTION 1 +/* We need a _Jv_RegisterClasses stub if JCR_SECTION_NAME is defined. */ +#ifdef JCR_SECTION_NAME +#define PA_JV_REGISTERCLASSES_STUB \ +void \ +_Jv_RegisterClasses (void *p __attribute__((unused))) {} +#else +#define PA_JV_REGISTERCLASSES_STUB +#endif -#undef ENDFILE_SPEC -#define ENDFILE_SPEC "" +/* We need to add frame_dummy to the initializer list if EH_FRAME_SECTION_NAME + or JCR_SECTION_NAME is defined. */ +#if defined(EH_FRAME_SECTION_NAME) || defined(JCR_SECTION_NAME) +#define PA_INIT_FRAME_DUMMY_ASM_OP ".dword P%frame_dummy" +#else +#define PA_INIT_FRAME_DUMMY_ASM_OP "" +#endif -#undef STARTFILE_SPEC -#define STARTFILE_SPEC "%{!shared: %{!symbolic: crt0.o%s}}" - -/* Since we are not yet using .init and .fini sections, we need to - explicitly arrange to run the global constructors and destructors. - We could use ldd for this but it depends on LD_LIBRARY_PATH being - correctly set. So, we use the ld init and fini switches. However, - we need to support different switches for the GNU and HP linkers. - We can't check TARGET_GNU_LD in collect2, so we need a different - test. The +Accept switch is always the first switch when we are - using the HP linker (see define for LINK_SPEC). Checking for it - is a somewhat fragile as it depends on internal details of the - collect2 program but it is better than testing ld_file_name. - - FIXME: The GNU linker is broken. The -init/-fini switches don't - work and ldd can't determine the dynamic dependences of executables - linked with GNU ld. The init and fini routines are not executed - although DT_INIT and DT_FINI appear ok. As a result, defining - LD_INIT_SWITCH and LD_FINI_SWITCH causes more harm than good when - using GNU ld. However, the definitions appear to work fine with - the HP linker. */ -#if 0 -#define LD_INIT_SWITCH (strcmp ("+Accept", ld2_argv[1]) ? "-init" : "+init") -#define LD_FINI_SWITCH (strcmp ("+Accept", ld2_argv[1]) ? "-fini" : "+fini") +#define PA_INIT_FINI_HACK \ +static void __attribute__((used)) \ +__do_global_ctors_aux (void) \ +{ \ + func_ptr *p = __CTOR_LIST__; \ + while (*(p + 1)) \ + p++; \ + for (; *p != (func_ptr) -1; p--) \ + (*p) (); \ +} \ + \ +PA_CXA_FINALIZE_STUB \ +PA_JV_REGISTERCLASSES_STUB \ + \ +asm (HP_INIT_ARRAY_SECTION_ASM_OP); \ +asm (".dword P%__do_global_ctors_aux"); \ +asm (PA_INIT_FRAME_DUMMY_ASM_OP); \ +asm (GNU_INIT_ARRAY_SECTION_ASM_OP); \ +asm (".dword P%__do_global_ctors_aux"); \ +asm (PA_INIT_FRAME_DUMMY_ASM_OP); \ +asm (HP_FINI_ARRAY_SECTION_ASM_OP); \ +asm (".dword P%__do_global_dtors_aux"); \ +asm (GNU_FINI_ARRAY_SECTION_ASM_OP); \ +asm (".dword P%__do_global_dtors_aux") + +/* The following two variants of DTOR_LIST_BEGIN are identical to those + in crtstuff.c except for the addition of the above init-fini hack. */ +#ifdef DTORS_SECTION_ASM_OP +#define DTOR_LIST_BEGIN \ +asm (DTORS_SECTION_ASM_OP); \ +STATIC func_ptr __DTOR_LIST__[1] \ + __attribute__ ((aligned(sizeof(func_ptr)))) \ + = { (func_ptr) (-1) }; \ +PA_INIT_FINI_HACK +#else +#define DTOR_LIST_BEGIN \ +STATIC func_ptr __DTOR_LIST__[1] \ + __attribute__ ((section(".dtors"), aligned(sizeof(func_ptr)))) \ + = { (func_ptr) (-1) }; \ +PA_INIT_FINI_HACK #endif /* If using HP ld do not call pxdb. Use size as a program that does nothing diff --git a/gcc/config/pa/rtems.h b/gcc/config/pa/rtems.h index b03b5c802c3..c71ac6e8441 100644 --- a/gcc/config/pa/rtems.h +++ b/gcc/config/pa/rtems.h @@ -1,5 +1,5 @@ /* Definitions of target machine for GNU compiler, for PRO. - Copyright (C) 1997, 2000, 2002 Free Software Foundation, Inc. + Copyright (C) 1997, 2000, 2002, 2003 Free Software Foundation, Inc. Contributed by Joel Sherrill (joel@OARcorp.com). This file is part of GNU CC. @@ -35,3 +35,6 @@ Boston, MA 02111-1307, USA. */ builtin_assert ("system=rtems"); \ } \ while (0) + +#undef LIB_SPEC +#define LIB_SPEC "%{!p:%{!pg:-lc}}%{p: -lc}%{pg: -lc} -N" diff --git a/gcc/config/pa/som.h b/gcc/config/pa/som.h index 98c66fbfe37..7609fdbe176 100644 --- a/gcc/config/pa/som.h +++ b/gcc/config/pa/som.h @@ -362,10 +362,6 @@ do { \ /* The .align directive in the HP assembler allows up to a 32 alignment. */ #define MAX_OFILE_ALIGNMENT 32768 -/* SOM does not support the init_priority C++ attribute. */ -#undef SUPPORTS_INIT_PRIORITY -#define SUPPORTS_INIT_PRIORITY 0 - /* The SOM linker hardcodes paths into binaries. As a result, dotdots must be removed from library prefixes to prevent binaries from depending on the location of the GCC tool directory. The downside is GCC @@ -375,3 +371,52 @@ do { \ /* Aggregates with a single float or double field should be passed and returned in the general registers. */ #define MEMBER_TYPE_FORCES_BLK(FIELD, MODE) (MODE==SFmode || MODE==DFmode) + +/* If GAS supports weak, we can support weak when we have working linker + support for secondary definitions and are generating code for GAS. */ +#ifdef HAVE_GAS_WEAK +#define SUPPORTS_WEAK (TARGET_SOM_SDEF && TARGET_GAS) +#else +#define SUPPORTS_WEAK 0 +#endif + +/* We can support one only if we support weak. */ +#define SUPPORTS_ONE_ONLY SUPPORTS_WEAK + +/* Use weak (secondary definitions) to make one only declarations. */ +#define MAKE_DECL_ONE_ONLY(DECL) (DECL_WEAK (DECL) = 1) + +/* This is how we tell the assembler that a symbol is weak. The SOM + weak implementation uses the secondary definition (sdef) flag. + + The behavior of sdef symbols is similar to ELF weak symbols in that + multiple definitions can occur without incurring a link error. + However, they differ in the following ways: + 1) Undefined sdef symbols are not allowed. + 2) The linker searches for undefined sdef symbols and will load an + archive library member to resolve an undefined sdef symbol. + 3) The exported symbol from a shared library is a primary symbol + rather than a sdef symbol. Thus, more care is needed in the + ordering of libraries. + + It appears that the linker discards extra copies of "weak" functions + when linking shared libraries, independent of whether or not they + are in their own section. In linking final executables, -Wl,-O can + be used to remove dead procedures. Thus, support for named sections + is not needed and in previous testing caused problems with various + HP tools. */ +#define ASM_WEAKEN_LABEL(FILE,NAME) \ + do { fputs ("\t.weak\t", FILE); \ + assemble_name (FILE, NAME); \ + fputc ('\n', FILE); \ + if (! FUNCTION_NAME_P (NAME)) \ + { \ + fputs ("\t.EXPORT ", FILE); \ + assemble_name (FILE, NAME); \ + fputs (",DATA\n", FILE); \ + } \ + } while (0) + +/* We can't handle weak aliases, and therefore can't support pragma weak. + Suppress the use of pragma weak in gthr-dce.h and gthr-posix.h. */ +#define GTHREAD_USE_WEAK 0 diff --git a/gcc/config/pa/t-hpux-shlib b/gcc/config/pa/t-hpux-shlib index 52c3fd90c4f..1c924497c0b 100644 --- a/gcc/config/pa/t-hpux-shlib +++ b/gcc/config/pa/t-hpux-shlib @@ -13,7 +13,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ # $(slibdir) double quoted to protect it from expansion while building # libgcc.mk. We want this delayed until actual install time. SHLIB_INSTALL = $(INSTALL_DATA) -m 555 $(SHLIB_NAME) \ - $$(slibdir)/$(SHLIB_SONAME); \ - rm -f $$(slibdir)/$(SHLIB_NAME); \ - $(LN_S) $(SHLIB_SONAME) $$(slibdir)/$(SHLIB_NAME) + $$(DESTDIR)$$(slibdir)/$(SHLIB_SONAME); \ + rm -f $$(DESTDIR)$$(slibdir)/$(SHLIB_NAME); \ + $(LN_S) $(SHLIB_SONAME) $$(DESTDIR)$$(slibdir)/$(SHLIB_NAME) diff --git a/gcc/config/rs6000/altivec.h b/gcc/config/rs6000/altivec.h index f1387c0c898..1e2d8c8d408 100644 --- a/gcc/config/rs6000/altivec.h +++ b/gcc/config/rs6000/altivec.h @@ -1102,43 +1102,43 @@ vec_cmple (vector float a1, vector float a2) inline vector signed char vec_cmplt (vector unsigned char a1, vector unsigned char a2) { - return (vector signed char) __builtin_altivec_vcmpgtub ((vector signed char) a1, (vector signed char) a2); + return (vector signed char) __builtin_altivec_vcmpgtub ((vector signed char) a2, (vector signed char) a1); } inline vector signed char vec_cmplt (vector signed char a1, vector signed char a2) { - return (vector signed char) __builtin_altivec_vcmpgtsb ((vector signed char) a1, (vector signed char) a2); + return (vector signed char) __builtin_altivec_vcmpgtsb ((vector signed char) a2, (vector signed char) a1); } inline vector signed short vec_cmplt (vector unsigned short a1, vector unsigned short a2) { - return (vector signed short) __builtin_altivec_vcmpgtuh ((vector signed short) a1, (vector signed short) a2); + return (vector signed short) __builtin_altivec_vcmpgtuh ((vector signed short) a2, (vector signed short) a1); } inline vector signed short vec_cmplt (vector signed short a1, vector signed short a2) { - return (vector signed short) __builtin_altivec_vcmpgtsh ((vector signed short) a1, (vector signed short) a2); + return (vector signed short) __builtin_altivec_vcmpgtsh ((vector signed short) a2, (vector signed short) a1); } inline vector signed int vec_cmplt (vector unsigned int a1, vector unsigned int a2) { - return (vector signed int) __builtin_altivec_vcmpgtuw ((vector signed int) a1, (vector signed int) a2); + return (vector signed int) __builtin_altivec_vcmpgtuw ((vector signed int) a2, (vector signed int) a1); } inline vector signed int vec_cmplt (vector signed int a1, vector signed int a2) { - return (vector signed int) __builtin_altivec_vcmpgtsw ((vector signed int) a1, (vector signed int) a2); + return (vector signed int) __builtin_altivec_vcmpgtsw ((vector signed int) a2, (vector signed int) a1); } inline vector signed int vec_cmplt (vector float a1, vector float a2) { - return (vector signed int) __builtin_altivec_vcmpgtfp ((vector float) a1, (vector float) a2); + return (vector signed int) __builtin_altivec_vcmpgtfp ((vector float) a2, (vector float) a1); } /* vec_ctf */ @@ -6523,7 +6523,7 @@ __ch (__bin_args_eq (vector unsigned char, (a1), vector unsigned char, (a2)), \ #define vec_cmple(a1, a2) __builtin_altivec_vcmpgefp ((a1), (a2)) -#define vec_cmplt(a1, a2) \ +#define vec_cmplt(a2, a1) \ __ch (__bin_args_eq (vector unsigned char, (a1), vector unsigned char, (a2)), \ ((vector signed char) __builtin_altivec_vcmpgtub ((vector signed char) (a1), (vector signed char) (a2))), \ __ch (__bin_args_eq (vector signed char, (a1), vector signed char, (a2)), \ diff --git a/gcc/config/rs6000/altivec.md b/gcc/config/rs6000/altivec.md index 3d20ff48e23..25e4b084433 100644 --- a/gcc/config/rs6000/altivec.md +++ b/gcc/config/rs6000/altivec.md @@ -490,18 +490,27 @@ "vmaddfp %0,%1,%2,%3" [(set_attr "type" "vecfloat")]) -;; The unspec here is a vec splat of 0. We do multiply as a fused -;; multiply-add with an add of a 0 vector. +;; We do multiply as a fused multiply-add with an add of a -0.0 vector. (define_expand "mulv4sf3" - [(set (match_dup 3) (unspec:V4SF [(const_int 0)] 142)) - (set (match_operand:V4SF 0 "register_operand" "=v") - (plus:V4SF (mult:V4SF (match_operand:V4SF 1 "register_operand" "v") - (match_operand:V4SF 2 "register_operand" "v")) - (match_dup 3)))] + [(use (match_operand:V4SF 0 "register_operand" "")) + (use (match_operand:V4SF 1 "register_operand" "")) + (use (match_operand:V4SF 2 "register_operand" ""))] "TARGET_ALTIVEC && TARGET_FUSED_MADD" " -{ operands[3] = gen_reg_rtx (V4SFmode); }") +{ + rtx neg0; + + /* Generate [-0.0, -0.0, -0.0, -0.0]. */ + neg0 = gen_reg_rtx (V4SFmode); + emit_insn (gen_altivec_vspltisw_v4sf (neg0, GEN_INT (-1))); + emit_insn (gen_altivec_vslw_v4sf (neg0, neg0, neg0)); + + /* Use the multiply-add. */ + emit_insn (gen_altivec_vmaddfp (operands[0], operands[1], operands[2], + neg0)); + DONE; +}") ;; Fused multiply subtract (define_insn "altivec_vnmsubfp" @@ -1043,6 +1052,14 @@ "vslw %0,%1,%2" [(set_attr "type" "vecsimple")]) +(define_insn "altivec_vslw_v4sf" + [(set (match_operand:V4SF 0 "register_operand" "=v") + (unspec:V4SF [(match_operand:V4SF 1 "register_operand" "v") + (match_operand:V4SF 2 "register_operand" "v")] 109))] + "TARGET_ALTIVEC" + "vslw %0,%1,%2" + [(set_attr "type" "vecsimple")]) + (define_insn "altivec_vsl" [(set (match_operand:V4SI 0 "register_operand" "=v") (unspec:V4SI [(match_operand:V4SI 1 "register_operand" "v") @@ -1316,7 +1333,7 @@ "vspltisw %0, %1" [(set_attr "type" "vecsimple")]) -(define_insn "" +(define_insn "altivec_vspltisw_v4sf" [(set (match_operand:V4SF 0 "register_operand" "=v") (unspec:V4SF [(match_operand:QI 1 "immediate_operand" "i")] 142))] "TARGET_ALTIVEC" @@ -1830,8 +1847,8 @@ (define_insn "absv16qi2" [(set (match_operand:V16QI 0 "register_operand" "=v") (abs:V16QI (match_operand:V16QI 1 "register_operand" "v"))) - (clobber (match_scratch:V16QI 2 "=v")) - (clobber (match_scratch:V16QI 3 "=v"))] + (clobber (match_scratch:V16QI 2 "=&v")) + (clobber (match_scratch:V16QI 3 "=&v"))] "TARGET_ALTIVEC" "vspltisb %2,0\;vsububm %3,%2,%1\;vmaxsb %0,%1,%3" [(set_attr "type" "altivec") @@ -1840,8 +1857,8 @@ (define_insn "absv8hi2" [(set (match_operand:V8HI 0 "register_operand" "=v") (abs:V8HI (match_operand:V8HI 1 "register_operand" "v"))) - (clobber (match_scratch:V8HI 2 "=v")) - (clobber (match_scratch:V8HI 3 "=v"))] + (clobber (match_scratch:V8HI 2 "=&v")) + (clobber (match_scratch:V8HI 3 "=&v"))] "TARGET_ALTIVEC" "vspltisb %2,0\;vsubuhm %3,%2,%1\;vmaxsh %0,%1,%3" [(set_attr "type" "altivec") @@ -1850,8 +1867,8 @@ (define_insn "absv4si2" [(set (match_operand:V4SI 0 "register_operand" "=v") (abs:V4SI (match_operand:V4SI 1 "register_operand" "v"))) - (clobber (match_scratch:V4SI 2 "=v")) - (clobber (match_scratch:V4SI 3 "=v"))] + (clobber (match_scratch:V4SI 2 "=&v")) + (clobber (match_scratch:V4SI 3 "=&v"))] "TARGET_ALTIVEC" "vspltisb %2,0\;vsubuwm %3,%2,%1\;vmaxsw %0,%1,%3" [(set_attr "type" "altivec") @@ -1860,8 +1877,8 @@ (define_insn "absv4sf2" [(set (match_operand:V4SF 0 "register_operand" "=v") (abs:V4SF (match_operand:V4SF 1 "register_operand" "v"))) - (clobber (match_scratch:V4SF 2 "=v")) - (clobber (match_scratch:V4SF 3 "=v"))] + (clobber (match_scratch:V4SF 2 "=&v")) + (clobber (match_scratch:V4SF 3 "=&v"))] "TARGET_ALTIVEC" "vspltisw %2, -1\;vslw %3,%2,%2\;vandc %0,%1,%3" [(set_attr "type" "altivec") @@ -1870,8 +1887,8 @@ (define_insn "altivec_abss_v16qi" [(set (match_operand:V16QI 0 "register_operand" "=v") (unspec:V16QI [(match_operand:V16QI 1 "register_operand" "v")] 210)) - (clobber (match_scratch:V16QI 2 "=v")) - (clobber (match_scratch:V16QI 3 "=v"))] + (clobber (match_scratch:V16QI 2 "=&v")) + (clobber (match_scratch:V16QI 3 "=&v"))] "TARGET_ALTIVEC" "vspltisb %2,0\;vsubsbs %3,%2,%1\;vmaxsb %0,%1,%3" [(set_attr "type" "altivec") @@ -1880,8 +1897,8 @@ (define_insn "altivec_abss_v8hi" [(set (match_operand:V8HI 0 "register_operand" "=v") (unspec:V8HI [(match_operand:V8HI 1 "register_operand" "v")] 211)) - (clobber (match_scratch:V8HI 2 "=v")) - (clobber (match_scratch:V8HI 3 "=v"))] + (clobber (match_scratch:V8HI 2 "=&v")) + (clobber (match_scratch:V8HI 3 "=&v"))] "TARGET_ALTIVEC" "vspltisb %2,0\;vsubshs %3,%2,%1\;vmaxsh %0,%1,%3" [(set_attr "type" "altivec") @@ -1890,8 +1907,8 @@ (define_insn "altivec_abss_v4si" [(set (match_operand:V4SI 0 "register_operand" "=v") (unspec:V4SI [(match_operand:V4SI 1 "register_operand" "v")] 212)) - (clobber (match_scratch:V4SI 2 "=v")) - (clobber (match_scratch:V4SI 3 "=v"))] + (clobber (match_scratch:V4SI 2 "=&v")) + (clobber (match_scratch:V4SI 3 "=&v"))] "TARGET_ALTIVEC" "vspltisb %2,0\;vsubsws %3,%2,%1\;vmaxsw %0,%1,%3" [(set_attr "type" "altivec") diff --git a/gcc/config/rs6000/darwin.h b/gcc/config/rs6000/darwin.h index 73041a28775..b3468f2b66b 100644 --- a/gcc/config/rs6000/darwin.h +++ b/gcc/config/rs6000/darwin.h @@ -58,7 +58,9 @@ Boston, MA 02111-1307, USA. */ /* We want -fPIC by default, unless we're using -static to compile for the kernel or some such. */ -#define CC1_SPEC "%{!static:-fPIC}" +#define CC1_SPEC "\ +%{static: %{Zdynamic: %e conflicting code gen style switches are used}}\ +%{!static:-fPIC}" /* Make both r2 and r3 available for allocation. */ #define FIXED_R2 0 diff --git a/gcc/config/rs6000/linux.h b/gcc/config/rs6000/linux.h index 1711354da76..bb195d00829 100644 --- a/gcc/config/rs6000/linux.h +++ b/gcc/config/rs6000/linux.h @@ -1,7 +1,7 @@ /* Definitions of target machine for GNU compiler, for PowerPC machines running Linux. - Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, - Inc. + Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 + Free Software Foundation, Inc. Contributed by Michael Meissner (meissner@cygnus.com). This file is part of GNU CC. @@ -96,12 +96,34 @@ enum { SIGNAL_FRAMESIZE = 64 }; long new_cfa_; \ int i_; \ \ - /* li r0, 0x7777; sc (rt_sigreturn) */ \ - /* li r0, 0x6666; sc (sigreturn) */ \ - if (((*(unsigned int *) (pc_+0) == 0x38007777) \ - || (*(unsigned int *) (pc_+0) == 0x38006666)) \ - && (*(unsigned int *) (pc_+4) == 0x44000002)) \ - sc_ = (CONTEXT)->cfa + SIGNAL_FRAMESIZE; \ + /* li r0, 0x7777; sc (sigreturn old) */ \ + /* li r0, 0x0077; sc (sigreturn new) */ \ + /* li r0, 0x6666; sc (rt_sigreturn old) */ \ + /* li r0, 0x00AC; sc (rt_sigreturn new) */ \ + if (*(unsigned int *) (pc_+4) != 0x44000002) \ + break; \ + if (*(unsigned int *) (pc_+0) == 0x38007777 \ + || *(unsigned int *) (pc_+0) == 0x38000077) \ + { \ + struct sigframe { \ + char gap[SIGNAL_FRAMESIZE]; \ + struct sigcontext sigctx; \ + } *rt_ = (CONTEXT)->cfa; \ + sc_ = &rt_->sigctx; \ + } \ + else if (*(unsigned int *) (pc_+0) == 0x38006666 \ + || *(unsigned int *) (pc_+0) == 0x380000AC) \ + { \ + struct rt_sigframe { \ + char gap[SIGNAL_FRAMESIZE]; \ + unsigned long _unused[2]; \ + struct siginfo *pinfo; \ + void *puc; \ + struct siginfo info; \ + struct ucontext uc; \ + } *rt_ = (CONTEXT)->cfa; \ + sc_ = &rt_->uc.uc_mcontext; \ + } \ else \ break; \ \ @@ -124,11 +146,13 @@ enum { SIGNAL_FRAMESIZE = 64 }; \ /* The unwinder expects the IP to point to the following insn, \ whereas the kernel returns the address of the actual \ - faulting insn. */ \ - sc_->regs->nip += 4; \ + faulting insn. We store NIP+4 in an unused register slot to \ + get the same result for multiple evaluation of the same signal \ + frame. */ \ + sc_->regs->gpr[47] = sc_->regs->nip + 4; \ (FS)->regs.reg[CR0_REGNO].how = REG_SAVED_OFFSET; \ (FS)->regs.reg[CR0_REGNO].loc.offset \ - = (long)&(sc_->regs->nip) - new_cfa_; \ + = (long)&(sc_->regs->gpr[47]) - new_cfa_; \ (FS)->retaddr_column = CR0_REGNO; \ goto SUCCESS; \ } while (0) diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index 5c0ef2f6f30..6dc0703ae13 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -284,7 +284,9 @@ char rs6000_reg_names[][8] = "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", - "vrsave" + "vrsave", "vscr", + /* SPE registers. */ + "spe_acc", "spefscr" }; #ifdef TARGET_REGNAMES @@ -301,12 +303,14 @@ static const char alt_reg_names[][8] = "mq", "lr", "ctr", "ap", "%cr0", "%cr1", "%cr2", "%cr3", "%cr4", "%cr5", "%cr6", "%cr7", "xer", - /* AltiVec registers. */ + /* AltiVec registers. */ "%v0", "%v1", "%v2", "%v3", "%v4", "%v5", "%v6", "%v7", - "%v8", "%v9", "%v10", "%v11", "%v12", "%v13", "%v14", "%v15", - "%v16", "%v17", "%v18", "%v19", "%v20", "%v21", "%v22", "%v23", - "%v24", "%v25", "%v26", "%v27", "%v28", "%v29", "%v30", "%v31", - "vrsave" + "%v8", "%v9", "%v10", "%v11", "%v12", "%v13", "%v14", "%v15", + "%v16", "%v17", "%v18", "%v19", "%v20", "%v21", "%v22", "%v23", + "%v24", "%v25", "%v26", "%v27", "%v28", "%v29", "%v30", "%v31", + "vrsave", "vscr", + /* SPE registers. */ + "spe_acc", "spefscr" }; #endif @@ -2841,6 +2845,16 @@ rs6000_emit_move (dest, source, mode) operands[1] = replace_equiv_address (operands[1], copy_addr_to_reg (XEXP (operands[1], 0))); + if (TARGET_POWER) + { + emit_insn (gen_rtx_PARALLEL (VOIDmode, + gen_rtvec (2, + gen_rtx_SET (VOIDmode, + operands[0], operands[1]), + gen_rtx_CLOBBER (VOIDmode, + gen_rtx_SCRATCH (SImode))))); + return; + } break; default: @@ -12617,11 +12631,15 @@ rs6000_elf_encode_section_info (decl, first) && DEFAULT_ABI == ABI_V4 && TREE_CODE (decl) == VAR_DECL) { + rtx sym_ref = XEXP (DECL_RTL (decl), 0); int size = int_size_in_bytes (TREE_TYPE (decl)); tree section_name = DECL_SECTION_NAME (decl); const char *name = (char *)0; int len = 0; + if ((*targetm.binds_local_p) (decl)) + SYMBOL_REF_FLAG (sym_ref) = 1; + if (section_name) { if (TREE_CODE (section_name) == STRING_CST) @@ -12648,7 +12666,6 @@ rs6000_elf_encode_section_info (decl, first) || (len == sizeof (".PPC.EMB.sbss0") - 1 && strcmp (name, ".PPC.EMB.sbss0") == 0)))) { - rtx sym_ref = XEXP (DECL_RTL (decl), 0); size_t len = strlen (XSTR (sym_ref, 0)); char *str = alloca (len + 2); diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h index e5e9e27cce9..fb3ee284726 100644 --- a/gcc/config/rs6000/rs6000.h +++ b/gcc/config/rs6000/rs6000.h @@ -611,6 +611,9 @@ extern int rs6000_default_long_calls; #define LIBGCC2_LONG_DOUBLE_TYPE_SIZE 64 #endif +/* Work around rs6000_long_double_type_size dependency in ada/targtyps.c. */ +#define WIDEST_HARDWARE_FP_SIZE 64 + /* Width in bits of a pointer. See also the macro `Pmode' defined below. */ #define POINTER_SIZE (TARGET_32BIT ? 32 : 64) @@ -2723,8 +2726,8 @@ extern char rs6000_reg_names[][8]; /* register names (0 vs. %r0). */ #define DEBUG_REGISTER_NAMES \ { \ - "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", \ - "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15", \ + "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", \ + "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15", \ "r16", "r17", "r18", "r19", "r20", "r21", "r22", "r23", \ "r24", "r25", "r26", "r27", "r28", "r29", "r30", "r31", \ "f0", "f1", "f2", "f3", "f4", "f5", "f6", "f7", \ @@ -2733,13 +2736,13 @@ extern char rs6000_reg_names[][8]; /* register names (0 vs. %r0). */ "f24", "f25", "f26", "f27", "f28", "f29", "f30", "f31", \ "mq", "lr", "ctr", "ap", \ "cr0", "cr1", "cr2", "cr3", "cr4", "cr5", "cr6", "cr7", \ - "xer", \ + "xer", \ "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", \ "v8", "v9", "v10", "v11", "v12", "v13", "v14", "v15", \ "v16", "v17", "v18", "v19", "v20", "v21", "v22", "v23", \ "v24", "v25", "v26", "v27", "v28", "v29", "v30", "v31", \ - "vrsave", "vscr" \ - , "spe_acc", "spefscr" \ + "vrsave", "vscr", \ + "spe_acc", "spefscr" \ } /* Table of additional register names to use in user input. */ diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md index a031a295e9b..c85ffcdcd17 100644 --- a/gcc/config/rs6000/rs6000.md +++ b/gcc/config/rs6000/rs6000.md @@ -9313,8 +9313,7 @@ (define_insn "*movti_string" [(set (match_operand:TI 0 "reg_or_mem_operand" "=Q,m,????r,????r,????r") - (match_operand:TI 1 "reg_or_mem_operand" "r,r,r,Q,m")) - (clobber (match_scratch:SI 2 "X,X,X,X,X"))] + (match_operand:TI 1 "reg_or_mem_operand" "r,r,r,Q,m"))] "TARGET_STRING && ! TARGET_POWER && ! TARGET_POWERPC64 && (gpc_reg_operand (operands[0], TImode) || gpc_reg_operand (operands[1], TImode))" "* diff --git a/gcc/config/rs6000/rtems.h b/gcc/config/rs6000/rtems.h index 072d86c4ca2..7e7584604e9 100644 --- a/gcc/config/rs6000/rtems.h +++ b/gcc/config/rs6000/rtems.h @@ -1,5 +1,5 @@ /* Definitions for rtems targeting a PowerPC using elf. - Copyright (C) 1996, 1997, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Contributed by Joel Sherrill (joel@OARcorp.com). This file is part of GNU CC. @@ -32,3 +32,6 @@ Boston, MA 02111-1307, USA. */ builtin_assert ("machine=powerpc"); \ } \ while (0) + +#undef CPP_OS_DEFAULT_SPEC +#define CPP_OS_DEFAULT_SPEC "%(cpp_os_rtems)" diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h index 68fa73f7997..380c9d9da45 100644 --- a/gcc/config/rs6000/sysv4.h +++ b/gcc/config/rs6000/sysv4.h @@ -1,5 +1,5 @@ /* Target definitions for GNU compiler for PowerPC running System V.4 - Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 + Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Contributed by Cygnus Support. @@ -1205,6 +1205,21 @@ ncrtn.o%s" #define CPP_OS_NETBSD_SPEC "\ -D__powerpc__ -D__NetBSD__ -D__ELF__ -D__KPRINTF_ATTRIBUTE__" +/* RTEMS support. */ + +#define CPP_OS_RTEMS_SPEC "\ +%{!mcpu*: %{!Dppc*: %{!Dmpc*: -Dmpc750} } }\ +%{mcpu=403: %{!Dppc*: %{!Dmpc*: -Dppc403} } } \ +%{mcpu=505: %{!Dppc*: %{!Dmpc*: -Dmpc505} } } \ +%{mcpu=601: %{!Dppc*: %{!Dmpc*: -Dppc601} } } \ +%{mcpu=602: %{!Dppc*: %{!Dmpc*: -Dppc602} } } \ +%{mcpu=603: %{!Dppc*: %{!Dmpc*: -Dppc603} } } \ +%{mcpu=603e: %{!Dppc*: %{!Dmpc*: -Dppc603e} } } \ +%{mcpu=604: %{!Dppc*: %{!Dmpc*: -Dmpc604} } } \ +%{mcpu=750: %{!Dppc*: %{!Dmpc*: -Dmpc750} } } \ +%{mcpu=821: %{!Dppc*: %{!Dmpc*: -Dmpc821} } } \ +%{mcpu=860: %{!Dppc*: %{!Dmpc*: -Dmpc860} } }" + /* VxWorks support. */ /* VxWorks does all the library stuff itself. */ #define LIB_VXWORKS_SPEC "" @@ -1343,6 +1358,7 @@ ncrtn.o%s" { "cpp_os_gnu", CPP_OS_GNU_SPEC }, \ { "cpp_os_linux", CPP_OS_LINUX_SPEC }, \ { "cpp_os_netbsd", CPP_OS_NETBSD_SPEC }, \ + { "cpp_os_rtems", CPP_OS_RTEMS_SPEC }, \ { "cpp_os_vxworks", CPP_OS_VXWORKS_SPEC }, \ { "cpp_os_windiss", CPP_OS_WINDISS_SPEC }, \ { "cpp_os_default", CPP_OS_DEFAULT_SPEC }, diff --git a/gcc/config/rs6000/t-aix43 b/gcc/config/rs6000/t-aix43 index 1acccf64d10..a716209e9bc 100644 --- a/gcc/config/rs6000/t-aix43 +++ b/gcc/config/rs6000/t-aix43 @@ -55,7 +55,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ rm -f @multilib_dir@/shr.o # $(slibdir) double quoted to protect it from expansion while building # libgcc.mk. We want this delayed until actual install time. -SHLIB_INSTALL = $(INSTALL_DATA) @shlib_base_name@.a $$(slibdir)/ +SHLIB_INSTALL = $(INSTALL_DATA) @shlib_base_name@.a $$(DESTDIR)$$(slibdir)/ SHLIB_LIBS = -lc `case @shlib_base_name@ in *pthread*) echo -lpthread ;; esac` SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver diff --git a/gcc/config/rs6000/t-aix52 b/gcc/config/rs6000/t-aix52 index 97e1e079508..bddcdb11490 100644 --- a/gcc/config/rs6000/t-aix52 +++ b/gcc/config/rs6000/t-aix52 @@ -36,7 +36,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ rm -f @multilib_dir@/shr.o # $(slibdir) double quoted to protect it from expansion while building # libgcc.mk. We want this delayed until actual install time. -SHLIB_INSTALL = $(INSTALL_DATA) @shlib_base_name@.a $$(slibdir)/ +SHLIB_INSTALL = $(INSTALL_DATA) @shlib_base_name@.a $$(DESTDIR)$$(slibdir)/ SHLIB_LIBS = -lc `case @shlib_base_name@ in *pthread*) echo -lpthread ;; esac` SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver diff --git a/gcc/config/rs6000/t-rtems b/gcc/config/rs6000/t-rtems new file mode 100644 index 00000000000..364a22d2278 --- /dev/null +++ b/gcc/config/rs6000/t-rtems @@ -0,0 +1,86 @@ +# Multilibs for powerpc RTEMS targets. + +MULTILIB_OPTIONS = \ +mcpu=403/mcpu=505/mcpu=601/mcpu=602/mcpu=603/mcpu=603e/mcpu=604/mcpu=750/mcpu=821/mcpu=860 \ +Dmpc509/Dmpc8260 \ +D_OLD_EXCEPTIONS \ +msoft-float + +MULTILIB_DIRNAMES = \ +m403 m505 m601 m602 m603 m603e m604 m750 m821 m860 \ +mpc509 \ +mpc8260 \ +roe \ +nof + +MULTILIB_EXTRA_OPTS = mrelocatable-lib mno-eabi mstrict-align + +# MULTILIB_MATCHES = ${MULTILIB_MATCHES_FLOAT} +MULTILIB_MATCHES = ${MULTILIB_MATCHES_ENDIAN} \ + ${MULTILIB_MATCHES_SYSV} \ + mcpu?505/Dmpc505=mcpu?505/Dmpc509 + +# +# RTEMS old/new-exceptions handling +# +# old-exception processing is depredicated, therefore +# +# * Cpu-variants supporting new exception processing are build +# with new exception processing only +# * Cpu-variants not having been ported to new exception processing are +# build with old and new exception processing +# + +# Cpu-variants supporting new exception processing only +MULTILIB_NEW_EXCEPTIONS_ONLY = \ +*mcpu=604*/*D_OLD_EXCEPTIONS* \ +*mcpu=750*/*D_OLD_EXCEPTIONS* \ +*mcpu=821*/*D_OLD_EXCEPTIONS* \ +*Dmpc8260*/*D_OLD_EXCEPTIONS* \ +*mcpu=860*/*D_OLD_EXCEPTIONS* + +# Soft-float only, default implies msoft-float +# NOTE: Must match with MULTILIB_MATCHES_FLOAT and MULTILIB_MATCHES +MULTILIB_SOFTFLOAT_ONLY = \ +mcpu=403/*msoft-float* \ +mcpu=821/*msoft-float* \ +mcpu=860/*msoft-float* + +# Hard-float only, take out msoft-float +MULTILIB_HARDFLOAT_ONLY = \ +mcpu=505/*msoft-float* + +MULTILIB_EXCEPTIONS = + +# Disallow -D_OLD_EXCEPTIONS without other options +MULTILIB_EXCEPTIONS += D_OLD_EXCEPTIONS* + +# Disallow -Dppc and -Dmpc without other options +MULTILIB_EXCEPTIONS += Dppc* Dmpc* + +MULTILIB_EXCEPTIONS += \ +${MULTILIB_NEW_EXCEPTIONS_ONLY} \ +${MULTILIB_SOFTFLOAT_ONLY} \ +${MULTILIB_HARDFLOAT_ONLY} + +# Special rules +# Take out all variants we don't want +MULTILIB_EXCEPTIONS += mcpu=403/Dmpc509* +MULTILIB_EXCEPTIONS += mcpu=403/Dmpc8260* +MULTILIB_EXCEPTIONS += mcpu=505/Dmpc509* +MULTILIB_EXCEPTIONS += mcpu=505/Dmpc8260* +MULTILIB_EXCEPTIONS += mcpu=601/Dmpc509* +MULTILIB_EXCEPTIONS += mcpu=601/Dmpc8260* +MULTILIB_EXCEPTIONS += mcpu=602/Dmpc509* +MULTILIB_EXCEPTIONS += mcpu=602/Dmpc8260* +MULTILIB_EXCEPTIONS += mcpu=603/Dmpc509* +MULTILIB_EXCEPTIONS += mcpu=603/Dmpc8260* +MULTILIB_EXCEPTIONS += mcpu=603e/Dmpc509* +MULTILIB_EXCEPTIONS += mcpu=604/Dmpc509* +MULTILIB_EXCEPTIONS += mcpu=604/Dmpc8260* +MULTILIB_EXCEPTIONS += mcpu=750/Dmpc509* +MULTILIB_EXCEPTIONS += mcpu=750/Dmpc8260* +MULTILIB_EXCEPTIONS += mcpu=821/Dmpc509* +MULTILIB_EXCEPTIONS += mcpu=821/Dmpc8260* +MULTILIB_EXCEPTIONS += mcpu=860/Dmpc509* +MULTILIB_EXCEPTIONS += mcpu=860/Dmpc8260* diff --git a/gcc/config/s390/s390-protos.h b/gcc/config/s390/s390-protos.h index deecef6b969..7efacb4bc84 100644 --- a/gcc/config/s390/s390-protos.h +++ b/gcc/config/s390/s390-protos.h @@ -1,5 +1,5 @@ /* Definitions of target machine for GNU compiler, for IBM S/390. - Copyright (C) 2000, 2002 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. Contributed by Hartmut Penner (hpenner@de.ibm.com) This file is part of GNU CC. @@ -43,13 +43,16 @@ extern int s390_single_hi PARAMS ((rtx, enum machine_mode, int)); extern int s390_extract_hi PARAMS ((rtx, enum machine_mode, int)); extern int s390_single_qi PARAMS ((rtx, enum machine_mode, int)); extern int s390_extract_qi PARAMS ((rtx, enum machine_mode, int)); +extern int tls_symbolic_operand PARAMS ((rtx)); extern int s390_match_ccmode PARAMS ((rtx, enum machine_mode)); extern enum machine_mode s390_tm_ccmode PARAMS ((rtx, rtx, int)); extern enum machine_mode s390_select_ccmode PARAMS ((enum rtx_code, rtx, rtx)); extern int symbolic_reference_mentioned_p PARAMS ((rtx)); +extern int tls_symbolic_reference_mentioned_p PARAMS ((rtx)); +extern rtx s390_tls_get_offset PARAMS ((void)); extern int legitimate_la_operand_p PARAMS ((rtx)); -extern int preferred_la_operand_p PARAMS ((rtx, int)); +extern int preferred_la_operand_p PARAMS ((rtx)); extern int legitimate_pic_operand_p PARAMS ((rtx)); extern int legitimate_constant_p PARAMS ((rtx)); extern int legitimate_reload_constant_p PARAMS ((rtx)); @@ -60,7 +63,7 @@ extern enum reg_class s390_preferred_reload_class PARAMS ((rtx, enum reg_class)) extern enum reg_class s390_secondary_input_reload_class PARAMS ((enum reg_class, enum machine_mode, rtx)); extern int s390_plus_operand PARAMS ((rtx, enum machine_mode)); extern void s390_expand_plus_operand PARAMS ((rtx, rtx, rtx)); -extern void emit_pic_move PARAMS ((rtx *, enum machine_mode)); +extern void emit_symbolic_move PARAMS ((rtx *)); extern void s390_load_address PARAMS ((rtx, rtx)); extern void s390_expand_movstr PARAMS ((rtx, rtx, rtx)); extern void s390_expand_clrstr PARAMS ((rtx, rtx)); diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c index 3f6ec452b1c..75d2dcfbc3a 100644 --- a/gcc/config/s390/s390.c +++ b/gcc/config/s390/s390.c @@ -1,5 +1,5 @@ /* Subroutines used for code generation on IBM S/390 and zSeries - Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Contributed by Hartmut Penner (hpenner@de.ibm.com) and Ulrich Weigand (uweigand@de.ibm.com). @@ -54,6 +54,11 @@ static int s390_adjust_priority PARAMS ((rtx, int)); static void s390_select_rtx_section PARAMS ((enum machine_mode, rtx, unsigned HOST_WIDE_INT)); static void s390_encode_section_info PARAMS ((tree, int)); +static const char *s390_strip_name_encoding PARAMS ((const char *)); +static bool s390_cannot_force_const_mem PARAMS ((rtx)); +static void s390_init_builtins PARAMS ((void)); +static rtx s390_expand_builtin PARAMS ((tree, rtx, rtx, + enum machine_mode, int)); static void s390_output_mi_thunk PARAMS ((FILE *, tree, HOST_WIDE_INT, HOST_WIDE_INT, tree)); @@ -81,6 +86,20 @@ static void s390_output_mi_thunk PARAMS ((FILE *, tree, HOST_WIDE_INT, #undef TARGET_ENCODE_SECTION_INFO #define TARGET_ENCODE_SECTION_INFO s390_encode_section_info +#undef TARGET_STRIP_NAME_ENCODING +#define TARGET_STRIP_NAME_ENCODING s390_strip_name_encoding + +#ifdef HAVE_AS_TLS +#undef TARGET_HAVE_TLS +#define TARGET_HAVE_TLS true +#endif +#undef TARGET_CANNOT_FORCE_CONST_MEM +#define TARGET_CANNOT_FORCE_CONST_MEM s390_cannot_force_const_mem + +#undef TARGET_INIT_BUILTINS +#define TARGET_INIT_BUILTINS s390_init_builtins +#undef TARGET_EXPAND_BUILTIN +#define TARGET_EXPAND_BUILTIN s390_expand_builtin #undef TARGET_ASM_OUTPUT_MI_THUNK #define TARGET_ASM_OUTPUT_MI_THUNK s390_output_mi_thunk @@ -98,6 +117,9 @@ static int s390_sr_alias_set = 0; emitted. */ rtx s390_compare_op0, s390_compare_op1; +/* The encoding characters for the four TLS models present in ELF. */ +static char const tls_model_chars[] = " GLil"; + /* Structure used to hold the components of a S/390 memory address. A legitimate address on S/390 is of the general form @@ -132,6 +154,9 @@ struct machine_function GTY(()) /* Size of stack frame. */ HOST_WIDE_INT frame_size; + + /* Some local-dynamic TLS symbol name. */ + const char *some_ld_name; }; static int s390_match_ccmode_set PARAMS ((rtx, enum machine_mode)); @@ -140,6 +165,10 @@ static const char *s390_branch_condition_mnemonic PARAMS ((rtx, int)); static int check_mode PARAMS ((rtx, enum machine_mode *)); static int general_s_operand PARAMS ((rtx, enum machine_mode, int)); static int s390_decompose_address PARAMS ((rtx, struct s390_address *)); +static rtx get_thread_pointer PARAMS ((void)); +static rtx legitimize_tls_address PARAMS ((rtx, rtx)); +static const char *get_some_local_dynamic_name PARAMS ((void)); +static int get_some_local_dynamic_name_1 PARAMS ((rtx *, void *)); static int reg_used_in_mem_p PARAMS ((int, rtx)); static int addr_generation_dependency_p PARAMS ((rtx, rtx)); static int s390_split_branches PARAMS ((rtx, bool *)); @@ -910,6 +939,7 @@ larl_operand (op, mode) if (GET_CODE (op) == LABEL_REF) return 1; if (GET_CODE (op) == SYMBOL_REF + && !tls_symbolic_operand (op) && (!flag_pic || SYMBOL_REF_FLAG (op) || CONSTANT_POOL_ADDRESS_P (op))) return 1; @@ -932,17 +962,22 @@ larl_operand (op, mode) if (GET_CODE (op) == LABEL_REF) return 1; if (GET_CODE (op) == SYMBOL_REF + && !tls_symbolic_operand (op) && (!flag_pic || SYMBOL_REF_FLAG (op) || CONSTANT_POOL_ADDRESS_P (op))) return 1; - /* Now we must have a @GOTENT offset or @PLT stub. */ + /* Now we must have a @GOTENT offset or @PLT stub + or an @INDNTPOFF TLS offset. */ if (GET_CODE (op) == UNSPEC && XINT (op, 1) == 111) return 1; if (GET_CODE (op) == UNSPEC && XINT (op, 1) == 113) return 1; + if (GET_CODE (op) == UNSPEC + && XINT (op, 1) == UNSPEC_INDNTPOFF) + return 1; return 0; } @@ -1091,6 +1126,23 @@ bras_sym_operand (op, mode) return 0; } +/* If OP is a SYMBOL_REF of a thread-local symbol, return its TLS mode, + otherwise return 0. */ + +int +tls_symbolic_operand (op) + register rtx op; +{ + const char *symbol_str; + + if (GET_CODE (op) != SYMBOL_REF) + return 0; + symbol_str = XSTR (op, 0); + + if (symbol_str[0] != '%') + return 0; + return strchr (tls_model_chars, symbol_str[1]) - tls_model_chars; +} /* Return true if OP is a load multiple operation. It is known to be a PARALLEL and the first section will be tested. @@ -1250,6 +1302,37 @@ symbolic_reference_mentioned_p (op) return 0; } +/* Return true if OP contains a reference to a thread-local symbol. */ + +int +tls_symbolic_reference_mentioned_p (op) + rtx op; +{ + register const char *fmt; + register int i; + + if (GET_CODE (op) == SYMBOL_REF) + return tls_symbolic_operand (op); + + fmt = GET_RTX_FORMAT (GET_CODE (op)); + for (i = GET_RTX_LENGTH (GET_CODE (op)) - 1; i >= 0; i--) + { + if (fmt[i] == 'E') + { + register int j; + + for (j = XVECLEN (op, i) - 1; j >= 0; j--) + if (tls_symbolic_reference_mentioned_p (XVECEXP (op, i, j))) + return 1; + } + + else if (fmt[i] == 'e' && tls_symbolic_reference_mentioned_p (XEXP (op, i))) + return 1; + } + + return 0; +} + /* Return true if OP is a legitimate general operand when generating PIC code. It is given that flag_pic is on @@ -1264,7 +1347,7 @@ legitimate_pic_operand_p (op) return 1; /* Reject everything else; must be handled - via emit_pic_move. */ + via emit_symbolic_move. */ return 0; } @@ -1279,22 +1362,87 @@ legitimate_constant_p (op) if (!SYMBOLIC_CONST (op)) return 1; + /* Accept immediate LARL operands. */ + if (TARGET_64BIT && larl_operand (op, VOIDmode)) + return 1; + + /* Thread-local symbols are never legal constants. This is + so that emit_call knows that computing such addresses + might require a function call. */ + if (TLS_SYMBOLIC_CONST (op)) + return 0; + /* In the PIC case, symbolic constants must *not* be forced into the literal pool. We accept them here, - so that they will be handled by emit_pic_move. */ + so that they will be handled by emit_symbolic_move. */ if (flag_pic) return 1; - /* Even in the non-PIC case, we can accept immediate - LARL operands here. */ - if (TARGET_64BIT) - return larl_operand (op, VOIDmode); - /* All remaining non-PIC symbolic constants are forced into the literal pool. */ return 0; } +/* Determine if it's legal to put X into the constant pool. This + is not possible if X contains the address of a symbol that is + not constant (TLS) or not known at final link time (PIC). */ + +static bool +s390_cannot_force_const_mem (x) + rtx x; +{ + switch (GET_CODE (x)) + { + case CONST_INT: + case CONST_DOUBLE: + /* Accept all non-symbolic constants. */ + return false; + + case LABEL_REF: + /* Labels are OK iff we are non-PIC. */ + return flag_pic != 0; + + case SYMBOL_REF: + /* 'Naked' TLS symbol references are never OK, + non-TLS symbols are OK iff we are non-PIC. */ + if (tls_symbolic_operand (x)) + return true; + else + return flag_pic != 0; + + case CONST: + return s390_cannot_force_const_mem (XEXP (x, 0)); + case PLUS: + case MINUS: + return s390_cannot_force_const_mem (XEXP (x, 0)) + || s390_cannot_force_const_mem (XEXP (x, 1)); + + case UNSPEC: + switch (XINT (x, 1)) + { + /* Only lt-relative or GOT-relative UNSPECs are OK. */ + case 100: + case 104: + case 112: + case 114: + case UNSPEC_TLSGD: + case UNSPEC_TLSLDM: + case UNSPEC_NTPOFF: + case UNSPEC_DTPOFF: + case UNSPEC_GOTNTPOFF: + case UNSPEC_INDNTPOFF: + return false; + + default: + return true; + } + break; + + default: + abort (); + } +} + /* Returns true if the constant value OP is a legitimate general operand during and after reload. The difference to legitimate_constant_p is that this function will not accept @@ -1624,10 +1772,11 @@ s390_decompose_address (addr, out) } /* In the small-PIC case, the linker converts @GOT12 - offsets to possible displacements. */ + and @GOTNTPOFF offsets to possible displacements. */ else if (GET_CODE (disp) == CONST && GET_CODE (XEXP (disp, 0)) == UNSPEC - && XINT (XEXP (disp, 0), 1) == 110) + && (XINT (XEXP (disp, 0), 1) == 110 + || XINT (XEXP (disp, 0), 1) == UNSPEC_GOTNTPOFF)) { if (flag_pic != 1) return FALSE; @@ -1677,12 +1826,6 @@ s390_decompose_address (addr, out) || !CONSTANT_POOL_ADDRESS_P (disp)) return FALSE; - /* In 64-bit PIC mode we cannot accept symbolic - constants in the constant pool. */ - if (TARGET_64BIT && flag_pic - && SYMBOLIC_CONST (get_pool_constant (disp))) - return FALSE; - /* If we have an offset, make sure it does not exceed the size of the constant pool entry. */ if (offset && offset >= GET_MODE_SIZE (get_pool_mode (disp))) @@ -1773,14 +1916,11 @@ legitimate_la_operand_p (op) } /* Return 1 if OP is a valid operand for the LA instruction, - and we prefer to use LA over addition to compute it. - If STRICT is true, only accept operands that will never - change to something we cannot recognize as preferred. */ + and we prefer to use LA over addition to compute it. */ int -preferred_la_operand_p (op, strict) +preferred_la_operand_p (op) register rtx op; - int strict; { struct s390_address addr; if (!s390_decompose_address (op, &addr)) @@ -1792,10 +1932,9 @@ preferred_la_operand_p (op, strict) if (addr.pointer) return TRUE; - if (!strict) - if ((addr.base && REG_P (addr.base) && REG_POINTER (addr.base)) - || (addr.indx && REG_P (addr.indx) && REG_POINTER (addr.indx))) - return TRUE; + if ((addr.base && REG_P (addr.base) && REG_POINTER (addr.base)) + || (addr.indx && REG_P (addr.indx) && REG_POINTER (addr.indx))) + return TRUE; return FALSE; } @@ -2098,18 +2237,237 @@ legitimize_pic_address (orig, reg) return new; } +/* Load the thread pointer into a register. */ + +static rtx +get_thread_pointer () +{ + rtx tp; + + tp = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, const0_rtx), UNSPEC_TP); + tp = force_reg (Pmode, tp); + mark_reg_pointer (tp, BITS_PER_WORD); + + return tp; +} + +/* Construct the SYMBOL_REF for the tls_get_offset function. */ + +static GTY(()) rtx s390_tls_symbol; +rtx +s390_tls_get_offset () +{ + if (!s390_tls_symbol) + s390_tls_symbol = gen_rtx_SYMBOL_REF (Pmode, "__tls_get_offset"); + + return s390_tls_symbol; +} + +/* ADDR contains a thread-local SYMBOL_REF. Generate code to compute + this (thread-local) address. REG may be used as temporary. */ + +static rtx +legitimize_tls_address (addr, reg) + rtx addr; + rtx reg; +{ + rtx new, tls_call, temp, base, r2, insn; + + if (GET_CODE (addr) == SYMBOL_REF) + switch (tls_symbolic_operand (addr)) + { + case TLS_MODEL_GLOBAL_DYNAMIC: + start_sequence (); + r2 = gen_rtx_REG (Pmode, 2); + tls_call = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, addr), UNSPEC_TLSGD); + new = gen_rtx_CONST (Pmode, tls_call); + new = force_const_mem (Pmode, new); + emit_move_insn (r2, new); + emit_call_insn (gen_call_value_tls (r2, tls_call)); + insn = get_insns (); + end_sequence (); + + new = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, addr), UNSPEC_NTPOFF); + temp = gen_reg_rtx (Pmode); + emit_libcall_block (insn, temp, r2, new); + + new = gen_rtx_PLUS (Pmode, get_thread_pointer (), temp); + if (reg != 0) + { + s390_load_address (reg, new); + new = reg; + } + break; + + case TLS_MODEL_LOCAL_DYNAMIC: + start_sequence (); + r2 = gen_rtx_REG (Pmode, 2); + tls_call = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, const0_rtx), UNSPEC_TLSLDM); + new = gen_rtx_CONST (Pmode, tls_call); + new = force_const_mem (Pmode, new); + emit_move_insn (r2, new); + emit_call_insn (gen_call_value_tls (r2, tls_call)); + insn = get_insns (); + end_sequence (); + + new = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, const0_rtx), UNSPEC_TLSLDM_NTPOFF); + temp = gen_reg_rtx (Pmode); + emit_libcall_block (insn, temp, r2, new); + + new = gen_rtx_PLUS (Pmode, get_thread_pointer (), temp); + base = gen_reg_rtx (Pmode); + s390_load_address (base, new); + + new = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, addr), UNSPEC_DTPOFF); + new = gen_rtx_CONST (Pmode, new); + new = force_const_mem (Pmode, new); + temp = gen_reg_rtx (Pmode); + emit_move_insn (temp, new); + + new = gen_rtx_PLUS (Pmode, base, temp); + if (reg != 0) + { + s390_load_address (reg, new); + new = reg; + } + break; + + case TLS_MODEL_INITIAL_EXEC: + if (flag_pic == 1) + { + /* Assume GOT offset < 4k. This is handled the same way + in both 31- and 64-bit code. */ + + if (reload_in_progress || reload_completed) + regs_ever_live[PIC_OFFSET_TABLE_REGNUM] = 1; + + new = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, addr), UNSPEC_GOTNTPOFF); + new = gen_rtx_CONST (Pmode, new); + new = gen_rtx_PLUS (Pmode, pic_offset_table_rtx, new); + new = gen_rtx_MEM (Pmode, new); + RTX_UNCHANGING_P (new) = 1; + temp = gen_reg_rtx (Pmode); + emit_move_insn (temp, new); + } + else if (TARGET_64BIT) + { + /* If the GOT offset might be >= 4k, we determine the position + of the GOT entry via a PC-relative LARL. */ + + new = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, addr), UNSPEC_INDNTPOFF); + new = gen_rtx_CONST (Pmode, new); + temp = gen_reg_rtx (Pmode); + emit_move_insn (temp, new); + + new = gen_rtx_MEM (Pmode, temp); + RTX_UNCHANGING_P (new) = 1; + temp = gen_reg_rtx (Pmode); + emit_move_insn (temp, new); + } + else if (flag_pic) + { + /* If the GOT offset might be >= 4k, we have to load it + from the literal pool. */ + + if (reload_in_progress || reload_completed) + regs_ever_live[PIC_OFFSET_TABLE_REGNUM] = 1; + + new = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, addr), UNSPEC_GOTNTPOFF); + new = gen_rtx_CONST (Pmode, new); + new = force_const_mem (Pmode, new); + temp = gen_reg_rtx (Pmode); + emit_move_insn (temp, new); + + new = gen_rtx_PLUS (Pmode, pic_offset_table_rtx, temp); + new = gen_rtx_MEM (Pmode, new); + RTX_UNCHANGING_P (new) = 1; + + new = gen_rtx_UNSPEC (Pmode, gen_rtvec (2, new, addr), UNSPEC_TLS_LOAD); + temp = gen_reg_rtx (Pmode); + emit_insn (gen_rtx_SET (Pmode, temp, new)); + } + else + { + /* In position-dependent code, load the absolute address of + the GOT entry from the literal pool. */ + + new = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, addr), UNSPEC_INDNTPOFF); + new = gen_rtx_CONST (Pmode, new); + new = force_const_mem (Pmode, new); + temp = gen_reg_rtx (Pmode); + emit_move_insn (temp, new); + + new = temp; + new = gen_rtx_MEM (Pmode, new); + RTX_UNCHANGING_P (new) = 1; + + new = gen_rtx_UNSPEC (Pmode, gen_rtvec (2, new, addr), UNSPEC_TLS_LOAD); + temp = gen_reg_rtx (Pmode); + emit_insn (gen_rtx_SET (Pmode, temp, new)); + } + + new = gen_rtx_PLUS (Pmode, get_thread_pointer (), temp); + if (reg != 0) + { + s390_load_address (reg, new); + new = reg; + } + break; + + case TLS_MODEL_LOCAL_EXEC: + new = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, addr), UNSPEC_NTPOFF); + new = gen_rtx_CONST (Pmode, new); + new = force_const_mem (Pmode, new); + temp = gen_reg_rtx (Pmode); + emit_move_insn (temp, new); + + new = gen_rtx_PLUS (Pmode, get_thread_pointer (), temp); + if (reg != 0) + { + s390_load_address (reg, new); + new = reg; + } + break; + + default: + abort (); + } + + else if (GET_CODE (addr) == CONST && GET_CODE (XEXP (addr, 0)) == UNSPEC) + { + switch (XINT (XEXP (addr, 0), 1)) + { + case UNSPEC_INDNTPOFF: + if (TARGET_64BIT) + new = addr; + else + abort (); + break; + + default: + abort (); + } + } + + else + abort (); /* for now ... */ + + return new; +} + /* Emit insns to move operands[1] into operands[0]. */ void -emit_pic_move (operands, mode) +emit_symbolic_move (operands) rtx *operands; - enum machine_mode mode ATTRIBUTE_UNUSED; { rtx temp = no_new_pseudos ? operands[0] : gen_reg_rtx (Pmode); - if (GET_CODE (operands[0]) == MEM && SYMBOLIC_CONST (operands[1])) + if (GET_CODE (operands[0]) == MEM) operands[1] = force_reg (Pmode, operands[1]); - else + else if (TLS_SYMBOLIC_CONST (operands[1])) + operands[1] = legitimize_tls_address (operands[1], temp); + else if (flag_pic) operands[1] = legitimize_pic_address (operands[1], temp); } @@ -2132,7 +2490,14 @@ legitimize_address (x, oldx, mode) { rtx constant_term = const0_rtx; - if (flag_pic) + if (TLS_SYMBOLIC_CONST (x)) + { + x = legitimize_tls_address (x, 0); + + if (legitimate_address_p (mode, x, FALSE)) + return x; + } + else if (flag_pic) { if (SYMBOLIC_CONST (x) || (GET_CODE (x) == PLUS @@ -2544,6 +2909,48 @@ s390_simplify_dwarf_addr (orig_x) return orig_x; } +/* Locate some local-dynamic symbol still in use by this function + so that we can print its name in local-dynamic base patterns. */ + +static const char * +get_some_local_dynamic_name () +{ + rtx insn; + + if (cfun->machine->some_ld_name) + return cfun->machine->some_ld_name; + + for (insn = get_insns (); insn ; insn = NEXT_INSN (insn)) + if (INSN_P (insn) + && for_each_rtx (&PATTERN (insn), get_some_local_dynamic_name_1, 0)) + return cfun->machine->some_ld_name; + + abort (); +} + +static int +get_some_local_dynamic_name_1 (px, data) + rtx *px; + void *data ATTRIBUTE_UNUSED; +{ + rtx x = *px; + + if (GET_CODE (x) == SYMBOL_REF && CONSTANT_POOL_ADDRESS_P (x)) + { + x = get_pool_constant (x); + return for_each_rtx (&x, get_some_local_dynamic_name_1, 0); + } + + if (GET_CODE (x) == SYMBOL_REF + && tls_symbolic_operand (x) == TLS_MODEL_LOCAL_DYNAMIC) + { + cfun->machine->some_ld_name = XSTR (x, 0); + return 1; + } + + return 0; +} + /* Output symbolic constant X in assembler syntax to stdio stream FILE. */ @@ -2616,6 +3023,30 @@ s390_output_symbolic_const (file, x) fprintf (file, "@PLT-"); s390_output_symbolic_const (file, cfun->machine->literal_pool_label); break; + case UNSPEC_TLSGD: + s390_output_symbolic_const (file, XVECEXP (x, 0, 0)); + fprintf (file, "@TLSGD"); + break; + case UNSPEC_TLSLDM: + assemble_name (file, get_some_local_dynamic_name ()); + fprintf (file, "@TLSLDM"); + break; + case UNSPEC_DTPOFF: + s390_output_symbolic_const (file, XVECEXP (x, 0, 0)); + fprintf (file, "@DTPOFF"); + break; + case UNSPEC_NTPOFF: + s390_output_symbolic_const (file, XVECEXP (x, 0, 0)); + fprintf (file, "@NTPOFF"); + break; + case UNSPEC_GOTNTPOFF: + s390_output_symbolic_const (file, XVECEXP (x, 0, 0)); + fprintf (file, "@GOTNTPOFF"); + break; + case UNSPEC_INDNTPOFF: + s390_output_symbolic_const (file, XVECEXP (x, 0, 0)); + fprintf (file, "@INDNTPOFF"); + break; default: output_operand_lossage ("invalid UNSPEC as operand (2)"); break; @@ -2661,6 +3092,7 @@ print_operand_address (file, addr) 'C': print opcode suffix for branch condition. 'D': print opcode suffix for inverse branch condition. + 'J': print tls_load/tls_gdcall/tls_ldcall suffix 'O': print only the displacement of a memory reference. 'R': print only the base register of a memory reference. 'N': print the second word of a DImode operand. @@ -2686,6 +3118,26 @@ print_operand (file, x, code) fprintf (file, s390_branch_condition_mnemonic (x, TRUE)); return; + case 'J': + if (GET_CODE (x) == SYMBOL_REF) + { + fprintf (file, "%s", ":tls_load:"); + output_addr_const (file, x); + } + else if (GET_CODE (x) == UNSPEC && XINT (x, 1) == UNSPEC_TLSGD) + { + fprintf (file, "%s", ":tls_gdcall:"); + output_addr_const (file, XVECEXP (x, 0, 0)); + } + else if (GET_CODE (x) == UNSPEC && XINT (x, 1) == UNSPEC_TLSLDM) + { + fprintf (file, "%s", ":tls_ldcall:"); + assemble_name (file, get_some_local_dynamic_name ()); + } + else + abort (); + return; + case 'O': { struct s390_address ad; @@ -5447,6 +5899,134 @@ s390_va_arg (valist, type) } +/* Builtins. */ + +enum s390_builtin +{ + S390_BUILTIN_THREAD_POINTER, + S390_BUILTIN_SET_THREAD_POINTER, + + S390_BUILTIN_max +}; + +static unsigned int const code_for_builtin_64[S390_BUILTIN_max] = { + CODE_FOR_get_tp_64, + CODE_FOR_set_tp_64 +}; + +static unsigned int const code_for_builtin_31[S390_BUILTIN_max] = { + CODE_FOR_get_tp_31, + CODE_FOR_set_tp_31 +}; + +static void +s390_init_builtins () +{ + tree ftype; + + ftype = build_function_type (ptr_type_node, void_list_node); + builtin_function ("__builtin_thread_pointer", ftype, + S390_BUILTIN_THREAD_POINTER, BUILT_IN_MD, + NULL, NULL_TREE); + + ftype = build_function_type_list (void_type_node, ptr_type_node, NULL_TREE); + builtin_function ("__builtin_set_thread_pointer", ftype, + S390_BUILTIN_SET_THREAD_POINTER, BUILT_IN_MD, + NULL, NULL_TREE); +} + +/* Expand an expression EXP that calls a built-in function, + with result going to TARGET if that's convenient + (and in mode MODE if that's convenient). + SUBTARGET may be used as the target for computing one of EXP's operands. + IGNORE is nonzero if the value is to be ignored. */ + +static rtx +s390_expand_builtin (exp, target, subtarget, mode, ignore) + tree exp; + rtx target; + rtx subtarget ATTRIBUTE_UNUSED; + enum machine_mode mode ATTRIBUTE_UNUSED; + int ignore ATTRIBUTE_UNUSED; +{ +#define MAX_ARGS 2 + + unsigned int const *code_for_builtin = + TARGET_64BIT ? code_for_builtin_64 : code_for_builtin_31; + + tree fndecl = TREE_OPERAND (TREE_OPERAND (exp, 0), 0); + unsigned int fcode = DECL_FUNCTION_CODE (fndecl); + tree arglist = TREE_OPERAND (exp, 1); + enum insn_code icode; + rtx op[MAX_ARGS], pat; + int arity; + bool nonvoid; + + if (fcode >= S390_BUILTIN_max) + internal_error ("bad builtin fcode"); + icode = code_for_builtin[fcode]; + if (icode == 0) + internal_error ("bad builtin fcode"); + + nonvoid = TREE_TYPE (TREE_TYPE (fndecl)) != void_type_node; + + for (arglist = TREE_OPERAND (exp, 1), arity = 0; + arglist; + arglist = TREE_CHAIN (arglist), arity++) + { + const struct insn_operand_data *insn_op; + + tree arg = TREE_VALUE (arglist); + if (arg == error_mark_node) + return NULL_RTX; + if (arity > MAX_ARGS) + return NULL_RTX; + + insn_op = &insn_data[icode].operand[arity + nonvoid]; + + op[arity] = expand_expr (arg, NULL_RTX, insn_op->mode, 0); + + if (!(*insn_op->predicate) (op[arity], insn_op->mode)) + op[arity] = copy_to_mode_reg (insn_op->mode, op[arity]); + } + + if (nonvoid) + { + enum machine_mode tmode = insn_data[icode].operand[0].mode; + if (!target + || GET_MODE (target) != tmode + || !(*insn_data[icode].operand[0].predicate) (target, tmode)) + target = gen_reg_rtx (tmode); + } + + switch (arity) + { + case 0: + pat = GEN_FCN (icode) (target); + break; + case 1: + if (nonvoid) + pat = GEN_FCN (icode) (target, op[0]); + else + pat = GEN_FCN (icode) (op[0]); + break; + case 2: + pat = GEN_FCN (icode) (target, op[0], op[1]); + break; + default: + abort (); + } + if (!pat) + return NULL_RTX; + emit_insn (pat); + + if (nonvoid) + return target; + else + return const0_rtx; +} + + /* Output assembly code for the trampoline template to stdio stream FILE. @@ -5606,28 +6186,85 @@ s390_select_rtx_section (mode, x, align) function_section (current_function_decl); } -/* If using PIC, mark a SYMBOL_REF for a non-global symbol so that we - may access it directly in the GOT. */ +/* Encode symbol attributes (local vs. global, tls model) of a SYMBOL_REF + into its name and SYMBOL_REF_FLAG. */ static void s390_encode_section_info (decl, first) tree decl; int first ATTRIBUTE_UNUSED; { + bool local_p = (*targetm.binds_local_p) (decl); + rtx rtl, symbol; + + rtl = DECL_P (decl) ? DECL_RTL (decl) : TREE_CST_RTL (decl); + if (GET_CODE (rtl) != MEM) + return; + symbol = XEXP (rtl, 0); + if (GET_CODE (symbol) != SYMBOL_REF) + return; + + /* When using PIC, SYMBOL_REF_FLAG marks non-global symbols + that can be accessed directly. */ if (flag_pic) + SYMBOL_REF_FLAG (symbol) = local_p; + + /* Encode thread-local data with %[GLil] for "global dynamic", + "local dynamic", "initial exec" or "local exec" TLS models, + respectively. */ + + if (TREE_CODE (decl) == VAR_DECL && DECL_THREAD_LOCAL (decl)) { - rtx rtl = (TREE_CODE_CLASS (TREE_CODE (decl)) != 'd' - ? TREE_CST_RTL (decl) : DECL_RTL (decl)); + const char *symbol_str = XSTR (symbol, 0); + char *newstr; + size_t len; + enum tls_model kind = decl_tls_model (decl); - if (GET_CODE (rtl) == MEM) + if (!flag_pic) { - SYMBOL_REF_FLAG (XEXP (rtl, 0)) - = (TREE_CODE_CLASS (TREE_CODE (decl)) != 'd' - || ! TREE_PUBLIC (decl)); + /* We don't allow non-pic code for shared libraries, + so don't generate GD/LD TLS models for non-pic code. */ + switch (kind) + { + case TLS_MODEL_GLOBAL_DYNAMIC: + kind = TLS_MODEL_INITIAL_EXEC; break; + case TLS_MODEL_LOCAL_DYNAMIC: + kind = TLS_MODEL_LOCAL_EXEC; break; + default: + break; + } } + + if (symbol_str[0] == '%') + { + if (symbol_str[1] == tls_model_chars[kind]) + return; + symbol_str += 2; + } + len = strlen (symbol_str) + 1; + newstr = alloca (len + 2); + + newstr[0] = '%'; + newstr[1] = tls_model_chars[kind]; + memcpy (newstr + 2, symbol_str, len); + + XSTR (symbol, 0) = ggc_alloc_string (newstr, len + 2 - 1); } } +/* Undo the above when printing symbol names. */ + +static const char * +s390_strip_name_encoding (str) + const char *str; +{ + if (str[0] == '%') + str += 2; + if (str[0] == '*') + str += 1; + return str; +} + /* Output thunk to FILE that implements a C++ virtual function call (with multiple inheritance) to FUNCTION. The thunk adjusts the this pointer by DELTA, and unless VCALL_OFFSET is zero, applies an additional adjustment diff --git a/gcc/config/s390/s390.h b/gcc/config/s390/s390.h index 23721588c0f..d582f439d9f 100644 --- a/gcc/config/s390/s390.h +++ b/gcc/config/s390/s390.h @@ -1,5 +1,5 @@ /* Definitions of target machine for GNU compiler, for IBM S/390 - Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Contributed by Hartmut Penner (hpenner@de.ibm.com) and Ulrich Weigand (uweigand@de.ibm.com). This file is part of GNU CC. @@ -195,11 +195,13 @@ if (INTEGRAL_MODE_P (MODE) && \ #define ADDR_REGNO_P(N) ((N) >= 1 && (N) < 16) #define FP_REGNO_P(N) ((N) >= 16 && (N) < (TARGET_IEEE_FLOAT? 32 : 20)) #define CC_REGNO_P(N) ((N) == 33) +#define FRAME_REGNO_P(N) ((N) == 32 || (N) == 34) #define GENERAL_REG_P(X) (REG_P (X) && GENERAL_REGNO_P (REGNO (X))) #define ADDR_REG_P(X) (REG_P (X) && ADDR_REGNO_P (REGNO (X))) #define FP_REG_P(X) (REG_P (X) && FP_REGNO_P (REGNO (X))) #define CC_REG_P(X) (REG_P (X) && CC_REGNO_P (REGNO (X))) +#define FRAME_REG_P(X) (REG_P (X) && FRAME_REGNO_P (REGNO (X))) #define BASE_REGISTER 13 #define RETURN_REGNUM 14 @@ -314,6 +316,8 @@ do \ (HARD_REGNO_NREGS(REGNO, MODE) == 1 || !((REGNO) & 1)) : \ CC_REGNO_P(REGNO)? \ GET_MODE_CLASS (MODE) == MODE_CC : \ + FRAME_REGNO_P(REGNO)? \ + (enum machine_mode) (MODE) == Pmode : \ 0) #define MODES_TIEABLE_P(MODE1, MODE2) \ @@ -749,6 +753,10 @@ CUMULATIVE_ARGS; || GET_CODE (X) == LABEL_REF \ || (GET_CODE (X) == CONST && symbolic_reference_mentioned_p (X))) +#define TLS_SYMBOLIC_CONST(X) \ +((GET_CODE (X) == SYMBOL_REF && tls_symbolic_operand (X)) \ + || (GET_CODE (X) == CONST && tls_symbolic_reference_mentioned_p (X))) + /* Condition codes. */ @@ -926,6 +934,10 @@ extern int flag_pic; #define ASM_OUTPUT_SKIP(FILE, SIZE) \ fprintf ((FILE), "\t.set\t.,.+%u\n", (SIZE)) +/* Output a reference to a user-level label named NAME. */ +#define ASM_OUTPUT_LABELREF(FILE, NAME) \ + asm_fprintf ((FILE), "%U%s", (*targetm.strip_name_encoding) (NAME)) + /* Store in OUTPUT a string (made with alloca) containing an assembler-name for a local static variable named NAME. LABELNO is an integer which is different for each call. */ @@ -1014,10 +1026,9 @@ extern int s390_nr_constants; \ case MODE_INT: \ case MODE_PARTIAL_INT: \ - if (flag_pic \ - && (GET_CODE (EXP) == CONST \ - || GET_CODE (EXP) == SYMBOL_REF \ - || GET_CODE (EXP) == LABEL_REF )) \ + if (GET_CODE (EXP) == CONST \ + || GET_CODE (EXP) == SYMBOL_REF \ + || GET_CODE (EXP) == LABEL_REF) \ { \ fputs (integer_asm_op (UNITS_PER_WORD, TRUE), FILE); \ s390_output_symbolic_const (FILE, EXP); \ diff --git a/gcc/config/s390/s390.md b/gcc/config/s390/s390.md index 197aa67ebcb..26be40e5906 100644 --- a/gcc/config/s390/s390.md +++ b/gcc/config/s390/s390.md @@ -1,5 +1,5 @@ ;;- Machine description for GNU compiler -- S/390 / zSeries version. -;; Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +;; Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. ;; Contributed by Hartmut Penner (hpenner@de.ibm.com) and ;; Ulrich Weigand (uweigand@de.ibm.com). ;; This file is part of GNU CC. @@ -44,6 +44,34 @@ ;; s_operand -- Matches a valid S operand in a RS, SI or SS type instruction. ;; +;; +;; UNSPEC usage +;; + +(define_constants + [; TLS relocation specifiers + (UNSPEC_TLSGD 500) + (UNSPEC_TLSLDM 501) + (UNSPEC_NTPOFF 502) + (UNSPEC_DTPOFF 503) + (UNSPEC_GOTNTPOFF 504) + (UNSPEC_INDNTPOFF 505) + + ; TLS support + (UNSPEC_TP 510) + (UNSPEC_TLSLDM_NTPOFF 511) + (UNSPEC_TLS_LOAD 512) + ]) + +;; +;; UNSPEC_VOLATILE usage +;; + +(define_constants + [; TLS support + (UNSPECV_SET_TP 500) + ]) + ;; Define an insn type attribute. This is used in function unit delay ;; computations. @@ -500,6 +528,31 @@ "ltr\\t%0,%0" [(set_attr "op_type" "RR")]) +(define_insn "*tsthiCCT" + [(set (reg 33) + (compare (match_operand:HI 0 "nonimmediate_operand" "?Q,d") + (match_operand:HI 1 "const0_operand" ""))) + (set (match_operand:HI 2 "register_operand" "=d,0") + (match_dup 0))] + "s390_match_ccmode(insn, CCTmode)" + "@ + icm\\t%2,3,%0 + tml\\t%0,65535" + [(set_attr "op_type" "RS,RI") + (set_attr "atype" "mem,reg")]) + +(define_insn "*tsthiCCT_cconly" + [(set (reg 33) + (compare (match_operand:HI 0 "nonimmediate_operand" "?Q,d") + (match_operand:HI 1 "const0_operand" ""))) + (clobber (match_scratch:HI 2 "=d,X"))] + "s390_match_ccmode(insn, CCTmode)" + "@ + icm\\t%2,3,%0 + tml\\t%0,65535" + [(set_attr "op_type" "RS,RI") + (set_attr "atype" "mem,reg")]) + (define_insn "*tsthi" [(set (reg 33) (compare (match_operand:HI 0 "s_operand" "Q") @@ -521,6 +574,30 @@ [(set_attr "op_type" "RS") (set_attr "atype" "mem")]) +(define_insn "*tstqiCCT" + [(set (reg 33) + (compare (match_operand:QI 0 "nonimmediate_operand" "?Q,d") + (match_operand:QI 1 "const0_operand" ""))) + (set (match_operand:QI 2 "register_operand" "=d,0") + (match_dup 0))] + "s390_match_ccmode(insn, CCTmode)" + "@ + icm\\t%2,1,%0 + tml\\t%0,255" + [(set_attr "op_type" "RS,RI") + (set_attr "atype" "mem,reg")]) + +(define_insn "*tstqiCCT_cconly" + [(set (reg 33) + (compare (match_operand:QI 0 "nonimmediate_operand" "?Q,d") + (match_operand:QI 1 "const0_operand" "")))] + "s390_match_ccmode(insn, CCTmode)" + "@ + cli\\t%0,0 + tml\\t%0,255" + [(set_attr "op_type" "SI,RI") + (set_attr "atype" "mem,reg")]) + (define_insn "*tstqi" [(set (reg 33) (compare (match_operand:QI 0 "s_operand" "Q") @@ -844,18 +921,15 @@ ; movdi instruction pattern(s). ; -;; If generating PIC code and operands[1] is a symbolic CONST, emit a -;; move to get the address of the symbolic object from the GOT. - (define_expand "movdi" [(set (match_operand:DI 0 "general_operand" "") (match_operand:DI 1 "general_operand" ""))] "" " { - /* Handle PIC symbolic constants. */ - if (TARGET_64BIT && flag_pic && SYMBOLIC_CONST (operands[1])) - emit_pic_move (operands, DImode); + /* Handle symbolic constants. */ + if (TARGET_64BIT && SYMBOLIC_CONST (operands[1])) + emit_symbolic_move (operands); /* During and after reload, we need to force constants to the literal pool ourselves, if necessary. */ @@ -1008,18 +1082,15 @@ ; movsi instruction pattern(s). ; -;; If generating PIC code and operands[1] is a symbolic CONST, emit a -;; move to get the address of the symbolic object from the GOT. - (define_expand "movsi" [(set (match_operand:SI 0 "general_operand" "") (match_operand:SI 1 "general_operand" ""))] "" " { - /* Handle PIC symbolic constants. */ - if (!TARGET_64BIT && flag_pic && SYMBOLIC_CONST (operands[1])) - emit_pic_move (operands, SImode); + /* Handle symbolic constants. */ + if (!TARGET_64BIT && SYMBOLIC_CONST (operands[1])) + emit_symbolic_move (operands); /* expr.c tries to load an effective address using force_reg. This fails because we don't have a @@ -2837,25 +2908,6 @@ ; adddi3 instruction pattern(s). ; -(define_insn "*la_64_cc" - [(set (match_operand:DI 0 "register_operand" "=d") - (match_operand:QI 1 "address_operand" "p")) - (clobber (reg:CC 33))] - "TARGET_64BIT - && preferred_la_operand_p (operands[1], 1)" - "#" - [(set_attr "op_type" "RX") - (set_attr "atype" "mem") - (set_attr "type" "la")]) - -(define_split - [(set (match_operand:DI 0 "register_operand" "") - (match_operand:QI 1 "address_operand" "")) - (clobber (reg:CC 33))] - "TARGET_64BIT && reload_completed - && preferred_la_operand_p (operands[1], 0)" - [(set (match_dup 0) (match_dup 1))]) - (define_insn "*adddi3_sign" [(set (match_operand:DI 0 "register_operand" "=d,d") (plus:DI (sign_extend:DI (match_operand:SI 2 "general_operand" "d,m")) @@ -3025,6 +3077,32 @@ (set_attr "atype" "mem") (set_attr "type" "la")]) +(define_peephole2 + [(parallel + [(set (match_operand:DI 0 "register_operand" "") + (match_operand:QI 1 "address_operand" "")) + (clobber (reg:CC 33))])] + "TARGET_64BIT + && strict_memory_address_p (VOIDmode, operands[1]) + && preferred_la_operand_p (operands[1])" + [(set (match_dup 0) (match_dup 1))] + "") + +(define_peephole2 + [(set (match_operand:DI 0 "register_operand" "") + (match_operand:DI 1 "register_operand" "")) + (parallel + [(set (match_dup 0) + (plus:DI (match_dup 0) + (match_operand:DI 2 "nonmemory_operand" ""))) + (clobber (reg:CC 33))])] + "TARGET_64BIT + && !reg_overlap_mentioned_p (operands[0], operands[2]) + && strict_memory_address_p (VOIDmode, gen_rtx_PLUS (DImode, operands[1], operands[2])) + && preferred_la_operand_p (gen_rtx_PLUS (DImode, operands[1], operands[2]))" + [(set (match_dup 0) (plus:DI (match_dup 1) (match_dup 2)))] + "") + (define_expand "reload_indi" [(parallel [(match_operand:DI 0 "register_operand" "=a") (match_operand:DI 1 "s390_plus_operand" "") @@ -3041,25 +3119,6 @@ ; addsi3 instruction pattern(s). ; -(define_insn "*la_31_cc" - [(set (match_operand:SI 0 "register_operand" "=d") - (match_operand:QI 1 "address_operand" "p")) - (clobber (reg:CC 33))] - "!TARGET_64BIT - && preferred_la_operand_p (operands[1], 1)" - "#" - [(set_attr "op_type" "RX") - (set_attr "atype" "mem") - (set_attr "type" "la")]) - -(define_split - [(set (match_operand:SI 0 "register_operand" "") - (match_operand:QI 1 "address_operand" "")) - (clobber (reg:CC 33))] - "!TARGET_64BIT && reload_completed - && preferred_la_operand_p (operands[1], 0)" - [(set (match_dup 0) (match_dup 1))]) - (define_insn "*addsi3_imm_cc" [(set (reg 33) (compare (plus:SI (match_operand:SI 1 "nonimmediate_operand" "0") @@ -3208,6 +3267,32 @@ (set_attr "atype" "mem") (set_attr "type" "la")]) +(define_peephole2 + [(parallel + [(set (match_operand:SI 0 "register_operand" "") + (match_operand:QI 1 "address_operand" "")) + (clobber (reg:CC 33))])] + "!TARGET_64BIT + && strict_memory_address_p (VOIDmode, operands[1]) + && preferred_la_operand_p (operands[1])" + [(set (match_dup 0) (match_dup 1))] + "") + +(define_peephole2 + [(set (match_operand:SI 0 "register_operand" "") + (match_operand:SI 1 "register_operand" "")) + (parallel + [(set (match_dup 0) + (plus:SI (match_dup 0) + (match_operand:SI 2 "nonmemory_operand" ""))) + (clobber (reg:CC 33))])] + "!TARGET_64BIT + && !reg_overlap_mentioned_p (operands[0], operands[2]) + && strict_memory_address_p (VOIDmode, gen_rtx_PLUS (SImode, operands[1], operands[2])) + && preferred_la_operand_p (gen_rtx_PLUS (SImode, operands[1], operands[2]))" + [(set (match_dup 0) (plus:DI (match_dup 1) (match_dup 2)))] + "") + (define_insn "*la_31_and" [(set (match_operand:SI 0 "register_operand" "=d") (and:SI (match_operand:QI 1 "address_operand" "p") @@ -6452,6 +6537,192 @@ (set_attr "type" "jsr") (set_attr "atype" "mem")]) +;; +;;- Thread-local storage support. +;; + +(define_insn "get_tp_64" + [(set (match_operand:DI 0 "nonimmediate_operand" "=??d,Q") + (unspec:DI [(const_int 0)] UNSPEC_TP))] + "TARGET_64BIT" + "@ + ear\\t%0,%%a0\;sllg\\t%0,%0,32\;ear\\t%0,%%a1 + stam\\t%%a0,%%a1,%0" + [(set_attr "op_type" "NN,RS") + (set_attr "atype" "reg,mem") + (set_attr "type" "o3,*") + (set_attr "length" "14,*")]) + +(define_insn "get_tp_31" + [(set (match_operand:SI 0 "nonimmediate_operand" "=d,Q") + (unspec:SI [(const_int 0)] UNSPEC_TP))] + "!TARGET_64BIT" + "@ + ear\\t%0,%%a0 + stam\\t%%a0,%%a0,%0" + [(set_attr "op_type" "RRE,RS") + (set_attr "atype" "reg,mem")]) + +(define_insn "set_tp_64" + [(unspec_volatile [(match_operand:DI 0 "general_operand" "??d,Q")] UNSPECV_SET_TP) + (clobber (match_scratch:SI 1 "=d,X"))] + "TARGET_64BIT" + "@ + sar\\t%%a1,%0\;srlg\\t%1,%0,32\;sar\\t%%a0,%1 + lam\\t%%a0,%%a1,%0" + [(set_attr "op_type" "NN,RS") + (set_attr "atype" "reg,mem") + (set_attr "type" "o3,*") + (set_attr "length" "14,*")]) + +(define_insn "set_tp_31" + [(unspec_volatile [(match_operand:SI 0 "general_operand" "d,Q")] UNSPECV_SET_TP)] + "!TARGET_64BIT" + "@ + sar\\t%%a0,%0 + lam\\t%%a0,%%a0,%0" + [(set_attr "op_type" "RRE,RS") + (set_attr "atype" "reg,mem")]) + +(define_insn "*tls_load_64" + [(set (match_operand:DI 0 "register_operand" "=d") + (unspec:DI [(match_operand:DI 1 "memory_operand" "m") + (match_operand:DI 2 "" "")] + UNSPEC_TLS_LOAD))] + "TARGET_64BIT" + "lg\\t%0,%1%J2" + [(set_attr "op_type" "RXE") + (set_attr "atype" "mem")]) + +(define_insn "*tls_load_31" + [(set (match_operand:SI 0 "register_operand" "=d") + (unspec:SI [(match_operand:SI 1 "memory_operand" "m") + (match_operand:SI 2 "" "")] + UNSPEC_TLS_LOAD))] + "!TARGET_64BIT" + "l\\t%0,%1%J2" + [(set_attr "op_type" "RX") + (set_attr "atype" "mem")]) + +(define_expand "call_value_tls" + [(set (match_operand 0 "" "") + (call (const_int 0) (const_int 0))) + (use (match_operand 1 "" ""))] + "" + " +{ + rtx insn, sym; + + if (!flag_pic) + abort (); + + sym = s390_tls_get_offset (); + sym = gen_rtx_UNSPEC (Pmode, gen_rtvec (1, sym), 113); + sym = gen_rtx_CONST (Pmode, sym); + + /* Unless we can use the bras(l) insn, force the + routine address into a register. */ + if (!TARGET_SMALL_EXEC && !TARGET_64BIT) + { + rtx target = gen_reg_rtx (Pmode); + emit_move_insn (target, sym); + sym = target; + } + + sym = gen_rtx_MEM (QImode, sym); + + /* Emit insn. */ + insn = emit_call_insn ( + gen_call_value_tls_exp (operands[0], sym, const0_rtx, + gen_rtx_REG (Pmode, RETURN_REGNUM), + operands[1])); + + /* The calling convention of __tls_get_offset uses the + GOT register implicitly. */ + use_reg (&CALL_INSN_FUNCTION_USAGE (insn), pic_offset_table_rtx); + use_reg (&CALL_INSN_FUNCTION_USAGE (insn), operands[0]); + CONST_OR_PURE_CALL_P (insn) = 1; + + DONE; +}") + +(define_expand "call_value_tls_exp" + [(parallel [(set (match_operand 0 "" "") + (call (match_operand 1 "" "") + (match_operand 2 "" ""))) + (clobber (match_operand 3 "" "")) + (use (match_operand 4 "" ""))])] + "" + "") + +(define_insn "brasl_tls" + [(set (match_operand 0 "register_operand" "=df") + (call (mem:QI (match_operand:DI 1 "bras_sym_operand" "X")) + (match_operand:SI 2 "const_int_operand" "n"))) + (clobber (match_operand:DI 3 "register_operand" "=r")) + (use (match_operand:DI 4 "" ""))] + "TARGET_64BIT" + "brasl\\t%3,%1%J4" + [(set_attr "op_type" "RIL") + (set_attr "type" "jsr")]) + +(define_insn "bras_tls" + [(set (match_operand 0 "register_operand" "=df") + (call (mem:QI (match_operand:SI 1 "bras_sym_operand" "X")) + (match_operand:SI 2 "const_int_operand" "n"))) + (clobber (match_operand:SI 3 "register_operand" "=r")) + (use (match_operand:SI 4 "" ""))] + "TARGET_SMALL_EXEC" + "bras\\t%3,%1%J4" + [(set_attr "op_type" "RI") + (set_attr "type" "jsr")]) + +(define_insn "basr_tls_64" + [(set (match_operand 0 "register_operand" "=df") + (call (mem:QI (match_operand:DI 1 "register_operand" "a")) + (match_operand:SI 2 "const_int_operand" "n"))) + (clobber (match_operand:DI 3 "register_operand" "=r")) + (use (match_operand:DI 4 "" ""))] + "TARGET_64BIT" + "basr\\t%3,%1%J4" + [(set_attr "op_type" "RR") + (set_attr "type" "jsr")]) + +(define_insn "basr_tls_31" + [(set (match_operand 0 "register_operand" "=df") + (call (mem:QI (match_operand:SI 1 "register_operand" "a")) + (match_operand:SI 2 "const_int_operand" "n"))) + (clobber (match_operand:SI 3 "register_operand" "=r")) + (use (match_operand:SI 4 "" ""))] + "!TARGET_64BIT" + "basr\\t%3,%1%J4" + [(set_attr "op_type" "RR") + (set_attr "type" "jsr") + (set_attr "atype" "mem")]) + +(define_insn "bas_tls_64" + [(set (match_operand 0 "register_operand" "=df") + (call (mem:QI (match_operand:QI 1 "address_operand" "p")) + (match_operand:SI 2 "const_int_operand" "n"))) + (clobber (match_operand:DI 3 "register_operand" "=r")) + (use (match_operand:DI 4 "" ""))] + "TARGET_64BIT" + "bas\\t%3,%a1%J4" + [(set_attr "op_type" "RX") + (set_attr "type" "jsr") + (set_attr "atype" "mem")]) + +(define_insn "bas_tls_31" + [(set (match_operand 0 "register_operand" "=df") + (call (mem:QI (match_operand:QI 1 "address_operand" "p")) + (match_operand:SI 2 "const_int_operand" "n"))) + (clobber (match_operand:SI 3 "register_operand" "=r")) + (use (match_operand:SI 4 "" ""))] + "!TARGET_64BIT" + "bas\\t%3,%a1%J4" + [(set_attr "op_type" "RX") + (set_attr "type" "jsr") + (set_attr "atype" "mem")]) ;; ;;- Miscellaneous instructions. diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c index 75c9d263bfa..199dd30f70f 100644 --- a/gcc/config/sh/sh.c +++ b/gcc/config/sh/sh.c @@ -7355,14 +7355,14 @@ sh_initialize_trampoline (tramp, fnaddr, cxt) emit_insn (gen_mshflo_w_x (gen_rtx_SUBREG (V4HImode, quad0, 0), gen_rtx_SUBREG (V2HImode, fnaddr, 0), movishori)); - emit_insn (gen_rotldi3_mextr (quad0, quad0, + emit_insn (gen_rotrdi3_mextr (quad0, quad0, GEN_INT (TARGET_LITTLE_ENDIAN ? 24 : 56))); emit_insn (gen_ashldi3_media (quad0, quad0, GEN_INT (2))); emit_move_insn (gen_rtx_MEM (DImode, tramp), quad0); emit_insn (gen_mshflo_w_x (gen_rtx_SUBREG (V4HImode, cxtload, 0), gen_rtx_SUBREG (V2HImode, cxt, 0), movishori)); - emit_insn (gen_rotldi3_mextr (cxtload, cxtload, + emit_insn (gen_rotrdi3_mextr (cxtload, cxtload, GEN_INT (TARGET_LITTLE_ENDIAN ? 24 : 56))); emit_insn (gen_ashldi3_media (cxtload, cxtload, GEN_INT (2))); if (TARGET_LITTLE_ENDIAN) diff --git a/gcc/config/sh/sh.h b/gcc/config/sh/sh.h index 57ebbb311af..38183adc9fc 100644 --- a/gcc/config/sh/sh.h +++ b/gcc/config/sh/sh.h @@ -2574,7 +2574,7 @@ while (0) /* Specify the machine mode that this machine uses for the index in the tablejump instruction. */ -#define CASE_VECTOR_MODE (TARGET_BIGTABLE ? SImode : HImode) +#define CASE_VECTOR_MODE ((! optimize || TARGET_BIGTABLE) ? SImode : HImode) #define CASE_VECTOR_SHORTEN_MODE(MIN_OFFSET, MAX_OFFSET, BODY) \ ((MIN_OFFSET) >= 0 && (MAX_OFFSET) <= 127 \ @@ -3047,7 +3047,7 @@ while (0) /* Output an absolute table element. */ #define ASM_OUTPUT_ADDR_VEC_ELT(STREAM,VALUE) \ - if (TARGET_BIGTABLE) \ + if (! optimize || TARGET_BIGTABLE) \ asm_fprintf ((STREAM), "\t.long\t%LL%d\n", (VALUE)); \ else \ asm_fprintf ((STREAM), "\t.word\t%LL%d\n", (VALUE)); diff --git a/gcc/config/t-slibgcc-elf-ver b/gcc/config/t-slibgcc-elf-ver index c02ff9d6b7c..a176b10fa0a 100644 --- a/gcc/config/t-slibgcc-elf-ver +++ b/gcc/config/t-slibgcc-elf-ver @@ -19,11 +19,11 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ # $(slibdir) double quoted to protect it from expansion while building # libgcc.mk. We want this delayed until actual install time. SHLIB_INSTALL = \ - $$(SHELL) $$(srcdir)/mkinstalldirs $$(slibdir)$(SHLIB_SLIBDIR_QUAL); \ + $$(SHELL) $$(srcdir)/mkinstalldirs $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL); \ $(INSTALL_DATA) $(SHLIB_NAME) \ - $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \ - rm -f $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \ + $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \ + rm -f $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \ $(LN_S) $(SHLIB_SONAME) \ - $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK) + $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK) SHLIB_MKMAP = $(srcdir)/mkmap-symver.awk SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver diff --git a/gcc/config/t-slibgcc-sld b/gcc/config/t-slibgcc-sld index c11a5721966..6bdd521da1b 100644 --- a/gcc/config/t-slibgcc-sld +++ b/gcc/config/t-slibgcc-sld @@ -17,11 +17,11 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \ # $(slibdir) double quoted to protect it from expansion while building # libgcc.mk. We want this delayed until actual install time. SHLIB_INSTALL = \ - $$(SHELL) $$(srcdir)/mkinstalldirs $$(slibdir)$(SHLIB_SLIBDIR_QUAL); \ + $$(SHELL) $$(srcdir)/mkinstalldirs $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL); \ $(INSTALL_DATA) $(SHLIB_NAME) \ - $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \ - rm -f $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \ + $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \ + rm -f $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \ $(LN_S) $(SHLIB_SONAME) \ - $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK) + $$(DESTDIR)$$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK) SHLIB_MKMAP = $(srcdir)/mkmap-symver.awk SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver diff --git a/gcc/configure b/gcc/configure index 7c20fad4b86..5497c071ffb 100755 --- a/gcc/configure +++ b/gcc/configure @@ -1291,10 +1291,7 @@ procedure conftest is begin null; end conftest; EOF gcc_cv_prog_adac=no # Have to do ac_tool_prefix and user overrides by hand. -user_adac=$ADAC -user_cc=$CC -for cand in ${ac_tool_prefix}$user_adac $user_adac \ - ${ac_tool_prefix}$user_cc $user_cc \ +for cand in ${ADAC+"$ADAC"} ${CC+"$CC"} \ ${ac_tool_prefix}gcc gcc \ ${ac_tool_prefix}cc cc \ ${ac_tool_prefix}gnatgcc gnatgcc \ @@ -1327,21 +1324,21 @@ fi echo $ac_n "checking whether ${CC-cc} accepts -Wno-long-long""... $ac_c" 1>&6 -echo "configure:1331: checking whether ${CC-cc} accepts -Wno-long-long" >&5 +echo "configure:1328: checking whether ${CC-cc} accepts -Wno-long-long" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_no_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else save_CFLAGS="$CFLAGS" CFLAGS="-Wno-long-long" cat > conftest.$ac_ext <<EOF -#line 1338 "configure" +#line 1335 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:1345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1342: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_prog_cc_no_long_long=yes else @@ -1358,7 +1355,7 @@ echo "$ac_t""$ac_cv_prog_cc_no_long_long" 1>&6 if test x$have_gnat != xno ; then echo $ac_n "checking whether ${ADAC} accepts -Wno-long-long""... $ac_c" 1>&6 -echo "configure:1362: checking whether ${ADAC} accepts -Wno-long-long" >&5 +echo "configure:1359: checking whether ${ADAC} accepts -Wno-long-long" >&5 if eval "test \"`echo '$''{'ac_cv_prog_adac_no_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1386,7 +1383,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1390: checking how to run the C preprocessor" >&5 +echo "configure:1387: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1401,13 +1398,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1405 "configure" +#line 1402 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1411: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1408: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1418,13 +1415,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1422 "configure" +#line 1419 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1425: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1435,13 +1432,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1439 "configure" +#line 1436 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1442: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1466,21 +1463,21 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:1470: checking for inline" >&5 +echo "configure:1467: checking for inline" >&5 if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 1477 "configure" +#line 1474 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:1484: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -1506,19 +1503,19 @@ EOF esac echo $ac_n "checking for volatile""... $ac_c" 1>&6 -echo "configure:1510: checking for volatile" >&5 +echo "configure:1507: checking for volatile" >&5 if eval "test \"`echo '$''{'gcc_cv_c_volatile'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1515 "configure" +#line 1512 "configure" #include "confdefs.h" int main() { volatile int foo; ; return 0; } EOF -if { (eval echo configure:1522: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_c_volatile=yes else @@ -1540,7 +1537,7 @@ fi echo $ac_n "checking for long double""... $ac_c" 1>&6 -echo "configure:1544: checking for long double" >&5 +echo "configure:1541: checking for long double" >&5 if eval "test \"`echo '$''{'gcc_cv_c_long_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1548,7 +1545,7 @@ else gcc_cv_c_long_double=yes else cat > conftest.$ac_ext <<EOF -#line 1552 "configure" +#line 1549 "configure" #include "confdefs.h" int main() { @@ -1558,7 +1555,7 @@ long double foo = 0.0; switch (0) case 0: case (sizeof(long double) >= sizeof(double)):; ; return 0; } EOF -if { (eval echo configure:1562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_c_long_double=yes else @@ -1580,19 +1577,19 @@ EOF fi echo $ac_n "checking for long long int""... $ac_c" 1>&6 -echo "configure:1584: checking for long long int" >&5 +echo "configure:1581: checking for long long int" >&5 if eval "test \"`echo '$''{'ac_cv_c_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1589 "configure" +#line 1586 "configure" #include "confdefs.h" int main() { long long int i; ; return 0; } EOF -if { (eval echo configure:1596: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1593: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_long_long=yes else @@ -1612,19 +1609,19 @@ EOF fi echo $ac_n "checking for __int64""... $ac_c" 1>&6 -echo "configure:1616: checking for __int64" >&5 +echo "configure:1613: checking for __int64" >&5 if eval "test \"`echo '$''{'ac_cv_c___int64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1621 "configure" +#line 1618 "configure" #include "confdefs.h" int main() { __int64 i; ; return 0; } EOF -if { (eval echo configure:1628: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1625: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c___int64=yes else @@ -1645,19 +1642,19 @@ EOF fi echo $ac_n "checking for built-in _Bool""... $ac_c" 1>&6 -echo "configure:1649: checking for built-in _Bool" >&5 +echo "configure:1646: checking for built-in _Bool" >&5 if eval "test \"`echo '$''{'gcc_cv_c__bool'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1654 "configure" +#line 1651 "configure" #include "confdefs.h" int main() { _Bool foo; ; return 0; } EOF -if { (eval echo configure:1661: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_c__bool=yes else @@ -1681,13 +1678,13 @@ fi # sizeof(char) is 1 by definition. echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:1685: checking size of short" >&5 +echo "configure:1682: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext <<EOF -#line 1691 "configure" +#line 1688 "configure" #include "confdefs.h" #include "confdefs.h" #include <sys/types.h> @@ -1697,7 +1694,7 @@ int main() { switch (0) case 0: case (sizeof (short) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:1701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_short=$ac_size else @@ -1720,13 +1717,13 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:1724: checking size of int" >&5 +echo "configure:1721: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext <<EOF -#line 1730 "configure" +#line 1727 "configure" #include "confdefs.h" #include "confdefs.h" #include <sys/types.h> @@ -1736,7 +1733,7 @@ int main() { switch (0) case 0: case (sizeof (int) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:1740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_int=$ac_size else @@ -1759,13 +1756,13 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:1763: checking size of long" >&5 +echo "configure:1760: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext <<EOF -#line 1769 "configure" +#line 1766 "configure" #include "confdefs.h" #include "confdefs.h" #include <sys/types.h> @@ -1775,7 +1772,7 @@ int main() { switch (0) case 0: case (sizeof (long) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:1779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_long=$ac_size else @@ -1799,13 +1796,13 @@ EOF if test $ac_cv_c_long_long = yes; then echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:1803: checking size of long long" >&5 +echo "configure:1800: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext <<EOF -#line 1809 "configure" +#line 1806 "configure" #include "confdefs.h" #include "confdefs.h" #include <sys/types.h> @@ -1815,7 +1812,7 @@ int main() { switch (0) case 0: case (sizeof (long long) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:1819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_long_long=$ac_size else @@ -1840,13 +1837,13 @@ EOF fi if test $ac_cv_c___int64 = yes; then echo $ac_n "checking size of __int64""... $ac_c" 1>&6 -echo "configure:1844: checking size of __int64" >&5 +echo "configure:1841: checking size of __int64" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof___int64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext <<EOF -#line 1850 "configure" +#line 1847 "configure" #include "confdefs.h" #include "confdefs.h" #include <sys/types.h> @@ -1856,7 +1853,7 @@ int main() { switch (0) case 0: case (sizeof (__int64) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:1860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof___int64=$ac_size else @@ -1881,12 +1878,12 @@ EOF fi echo $ac_n "checking execution character set""... $ac_c" 1>&6 -echo "configure:1885: checking execution character set" >&5 +echo "configure:1882: checking execution character set" >&5 if eval "test \"`echo '$''{'ac_cv_c_charset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1890 "configure" +#line 1887 "configure" #include "confdefs.h" #if '\n' == 0x0A && ' ' == 0x20 && '0' == 0x30 \ && 'A' == 0x41 && 'a' == 0x61 && '!' == 0x21 @@ -1902,7 +1899,7 @@ rm -f conftest* if test x${ac_cv_c_charset+set} != xset; then cat > conftest.$ac_ext <<EOF -#line 1906 "configure" +#line 1903 "configure" #include "confdefs.h" #if '\n' == 0x15 && ' ' == 0x40 && '0' == 0xF0 \ && 'A' == 0xC1 && 'a' == 0x81 && '!' == 0x5A @@ -1985,9 +1982,6 @@ no) ;; ;; esac -else - # Enable some checks by default for development versions of GCC -ac_checking=1; ac_tree_checking=1; ac_gc_checking=1; ac_rtlflag_checking=1; fi nocommon_flag="" @@ -2036,17 +2030,17 @@ if test x$ac_checking_valgrind != x ; then # GCC relies on making annotations so we must have both. ac_safe=`echo "valgrind.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for valgrind.h""... $ac_c" 1>&6 -echo "configure:2040: checking for valgrind.h" >&5 +echo "configure:2034: checking for valgrind.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2045 "configure" +#line 2039 "configure" #include "confdefs.h" #include <valgrind.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2050: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2071,7 +2065,7 @@ fi # Extract the first word of "valgrind", so it can be a program name with args. set dummy valgrind; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2075: checking for $ac_word" >&5 +echo "configure:2069: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_valgrind_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2274,7 +2268,7 @@ esac echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:2278: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:2272: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2302,7 +2296,7 @@ fi echo $ac_n "checking whether a default assembler was specified""... $ac_c" 1>&6 -echo "configure:2306: checking whether a default assembler was specified" >&5 +echo "configure:2300: checking whether a default assembler was specified" >&5 if test x"${DEFAULT_ASSEMBLER+set}" = x"set"; then if test x"$gas_flag" = x"no"; then echo "$ac_t""yes ($DEFAULT_ASSEMBLER)" 1>&6 @@ -2314,7 +2308,7 @@ else fi echo $ac_n "checking whether a default linker was specified""... $ac_c" 1>&6 -echo "configure:2318: checking whether a default linker was specified" >&5 +echo "configure:2312: checking whether a default linker was specified" >&5 if test x"${DEFAULT_LINKER+set}" = x"set"; then if test x"$gnu_ld_flag" = x"no"; then echo "$ac_t""yes ($DEFAULT_LINKER)" 1>&6 @@ -2326,12 +2320,12 @@ else fi echo $ac_n "checking for GNU C library""... $ac_c" 1>&6 -echo "configure:2330: checking for GNU C library" >&5 +echo "configure:2324: checking for GNU C library" >&5 if eval "test \"`echo '$''{'gcc_cv_glibc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2335 "configure" +#line 2329 "configure" #include "confdefs.h" #include <features.h> int main() { @@ -2341,7 +2335,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:2345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_glibc=yes else @@ -2362,12 +2356,12 @@ EOF fi # Find some useful tools -for ac_prog in gawk mawk nawk awk +for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2371: checking for $ac_word" >&5 +echo "configure:2365: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2397,7 +2391,7 @@ test -n "$AWK" && break done echo $ac_n "checking whether ln works""... $ac_c" 1>&6 -echo "configure:2401: checking whether ln works" >&5 +echo "configure:2395: checking whether ln works" >&5 if eval "test \"`echo '$''{'gcc_cv_prog_LN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2429,7 +2423,7 @@ else fi echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:2433: checking whether ln -s works" >&5 +echo "configure:2427: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'gcc_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2463,7 +2457,7 @@ fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2467: checking for $ac_word" >&5 +echo "configure:2461: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2501,7 +2495,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:2505: checking for a BSD compatible install" >&5 +echo "configure:2499: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2552,12 +2546,12 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2556: checking for ANSI C header files" >&5 +echo "configure:2550: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2561 "configure" +#line 2555 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -2565,7 +2559,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2563: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2582,7 +2576,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 2586 "configure" +#line 2580 "configure" #include "confdefs.h" #include <string.h> EOF @@ -2600,7 +2594,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 2604 "configure" +#line 2598 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -2621,7 +2615,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 2625 "configure" +#line 2619 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2632,7 +2626,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2656,12 +2650,12 @@ EOF fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2660: checking whether time.h and sys/time.h may both be included" >&5 +echo "configure:2654: checking whether time.h and sys/time.h may both be included" >&5 if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2665 "configure" +#line 2659 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -2670,7 +2664,7 @@ int main() { struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2691,19 +2685,19 @@ EOF fi echo $ac_n "checking for working stdbool.h""... $ac_c" 1>&6 -echo "configure:2695: checking for working stdbool.h" >&5 +echo "configure:2689: checking for working stdbool.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdbool_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2700 "configure" +#line 2694 "configure" #include "confdefs.h" #include <stdbool.h> int main() { bool foo = false; ; return 0; } EOF -if { (eval echo configure:2707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_stdbool_h=yes else @@ -2724,12 +2718,12 @@ EOF fi echo $ac_n "checking whether string.h and strings.h may both be included""... $ac_c" 1>&6 -echo "configure:2728: checking whether string.h and strings.h may both be included" >&5 +echo "configure:2722: checking whether string.h and strings.h may both be included" >&5 if eval "test \"`echo '$''{'gcc_cv_header_string'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2733 "configure" +#line 2727 "configure" #include "confdefs.h" #include <string.h> #include <strings.h> @@ -2737,7 +2731,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:2741: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2735: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_header_string=yes else @@ -2758,12 +2752,12 @@ EOF fi echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:2762: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:2756: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2767 "configure" +#line 2761 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -2779,7 +2773,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:2783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -2806,17 +2800,17 @@ for ac_hdr in limits.h stddef.h string.h strings.h stdlib.h time.h \ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2810: checking for $ac_hdr" >&5 +echo "configure:2804: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2815 "configure" +#line 2809 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2820: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2814: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2846,17 +2840,17 @@ done # Check for thread headers. ac_safe=`echo "thread.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for thread.h""... $ac_c" 1>&6 -echo "configure:2850: checking for thread.h" >&5 +echo "configure:2844: checking for thread.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2855 "configure" +#line 2849 "configure" #include "confdefs.h" #include <thread.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2880,17 +2874,17 @@ fi ac_safe=`echo "pthread.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for pthread.h""... $ac_c" 1>&6 -echo "configure:2884: checking for pthread.h" >&5 +echo "configure:2878: checking for pthread.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2889 "configure" +#line 2883 "configure" #include "confdefs.h" #include <pthread.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2894: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2915,12 +2909,12 @@ fi # These tests can't be done till we know if we have limits.h. echo $ac_n "checking for CHAR_BIT""... $ac_c" 1>&6 -echo "configure:2919: checking for CHAR_BIT" >&5 +echo "configure:2913: checking for CHAR_BIT" >&5 if eval "test \"`echo '$''{'gcc_cv_decl_char_bit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2924 "configure" +#line 2918 "configure" #include "confdefs.h" #ifdef HAVE_LIMITS_H #include <limits.h> @@ -2945,7 +2939,7 @@ fi echo "$ac_t""$gcc_cv_decl_char_bit" 1>&6 if test $gcc_cv_decl_char_bit = no; then echo $ac_n "checking number of bits in a byte""... $ac_c" 1>&6 -echo "configure:2949: checking number of bits in a byte" >&5 +echo "configure:2943: checking number of bits in a byte" >&5 if eval "test \"`echo '$''{'gcc_cv_c_nbby'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2953,7 +2947,7 @@ else gcc_cv_c_nbby= while test $i -lt 65; do cat > conftest.$ac_ext <<EOF -#line 2957 "configure" +#line 2951 "configure" #include "confdefs.h" int main() { @@ -2963,7 +2957,7 @@ switch(0) { ; } ; return 0; } EOF -if { (eval echo configure:2967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_c_nbby=$i; break else @@ -2988,7 +2982,7 @@ EOF fi fi echo $ac_n "checking byte ordering""... $ac_c" 1>&6 -echo "configure:2992: checking byte ordering" >&5 +echo "configure:2986: checking byte ordering" >&5 if eval "test \"`echo '$''{'ac_cv_c_compile_endian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3002,7 +2996,7 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 3006 "configure" +#line 3000 "configure" #include "confdefs.h" #ifdef HAVE_LIMITS_H @@ -3022,7 +3016,7 @@ cat > conftest.$ac_ext <<EOF 'X', '\n' }; EOF -if { (eval echo configure:3026: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3020: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then od -c conftest.o | sed 's/^[0-7]*[ ]*/ / s/\*/./g @@ -3061,7 +3055,7 @@ EOF fi echo $ac_n "checking floating point format""... $ac_c" 1>&6 -echo "configure:3065: checking floating point format" >&5 +echo "configure:3059: checking floating point format" >&5 if eval "test \"`echo '$''{'ac_cv_c_float_format'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3074,7 +3068,7 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 3078 "configure" +#line 3072 "configure" #include "confdefs.h" /* This will not work unless sizeof(double) == 8. */ extern char sizeof_double_must_be_8 [sizeof(double) == 8 ? 1 : -1]; @@ -3096,7 +3090,7 @@ struct possibility table [] = C(-5.22995989424860458374e+10) /* IBMHEXFP - s/390 format, EBCDIC */ }; EOF -if { (eval echo configure:3100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3094: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then od -c conftest.o | sed 's/^[0-7]*[ ]*/ / s/\*/./g @@ -3185,7 +3179,7 @@ fi # Extract the first word of "mktemp", so it can be a program name with args. set dummy mktemp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3189: checking for $ac_word" >&5 +echo "configure:3183: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_have_mktemp_command'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3224,7 +3218,7 @@ else # Extract the first word of "makeinfo", so it can be a program name with args. set dummy makeinfo; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3228: checking for $ac_word" >&5 +echo "configure:3222: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3253,16 +3247,16 @@ fi if test -n "$MAKEINFO"; then # Found it, now check the version. echo $ac_n "checking for modern makeinfo""... $ac_c" 1>&6 -echo "configure:3257: checking for modern makeinfo" >&5 +echo "configure:3251: checking for modern makeinfo" >&5 if eval "test \"`echo '$''{'gcc_cv_prog_makeinfo_modern'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_prog_version=`$MAKEINFO --version 2>&1 | sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'` - echo "configure:3263: version of makeinfo is $ac_prog_version" >&5 + echo "configure:3257: version of makeinfo is $ac_prog_version" >&5 case $ac_prog_version in '') gcc_cv_prog_makeinfo_modern=no;; - 4.[1-9]*) + 4.[2-9]*) gcc_cv_prog_makeinfo_modern=yes;; *) gcc_cv_prog_makeinfo_modern=no;; esac @@ -3287,7 +3281,7 @@ fi # Is pod2man recent enough to regenerate manpages? echo $ac_n "checking for recent Pod::Man""... $ac_c" 1>&6 -echo "configure:3291: checking for recent Pod::Man" >&5 +echo "configure:3285: checking for recent Pod::Man" >&5 if (perl -e 'use 1.10 Pod::Man') >/dev/null 2>&1; then echo "$ac_t""yes" 1>&6 GENERATED_MANPAGES=generated-manpages @@ -3303,7 +3297,7 @@ else # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3307: checking for $ac_word" >&5 +echo "configure:3301: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_FLEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3340,7 +3334,7 @@ else # Extract the first word of "bison", so it can be a program name with args. set dummy bison; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3344: checking for $ac_word" >&5 +echo "configure:3338: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_BISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3372,7 +3366,7 @@ fi # These libraries may be used by collect2. # We may need a special search path to get them linked. echo $ac_n "checking for collect2 libraries""... $ac_c" 1>&6 -echo "configure:3376: checking for collect2 libraries" >&5 +echo "configure:3370: checking for collect2 libraries" >&5 if eval "test \"`echo '$''{'gcc_cv_collect2_libs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3383,7 +3377,7 @@ for libs in '' -lld -lmld \ do LIBS="$libs" cat > conftest.$ac_ext <<EOF -#line 3387 "configure" +#line 3381 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3394,7 +3388,7 @@ int main() { ldopen() ; return 0; } EOF -if { (eval echo configure:3398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gcc_cv_collect2_libs="$libs"; break else @@ -3420,14 +3414,14 @@ save_LIBS="$LIBS" LIBS= echo $ac_n "checking for library containing exc_resume""... $ac_c" 1>&6 -echo "configure:3424: checking for library containing exc_resume" >&5 +echo "configure:3418: checking for library containing exc_resume" >&5 if eval "test \"`echo '$''{'ac_cv_search_exc_resume'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_exc_resume="no" cat > conftest.$ac_ext <<EOF -#line 3431 "configure" +#line 3425 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3438,7 +3432,7 @@ int main() { exc_resume() ; return 0; } EOF -if { (eval echo configure:3442: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_exc_resume="none required" else @@ -3449,7 +3443,7 @@ rm -f conftest* test "$ac_cv_search_exc_resume" = "no" && for i in exc; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 3453 "configure" +#line 3447 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3460,7 +3454,7 @@ int main() { exc_resume() ; return 0; } EOF -if { (eval echo configure:3464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_exc_resume="-l$i" break @@ -3489,12 +3483,12 @@ LIBS="$save_LIBS" echo $ac_n "checking for preprocessor stringizing operator""... $ac_c" 1>&6 -echo "configure:3493: checking for preprocessor stringizing operator" >&5 +echo "configure:3487: checking for preprocessor stringizing operator" >&5 if eval "test \"`echo '$''{'ac_cv_c_stringize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3498 "configure" +#line 3492 "configure" #include "confdefs.h" #define x(y) #y @@ -3527,12 +3521,12 @@ echo "$ac_t""${ac_cv_c_stringize}" 1>&6 # Use <inttypes.h> only if it exists, # doesn't clash with <sys/types.h>, and declares intmax_t. echo $ac_n "checking for inttypes.h""... $ac_c" 1>&6 -echo "configure:3531: checking for inttypes.h" >&5 +echo "configure:3525: checking for inttypes.h" >&5 if eval "test \"`echo '$''{'gcc_cv_header_inttypes_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3536 "configure" +#line 3530 "configure" #include "confdefs.h" #include <sys/types.h> #include <inttypes.h> @@ -3540,7 +3534,7 @@ int main() { intmax_t i = -1; ; return 0; } EOF -if { (eval echo configure:3544: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_header_inttypes_h=yes else @@ -3567,12 +3561,12 @@ for ac_func in times clock dup2 kill getrlimit setrlimit atoll atoq \ scandir alphasort do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3571: checking for $ac_func" >&5 +echo "configure:3565: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3576 "configure" +#line 3570 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3595,7 +3589,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3621,12 +3615,12 @@ done echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:3625: checking for ssize_t" >&5 +echo "configure:3619: checking for ssize_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3630 "configure" +#line 3624 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3657,12 +3651,12 @@ fi # Try to determine the array type of the second argument of getgroups # for the target system (int or gid_t). echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:3661: checking for uid_t in sys/types.h" >&5 +echo "configure:3655: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3666 "configure" +#line 3660 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -3691,7 +3685,7 @@ EOF fi echo $ac_n "checking type of array argument to getgroups""... $ac_c" 1>&6 -echo "configure:3695: checking type of array argument to getgroups" >&5 +echo "configure:3689: checking type of array argument to getgroups" >&5 if eval "test \"`echo '$''{'ac_cv_type_getgroups'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3699,7 +3693,7 @@ else ac_cv_type_getgroups=cross else cat > conftest.$ac_ext <<EOF -#line 3703 "configure" +#line 3697 "configure" #include "confdefs.h" /* Thanks to Mike Rendell for this test. */ @@ -3724,7 +3718,7 @@ main() } EOF -if { (eval echo configure:3728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_type_getgroups=gid_t else @@ -3738,7 +3732,7 @@ fi if test $ac_cv_type_getgroups = cross; then cat > conftest.$ac_ext <<EOF -#line 3742 "configure" +#line 3736 "configure" #include "confdefs.h" #include <unistd.h> EOF @@ -3779,7 +3773,7 @@ fi echo $ac_n "checking whether the printf functions support %p""... $ac_c" 1>&6 -echo "configure:3783: checking whether the printf functions support %p" >&5 +echo "configure:3777: checking whether the printf functions support %p" >&5 if eval "test \"`echo '$''{'gcc_cv_func_printf_ptr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3787,7 +3781,7 @@ else gcc_cv_func_printf_ptr=no else cat > conftest.$ac_ext <<EOF -#line 3791 "configure" +#line 3785 "configure" #include "confdefs.h" #include <stdio.h> @@ -3800,7 +3794,7 @@ int main() return (p != q); } EOF -if { (eval echo configure:3804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then gcc_cv_func_printf_ptr=yes else @@ -3838,12 +3832,12 @@ case "${host}" in ;; esac echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:3842: checking for pid_t" >&5 +echo "configure:3836: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3847 "configure" +#line 3841 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3872,17 +3866,17 @@ fi ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:3876: checking for vfork.h" >&5 +echo "configure:3870: checking for vfork.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3881 "configure" +#line 3875 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3907,18 +3901,18 @@ else fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:3911: checking for working vfork" >&5 +echo "configure:3905: checking for working vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then echo $ac_n "checking for vfork""... $ac_c" 1>&6 -echo "configure:3917: checking for vfork" >&5 +echo "configure:3911: checking for vfork" >&5 if eval "test \"`echo '$''{'ac_cv_func_vfork'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3922 "configure" +#line 3916 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char vfork(); below. */ @@ -3941,7 +3935,7 @@ vfork(); ; return 0; } EOF -if { (eval echo configure:3945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_vfork=yes" else @@ -3963,7 +3957,7 @@ fi ac_cv_func_vfork_works=$ac_cv_func_vfork else cat > conftest.$ac_ext <<EOF -#line 3967 "configure" +#line 3961 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -4058,7 +4052,7 @@ main() { } } EOF -if { (eval echo configure:4062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4056: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_vfork_works=yes else @@ -4083,12 +4077,12 @@ fi for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4087: checking for $ac_func" >&5 +echo "configure:4081: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4092 "configure" +#line 4086 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4111,7 +4105,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4382,7 +4376,7 @@ main () EOF echo $ac_n "checking for working mmap from /dev/zero""... $ac_c" 1>&6 -echo "configure:4386: checking for working mmap from /dev/zero" >&5 +echo "configure:4380: checking for working mmap from /dev/zero" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_dev_zero'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4397,11 +4391,11 @@ else esac else cat > conftest.$ac_ext <<EOF -#line 4401 "configure" +#line 4395 "configure" #include "confdefs.h" #include "ct-mmap.inc" EOF -if { (eval echo configure:4405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_dev_zero=yes else @@ -4428,7 +4422,7 @@ EOF fi echo $ac_n "checking for working mmap with MAP_ANON(YMOUS)""... $ac_c" 1>&6 -echo "configure:4432: checking for working mmap with MAP_ANON(YMOUS)" >&5 +echo "configure:4426: checking for working mmap with MAP_ANON(YMOUS)" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_anon'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4441,12 +4435,12 @@ else esac else cat > conftest.$ac_ext <<EOF -#line 4445 "configure" +#line 4439 "configure" #include "confdefs.h" #define USE_MAP_ANON #include "ct-mmap.inc" EOF -if { (eval echo configure:4450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_anon=yes else @@ -4474,7 +4468,7 @@ fi rm -f ct-mmap.inc echo $ac_n "checking for working mmap of a file""... $ac_c" 1>&6 -echo "configure:4478: checking for working mmap of a file" >&5 +echo "configure:4472: checking for working mmap of a file" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_file'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4492,7 +4486,7 @@ if test "$cross_compiling" = yes; then esac else cat > conftest.$ac_ext <<EOF -#line 4496 "configure" +#line 4490 "configure" #include "confdefs.h" /* Test by Zack Weinberg. Modified from MMAP_ANYWHERE test by @@ -4529,7 +4523,7 @@ int main() exit(0); } EOF -if { (eval echo configure:4533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_file=yes else @@ -4568,7 +4562,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:4572: checking for iconv" >&5 +echo "configure:4566: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4576,7 +4570,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext <<EOF -#line 4580 "configure" +#line 4574 "configure" #include "confdefs.h" #include <stdlib.h> #include <iconv.h> @@ -4586,7 +4580,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:4590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -4598,7 +4592,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS $am_cv_libiconv_ldpath -liconv" cat > conftest.$ac_ext <<EOF -#line 4602 "configure" +#line 4596 "configure" #include "confdefs.h" #include <stdlib.h> #include <iconv.h> @@ -4608,7 +4602,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:4612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_lib_iconv=yes am_cv_func_iconv=yes @@ -4629,13 +4623,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:4633: checking for iconv declaration" >&5 +echo "configure:4627: checking for iconv declaration" >&5 if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4639 "configure" +#line 4633 "configure" #include "confdefs.h" #include <stdlib.h> @@ -4654,7 +4648,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else @@ -4692,12 +4686,12 @@ for ac_func in getenv atol sbrk abort atof getcwd getwd \ do ac_tr_decl=HAVE_DECL_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` echo $ac_n "checking whether $ac_func is declared""... $ac_c" 1>&6 -echo "configure:4696: checking whether $ac_func is declared" >&5 +echo "configure:4690: checking whether $ac_func is declared" >&5 if eval "test \"`echo '$''{'gcc_cv_have_decl_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4701 "configure" +#line 4695 "configure" #include "confdefs.h" #undef $ac_tr_decl #define $ac_tr_decl 1 @@ -4711,7 +4705,7 @@ char *(*pfn) = (char *(*)) $ac_func ; #endif ; return 0; } EOF -if { (eval echo configure:4715: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "gcc_cv_have_decl_$ac_func=yes" else @@ -4813,12 +4807,12 @@ for ac_func in getrlimit setrlimit getrusage do ac_tr_decl=HAVE_DECL_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` echo $ac_n "checking whether $ac_func is declared""... $ac_c" 1>&6 -echo "configure:4817: checking whether $ac_func is declared" >&5 +echo "configure:4811: checking whether $ac_func is declared" >&5 if eval "test \"`echo '$''{'gcc_cv_have_decl_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4822 "configure" +#line 4816 "configure" #include "confdefs.h" #undef $ac_tr_decl #define $ac_tr_decl 1 @@ -4836,7 +4830,7 @@ char *(*pfn) = (char *(*)) $ac_func ; #endif ; return 0; } EOF -if { (eval echo configure:4840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4834: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "gcc_cv_have_decl_$ac_func=yes" else @@ -4878,12 +4872,12 @@ for ac_func in times do ac_tr_decl=HAVE_DECL_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` echo $ac_n "checking whether $ac_func is declared""... $ac_c" 1>&6 -echo "configure:4882: checking whether $ac_func is declared" >&5 +echo "configure:4876: checking whether $ac_func is declared" >&5 if eval "test \"`echo '$''{'gcc_cv_have_decl_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4887 "configure" +#line 4881 "configure" #include "confdefs.h" #undef $ac_tr_decl #define $ac_tr_decl 1 @@ -4901,7 +4895,7 @@ char *(*pfn) = (char *(*)) $ac_func ; #endif ; return 0; } EOF -if { (eval echo configure:4905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "gcc_cv_have_decl_$ac_func=yes" else @@ -4935,13 +4929,13 @@ fi # More time-related stuff. echo $ac_n "checking for struct tms""... $ac_c" 1>&6 -echo "configure:4939: checking for struct tms" >&5 +echo "configure:4933: checking for struct tms" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tms'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4945 "configure" +#line 4939 "configure" #include "confdefs.h" #include "ansidecl.h" @@ -4954,7 +4948,7 @@ int main() { struct tms tms; ; return 0; } EOF -if { (eval echo configure:4958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tms=yes else @@ -4977,13 +4971,13 @@ fi # use gcc_cv_* here because this doesn't match the behavior of AC_CHECK_TYPE. # revisit after autoconf 2.50. echo $ac_n "checking for clock_t""... $ac_c" 1>&6 -echo "configure:4981: checking for clock_t" >&5 +echo "configure:4975: checking for clock_t" >&5 if eval "test \"`echo '$''{'gcc_cv_type_clock_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4987 "configure" +#line 4981 "configure" #include "confdefs.h" #include "ansidecl.h" @@ -4993,7 +4987,7 @@ int main() { clock_t x; ; return 0; } EOF -if { (eval echo configure:4997: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4991: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_type_clock_t=yes else @@ -5019,7 +5013,7 @@ if test "${enable_initfini_array+set}" = set; then gcc_cv_initfinit_array=$enableval else echo $ac_n "checking for .preinit_array/.init_array/.fini_array support""... $ac_c" 1>&6 -echo "configure:5023: checking for .preinit_array/.init_array/.fini_array support" >&5 +echo "configure:5017: checking for .preinit_array/.init_array/.fini_array support" >&5 if eval "test \"`echo '$''{'gcc_cv_initfinit_array'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5029,7 +5023,7 @@ int main (void) { return x; } int foo (void) { x = 0; } int (*fp) (void) __attribute__ ((section (".init_array"))) = foo; EOF - if { ac_try='${CC-cc} -o conftest conftest.c 1>&AS_MESSAGE_LOG_FD'; { (eval echo configure:5033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } + if { ac_try='${CC-cc} -o conftest conftest.c 1>&AS_MESSAGE_LOG_FD'; { (eval echo configure:5027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } then if ./conftest; then gcc_cv_initfinit_array=yes @@ -5058,12 +5052,12 @@ CFLAGS="$saved_CFLAGS" # mkdir takes a single argument on some systems. echo $ac_n "checking if mkdir takes one argument""... $ac_c" 1>&6 -echo "configure:5062: checking if mkdir takes one argument" >&5 +echo "configure:5056: checking if mkdir takes one argument" >&5 if eval "test \"`echo '$''{'gcc_cv_mkdir_takes_one_arg'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5067 "configure" +#line 5061 "configure" #include "confdefs.h" #include <sys/types.h> @@ -5080,7 +5074,7 @@ int main() { mkdir ("foo", 0); ; return 0; } EOF -if { (eval echo configure:5084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* gcc_cv_mkdir_takes_one_arg=no else @@ -5348,14 +5342,14 @@ fi echo $ac_n "checking for library containing strerror""... $ac_c" 1>&6 -echo "configure:5352: checking for library containing strerror" >&5 +echo "configure:5346: checking for library containing strerror" >&5 if eval "test \"`echo '$''{'ac_cv_search_strerror'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_strerror="no" cat > conftest.$ac_ext <<EOF -#line 5359 "configure" +#line 5353 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5366,7 +5360,7 @@ int main() { strerror() ; return 0; } EOF -if { (eval echo configure:5370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_strerror="none required" else @@ -5377,7 +5371,7 @@ rm -f conftest* test "$ac_cv_search_strerror" = "no" && for i in cposix; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 5381 "configure" +#line 5375 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5388,7 +5382,7 @@ int main() { strerror() ; return 0; } EOF -if { (eval echo configure:5392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_strerror="-l$i" break @@ -5411,12 +5405,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:5415: checking for working const" >&5 +echo "configure:5409: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5420 "configure" +#line 5414 "configure" #include "confdefs.h" int main() { @@ -5465,7 +5459,7 @@ ccp = (char const *const *) p; ; return 0; } EOF -if { (eval echo configure:5469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5463: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -5486,12 +5480,12 @@ EOF fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:5490: checking for off_t" >&5 +echo "configure:5484: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5495 "configure" +#line 5489 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -5519,12 +5513,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:5523: checking for size_t" >&5 +echo "configure:5517: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5528 "configure" +#line 5522 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -5554,19 +5548,19 @@ fi # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:5558: checking for working alloca.h" >&5 +echo "configure:5552: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5563 "configure" +#line 5557 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:5570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -5587,12 +5581,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:5591: checking for alloca" >&5 +echo "configure:5585: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5596 "configure" +#line 5590 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -5620,7 +5614,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:5624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -5652,12 +5646,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:5656: checking whether alloca needs Cray hooks" >&5 +echo "configure:5650: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5661 "configure" +#line 5655 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -5682,12 +5676,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5686: checking for $ac_func" >&5 +echo "configure:5680: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5691 "configure" +#line 5685 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5710,7 +5704,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5737,7 +5731,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:5741: checking stack direction for C alloca" >&5 +echo "configure:5735: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5745,7 +5739,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 5749 "configure" +#line 5743 "configure" #include "confdefs.h" find_stack_direction () { @@ -5764,7 +5758,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:5768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -5787,12 +5781,12 @@ fi echo $ac_n "checking whether we are using the GNU C Library 2.1 or newer""... $ac_c" 1>&6 -echo "configure:5791: checking whether we are using the GNU C Library 2.1 or newer" >&5 +echo "configure:5785: checking whether we are using the GNU C Library 2.1 or newer" >&5 if eval "test \"`echo '$''{'ac_cv_gnu_library_2_1'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5796 "configure" +#line 5790 "configure" #include "confdefs.h" #include <features.h> @@ -5828,17 +5822,17 @@ stdlib.h string.h unistd.h sys/param.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5832: checking for $ac_hdr" >&5 +echo "configure:5826: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5837 "configure" +#line 5831 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5869,12 +5863,12 @@ getgid getuid mempcpy munmap putenv setenv setlocale stpcpy strchr strcasecmp \ strdup strtoul tsearch __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5873: checking for $ac_func" >&5 +echo "configure:5867: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5878 "configure" +#line 5872 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5897,7 +5891,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5938,7 +5932,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:5942: checking for iconv" >&5 +echo "configure:5936: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5946,7 +5940,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext <<EOF -#line 5950 "configure" +#line 5944 "configure" #include "confdefs.h" #include <stdlib.h> #include <iconv.h> @@ -5956,7 +5950,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:5960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5954: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -5968,7 +5962,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS $am_cv_libiconv_ldpath -liconv" cat > conftest.$ac_ext <<EOF -#line 5972 "configure" +#line 5966 "configure" #include "confdefs.h" #include <stdlib.h> #include <iconv.h> @@ -5978,7 +5972,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:5982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_lib_iconv=yes am_cv_func_iconv=yes @@ -5999,13 +5993,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:6003: checking for iconv declaration" >&5 +echo "configure:5997: checking for iconv declaration" >&5 if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6009 "configure" +#line 6003 "configure" #include "confdefs.h" #include <stdlib.h> @@ -6024,7 +6018,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:6028: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6022: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else @@ -6053,19 +6047,19 @@ EOF echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:6057: checking for nl_langinfo and CODESET" >&5 +echo "configure:6051: checking for nl_langinfo and CODESET" >&5 if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6062 "configure" +#line 6056 "configure" #include "confdefs.h" #include <langinfo.h> int main() { char* cs = nl_langinfo(CODESET); ; return 0; } EOF -if { (eval echo configure:6069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_codeset=yes else @@ -6088,19 +6082,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:6092: checking for LC_MESSAGES" >&5 +echo "configure:6086: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6097 "configure" +#line 6091 "configure" #include "confdefs.h" #include <locale.h> int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:6104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -6121,7 +6115,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:6125: checking whether NLS is requested" >&5 +echo "configure:6119: checking whether NLS is requested" >&5 # Check whether --enable-nls or --disable-nls was given. if test "${enable_nls+set}" = set; then enableval="$enable_nls" @@ -6144,7 +6138,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:6148: checking whether included gettext is requested" >&5 +echo "configure:6142: checking whether included gettext is requested" >&5 # Check whether --with-included-gettext or --without-included-gettext was given. if test "${with_included_gettext+set}" = set; then withval="$with_included_gettext" @@ -6164,17 +6158,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:6168: checking for libintl.h" >&5 +echo "configure:6162: checking for libintl.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6173 "configure" +#line 6167 "configure" #include "confdefs.h" #include <libintl.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6172: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6195,12 +6189,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then EOF echo $ac_n "checking for GNU gettext in libc""... $ac_c" 1>&6 -echo "configure:6199: checking for GNU gettext in libc" >&5 +echo "configure:6193: checking for GNU gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6204 "configure" +#line 6198 "configure" #include "confdefs.h" #include <libintl.h> extern int _nl_msg_cat_cntr; @@ -6209,7 +6203,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:6213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext1_libc=yes else @@ -6225,14 +6219,14 @@ echo "$ac_t""$gt_cv_func_gnugettext1_libc" 1>&6 if test "$gt_cv_func_gnugettext1_libc" != "yes"; then echo $ac_n "checking for GNU gettext in libintl""... $ac_c" 1>&6 -echo "configure:6229: checking for GNU gettext in libintl" >&5 +echo "configure:6223: checking for GNU gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gnugettext1_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else gt_save_LIBS="$LIBS" LIBS="$LIBS -lintl $LIBICONV" cat > conftest.$ac_ext <<EOF -#line 6236 "configure" +#line 6230 "configure" #include "confdefs.h" #include <libintl.h> extern int _nl_msg_cat_cntr; @@ -6241,7 +6235,7 @@ bindtextdomain ("", ""); return (int) gettext ("") + _nl_msg_cat_cntr ; return 0; } EOF -if { (eval echo configure:6245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gnugettext1_libintl=yes else @@ -6274,12 +6268,12 @@ EOF for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6278: checking for $ac_func" >&5 +echo "configure:6272: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6283 "configure" +#line 6277 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6302,7 +6296,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6331,7 +6325,7 @@ done # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6335: checking for $ac_word" >&5 +echo "configure:6329: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6365,7 +6359,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6369: checking for $ac_word" >&5 +echo "configure:6363: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6402,7 +6396,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6406: checking for $ac_word" >&5 +echo "configure:6400: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6452,7 +6446,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6456: checking for $ac_word" >&5 +echo "configure:6450: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6486,7 +6480,7 @@ fi # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6490: checking for $ac_word" >&5 +echo "configure:6484: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GMSGFMT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6522,7 +6516,7 @@ fi # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6526: checking for $ac_word" >&5 +echo "configure:6520: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6594,7 +6588,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6598: checking for $ac_word" >&5 +echo "configure:6592: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_INTLBISON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6627,7 +6621,7 @@ done ac_verc_fail=yes else echo $ac_n "checking version of bison""... $ac_c" 1>&6 -echo "configure:6631: checking version of bison" >&5 +echo "configure:6625: checking version of bison" >&5 ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` case $ac_prog_version in '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; @@ -6672,7 +6666,7 @@ EOF if test "x$CATOBJEXT" != x; then echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:6676: checking for catalogs to be installed" >&5 +echo "configure:6670: checking for catalogs to be installed" >&5 # Look for .po and .gmo files in the source directory. CATALOGS= XLINGUAS= @@ -6730,7 +6724,7 @@ fi case $host_os in win32 | pe | cygwin* | mingw32* | uwin*) echo $ac_n "checking whether windows registry support is requested""... $ac_c" 1>&6 -echo "configure:6734: checking whether windows registry support is requested" >&5 +echo "configure:6728: checking whether windows registry support is requested" >&5 if test "x$enable_win32_registry" != xno; then cat >> confdefs.h <<\EOF #define ENABLE_WIN32_REGISTRY 1 @@ -6739,14 +6733,14 @@ EOF echo "$ac_t""yes" 1>&6 echo $ac_n "checking for library containing RegOpenKeyExA""... $ac_c" 1>&6 -echo "configure:6743: checking for library containing RegOpenKeyExA" >&5 +echo "configure:6737: checking for library containing RegOpenKeyExA" >&5 if eval "test \"`echo '$''{'ac_cv_search_RegOpenKeyExA'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_RegOpenKeyExA="no" cat > conftest.$ac_ext <<EOF -#line 6750 "configure" +#line 6744 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6757,7 +6751,7 @@ int main() { RegOpenKeyExA() ; return 0; } EOF -if { (eval echo configure:6761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_RegOpenKeyExA="none required" else @@ -6768,7 +6762,7 @@ rm -f conftest* test "$ac_cv_search_RegOpenKeyExA" = "no" && for i in advapi32; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <<EOF -#line 6772 "configure" +#line 6766 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6779,7 +6773,7 @@ int main() { RegOpenKeyExA() ; return 0; } EOF -if { (eval echo configure:6783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_RegOpenKeyExA="-l$i" break @@ -6821,7 +6815,7 @@ esac if test "x$enable_win32_registry" != xno; then echo $ac_n "checking registry key on windows hosts""... $ac_c" 1>&6 -echo "configure:6825: checking registry key on windows hosts" >&5 +echo "configure:6819: checking registry key on windows hosts" >&5 cat >> confdefs.h <<EOF #define WIN32_REGISTRY_KEY "$gcc_cv_win32_registry_key" EOF @@ -7035,7 +7029,7 @@ fi # Figure out what assembler we will be using. echo $ac_n "checking what assembler to use""... $ac_c" 1>&6 -echo "configure:7039: checking what assembler to use" >&5 +echo "configure:7033: checking what assembler to use" >&5 gcc_cv_as= gcc_cv_gas_major_version= gcc_cv_gas_minor_version= @@ -7129,7 +7123,7 @@ fi # Figure out what linker we will be using. echo $ac_n "checking what linker to use""... $ac_c" 1>&6 -echo "configure:7133: checking what linker to use" >&5 +echo "configure:7127: checking what linker to use" >&5 gcc_cv_ld= gcc_cv_gld_major_version= gcc_cv_gld_minor_version= @@ -7222,7 +7216,7 @@ fi # Figure out what nm we will be using. echo $ac_n "checking what nm to use""... $ac_c" 1>&6 -echo "configure:7226: checking what nm to use" >&5 +echo "configure:7220: checking what nm to use" >&5 if test -x nm$host_exeext; then gcc_cv_nm=./nm$host_exeext elif test "x$program_prefix" != xNONE; then @@ -7234,7 +7228,7 @@ echo "$ac_t""$gcc_cv_nm" 1>&6 # Figure out what objdump we will be using. echo $ac_n "checking what objdump to use""... $ac_c" 1>&6 -echo "configure:7238: checking what objdump to use" >&5 +echo "configure:7232: checking what objdump to use" >&5 if test -x objdump$host_exeext; then gcc_cv_objdump=./objdump$host_exeext elif test "x$program_prefix" != xNONE; then @@ -7246,7 +7240,7 @@ echo "$ac_t""$gcc_cv_objdump" 1>&6 # Figure out what assembler alignment features are present. echo $ac_n "checking assembler alignment features""... $ac_c" 1>&6 -echo "configure:7250: checking assembler alignment features" >&5 +echo "configure:7244: checking assembler alignment features" >&5 gcc_cv_as_alignment_features=none if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then # Gas version 2.6 and later support for .balign and .p2align. @@ -7294,7 +7288,7 @@ fi echo "$ac_t""$gcc_cv_as_alignment_features" 1>&6 echo $ac_n "checking assembler subsection support""... $ac_c" 1>&6 -echo "configure:7298: checking assembler subsection support" >&5 +echo "configure:7292: checking assembler subsection support" >&5 gcc_cv_as_subsections=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then @@ -7334,7 +7328,7 @@ fi echo "$ac_t""$gcc_cv_as_subsections" 1>&6 echo $ac_n "checking assembler weak support""... $ac_c" 1>&6 -echo "configure:7338: checking assembler weak support" >&5 +echo "configure:7332: checking assembler weak support" >&5 gcc_cv_as_weak=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 2 -o "$gcc_cv_gas_major_version" -gt 2; then @@ -7357,7 +7351,7 @@ fi echo "$ac_t""$gcc_cv_as_weak" 1>&6 echo $ac_n "checking assembler hidden support""... $ac_c" 1>&6 -echo "configure:7361: checking assembler hidden support" >&5 +echo "configure:7355: checking assembler hidden support" >&5 gcc_cv_as_hidden=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 \ @@ -7418,10 +7412,14 @@ fi echo "$ac_t""$gcc_cv_as_hidden" 1>&6 libgcc_visibility=$gcc_cv_as_hidden case "$target" in - mips-sgi-irix6*o32) + mips-sgi-irix6*) if test x"$gnu_ld_flag" = x"no"; then # Even if using gas with .hidden support, the resulting object files - # cannot be linked with the IRIX 6 O32 linker. + # cannot be linked with the IRIX 6 O32 linker. With the N32 and + # N64 linkers, the problem is that the linker refuses to accept + # -call_shared (passed by default to the linker) and -r (used to + # link the object file generated without .hidden directives with + # one that hides symbols), so we also lose. libgcc_visibility=no fi ;; @@ -7429,7 +7427,7 @@ esac echo $ac_n "checking assembler leb128 support""... $ac_c" 1>&6 -echo "configure:7433: checking assembler leb128 support" >&5 +echo "configure:7431: checking assembler leb128 support" >&5 gcc_cv_as_leb128=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 11 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then @@ -7474,7 +7472,7 @@ fi echo "$ac_t""$gcc_cv_as_leb128" 1>&6 echo $ac_n "checking assembler eh_frame optimization""... $ac_c" 1>&6 -echo "configure:7478: checking assembler eh_frame optimization" >&5 +echo "configure:7476: checking assembler eh_frame optimization" >&5 gcc_cv_as_eh_frame=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 12 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then @@ -7555,7 +7553,7 @@ fi echo "$ac_t""$gcc_cv_as_eh_frame" 1>&6 echo $ac_n "checking assembler section merging support""... $ac_c" 1>&6 -echo "configure:7559: checking assembler section merging support" >&5 +echo "configure:7557: checking assembler section merging support" >&5 gcc_cv_as_shf_merge=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 12 -o "$gcc_cv_gas_major_version" -gt 2 && grep 'obj_format = elf' ../gas/Makefile > /dev/null; then @@ -7578,7 +7576,7 @@ fi echo "$ac_t""$gcc_cv_as_shf_merge" 1>&6 echo $ac_n "checking assembler thread-local storage support""... $ac_c" 1>&6 -echo "configure:7582: checking assembler thread-local storage support" >&5 +echo "configure:7580: checking assembler thread-local storage support" >&5 gcc_cv_as_tls=no conftest_s= tls_first_major= @@ -7656,6 +7654,41 @@ foo: data8 25 tls_first_major=2 tls_first_minor=13 ;; + s390-*-*) + conftest_s=' + .section ".tdata","awT",@progbits +foo: .long 25 + .text + .long foo@TLSGD + .long foo@TLSLDM + .long foo@DTPOFF + .long foo@NTPOFF + .long foo@GOTNTPOFF + .long foo@INDNTPOFF + l %r1,foo@GOTNTPOFF(%r12) + l %r1,0(%r1):tls_load:foo + bas %r14,0(%r1,%r13):tls_gdcall:foo + bas %r14,0(%r1,%r13):tls_ldcall:foo' + tls_first_major=2 + tls_first_minor=14 + ;; + s390x-*-*) + conftest_s=' + .section ".tdata","awT",@progbits +foo: .long 25 + .text + .quad foo@TLSGD + .quad foo@TLSLDM + .quad foo@DTPOFF + .quad foo@NTPOFF + .quad foo@GOTNTPOFF + lg %r1,foo@GOTNTPOFF(%r12) + larl %r1,foo@INDNTPOFF + brasl %r14,__tls_get_offset@PLT:tls_gdcall:foo + brasl %r14,__tls_get_offset@PLT:tls_ldcall:foo' + tls_first_major=2 + tls_first_minor=14 + ;; esac if test -z "$tls_first_major"; then : @@ -7686,7 +7719,7 @@ case "$target" in # All TARGET_ABI_OSF targets. alpha*-*-osf* | alpha*-*-linux* | alpha*-*-*bsd*) echo $ac_n "checking assembler supports explicit relocations""... $ac_c" 1>&6 -echo "configure:7690: checking assembler supports explicit relocations" >&5 +echo "configure:7723: checking assembler supports explicit relocations" >&5 if eval "test \"`echo '$''{'gcc_cv_as_explicit_relocs'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7736,7 +7769,7 @@ EOF ;; sparc*-*-*) echo $ac_n "checking assembler .register pseudo-op support""... $ac_c" 1>&6 -echo "configure:7740: checking assembler .register pseudo-op support" >&5 +echo "configure:7773: checking assembler .register pseudo-op support" >&5 if eval "test \"`echo '$''{'gcc_cv_as_register_pseudo_op'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7764,7 +7797,7 @@ EOF fi echo $ac_n "checking assembler supports -relax""... $ac_c" 1>&6 -echo "configure:7768: checking assembler supports -relax" >&5 +echo "configure:7801: checking assembler supports -relax" >&5 if eval "test \"`echo '$''{'gcc_cv_as_relax_opt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7792,7 +7825,7 @@ EOF fi echo $ac_n "checking assembler and linker support unaligned pc related relocs""... $ac_c" 1>&6 -echo "configure:7796: checking assembler and linker support unaligned pc related relocs" >&5 +echo "configure:7829: checking assembler and linker support unaligned pc related relocs" >&5 if eval "test \"`echo '$''{'gcc_cv_as_sparc_ua_pcrel'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7819,7 +7852,7 @@ EOF fi echo $ac_n "checking assembler and linker support unaligned pc related relocs against hidden symbols""... $ac_c" 1>&6 -echo "configure:7823: checking assembler and linker support unaligned pc related relocs against hidden symbols" >&5 +echo "configure:7856: checking assembler and linker support unaligned pc related relocs against hidden symbols" >&5 if eval "test \"`echo '$''{'gcc_cv_as_sparc_ua_pcrel_hidden'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7859,7 +7892,7 @@ EOF fi echo $ac_n "checking for assembler offsetable %lo() support""... $ac_c" 1>&6 -echo "configure:7863: checking for assembler offsetable %lo() support" >&5 +echo "configure:7896: checking for assembler offsetable %lo() support" >&5 if eval "test \"`echo '$''{'gcc_cv_as_offsetable_lo10'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7898,7 +7931,7 @@ EOF i[34567]86-*-* | x86_64-*-*) echo $ac_n "checking assembler instructions""... $ac_c" 1>&6 -echo "configure:7902: checking assembler instructions" >&5 +echo "configure:7935: checking assembler instructions" >&5 gcc_cv_as_instructions= if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then if test "$gcc_cv_gas_major_version" -eq 2 -a "$gcc_cv_gas_minor_version" -ge 9 -o "$gcc_cv_gas_major_version" -gt 2; then @@ -7925,7 +7958,7 @@ EOF echo "$ac_t""$gcc_cv_as_instructions" 1>&6 echo $ac_n "checking assembler GOTOFF in data directives""... $ac_c" 1>&6 -echo "configure:7929: checking assembler GOTOFF in data directives" >&5 +echo "configure:7962: checking assembler GOTOFF in data directives" >&5 gcc_cv_as_gotoff_in_data=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x then @@ -7955,7 +7988,7 @@ EOF esac echo $ac_n "checking assembler dwarf2 debug_line support""... $ac_c" 1>&6 -echo "configure:7959: checking assembler dwarf2 debug_line support" >&5 +echo "configure:7992: checking assembler dwarf2 debug_line support" >&5 gcc_cv_as_dwarf2_debug_line=no # ??? Not all targets support dwarf2 debug_line, even within a version # of gas. Moreover, we need to emit a valid instruction to trigger any @@ -8012,7 +8045,7 @@ fi echo "$ac_t""$gcc_cv_as_dwarf2_debug_line" 1>&6 echo $ac_n "checking assembler --gdwarf2 support""... $ac_c" 1>&6 -echo "configure:8016: checking assembler --gdwarf2 support" >&5 +echo "configure:8049: checking assembler --gdwarf2 support" >&5 gcc_cv_as_gdwarf2_flag=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then @@ -8041,7 +8074,7 @@ fi echo "$ac_t""$gcc_cv_as_gdwarf2_flag" 1>&6 echo $ac_n "checking assembler --gstabs support""... $ac_c" 1>&6 -echo "configure:8045: checking assembler --gstabs support" >&5 +echo "configure:8078: checking assembler --gstabs support" >&5 gcc_cv_as_gstabs_flag=no if test x$gcc_cv_gas_major_version != x -a x$gcc_cv_gas_minor_version != x; then @@ -8069,7 +8102,7 @@ fi echo "$ac_t""$gcc_cv_as_gstabs_flag" 1>&6 echo $ac_n "checking linker read-only and read-write section mixing""... $ac_c" 1>&6 -echo "configure:8073: checking linker read-only and read-write section mixing" >&5 +echo "configure:8106: checking linker read-only and read-write section mixing" >&5 gcc_cv_ld_ro_rw_mix=unknown if test x$gcc_cv_gld_major_version != x -a x$gcc_cv_gld_minor_version != x; then if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 10 -o "$gcc_cv_gld_major_version" -gt 2 && grep 'EMUL = elf' ../ld/Makefile > /dev/null; then @@ -8107,7 +8140,7 @@ fi echo "$ac_t""$gcc_cv_ld_ro_rw_mix" 1>&6 echo $ac_n "checking linker PT_GNU_EH_FRAME support""... $ac_c" 1>&6 -echo "configure:8111: checking linker PT_GNU_EH_FRAME support" >&5 +echo "configure:8144: checking linker PT_GNU_EH_FRAME support" >&5 gcc_cv_ld_eh_frame_hdr=no if test x$gcc_cv_gld_major_version != x -a x$gcc_cv_gld_minor_version != x; then if test "$gcc_cv_gld_major_version" -eq 2 -a "$gcc_cv_gld_minor_version" -ge 12 -o "$gcc_cv_gld_major_version" -gt 2 && grep 'EMUL = elf' ../ld/Makefile > /dev/null; then @@ -8131,7 +8164,7 @@ echo "$ac_t""$gcc_cv_ld_eh_frame_hdr" 1>&6 case "$target" in mips*-*-*) echo $ac_n "checking whether libgloss uses STARTUP directives consistently""... $ac_c" 1>&6 -echo "configure:8135: checking whether libgloss uses STARTUP directives consistently" >&5 +echo "configure:8168: checking whether libgloss uses STARTUP directives consistently" >&5 gcc_cv_mips_libgloss_startup=no gcc_cv_libgloss_srcdir=`echo $srcdir | sed -e 's,/gcc$,,'`/libgloss if test "x$exec_prefix" = xNONE; then @@ -8335,7 +8368,7 @@ fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:8339: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:8372: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" diff --git a/gcc/configure.in b/gcc/configure.in index c0afb232296..4770e834947 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -1,7 +1,8 @@ # configure.in for GCC # Process this file with autoconf to generate a configuration script. -# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Free Software Foundation, Inc. #This file is part of GCC. @@ -300,8 +301,7 @@ no) ;; ;; esac ], -# Enable some checks by default for development versions of GCC -[ac_checking=1; ac_tree_checking=1; ac_gc_checking=1; ac_rtlflag_checking=1;]) +[]) nocommon_flag="" if test x$ac_checking != x ; then AC_DEFINE(ENABLE_CHECKING, 1, @@ -573,7 +573,7 @@ else # that we can use it. gcc_AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version, [GNU texinfo.* \([0-9][0-9.]*\)], - [4.[1-9]*]) + [4.[2-9]*]) fi if test $gcc_cv_prog_makeinfo_modern = no; then @@ -1633,10 +1633,14 @@ fi AC_MSG_RESULT($gcc_cv_as_hidden) libgcc_visibility=$gcc_cv_as_hidden case "$target" in - mips-sgi-irix6*o32) + mips-sgi-irix6*) if test x"$gnu_ld_flag" = x"no"; then # Even if using gas with .hidden support, the resulting object files - # cannot be linked with the IRIX 6 O32 linker. + # cannot be linked with the IRIX 6 O32 linker. With the N32 and + # N64 linkers, the problem is that the linker refuses to accept + # -call_shared (passed by default to the linker) and -r (used to + # link the object file generated without .hidden directives with + # one that hides symbols), so we also lose. libgcc_visibility=no fi ;; @@ -1865,6 +1869,41 @@ foo: data8 25 tls_first_major=2 tls_first_minor=13 ;; + s390-*-*) + conftest_s=' + .section ".tdata","awT",@progbits +foo: .long 25 + .text + .long foo@TLSGD + .long foo@TLSLDM + .long foo@DTPOFF + .long foo@NTPOFF + .long foo@GOTNTPOFF + .long foo@INDNTPOFF + l %r1,foo@GOTNTPOFF(%r12) + l %r1,0(%r1):tls_load:foo + bas %r14,0(%r1,%r13):tls_gdcall:foo + bas %r14,0(%r1,%r13):tls_ldcall:foo' + tls_first_major=2 + tls_first_minor=14 + ;; + s390x-*-*) + conftest_s=' + .section ".tdata","awT",@progbits +foo: .long 25 + .text + .quad foo@TLSGD + .quad foo@TLSLDM + .quad foo@DTPOFF + .quad foo@NTPOFF + .quad foo@GOTNTPOFF + lg %r1,foo@GOTNTPOFF(%r12) + larl %r1,foo@INDNTPOFF + brasl %r14,__tls_get_offset@PLT:tls_gdcall:foo + brasl %r14,__tls_get_offset@PLT:tls_ldcall:foo' + tls_first_major=2 + tls_first_minor=14 + ;; esac if test -z "$tls_first_major"; then : diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 096b906a633..61a86fc0873 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,204 @@ +2003-01-31 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + + PR c++/8849 + * error.c (dump_expr): Handle BASELINK. + * pt.c (resolve_overloaded_unification): Handle FUNCTION_DECL. + +2003-01-31 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + + PR c++/9453 + * friend.c (is_friend): Always accept when SUPPLICANT is still + a TEMPLATE_DECL. + * pt.c (push_access_scope_real): Call push_to_top_level for + function in namespace scope. + (push_access_scope): Remove ARGS argument, all caller adjusted. + (pop_access_scope): Call pop_from_top_level for function in + namespace scope. + (regenerate_decl_from_template): Use push_access_scope_real. + +2003-01-29 Nathan Sidwell <nathan@codesourcery.com> + + PR c++/9437 + * pt.c (unify): Don't unify '*T' with 'U C::*'. + +2003-01-27 Jeffrey D. Oldham <oldham@codesourcery.com> + + PR c++/47 + * cp-tree.h (lookup_nested_field): Add declaration. + * decl.c (lookup_name_real): Call lookup_nested_field. + * search.c (lookup_nested_field): Add function. + +2003-01-26 Christian Cornelssen <ccorn@cs.tu-berlin.de> + + * Make-lang.in (c++.install-common, c++.install-man) + (c++.uninstall): Prepend $(DESTDIR) to destination paths in + all (un)installation commands. + (c++.install-common): Rewrite $(LN) commands to support + DESTDIR with "ln" as well as with "ln -s". + +2003-01-24 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * decl2.c (check_classfn): Fix uninitialized warning. + +2003-01-22 Mark Mitchell <mark@codesourcery.com> + + PR c++/9328 + * error.c (dump_decl): For an OVERLOAD, just print the name of the + function; it doesn't make sense to try to print its type. + * semantics.c (finish_typeof): Issue errors about invalid uses. + +2003-01-22 Josef Zlomek <zlomekj@suse.cz> + + PR/9386, PR/8801 + 2002-12-27 Mark Mitchell <mark@codesourcery.com> + * typeck.c (build_class_member_access_expr): Fix anonymous union + handling. + +2003-01-17 Jason Merrill <jason@redhat.com> + + PR c++/9167, c++/9358 + * decl.c (require_complete_types_for_parms): Also update DECL_ARG_TYPE. + +2003-01-17 Jason Merrill <jason@redhat.com> + + PR c++/9342 + * call.c (build_conditional_expr): Always do lvalue-rvalue + conversion. + +2003-01-16 Jason Merrill <jason@redhat.com> + + PR c++/8564 + * init.c (build_vec_init): Re-add maxindex parm. + (perform_member_init, build_aggr_init): Pass it. + (build_new_1): Pass it. Use an incomplete array type for full_type. + * typeck.c (build_modify_expr): Pass it. + * cp-tree.h: Adjust. + +2003-01-13 Jason Merrill <jason@redhat.com> + + PR c++/8748 + * class.c (build_base_path): Take the address before calling save_expr. + + * call.c (build_user_type_conversion_1): Do set ICS_BAD_FLAG if + all the ambiguous conversions are bad. + + * class.c (maybe_warn_about_overly_private_class): Don't stop + searching when we find a nonprivate method. + +2003-01-09 Jakub Jelinek <jakub@redhat.com> + + * decl.c (start_decl): Only check DECL_THREAD_LOCAL for VAR_DECLs. + +2003-01-09 Jakub Jelinek <jakub@redhat.com> + + * decl.c (start_decl): Don't set DECL_COMMON for __thread variables. + +2003-01-07 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + + PR c++/9030 + * decl.c (make_typename_type): Check access only when tf_error. + (make_unbound_class_template): Likewise. + * pt.c (saved_access_scope): New variable. + (push_access_scope_real): New function. + (push_access_scope): Likewise. + (pop_access_scope): Likewise. + (tsubst_default_argument): Use them. + (instantiate_template): Likewise. + (regenerate_decl_from_template): Likewise. + (instantiate_decl): Likewise. + (get_mostly_instantiated_function_type): Likewise. + +2003-01-06 Mark Mitchell <mark@codesourcery.com> + + PR c++/9165 + * decl2.c (build_cleanup): Mark the object as used. + +2003-01-03 Nathan Sidwell <nathan@codesourcery.com> + + PR c++/45, c++/3784 + * tree.c (cp_tree_equal, TEMPLATE_PARM_INDEX): The types must be + the same too. + +2002-12-30 Nathan Sidwell <nathan@codesourcery.com> + + PR c++/9054 + * class.c (layout_class_type): Set DECL_CONTEXT of type for base. + * dump.c (cp_dump_tree, RECORD_TYPE): Deal with type for base types. + +2002-12-26 Nathan Sidwell <nathan@codesourcery.com> + + PR c++/4803 + * decl2.c (mark_used): Defer inline functions. + (finish_file): Merge deferred_fns loops. Check all used + inline functions have a definition. + * method.c (make_thunk): Thunks are not inline. + + PR c++/5116, c++/764 + * call.c (build_new_op): Make sure template class operands are + instantiated. + +2002-12-24 Nathan Sidwell <nathan@codesourcery.com> + + PR C++/7964 + * cp-tree.h (resolve_scoped_fn_name): Prototype. + * call.c (resolve_scoped_fn_name): New function. Deal with + more template expansion. Broken out of ... + * parse.y (parse_finish_call_expr): ... here. Call it. + * decl2.c (build_expr_from_tree, CALL_EXPR): Use + resolve_scoped_fn_name and build_call_from_tree. + + PR c++/9053 + * decl.c (duplicate_decls): Templates may be disambiguated by + return type. + + PR c++/8702 + * decl2.c (check_classfn): Use lookup_fnfield_1. List all + conversion operators on failure. + +2002-12-22 Nathan Sidwell <nathan@codesourcery.com> + + PR c++/8572 + * cp-tree.h (grokoptypename): Add SCOPE parameter. + * decl2.c (grokoptypename): Add SCOPE parameter. tsubst the type + if in a template scope. + * parse.y (unoperator): Return the scope. + (operator_name): Adjust grokoptypename call. + +2002-12-22 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + + * cp-tree.h (make_unbound_class_template): Use tsubst_flags_t. + * decl.c (make_unbound_class_template): Adjust. Check for tf_error. + * pt.c (tsubst) [OFFSET_TYPE]: Check for tf_error. + +2002-12-18 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + + PR c++/8099 + * friend.c (make_friend_class): Allow partial specialization + when declaration is not a template friend. + +2002-12-18 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + + PR c++/3663 + * pt.c (lookup_template_class): Copy TREE_PRIVATE and + TREE_PROTECTED to created decl nodes. + +2002-12-18 Mark Mitchell <mark@codesourcery.com> + + * class.c (build_base_field): Do not set DECL_PACKED on the + FIELD_DECL. + +2002-12-18 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + + * parse.y (bad_parm): Add missing argument to error function call. + +2002-12-18 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + + PR c++/8442 + * decl2.c (handle_class_head): Verify if the looked up name is a + type or template. + * pt.c (convert_template_argument): Fix type or template template + parameter decision logic. + 2002-12-13 Gabriel Dos Reis <gdr@integrable-solutions.net> PR C++/8031 diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index 42656e7933d..a42bbbb85c2 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -142,27 +142,32 @@ c++.install-normal: c++.install-common: installdirs -if [ -f cc1plus$(exeext) ] ; then \ if [ -f g++-cross$(exeext) ] ; then \ - rm -f $(bindir)/$(GXX_CROSS_NAME)$(exeext); \ - $(INSTALL_PROGRAM) g++-cross$(exeext) $(bindir)/$(GXX_CROSS_NAME)$(exeext); \ - chmod a+x $(bindir)/$(GXX_CROSS_NAME)$(exeext); \ - rm -f $(bindir)/$(CXX_CROSS_NAME)$(exeext); \ - $(LN) $(bindir)/$(GXX_CROSS_NAME)$(exeext) $(bindir)/$(CXX_CROSS_NAME)$(exeext); \ - if [ -d $(gcc_tooldir)/bin/. ] ; then \ - rm -f $(gcc_tooldir)/bin/g++$(exeext); \ - $(INSTALL_PROGRAM) g++-cross$(exeext) $(gcc_tooldir)/bin/g++$(exeext); \ - rm -f $(gcc_tooldir)/bin/c++$(exeext); \ - $(LN) $(gcc_tooldir)/bin/g++$(exeext) $(gcc_tooldir)/bin/c++$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$(GXX_CROSS_NAME)$(exeext); \ + $(INSTALL_PROGRAM) g++-cross$(exeext) $(DESTDIR)$(bindir)/$(GXX_CROSS_NAME)$(exeext); \ + chmod a+x $(DESTDIR)$(bindir)/$(GXX_CROSS_NAME)$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$(CXX_CROSS_NAME)$(exeext); \ + ( cd $(DESTDIR)$(bindir) && \ + $(LN) $(GXX_CROSS_NAME)$(exeext) $(CXX_CROSS_NAME)$(exeext) ); \ + if [ -d $(DESTDIR)$(gcc_tooldir)/bin/. ] ; then \ + rm -f $(DESTDIR)$(gcc_tooldir)/bin/g++$(exeext); \ + $(INSTALL_PROGRAM) g++-cross$(exeext) $(DESTDIR)$(gcc_tooldir)/bin/g++$(exeext); \ + rm -f $(DESTDIR)$(gcc_tooldir)/bin/c++$(exeext); \ + ( cd $(DESTDIR)$(gcc_tooldir)/bin && \ + $(LN) g++$(exeext) c++$(exeext) ); \ else true; fi; \ else \ - rm -f $(bindir)/$(GXX_INSTALL_NAME)$(exeext); \ - $(INSTALL_PROGRAM) g++$(exeext) $(bindir)/$(GXX_INSTALL_NAME)$(exeext); \ - chmod a+x $(bindir)/$(GXX_INSTALL_NAME)$(exeext); \ - rm -f $(bindir)/$(CXX_INSTALL_NAME)$(exeext); \ - $(LN) $(bindir)/$(GXX_INSTALL_NAME)$(exeext) $(bindir)/$(CXX_INSTALL_NAME)$(exeext); \ - rm -f $(bindir)/$(GXX_TARGET_INSTALL_NAME)$(exeext); \ - $(LN) $(bindir)/$(GXX_INSTALL_NAME)$(exeext) $(bindir)/$(GXX_TARGET_INSTALL_NAME)$(exeext); \ - rm -f $(bindir)/$(CXX_TARGET_INSTALL_NAME)$(exeext); \ - $(LN) $(bindir)/$(CXX_INSTALL_NAME)$(exeext) $(bindir)/$(CXX_TARGET_INSTALL_NAME)$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) g++$(exeext) $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext); \ + chmod a+x $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$(CXX_INSTALL_NAME)$(exeext); \ + ( cd $(DESTDIR)$(bindir) && \ + $(LN) $(GXX_INSTALL_NAME)$(exeext) $(CXX_INSTALL_NAME)$(exeext) ); \ + rm -f $(DESTDIR)$(bindir)/$(GXX_TARGET_INSTALL_NAME)$(exeext); \ + ( cd $(DESTDIR)$(bindir) && \ + $(LN) $(GXX_INSTALL_NAME)$(exeext) $(GXX_TARGET_INSTALL_NAME)$(exeext) ); \ + rm -f $(DESTDIR)$(bindir)/$(CXX_TARGET_INSTALL_NAME)$(exeext); \ + ( cd $(DESTDIR)$(bindir) && \ + $(LN) $(CXX_INSTALL_NAME)$(exeext) $(CXX_TARGET_INSTALL_NAME)$(exeext) ); \ fi ; \ fi @@ -171,23 +176,23 @@ c++.install-info: c++.install-man: installdirs $(srcdir)/cp/g++.1 -if [ -f cc1plus$(exeext) ] ; then \ if [ -f g++-cross$(exeext) ] ; then \ - rm -f $(man1dir)/$(GXX_CROSS_NAME)$(man1ext); \ - $(INSTALL_DATA) $(srcdir)/cp/g++.1 $(man1dir)/$(GXX_CROSS_NAME)$(man1ext); \ - chmod a-x $(man1dir)/$(GXX_CROSS_NAME)$(man1ext); \ + rm -f $(DESTDIR)$(man1dir)/$(GXX_CROSS_NAME)$(man1ext); \ + $(INSTALL_DATA) $(srcdir)/cp/g++.1 $(DESTDIR)$(man1dir)/$(GXX_CROSS_NAME)$(man1ext); \ + chmod a-x $(DESTDIR)$(man1dir)/$(GXX_CROSS_NAME)$(man1ext); \ else \ - rm -f $(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \ - $(INSTALL_DATA) $(srcdir)/cp/g++.1 $(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \ - chmod a-x $(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \ + rm -f $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \ + $(INSTALL_DATA) $(srcdir)/cp/g++.1 $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \ + chmod a-x $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \ fi; \ else true; fi c++.uninstall: - -rm -rf $(bindir)/$(CXX_INSTALL_NAME)$(exeext) - -rm -rf $(bindir)/$(CXX_CROSS_NAME)$(exeext) - -rm -rf $(bindir)/$(GXX_INSTALL_NAME)$(exeext) - -rm -rf $(bindir)/$(GXX_CROSS_NAME)$(exeext) - -rm -rf $(man1dir)/$(GXX_INSTALL_NAME)$(man1ext) - -rm -rf $(man1dir)/$(GXX_CROSS_NAME)$(man1ext) + -rm -rf $(DESTDIR)$(bindir)/$(CXX_INSTALL_NAME)$(exeext) + -rm -rf $(DESTDIR)$(bindir)/$(CXX_CROSS_NAME)$(exeext) + -rm -rf $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext) + -rm -rf $(DESTDIR)$(bindir)/$(GXX_CROSS_NAME)$(exeext) + -rm -rf $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext) + -rm -rf $(DESTDIR)$(man1dir)/$(GXX_CROSS_NAME)$(man1ext) # # Clean hooks: # A lot of the ancillary files are deleted by the main makefile. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 072fbe64515..f5f1b73e053 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -2620,8 +2620,11 @@ build_user_type_conversion_1 (totype, expr, flags) cand = candidates; /* any one will do */ cand->second_conv = build1 (AMBIG_CONV, totype, expr); ICS_USER_FLAG (cand->second_conv) = 1; - /* Don't set ICS_BAD_FLAG; an ambiguous conversion is no worse than - another user-defined conversion. */ + if (!any_strictly_viable (candidates)) + ICS_BAD_FLAG (cand->second_conv) = 1; + /* If there are viable candidates, don't set ICS_BAD_FLAG; an + ambiguous conversion is no worse than another user-defined + conversion. */ return cand; } @@ -2659,6 +2662,69 @@ build_user_type_conversion (totype, expr, flags) return NULL_TREE; } +/* Find the possibly overloaded set of functions corresponding to a + call of the form SCOPE::NAME (...). NAME might be a + TEMPLATE_ID_EXPR, OVERLOAD, _DECL, IDENTIFIER_NODE or LOOKUP_EXPR. */ + +tree +resolve_scoped_fn_name (tree scope, tree name) +{ + tree fn; + tree template_args = NULL_TREE; + bool is_template_id = TREE_CODE (name) == TEMPLATE_ID_EXPR; + + if (is_template_id) + { + template_args = TREE_OPERAND (name, 1); + name = TREE_OPERAND (name, 0); + } + if (TREE_CODE (name) == OVERLOAD) + name = DECL_NAME (get_first_fn (name)); + else if (TREE_CODE (name) == LOOKUP_EXPR) + name = TREE_OPERAND (name, 0); + + if (TREE_CODE (scope) == NAMESPACE_DECL) + fn = lookup_namespace_name (scope, name); + else + { + if (!TYPE_BEING_DEFINED (scope) + && !COMPLETE_TYPE_P (complete_type (scope))) + { + error ("incomplete type '%T' cannot be used to name a scope", + scope); + return error_mark_node; + } + + if (BASELINK_P (name)) + fn = name; + else + fn = lookup_member (scope, name, /*protect=*/1, /*prefer_type=*/0); + if (fn && current_class_type) + fn = (adjust_result_of_qualified_name_lookup + (fn, scope, current_class_type)); + } + + if (!fn) + { + error ("'%D' has no member named '%E'", scope, name); + return error_mark_node; + } + if (is_template_id) + { + tree fns = fn; + + if (BASELINK_P (fn)) + fns = BASELINK_FUNCTIONS (fns); + fns = build_nt (TEMPLATE_ID_EXPR, fns, template_args); + if (BASELINK_P (fn)) + BASELINK_FUNCTIONS (fn) = fns; + else + fn = fns; + } + + return fn; +} + /* Do any initial processing on the arguments to a function call. */ static tree @@ -3209,14 +3275,14 @@ build_conditional_expr (arg1, arg2, arg3) We use ocp_convert rather than build_user_type_conversion because the latter returns NULL_TREE on failure, while the former gives an error. */ - if (IS_AGGR_TYPE (TREE_TYPE (arg2)) && real_lvalue_p (arg2)) + if (IS_AGGR_TYPE (TREE_TYPE (arg2))) arg2 = ocp_convert (TREE_TYPE (arg2), arg2, CONV_IMPLICIT|CONV_FORCE_TEMP, LOOKUP_NORMAL); else arg2 = decay_conversion (arg2); arg2_type = TREE_TYPE (arg2); - if (IS_AGGR_TYPE (TREE_TYPE (arg3)) && real_lvalue_p (arg3)) + if (IS_AGGR_TYPE (TREE_TYPE (arg3))) arg3 = ocp_convert (TREE_TYPE (arg3), arg3, CONV_IMPLICIT|CONV_FORCE_TEMP, LOOKUP_NORMAL); else @@ -3355,6 +3421,10 @@ build_new_op (code, flags, arg1, arg2, arg3) if (TREE_CODE (arg1) == OFFSET_REF) arg1 = resolve_offset_ref (arg1); arg1 = convert_from_reference (arg1); + if (CLASS_TYPE_P (TREE_TYPE (arg1)) + && CLASSTYPE_TEMPLATE_INSTANTIATION (TREE_TYPE (arg1))) + /* Make sure the template type is instantiated now. */ + instantiate_class_template (TYPE_MAIN_VARIANT (TREE_TYPE (arg1))); switch (code) { @@ -3377,12 +3447,18 @@ build_new_op (code, flags, arg1, arg2, arg3) if (TREE_CODE (arg2) == OFFSET_REF) arg2 = resolve_offset_ref (arg2); arg2 = convert_from_reference (arg2); + if (CLASS_TYPE_P (TREE_TYPE (arg2)) + && CLASSTYPE_TEMPLATE_INSTANTIATION (TREE_TYPE (arg2))) + instantiate_class_template (TYPE_MAIN_VARIANT (TREE_TYPE (arg2))); } if (arg3) { if (TREE_CODE (arg3) == OFFSET_REF) arg3 = resolve_offset_ref (arg3); arg3 = convert_from_reference (arg3); + if (CLASS_TYPE_P (TREE_TYPE (arg3)) + && CLASSTYPE_TEMPLATE_INSTANTIATION (TREE_TYPE (arg3))) + instantiate_class_template (TYPE_MAIN_VARIANT (TREE_TYPE (arg3))); } if (code == COND_EXPR) diff --git a/gcc/cp/class.c b/gcc/cp/class.c index 06d09681e6f..fc22119c266 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -288,13 +288,15 @@ build_base_path (code, expr, binfo, nonnull) return error_mark_node; } + if (!want_pointer) + /* This must happen before the call to save_expr. */ + expr = build_unary_op (ADDR_EXPR, expr, 0); + fixed_type_p = resolves_to_fixed_type_p (expr, &nonnull); if (fixed_type_p <= 0 && TREE_SIDE_EFFECTS (expr)) expr = save_expr (expr); - if (!want_pointer) - expr = build_unary_op (ADDR_EXPR, expr, 0); - else if (!nonnull) + if (want_pointer && !nonnull) null_test = build (EQ_EXPR, boolean_type_node, expr, integer_zero_node); offset = BINFO_OFFSET (binfo); @@ -1832,7 +1834,7 @@ maybe_warn_about_overly_private_class (t) return; has_nonprivate_method = 1; - break; + /* Keep searching for a static member function. */ } else if (!DECL_CONSTRUCTOR_P (fn) && !DECL_DESTRUCTOR_P (fn)) has_member_fn = 1; @@ -3841,8 +3843,6 @@ build_base_field (record_layout_info rli, tree binfo, DECL_SIZE_UNIT (decl) = CLASSTYPE_SIZE_UNIT (basetype); DECL_ALIGN (decl) = CLASSTYPE_ALIGN (basetype); DECL_USER_ALIGN (decl) = CLASSTYPE_USER_ALIGN (basetype); - /* Tell the backend not to round up to TYPE_ALIGN. */ - DECL_PACKED (decl) = 1; /* Try to place the field. It may take more than one try if we have a hard time placing the field without putting two @@ -5116,6 +5116,7 @@ layout_class_type (tree t, tree *virtuals_p) /* Record the base version of the type. */ CLASSTYPE_AS_BASE (t) = base_t; + TYPE_CONTEXT (base_t) = t; } else CLASSTYPE_AS_BASE (t) = t; diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 3b50ffec48a..7981768eb6a 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -1,6 +1,6 @@ /* Definitions for C++ parsing and type checking. Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002 Free Software Foundation, Inc. + 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Contributed by Michael Tiemann (tiemann@cygnus.com) This file is part of GNU CC. @@ -3528,6 +3528,7 @@ extern tree build_method_call PARAMS ((tree, tree, tree, tree, int)); extern int null_ptr_cst_p PARAMS ((tree)); extern int sufficient_parms_p PARAMS ((tree)); extern tree type_decays_to PARAMS ((tree)); +extern tree resolve_scoped_fn_name PARAMS ((tree, tree)); extern tree build_user_type_conversion PARAMS ((tree, tree, int)); extern tree build_new_function_call PARAMS ((tree, tree)); extern tree build_new_method_call (tree, tree, tree, tree, int); @@ -3680,7 +3681,7 @@ extern void set_namespace_binding PARAMS ((tree, tree, tree)); extern tree lookup_namespace_name PARAMS ((tree, tree)); extern tree build_typename_type PARAMS ((tree, tree, tree, tree)); extern tree make_typename_type PARAMS ((tree, tree, tsubst_flags_t)); -extern tree make_unbound_class_template PARAMS ((tree, tree, int)); +extern tree make_unbound_class_template PARAMS ((tree, tree, tsubst_flags_t)); extern tree lookup_name_nonclass PARAMS ((tree)); extern tree lookup_function_nonclass PARAMS ((tree, tree)); extern tree lookup_name PARAMS ((tree, int)); @@ -3787,7 +3788,7 @@ extern void check_member_template PARAMS ((tree)); extern tree grokfield PARAMS ((tree, tree, tree, tree, tree)); extern tree grokbitfield PARAMS ((tree, tree, tree)); extern tree groktypefield PARAMS ((tree, tree)); -extern tree grokoptypename PARAMS ((tree, tree)); +extern tree grokoptypename PARAMS ((tree, tree, tree)); extern void cplus_decl_attributes PARAMS ((tree *, tree, int)); extern tree constructor_name_full PARAMS ((tree)); extern tree constructor_name PARAMS ((tree)); @@ -3897,7 +3898,7 @@ extern tree build_member_call PARAMS ((tree, tree, tree)); extern tree build_offset_ref PARAMS ((tree, tree)); extern tree resolve_offset_ref PARAMS ((tree)); extern tree build_new PARAMS ((tree, tree, tree, int)); -extern tree build_vec_init PARAMS ((tree, tree, int)); +extern tree build_vec_init PARAMS ((tree, tree, tree, int)); extern tree build_x_delete PARAMS ((tree, int, tree)); extern tree build_delete PARAMS ((tree, tree, special_function_kind, int, int)); extern void push_base_cleanups PARAMS ((void)); @@ -4044,6 +4045,7 @@ extern tree get_dynamic_cast_base_type PARAMS ((tree, tree)); extern void type_access_control PARAMS ((tree, tree)); extern int accessible_p PARAMS ((tree, tree)); extern tree lookup_field PARAMS ((tree, tree, int, int)); +extern tree lookup_nested_field PARAMS ((tree, int)); extern int lookup_fnfields_1 PARAMS ((tree, tree)); extern tree lookup_fnfields PARAMS ((tree, tree, int)); extern tree lookup_member PARAMS ((tree, tree, int, int)); diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index e68c06447e1..a39608084ed 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -1,6 +1,6 @@ /* Process declarations and variables for C compiler. Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002 Free Software Foundation, Inc. + 2001, 2002, 2003 Free Software Foundation, Inc. Contributed by Michael Tiemann (tiemann@cygnus.com) This file is part of GNU CC. @@ -3210,7 +3210,11 @@ duplicate_decls (newdecl, olddecl) && compparms (TYPE_ARG_TYPES (TREE_TYPE (DECL_TEMPLATE_RESULT (olddecl))), TYPE_ARG_TYPES (TREE_TYPE (DECL_TEMPLATE_RESULT (newdecl)))) && comp_template_parms (DECL_TEMPLATE_PARMS (newdecl), - DECL_TEMPLATE_PARMS (olddecl))) + DECL_TEMPLATE_PARMS (olddecl)) + /* Template functions can be disambiguated by + return type. */ + && same_type_p (TREE_TYPE (TREE_TYPE (newdecl)), + TREE_TYPE (TREE_TYPE (olddecl)))) { error ("new declaration `%#D'", newdecl); cp_error_at ("ambiguates old declaration `%#D'", olddecl); @@ -5677,10 +5681,13 @@ make_typename_type (context, name, complain) return error_mark_node; } - if (complain & tf_parsing) - type_access_control (context, tmpl); - else - enforce_access (context, tmpl); + if (complain & tf_error) + { + if (complain & tf_parsing) + type_access_control (context, tmpl); + else + enforce_access (context, tmpl); + } return lookup_template_class (tmpl, TREE_OPERAND (fullname, 1), @@ -5709,10 +5716,13 @@ make_typename_type (context, name, complain) return error_mark_node; } - if (complain & tf_parsing) - type_access_control (context, t); - else - enforce_access (context, t); + if (complain & tf_error) + { + if (complain & tf_parsing) + type_access_control (context, t); + else + enforce_access (context, t); + } if (DECL_ARTIFICIAL (t) || !(complain & tf_keep_type_decl)) t = TREE_TYPE (t); @@ -5753,7 +5763,7 @@ make_typename_type (context, name, complain) tree make_unbound_class_template (context, name, complain) tree context, name; - int complain; + tsubst_flags_t complain; { tree t; tree d; @@ -5775,15 +5785,18 @@ make_unbound_class_template (context, name, complain) if (!tmpl || !DECL_CLASS_TEMPLATE_P (tmpl)) { - if (complain) + if (complain & tf_error) error ("no class template named `%#T' in `%#T'", name, context); return error_mark_node; } - if (complain & tf_parsing) - type_access_control (context, tmpl); - else - enforce_access (context, tmpl); + if (complain & tf_error) + { + if (complain & tf_parsing) + type_access_control (context, tmpl); + else + enforce_access (context, tmpl); + } return tmpl; } @@ -6183,6 +6196,10 @@ lookup_name_real (name, prefer_type, nonclass, namespaces_only) } } + /* The name might be from an enclosing class of the current scope. */ + if (!val && !nonclass && current_class_type) + val = qualify_lookup (lookup_nested_field (name, !yylex), flags); + /* Now lookup in namespace scopes. */ if (!val || val_is_implicit_typename) { @@ -7417,7 +7434,9 @@ start_decl (declarator, declspecs, initialized, attributes, prefix_attributes) wrong semantics. If we say -fno-conserve-space, we want this to produce errors about redefs; to do this we force variables into the data segment. */ - DECL_COMMON (tem) = flag_conserve_space || ! TREE_PUBLIC (tem); + DECL_COMMON (tem) = ((TREE_CODE (tem) != VAR_DECL + || !DECL_THREAD_LOCAL (tem)) + && (flag_conserve_space || ! TREE_PUBLIC (tem))); #endif if (! processing_template_decl) @@ -12211,7 +12230,10 @@ require_complete_types_for_parms (parms) /* grokparms will have already issued an error */ TREE_TYPE (parms) = error_mark_node; else if (complete_type_or_else (TREE_TYPE (parms), parms)) - layout_decl (parms, 0); + { + layout_decl (parms, 0); + DECL_ARG_TYPE (parms) = type_passed_as (TREE_TYPE (parms)); + } else TREE_TYPE (parms) = error_mark_node; } diff --git a/gcc/cp/decl2.c b/gcc/cp/decl2.c index 248fa2d6725..a509c596109 100644 --- a/gcc/cp/decl2.c +++ b/gcc/cp/decl2.c @@ -674,11 +674,7 @@ tree check_classfn (ctype, function) tree ctype, function; { - tree fn_name = DECL_NAME (function); - tree fndecl, fndecls; - tree method_vec = CLASSTYPE_METHOD_VEC (complete_type (ctype)); - tree *methods = 0; - tree *end = 0; + int ix; if (DECL_USE_TEMPLATE (function) && !(TREE_CODE (function) == TEMPLATE_DECL @@ -695,81 +691,90 @@ check_classfn (ctype, function) reason we should, either. We let our callers know we didn't find the method, but we don't complain. */ return NULL_TREE; - - if (method_vec != 0) + + ix = lookup_fnfields_1 (complete_type (ctype), + DECL_CONSTRUCTOR_P (function) ? ctor_identifier : + DECL_DESTRUCTOR_P (function) ? dtor_identifier : + DECL_NAME (function)); + + if (ix >= 0) { - methods = &TREE_VEC_ELT (method_vec, 0); - end = TREE_VEC_END (method_vec); - - /* First suss out ctors and dtors. */ - if (*methods && fn_name == DECL_NAME (OVL_CURRENT (*methods)) - && DECL_CONSTRUCTOR_P (function)) - goto got_it; - if (*++methods && fn_name == DECL_NAME (OVL_CURRENT (*methods)) - && DECL_DESTRUCTOR_P (function)) - goto got_it; - - while (++methods != end && *methods) + tree methods = CLASSTYPE_METHOD_VEC (ctype); + tree fndecls, fndecl = 0; + bool is_conv_op; + const char *format = NULL; + + for (fndecls = TREE_VEC_ELT (methods, ix); + fndecls; fndecls = OVL_NEXT (fndecls)) + { + tree p1, p2; + + fndecl = OVL_CURRENT (fndecls); + p1 = TYPE_ARG_TYPES (TREE_TYPE (function)); + p2 = TYPE_ARG_TYPES (TREE_TYPE (fndecl)); + + /* We cannot simply call decls_match because this doesn't + work for static member functions that are pretending to + be methods, and because the name may have been changed by + asm("new_name"). */ + + /* Get rid of the this parameter on functions that become + static. */ + if (DECL_STATIC_FUNCTION_P (fndecl) + && TREE_CODE (TREE_TYPE (function)) == METHOD_TYPE) + p1 = TREE_CHAIN (p1); + + if (same_type_p (TREE_TYPE (TREE_TYPE (function)), + TREE_TYPE (TREE_TYPE (fndecl))) + && compparms (p1, p2) + && (DECL_TEMPLATE_SPECIALIZATION (function) + == DECL_TEMPLATE_SPECIALIZATION (fndecl)) + && (!DECL_TEMPLATE_SPECIALIZATION (function) + || (DECL_TI_TEMPLATE (function) + == DECL_TI_TEMPLATE (fndecl)))) + return fndecl; + } + error ("prototype for `%#D' does not match any in class `%T'", + function, ctype); + is_conv_op = DECL_CONV_FN_P (fndecl); + + if (is_conv_op) + ix = CLASSTYPE_FIRST_CONVERSION_SLOT; + fndecls = TREE_VEC_ELT (methods, ix); + while (fndecls) { - fndecl = *methods; - if (fn_name == DECL_NAME (OVL_CURRENT (*methods))) + fndecl = OVL_CURRENT (fndecls); + fndecls = OVL_NEXT (fndecls); + + if (!fndecls && is_conv_op) { - got_it: - for (fndecls = *methods; fndecls != NULL_TREE; - fndecls = OVL_NEXT (fndecls)) + if (TREE_VEC_LENGTH (methods) > ix) { - fndecl = OVL_CURRENT (fndecls); - - /* We cannot simply call decls_match because this - doesn't work for static member functions that are - pretending to be methods, and because the name - may have been changed by asm("new_name"). */ - if (DECL_NAME (function) == DECL_NAME (fndecl)) + ix++; + fndecls = TREE_VEC_ELT (methods, ix); + if (!DECL_CONV_FN_P (OVL_CURRENT (fndecls))) { - tree p1 = TYPE_ARG_TYPES (TREE_TYPE (function)); - tree p2 = TYPE_ARG_TYPES (TREE_TYPE (fndecl)); - - /* Get rid of the this parameter on functions that become - static. */ - if (DECL_STATIC_FUNCTION_P (fndecl) - && TREE_CODE (TREE_TYPE (function)) == METHOD_TYPE) - p1 = TREE_CHAIN (p1); - - if (same_type_p (TREE_TYPE (TREE_TYPE (function)), - TREE_TYPE (TREE_TYPE (fndecl))) - && compparms (p1, p2) - && (DECL_TEMPLATE_SPECIALIZATION (function) - == DECL_TEMPLATE_SPECIALIZATION (fndecl)) - && (!DECL_TEMPLATE_SPECIALIZATION (function) - || (DECL_TI_TEMPLATE (function) - == DECL_TI_TEMPLATE (fndecl)))) - return fndecl; + fndecls = NULL_TREE; + is_conv_op = false; } } - break; /* loser */ + else + is_conv_op = false; } + if (format) + format = " %#D"; + else if (fndecls) + format = "candidates are: %#D"; + else + format = "candidate is: %#D"; + cp_error_at (format, fndecl); } } - - if (methods != end && *methods) - { - tree fndecl = *methods; - error ("prototype for `%#D' does not match any in class `%T'", - function, ctype); - cp_error_at ("candidate%s: %+#D", OVL_NEXT (fndecl) ? "s are" : " is", - OVL_CURRENT (fndecl)); - while (fndecl = OVL_NEXT (fndecl), fndecl) - cp_error_at (" %#D", OVL_CURRENT(fndecl)); - } + else if (!COMPLETE_TYPE_P (ctype)) + cxx_incomplete_type_error (function, ctype); else - { - methods = 0; - if (!COMPLETE_TYPE_P (ctype)) - cxx_incomplete_type_error (function, ctype); - else - error ("no `%#D' member function declared in class `%T'", - function, ctype); - } + error ("no `%#D' member function declared in class `%T'", + function, ctype); /* If we did not find the method in the class, add it to avoid spurious errors (unless the CTYPE is not yet defined, in which @@ -1118,11 +1123,29 @@ grokbitfield (declarator, declspecs, width) return value; } +/* Convert a conversion operator name to an identifier. SCOPE is the + scope of the conversion operator, if explicit. */ + tree -grokoptypename (declspecs, declarator) +grokoptypename (declspecs, declarator, scope) tree declspecs, declarator; + tree scope; { tree t = grokdeclarator (declarator, declspecs, TYPENAME, 0, NULL); + + /* Resolve any TYPENAME_TYPEs that refer to SCOPE, before mangling + the name, so that we mangle the right thing. */ + if (scope && current_template_parms + && uses_template_parms (t) + && uses_template_parms (scope)) + { + tree args = current_template_args (); + + push_scope (scope); + t = tsubst (t, args, tf_error | tf_warning, NULL_TREE); + pop_scope (scope); + } + return mangle_conv_op_name_for_type (t); } @@ -2004,6 +2027,10 @@ import_export_tinfo (decl, type, is_in_library) DECL_INTERFACE_KNOWN (decl) = 1; } +/* Return an expression that performs the destruction of DECL, which + must be a VAR_DECL whose type has a non-trivial destructor, or is + an array whose (innermost) elements have a non-trivial destructor. */ + tree build_cleanup (decl) tree decl; @@ -2011,6 +2038,14 @@ build_cleanup (decl) tree temp; tree type = TREE_TYPE (decl); + /* This function should only be called for declarations that really + require cleanups. */ + my_friendly_assert (!TYPE_HAS_TRIVIAL_DESTRUCTOR (type), 20030106); + + /* Treat all objects with destructors as used; the destructor may do + something substantive. */ + mark_used (decl); + if (TREE_CODE (type) == ARRAY_TYPE) temp = decl; else @@ -2842,12 +2877,13 @@ finish_file () reconsider = 1; } - /* Go through the various inline functions, and see if any need - synthesizing. */ for (i = 0; i < deferred_fns_used; ++i) { tree decl = VARRAY_TREE (deferred_fns, i); + import_export_decl (decl); + + /* Does it need synthesizing? */ if (DECL_ARTIFICIAL (decl) && ! DECL_INITIAL (decl) && TREE_USED (decl) && (! DECL_REALLY_EXTERN (decl) || DECL_INLINE (decl))) @@ -2862,30 +2898,21 @@ finish_file () pop_from_top_level (); reconsider = 1; } - } - /* We lie to the back-end, pretending that some functions are - not defined when they really are. This keeps these functions - from being put out unnecessarily. But, we must stop lying - when the functions are referenced, or if they are not comdat - since they need to be put out now. - This is done in a separate for cycle, because if some deferred - function is contained in another deferred function later in - deferred_fns varray, rest_of_compilation would skip this - function and we really cannot expand the same function twice. */ - for (i = 0; i < deferred_fns_used; ++i) - { - tree decl = VARRAY_TREE (deferred_fns, i); - + /* We lie to the back-end, pretending that some functions + are not defined when they really are. This keeps these + functions from being put out unnecessarily. But, we must + stop lying when the functions are referenced, or if they + are not comdat since they need to be put out now. This + is done in a separate for cycle, because if some deferred + function is contained in another deferred function later + in deferred_fns varray, rest_of_compilation would skip + this function and we really cannot expand the same + function twice. */ if (DECL_NOT_REALLY_EXTERN (decl) && DECL_INITIAL (decl) && DECL_NEEDED_P (decl)) DECL_EXTERNAL (decl) = 0; - } - - for (i = 0; i < deferred_fns_used; ++i) - { - tree decl = VARRAY_TREE (deferred_fns, i); /* If we're going to need to write this function out, and there's already a body for it, create RTL for it now. @@ -2941,6 +2968,16 @@ finish_file () } while (reconsider); + /* All used inline functions must have a definition at this point. */ + for (i = 0; i < deferred_fns_used; ++i) + { + tree decl = VARRAY_TREE (deferred_fns, i); + + if (TREE_USED (decl) && DECL_DECLARED_INLINE_P (decl) + && !(TREE_ASM_WRITTEN (decl) || DECL_SAVED_TREE (decl))) + cp_warning_at ("inline function `%D' used but never defined", decl); + } + /* We give C linkage to static constructors and destructors. */ push_lang_context (lang_name_c); @@ -3292,16 +3329,18 @@ build_expr_from_tree (t) { tree ref = TREE_OPERAND (t, 0); tree name = TREE_OPERAND (ref, 1); + tree fn, scope, args; if (TREE_CODE (name) == TEMPLATE_ID_EXPR) name = build_nt (TEMPLATE_ID_EXPR, TREE_OPERAND (name, 0), build_expr_from_tree (TREE_OPERAND (name, 1))); - - return build_member_call - (build_expr_from_tree (TREE_OPERAND (ref, 0)), - name, - build_expr_from_tree (TREE_OPERAND (t, 1))); + + scope = build_expr_from_tree (TREE_OPERAND (ref, 0)); + args = build_expr_from_tree (TREE_OPERAND (t, 1)); + fn = resolve_scoped_fn_name (scope, name); + + return build_call_from_tree (fn, args, 1); } else { @@ -4714,6 +4753,12 @@ mark_used (decl) TREE_USED (decl) = 1; if (processing_template_decl) return; + + if (TREE_CODE (decl) == FUNCTION_DECL && DECL_DECLARED_INLINE_P (decl) + && !TREE_ASM_WRITTEN (decl)) + /* Remember it, so we can check it was defined. */ + defer_fn (decl); + if (!skip_evaluation) assemble_external (decl); @@ -4759,6 +4804,7 @@ handle_class_head (tag_kind, scope, id, attributes, defn_p, new_type_p) int *new_type_p; { tree decl = NULL_TREE; + tree type; tree current = current_scope (); bool xrefd_p = false; @@ -4807,12 +4853,28 @@ handle_class_head (tag_kind, scope, id, attributes, defn_p, new_type_p) xrefd_p = true; } - if (!TYPE_BINFO (TREE_TYPE (decl))) + type = TREE_TYPE (decl); + + if (!TYPE_BINFO (type)) { error ("`%T' is not a class or union type", decl); return error_mark_node; } - + + /* When `A' is a template class, using `class A' without template + argument is invalid unless + - we are inside the scope of the template class `A' or one of its + specialization. + - we are declaring the template class `A' itself. */ + if (TREE_CODE (type) == RECORD_TYPE + && CLASSTYPE_IS_TEMPLATE (type) + && processing_template_decl <= template_class_depth (current) + && ! is_base_of_enclosing_class (type, current_class_type)) + { + error ("template argument is required for `%T'", type); + return error_mark_node; + } + if (defn_p) { /* For a definition, we want to enter the containing scope diff --git a/gcc/cp/dump.c b/gcc/cp/dump.c index c4472b07359..39e72dcd983 100644 --- a/gcc/cp/dump.c +++ b/gcc/cp/dump.c @@ -263,6 +263,14 @@ cp_dump_tree (dump_info, t) return 1; } + /* Is it a type used as a base? */ + if (TYPE_CONTEXT (t) && TREE_CODE (TYPE_CONTEXT (t)) == TREE_CODE (t) + && CLASSTYPE_AS_BASE (TYPE_CONTEXT (t)) == t) + { + dump_child ("bfld", TYPE_CONTEXT (t)); + return 1; + } + dump_child ("vfld", TYPE_VFIELD (t)); if (CLASSTYPE_TEMPLATE_SPECIALIZATION(t)) dump_string(di, "spec"); diff --git a/gcc/cp/error.c b/gcc/cp/error.c index da880f5fad4..831ce21a640 100644 --- a/gcc/cp/error.c +++ b/gcc/cp/error.c @@ -928,6 +928,25 @@ dump_decl (t, flags) break; case OVERLOAD: + if (OVL_CHAIN (t)) + { + t = OVL_CURRENT (t); + if (DECL_CLASS_SCOPE_P (t)) + { + dump_type (DECL_CONTEXT (t), flags); + output_add_string (scratch_buffer, "::"); + } + else if (DECL_CONTEXT (t)) + { + dump_decl (DECL_CONTEXT (t), flags); + output_add_string (scratch_buffer, "::"); + } + dump_decl (DECL_NAME (t), flags); + break; + } + + /* If there's only one function, just treat it like an ordinary + FUNCTION_DECL. */ t = OVL_CURRENT (t); /* Fall through. */ @@ -2029,6 +2048,10 @@ dump_expr (t, flags) output_add_string (scratch_buffer, ") break; "); break; + case BASELINK: + print_tree_identifier (scratch_buffer, DECL_NAME (get_first_fn (t))); + break; + case TREE_LIST: if (TREE_VALUE (t) && TREE_CODE (TREE_VALUE (t)) == FUNCTION_DECL) { diff --git a/gcc/cp/friend.c b/gcc/cp/friend.c index 7b718ace0df..9280a09b196 100644 --- a/gcc/cp/friend.c +++ b/gcc/cp/friend.c @@ -64,6 +64,10 @@ is_friend (type, supplicant) if (supplicant == TREE_VALUE (friends)) return 1; + /* We haven't completed the instantiation yet. */ + if (TREE_CODE (supplicant) == TEMPLATE_DECL) + return 1; + /* Temporarily, we are more lenient to deal with nested friend functions, for which there can be more than one FUNCTION_DECL, despite being the @@ -203,24 +207,25 @@ make_friend_class (type, friend_type) return; } - if (CLASS_TYPE_P (friend_type) - && CLASSTYPE_TEMPLATE_SPECIALIZATION (friend_type) - && uses_template_parms (friend_type)) - { - /* [temp.friend] - - Friend declarations shall not declare partial - specializations. */ - error ("partial specialization `%T' declared `friend'", - friend_type); - return; - } - if (processing_template_decl > template_class_depth (type)) /* If the TYPE is a template then it makes sense for it to be friends with itself; this means that each instantiation is friends with all other instantiations. */ - is_template_friend = 1; + { + if (CLASS_TYPE_P (friend_type) + && CLASSTYPE_TEMPLATE_SPECIALIZATION (friend_type) + && uses_template_parms (friend_type)) + { + /* [temp.friend] + Friend declarations shall not declare partial + specializations. */ + error ("partial specialization `%T' declared `friend'", + friend_type); + return; + } + + is_template_friend = 1; + } else if (same_type_p (type, friend_type)) { pedwarn ("class `%T' is implicitly friends with itself", diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 39d4c57047e..af682035fa4 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -352,7 +352,8 @@ perform_member_init (tree member, tree init) && TREE_CODE (TREE_TYPE (TREE_VALUE (init))) == ARRAY_TYPE) { /* Initialization of one array from another. */ - finish_expr_stmt (build_vec_init (decl, TREE_VALUE (init), 1)); + finish_expr_stmt (build_vec_init (decl, NULL_TREE, TREE_VALUE (init), + /* from_array=*/1)); } else finish_expr_stmt (build_aggr_init (decl, init, 0)); @@ -1101,7 +1102,7 @@ build_aggr_init (exp, init, flags) TREE_TYPE (exp) = TYPE_MAIN_VARIANT (type); if (itype && cp_type_quals (itype) != TYPE_UNQUALIFIED) TREE_TYPE (init) = TYPE_MAIN_VARIANT (itype); - stmt_expr = build_vec_init (exp, init, + stmt_expr = build_vec_init (exp, NULL_TREE, init, init && same_type_p (TREE_TYPE (init), TREE_TYPE (exp))); TREE_READONLY (exp) = was_const; @@ -2138,6 +2139,7 @@ build_new_1 (exp) tree placement, init; tree type, true_type, size, rval, t; tree full_type; + tree outer_nelts = NULL_TREE; tree nelts = NULL_TREE; tree alloc_call, alloc_expr, alloc_node; tree alloc_fn; @@ -2167,12 +2169,11 @@ build_new_1 (exp) if (TREE_CODE (type) == ARRAY_REF) { has_array = 1; - nelts = TREE_OPERAND (type, 1); + nelts = outer_nelts = TREE_OPERAND (type, 1); type = TREE_OPERAND (type, 0); - full_type = cp_build_binary_op (MINUS_EXPR, nelts, integer_one_node); - full_type = build_index_type (full_type); - full_type = build_cplus_array_type (type, full_type); + /* Use an incomplete array type to avoid VLA headaches. */ + full_type = build_cplus_array_type (type, NULL_TREE); } else full_type = type; @@ -2362,7 +2363,11 @@ build_new_1 (exp) pedwarn ("ISO C++ forbids initialization in array new"); if (has_array) - init_expr = build_vec_init (init_expr, init, 0); + init_expr + = build_vec_init (init_expr, + cp_build_binary_op (MINUS_EXPR, outer_nelts, + integer_one_node), + init, /*from_array=*/0); else if (TYPE_NEEDS_CONSTRUCTING (type)) init_expr = build_special_member_call (init_expr, complete_ctor_identifier, @@ -2686,6 +2691,9 @@ get_temp_regvar (type, init) initialization of a vector of aggregate types. BASE is a reference to the vector, of ARRAY_TYPE. + MAXINDEX is the maximum index of the array (one less than the + number of elements). It is only used if + TYPE_DOMAIN (TREE_TYPE (BASE)) == NULL_TREE. INIT is the (possibly NULL) initializer. FROM_ARRAY is 0 if we should init everything with INIT @@ -2696,8 +2704,8 @@ get_temp_regvar (type, init) but use assignment instead of initialization. */ tree -build_vec_init (base, init, from_array) - tree base, init; +build_vec_init (base, maxindex, init, from_array) + tree base, init, maxindex; int from_array; { tree rval; @@ -2717,9 +2725,11 @@ build_vec_init (base, init, from_array) tree try_block = NULL_TREE; tree try_body = NULL_TREE; int num_initialized_elts = 0; - tree maxindex = array_type_nelts (TREE_TYPE (base)); - if (maxindex == error_mark_node) + if (TYPE_DOMAIN (atype)) + maxindex = array_type_nelts (atype); + + if (maxindex == NULL_TREE || maxindex == error_mark_node) return error_mark_node; if (init @@ -2909,7 +2919,7 @@ build_vec_init (base, init, from_array) sorry ("cannot initialize multi-dimensional array with initializer"); elt_init = build_vec_init (build1 (INDIRECT_REF, type, base), - 0, 0); + 0, 0, 0); } else elt_init = build_aggr_init (build1 (INDIRECT_REF, type, base), diff --git a/gcc/cp/method.c b/gcc/cp/method.c index 8a905b21b75..c942d327219 100644 --- a/gcc/cp/method.c +++ b/gcc/cp/method.c @@ -342,6 +342,8 @@ make_thunk (function, delta, vcall_index) DECL_NO_STATIC_CHAIN (thunk) = 1; /* The THUNK is not a pending inline, even if the FUNCTION is. */ DECL_PENDING_INLINE_P (thunk) = 0; + DECL_INLINE (thunk) = 0; + DECL_DECLARED_INLINE_P (thunk) = 0; /* Nor has it been deferred. */ DECL_DEFERRED_FN (thunk) = 0; /* Add it to the list of thunks associated with FUNCTION. */ diff --git a/gcc/cp/parse.y b/gcc/cp/parse.y index 0be461eada5..635944a83ed 100644 --- a/gcc/cp/parse.y +++ b/gcc/cp/parse.y @@ -386,7 +386,7 @@ check_class_key (key, aggr) %type <ttype> init initlist maybeasm maybe_init defarg defarg1 %type <ttype> asm_operands nonnull_asm_operands asm_operand asm_clobbers %type <ttype> maybe_attribute attributes attribute attribute_list attrib -%type <ttype> any_word +%type <ttype> any_word unoperator %type <itype> save_lineno %type <ttype> simple_stmt simple_if @@ -3830,7 +3830,7 @@ bad_parm: { if (TREE_CODE (TREE_OPERAND ($$, 0)) == TEMPLATE_TYPE_PARM || TREE_CODE (TREE_OPERAND ($$, 0)) == BOUND_TEMPLATE_TEMPLATE_PARM) - error ("`%E' is not a type, use `typename %E' to make it one", $$); + error ("`%E' is not a type, use `typename %E' to make it one", $$, $$); else error ("no type `%D' in `%T'", TREE_OPERAND ($$, 1), TREE_OPERAND ($$, 0)); } @@ -3917,6 +3917,7 @@ unoperator: got_object = TREE_VALUE (saved_scopes); looking_for_typename = TREE_LANG_FLAG_0 (saved_scopes); saved_scopes = TREE_CHAIN (saved_scopes); + $$ = got_scope; } ; @@ -3988,7 +3989,7 @@ operator_name: | operator DELETE '[' ']' unoperator { $$ = frob_opname (ansi_opname (VEC_DELETE_EXPR)); } | operator type_specifier_seq conversion_declarator unoperator - { $$ = frob_opname (grokoptypename ($2.t, $3)); } + { $$ = frob_opname (grokoptypename ($2.t, $3, $4)); } | operator error unoperator { $$ = frob_opname (ansi_opname (ERROR_MARK)); } ; @@ -4117,72 +4118,19 @@ static tree parse_finish_call_expr (tree fn, tree args, int koenig) { bool disallow_virtual; - tree template_args; - tree template_id; - tree f; if (TREE_CODE (fn) == OFFSET_REF) return build_offset_ref_call_from_tree (fn, args); if (TREE_CODE (fn) == SCOPE_REF) { - tree scope; - tree name; - - scope = TREE_OPERAND (fn, 0); - name = TREE_OPERAND (fn, 1); + tree scope = TREE_OPERAND (fn, 0); + tree name = TREE_OPERAND (fn, 1); if (scope == error_mark_node || name == error_mark_node) return error_mark_node; if (!processing_template_decl) - { - if (TREE_CODE (scope) == NAMESPACE_DECL) - fn = lookup_namespace_name (scope, name); - else - { - if (!COMPLETE_TYPE_P (scope) && !TYPE_BEING_DEFINED (scope)) - { - error ("incomplete type '%T' cannot be used to name a scope", - scope); - return error_mark_node; - } - else if (TREE_CODE (name) == TEMPLATE_ID_EXPR) - { - template_id = name; - template_args = TREE_OPERAND (name, 1); - name = TREE_OPERAND (name, 0); - } - else - { - template_id = NULL_TREE; - template_args = NULL_TREE; - } - - if (BASELINK_P (name)) - fn = name; - else - { - if (TREE_CODE (name) == OVERLOAD) - name = DECL_NAME (get_first_fn (name)); - fn = lookup_member (scope, name, /*protect=*/1, - /*prefer_type=*/0); - if (!fn) - { - error ("'%D' has no member named '%E'", scope, name); - return error_mark_node; - } - - if (BASELINK_P (fn) && template_id) - BASELINK_FUNCTIONS (fn) - = build_nt (TEMPLATE_ID_EXPR, - BASELINK_FUNCTIONS (fn), - template_args); - } - if (current_class_type) - fn = (adjust_result_of_qualified_name_lookup - (fn, scope, current_class_type)); - } - } + fn = resolve_scoped_fn_name (scope, name); disallow_virtual = true; } else @@ -4190,6 +4138,8 @@ parse_finish_call_expr (tree fn, tree args, int koenig) if (koenig && TREE_CODE (fn) == IDENTIFIER_NODE) { + tree f; + /* Do the Koenig lookup. */ fn = do_identifier (fn, 2, args); /* If name lookup didn't find any matching declarations, we've diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index fa3caac01dc..a8c3788ed20 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -66,6 +66,8 @@ static size_t inline_parm_levels_used; static GTY(()) tree current_tinst_level; +static GTY(()) tree saved_access_scope; + /* A map from local variable declarations in the body of the template presently being instantiated to the corresponding instantiated local variables. */ @@ -87,6 +89,9 @@ static htab_t local_specializations; #define GTB_IGNORE_TYPE 2 /* We don't need to try to unify the current type with the desired type. */ +static void push_access_scope_real PARAMS ((tree, tree, tree)); +static void push_access_scope PARAMS ((tree)); +static void pop_access_scope PARAMS ((tree)); static int resolve_overloaded_unification PARAMS ((tree, tree, tree, tree, unification_kind_t, int)); static int try_one_overload PARAMS ((tree, tree, tree, tree, tree, @@ -166,6 +171,87 @@ static tree copy_default_args_to_explicit_spec_1 PARAMS ((tree, tree)); static void copy_default_args_to_explicit_spec PARAMS ((tree)); static int invalid_nontype_parm_type_p PARAMS ((tree, tsubst_flags_t)); +/* Make the current scope suitable for access checking when we are + processing T. T can be FUNCTION_DECL for instantiated function + template, TEMPLATE_DECL for uninstantiated one, or VAR_DECL for + static member variable (need by instantiate_decl). ARGS is the + template argument for TEMPLATE_DECL. If CONTEXT is not NULL_TREE, + this is used instead of the context of T. */ + +void +push_access_scope_real (t, args, context) + tree t, args, context; +{ + if (TREE_CODE (t) == FUNCTION_DECL || DECL_FUNCTION_TEMPLATE_P (t)) + { + /* When we are processing specialization `foo<Outer>' for code like + + template <class U> typename U::Inner foo (); + class Outer { + struct Inner {}; + friend Outer::Inner foo<Outer> (); + }; + + `T' is a TEMPLATE_DECL, but `Outer' is only a friend of one of + its specialization. We can get the FUNCTION_DECL with the right + information because this specialization has already been + registered by the friend declaration above. */ + + if (DECL_FUNCTION_TEMPLATE_P (t) && args) + { + tree full_args = tsubst_template_arg_vector + (DECL_TI_ARGS (DECL_TEMPLATE_RESULT (t)), args, tf_none); + tree spec = NULL_TREE; + if (full_args != error_mark_node) + spec = retrieve_specialization (t, full_args); + if (spec) + t = spec; + } + } + + if (!context) + context = DECL_CONTEXT (t); + if (context && TYPE_P (context)) + push_nested_class (context, 2); + else + push_to_top_level (); + + if (TREE_CODE (t) == FUNCTION_DECL || DECL_FUNCTION_TEMPLATE_P (t)) + { + saved_access_scope = tree_cons + (NULL_TREE, current_function_decl, saved_access_scope); + current_function_decl = t; + } +} + +/* Like push_access_scope_real, but always uses DECL_CONTEXT. */ + +void +push_access_scope (t) + tree t; +{ + push_access_scope_real (t, NULL_TREE, NULL_TREE); +} + +/* Restore the scope set up by push_access_scope. T is the node we + are processing. */ + +void +pop_access_scope (t) + tree t; +{ + if (TREE_CODE (t) == FUNCTION_DECL || DECL_FUNCTION_TEMPLATE_P (t)) + { + current_function_decl = TREE_VALUE (saved_access_scope); + saved_access_scope = TREE_CHAIN (saved_access_scope); + } + + if (DECL_CLASS_SCOPE_P (t)) + pop_nested_class (); + else + pop_from_top_level (); +} + /* Do any processing required when DECL (a member template declaration using TEMPLATE_PARAMETERS as its innermost parameter list) is finished. Returns the TEMPLATE_DECL corresponding to DECL, unless @@ -3341,17 +3427,12 @@ convert_template_argument (parm, arg, args, complain, i, in_decl) && TREE_CODE (DECL_TEMPLATE_RESULT (arg)) == TYPE_DECL) || TREE_CODE (arg) == TEMPLATE_TEMPLATE_PARM || TREE_CODE (arg) == UNBOUND_CLASS_TEMPLATE); - else if (CLASSTYPE_TEMPLATE_INFO (arg) && !CLASSTYPE_USE_TEMPLATE (arg) - && PRIMARY_TEMPLATE_P (CLASSTYPE_TI_TEMPLATE (arg))) - { - if (is_base_of_enclosing_class (arg, current_class_type)) - /* This is a template name used within the scope of the - template. It could be the template, or it could be the - instantiation. Choose whichever makes sense. */ - is_tmpl_type = requires_tmpl_type; - else - is_tmpl_type = 1; - } + else if (CLASSTYPE_IS_TEMPLATE (arg) + && is_base_of_enclosing_class (arg, current_class_type)) + /* This is a template name used within the scope of the + template. It could be the template, or it could be the + instantiation. Choose whichever makes sense. */ + is_tmpl_type = requires_tmpl_type; else /* It is a non-template class, or a specialization of a template class, or a non-template member of a template class. */ @@ -4233,6 +4314,11 @@ lookup_template_class (d1, arglist, in_decl, context, entering_scope, complain) else type_decl = TYPE_NAME (t); + TREE_PRIVATE (type_decl) + = TREE_PRIVATE (TYPE_STUB_DECL (template_type)); + TREE_PROTECTED (type_decl) + = TREE_PROTECTED (TYPE_STUB_DECL (template_type)); + /* Set up the template information. We have to figure out which template is the immediate parent if this is a full instantiation. */ @@ -5691,14 +5777,14 @@ tsubst_default_argument (fn, type, arg) ??? current_class_type affects a lot more than name lookup. This is very fragile. Fortunately, it will go away when we do 2-phase name binding properly. */ - if (DECL_CLASS_SCOPE_P (fn)) - pushclass (DECL_CONTEXT (fn), 2); + + /* FN is already the desired FUNCTION_DECL. */ + push_access_scope (fn); arg = tsubst_expr (arg, DECL_TI_ARGS (fn), tf_error | tf_warning, NULL_TREE); - if (DECL_CLASS_SCOPE_P (fn)) - popclass (); + pop_access_scope (fn); /* Make sure the default argument is reasonable. */ arg = check_default_argument (type, arg); @@ -6793,7 +6879,7 @@ tsubst (t, args, complain, in_decl) } if (TREE_CODE (type) == REFERENCE_TYPE) { - if (complain) + if (complain & tf_error) error ("creating pointer to member reference type `%T'", type); return error_mark_node; @@ -7795,17 +7881,17 @@ instantiate_template (tmpl, targ_ptr) } /* Make sure that we can see identifiers, and compute access - correctly. */ - if (DECL_CLASS_SCOPE_P (gen_tmpl)) - pushclass (tsubst (DECL_CONTEXT (gen_tmpl), targ_ptr, tf_error, - gen_tmpl), 1); + correctly. The desired FUNCTION_DECL for FNDECL may or may not be + created earlier. Let push_access_scope_real figure that out. */ + push_access_scope_real + (gen_tmpl, targ_ptr, tsubst (DECL_CONTEXT (gen_tmpl), targ_ptr, + tf_error, gen_tmpl)); /* substitute template parameters */ fndecl = tsubst (DECL_TEMPLATE_RESULT (gen_tmpl), targ_ptr, tf_error, gen_tmpl); - if (DECL_CLASS_SCOPE_P (gen_tmpl)) - popclass (); + pop_access_scope (gen_tmpl); /* The DECL_TI_TEMPLATE should always be the immediate parent template, not the most general template. */ @@ -7877,7 +7963,7 @@ fn_type_unification (fn, explicit_targs, targs, args, return_type, int result; my_friendly_assert (TREE_CODE (fn) == TEMPLATE_DECL, 0); - + fntype = TREE_TYPE (fn); if (explicit_targs) { @@ -8292,7 +8378,8 @@ resolve_overloaded_unification (tparms, targs, parm, arg, strict, } } } - else if (TREE_CODE (arg) == OVERLOAD) + else if (TREE_CODE (arg) == OVERLOAD + || TREE_CODE (arg) == FUNCTION_DECL) { for (; arg; arg = OVL_NEXT (arg)) { @@ -8833,6 +8920,12 @@ unify (tparms, targs, parm, arg, strict) } else { + /* If ARG is an offset type, we're trying to unify '*T' with + 'U C::*', which is ill-formed. See the comment in the + POINTER_TYPE case about this ugliness. */ + if (TREE_CODE (arg) == OFFSET_TYPE) + return 1; + /* If PARM is `const T' and ARG is only `int', we don't have a match unless we are allowing additional qualification. If ARG is `const int' and PARM is just `T' that's OK; @@ -9897,6 +9990,7 @@ regenerate_decl_from_template (decl, tmpl) instantiation of a specialization, which it isn't: it's a full instantiation. */ gen_tmpl = most_general_template (tmpl); + push_access_scope_real (gen_tmpl, args, DECL_CONTEXT (decl)); unregistered = unregister_specialization (decl, gen_tmpl); /* If the DECL was not unregistered then something peculiar is @@ -9904,11 +9998,6 @@ regenerate_decl_from_template (decl, tmpl) register_specialization for it. */ my_friendly_assert (unregistered, 0); - if (DECL_CLASS_SCOPE_P (decl)) - /* Make sure that we can see identifiers, and compute access - correctly, for the class members used in the declaration of - this static variable or function. */ - pushclass (DECL_CONTEXT (decl), 2); /* Do the substitution to get the new declaration. */ new_decl = tsubst (code_pattern, args, tf_error, NULL_TREE); @@ -9930,9 +10019,7 @@ regenerate_decl_from_template (decl, tmpl) DECL_INITIAL (decl) = NULL_TREE; } - /* Pop the class context we pushed above. */ - if (DECL_CLASS_SCOPE_P (decl)) - popclass (); + pop_access_scope (decl); /* The immediate parent of the new template is still whatever it was before, even though tsubst sets DECL_TI_TEMPLATE up as the most @@ -10125,9 +10212,9 @@ instantiate_decl (d, defer_ok) tree type = TREE_TYPE (gen); /* Make sure that we can see identifiers, and compute access - correctly. */ - if (DECL_CLASS_SCOPE_P (d)) - pushclass (DECL_CONTEXT (d), 1); + correctly. D is already the target FUNCTION_DECL with the + right context. */ + push_access_scope (d); if (TREE_CODE (gen) == FUNCTION_DECL) { @@ -10142,8 +10229,7 @@ instantiate_decl (d, defer_ok) } tsubst (type, gen_args, tf_error | tf_warning, d); - if (DECL_CLASS_SCOPE_P (d)) - popclass (); + pop_access_scope (d); } if (TREE_CODE (d) == VAR_DECL && DECL_INITIALIZED_IN_CLASS_P (d) @@ -10483,8 +10569,7 @@ get_mostly_instantiated_function_type (decl) partial substitution here. It depends only on outer template parameters, regardless of whether the innermost level is specialized or not. */ - if (DECL_CLASS_SCOPE_P (decl)) - pushclass (DECL_CONTEXT (decl), 1); + push_access_scope (decl); /* Now, do the (partial) substitution to figure out the appropriate function type. */ @@ -10497,8 +10582,7 @@ get_mostly_instantiated_function_type (decl) TREE_VEC_LENGTH (partial_args)--; tparms = tsubst_template_parms (tparms, partial_args, tf_error); - if (DECL_CLASS_SCOPE_P (decl)) - popclass (); + pop_access_scope (decl); } return fn_type; diff --git a/gcc/cp/search.c b/gcc/cp/search.c index fefd11b8b16..0ccc54a0862 100644 --- a/gcc/cp/search.c +++ b/gcc/cp/search.c @@ -1,7 +1,7 @@ /* Breadth-first and depth-first routines for searching multiple-inheritance lattice for GNU C++. Copyright (C) 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2002 Free Software Foundation, Inc. + 1999, 2000, 2002, 2003 Free Software Foundation, Inc. Contributed by Michael Tiemann (tiemann@cygnus.com) This file is part of GNU CC. @@ -1580,6 +1580,70 @@ lookup_fnfields (xbasetype, name, protect) return rval; } +/* Try to find NAME inside a nested class. */ + +tree +lookup_nested_field (name, complain) + tree name; + int complain; +{ + register tree t; + + tree id = NULL_TREE; + if (TYPE_MAIN_DECL (current_class_type)) + { + /* Climb our way up the nested ladder, seeing if we're trying to + modify a field in an enclosing class. If so, we should only + be able to modify if it's static. */ + for (t = TYPE_MAIN_DECL (current_class_type); + t && DECL_CONTEXT (t); + t = TYPE_MAIN_DECL (DECL_CONTEXT (t))) + { + if (TREE_CODE (DECL_CONTEXT (t)) != RECORD_TYPE) + break; + + /* N.B.: lookup_field will do the access checking for us */ + id = lookup_field (DECL_CONTEXT (t), name, complain, 0); + if (id == error_mark_node) + { + id = NULL_TREE; + continue; + } + + if (id != NULL_TREE) + { + if (TREE_CODE (id) == FIELD_DECL + && ! TREE_STATIC (id) + && TREE_TYPE (id) != error_mark_node) + { + if (complain) + { + /* At parse time, we don't want to give this error, since + we won't have enough state to make this kind of + decision properly. But there are times (e.g., with + enums in nested classes) when we do need to call + this fn at parse time. So, in those cases, we pass + complain as a 0 and just return a NULL_TREE. */ + error ("assignment to non-static member `%D' of enclosing class `%T'", + id, DECL_CONTEXT (t)); + /* Mark this for do_identifier(). It would otherwise + claim that the variable was undeclared. */ + TREE_TYPE (id) = error_mark_node; + } + else + { + id = NULL_TREE; + continue; + } + } + break; + } + } + } + + return id; +} + /* TYPE is a class type. Return the index of the fields within the method vector with name NAME, or -1 is no such field exists. */ diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 81b4ccfdafc..bec48feac60 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -2098,20 +2098,28 @@ tree finish_typeof (expr) tree expr; { + tree type; + if (processing_template_decl) { - tree t; + type = make_aggr_type (TYPEOF_TYPE); + TYPE_FIELDS (type) = expr; - t = make_aggr_type (TYPEOF_TYPE); - TYPE_FIELDS (t) = expr; - - return t; + return type; } if (TREE_CODE (expr) == OFFSET_REF) expr = resolve_offset_ref (expr); - return TREE_TYPE (expr); + type = TREE_TYPE (expr); + + if (!type || type == unknown_type_node) + { + error ("type of `%E' is unknown", expr); + return error_mark_node; + } + + return type; } /* Compute the value of the `sizeof' operator. */ diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 6c313eba4d8..e3b4c4932e8 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -1737,8 +1737,10 @@ cp_tree_equal (t1, t2) return 0; case TEMPLATE_PARM_INDEX: - return TEMPLATE_PARM_IDX (t1) == TEMPLATE_PARM_IDX (t2) - && TEMPLATE_PARM_LEVEL (t1) == TEMPLATE_PARM_LEVEL (t2); + return (TEMPLATE_PARM_IDX (t1) == TEMPLATE_PARM_IDX (t2) + && TEMPLATE_PARM_LEVEL (t1) == TEMPLATE_PARM_LEVEL (t2) + && same_type_p (TREE_TYPE (TEMPLATE_PARM_DECL (t1)), + TREE_TYPE (TEMPLATE_PARM_DECL (t2)))); case SIZEOF_EXPR: case ALIGNOF_EXPR: diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 85eef41c2e0..019d7506412 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -1985,7 +1985,15 @@ build_class_member_access_expr (tree object, tree member, OBJECT so that it refers to the class containing the anonymous union. Generate a reference to the anonymous union itself, and recur to find MEMBER. */ - if (ANON_AGGR_TYPE_P (DECL_CONTEXT (member))) + if (ANON_AGGR_TYPE_P (DECL_CONTEXT (member)) + /* When this code is called from build_field_call, the + object already has the type of the anonymous union. + That is because the COMPONENT_REF was already + constructed, and was then disassembled before calling + build_field_call. After the function-call code is + cleaned up, this waste can be eliminated. */ + && (!same_type_ignoring_top_level_qualifiers_p + (TREE_TYPE (object), DECL_CONTEXT (member)))) { tree anonymous_union; @@ -5357,7 +5365,7 @@ build_modify_expr (lhs, modifycode, rhs) from_array = TREE_CODE (TREE_TYPE (newrhs)) == ARRAY_TYPE ? 1 + (modifycode != INIT_EXPR): 0; - return build_vec_init (lhs, newrhs, from_array); + return build_vec_init (lhs, NULL_TREE, newrhs, from_array); } if (modifycode == INIT_EXPR) diff --git a/gcc/cselib.c b/gcc/cselib.c index feffa6de6cf..e34f26772ac 100644 --- a/gcc/cselib.c +++ b/gcc/cselib.c @@ -83,6 +83,7 @@ static GTY((param_is (cselib_val))) htab_t hash_table; /* This is a global so we don't have to pass this through every function. It is used in new_elt_loc_list to set SETTING_INSN. */ static rtx cselib_current_insn; +static bool cselib_current_insn_in_libcall; /* Every new unknown value gets a unique number. */ static unsigned int next_unknown_value; @@ -163,6 +164,7 @@ new_elt_loc_list (next, loc) el->next = next; el->loc = loc; el->setting_insn = cselib_current_insn; + el->in_libcall = cselib_current_insn_in_libcall; return el; } @@ -1308,6 +1310,10 @@ cselib_process_insn (insn) int i; rtx x; + if (find_reg_note (insn, REG_LIBCALL, NULL)) + cselib_current_insn_in_libcall = true; + if (find_reg_note (insn, REG_RETVAL, NULL)) + cselib_current_insn_in_libcall = false; cselib_current_insn = insn; /* Forget everything at a CODE_LABEL, a volatile asm, or a setjmp. */ @@ -1407,6 +1413,7 @@ cselib_init () hash_table = htab_create_ggc (31, get_value_hash, entry_and_rtx_equal_p, NULL); clear_table (1); + cselib_current_insn_in_libcall = false; } /* Called when the current user is done with cselib. */ diff --git a/gcc/cselib.h b/gcc/cselib.h index 8cb2e6b41e3..f29ee8de04e 100644 --- a/gcc/cselib.h +++ b/gcc/cselib.h @@ -49,6 +49,8 @@ struct elt_loc_list GTY(()) rtx loc; /* The insn that made the equivalence. */ rtx setting_insn; + /* True when setting insn is inside libcall. */ + bool in_libcall; }; /* A list of cselib_val structures. */ @@ -1037,6 +1037,7 @@ df_uses_record (df, loc, ref_type, bb, insn, flags) case CONST_DOUBLE: case CONST_VECTOR: case PC: + case CC0: case ADDR_VEC: case ADDR_DIFF_VEC: return; @@ -1102,9 +1103,10 @@ df_uses_record (df, loc, ref_type, bb, insn, flags) } /* ... FALLTHRU ... */ case REG: - case PC: case PARALLEL: - break; + case PC: + case CC0: + break; case MEM: df_uses_record (df, &XEXP (dst, 0), DF_REF_REG_MEM_STORE, diff --git a/gcc/doc/bugreport.texi b/gcc/doc/bugreport.texi index b6e5ef1e752..b7c1fb0fbca 100644 --- a/gcc/doc/bugreport.texi +++ b/gcc/doc/bugreport.texi @@ -376,9 +376,9 @@ we should be able to reproduce the crash ourselves. To simplify creation of bug reports, and to allow better tracking of reports, we use the GNATS bug tracking system. Part of that system is -the @code{gccbug} script. This is a Unix shell script, so you need a +the @command{gccbug} script. This is a Unix shell script, so you need a shell to run it. It is normally installed in the same directory where -@code{gcc} is installed. +@command{gcc} is installed. The gccbug script is derived from send-pr, @pxref{using send-pr,,Creating new Problem Reports,send-pr,Reporting Problems}. When diff --git a/gcc/doc/collect2.texi b/gcc/doc/collect2.texi index 2cd1d3c0d5a..a3d43b280d1 100644 --- a/gcc/doc/collect2.texi +++ b/gcc/doc/collect2.texi @@ -52,7 +52,7 @@ if specified. @end itemize ``The compiler's search directories'' means all the directories where -@code{gcc} searches for passes of the compiler. This includes +@command{gcc} searches for passes of the compiler. This includes directories that you specify with @option{-B}. Cross-compilers search a little differently: diff --git a/gcc/doc/cpp.texi b/gcc/doc/cpp.texi index bc237c7729d..a6d6fb0db9f 100644 --- a/gcc/doc/cpp.texi +++ b/gcc/doc/cpp.texi @@ -6,10 +6,10 @@ @c @cropmarks @c @finalout -@macro copyrightnotice +@copying @c man begin COPYRIGHT Copyright @copyright{} 1987, 1989, 1991, 1992, 1993, 1994, 1995, 1996, -1997, 1998, 1999, 2000, 2001, 2002 +1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document @@ -23,9 +23,7 @@ section entitled ``GNU Free Documentation License''. man page gfdl(7). @c man end @end ignore -@end macro -@macro covertexts @c man begin COPYRIGHT This manual contains no Invariant Sections. The Front-Cover Texts are (a) (see below), and the Back-Cover Texts are (b) (see below). @@ -40,7 +38,7 @@ This manual contains no Invariant Sections. The Front-Cover Texts are software. Copies published by the Free Software Foundation raise funds for GNU development. @c man end -@end macro +@end copying @macro gcctabopt{body} @code{\body\} @@ -70,8 +68,7 @@ This manual contains no Invariant Sections. The Front-Cover Texts are @c There is a fill at the bottom of the page, so we need a filll to @c override it. @vskip 0pt plus 1filll -@copyrightnotice{} -@covertexts{} +@insertcopying @end titlepage @contents @page @@ -180,8 +177,7 @@ Obsolete Features @end detailmenu @end menu -@copyrightnotice{} -@covertexts{} +@insertcopying @end ifnottex @node Overview @@ -3779,7 +3775,7 @@ The standard requires at least 15 levels. The C standard mandates this be at least 63. CPP is limited only by available memory. -@item Levels of parenthesised expressions within a full expression. +@item Levels of parenthesized expressions within a full expression. The C standard requires this to be at least 63. In preprocessor conditional expressions, it is limited only by available memory. @@ -3892,9 +3888,9 @@ answers. Subsequent assertions do not override previous ones for the same predicate. All the answers for any given predicate are simultaneously true. -@cindex assertions, cancelling +@cindex assertions, canceling @findex #unassert -Assertions can be cancelled with the @samp{#unassert} directive. It +Assertions can be canceled with the @samp{#unassert} directive. It has the same syntax as @samp{#assert}. In that form it cancels only the answer which was specified on the @samp{#unassert} line; other answers for that predicate remain true. You can cancel an entire predicate by @@ -3978,7 +3974,7 @@ GCC 3.0 evaluates @samp{#} and @samp{##} at the same time and strictly left to right. Older versions evaluated all @samp{#} operators first, then all @samp{##} operators, in an unreliable order. -@item The form of whitespace betwen tokens in preprocessor output +@item The form of whitespace between tokens in preprocessor output @xref{Preprocessor Output}, for the current textual format. This is also the format used by stringification. Normally, the preprocessor diff --git a/gcc/doc/cppopts.texi b/gcc/doc/cppopts.texi index 74fe8be5b7d..f5ad684615f 100644 --- a/gcc/doc/cppopts.texi +++ b/gcc/doc/cppopts.texi @@ -564,7 +564,7 @@ also passed through to the output file where the macro is expanded. In addition to the side-effects of the @option{-C} option, the @option{-CC} option causes all C++-style comments inside a macro to be converted to C-style comments. This is to prevent later use -of that macro from inadvertently commenting out the remainer of +of that macro from inadvertently commenting out the remainder of the source line. The @option{-CC} option is generally used to support lint comments. diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi index 9a0f04cb0af..8e84e428f19 100644 --- a/gcc/doc/extend.texi +++ b/gcc/doc/extend.texi @@ -1,4 +1,4 @@ -@c Copyright (C) 1988,1989,1992,1993,1994,1996,1998,1999,2000,2001,2002 Free Software Foundation, Inc. +@c Copyright (C) 1988,1989,1992,1993,1994,1996,1998,1999,2000,2001,2002,2003 Free Software Foundation, Inc. @c This is part of the GCC manual. @c For copying conditions, see the file gcc.texi. @@ -2317,7 +2317,7 @@ See the ELF gABI for complete details, but the short story is @table @dfn @item default Default visibility is the normal case for ELF. This value is -available for the visibiliy attribute to override other options +available for the visibility attribute to override other options that may change the assumed visibility of symbols. @item hidden @@ -4482,7 +4482,7 @@ provided they are of the same size (in fact, you can also cast vectors to and from other datatypes of the same size). You cannot operate between vectors of different lengths or different -signness without a cast. +signedness without a cast. A port that supports hardware vector operations, usually provides a set of built-in functions that can be used to operate on vectors. For @@ -4888,7 +4888,7 @@ type is @code{long double}. This is an implementation of the ISO C99 function @code{nan}. Since ISO C99 defines this function in terms of @code{strtod}, which we -do not implement, a desription of the parsing is in order. The string +do not implement, a description of the parsing is in order. The string is parsed as by @code{strtol}; that is, the base is recognized by leading @samp{0} or @samp{0x} prefixes. The number parsed is placed in the significand such that the least significant bit of the number @@ -6682,7 +6682,7 @@ Add after paragraph 4 @quotation The storage for an object of thread storage duration shall be -staticly initialized before the first statement of the thread startup +statically initialized before the first statement of the thread startup function. An object of thread storage duration shall not require dynamic initialization. @end quotation diff --git a/gcc/doc/gcc.texi b/gcc/doc/gcc.texi index 1e9fcf48e18..d6bd8da0410 100644 --- a/gcc/doc/gcc.texi +++ b/gcc/doc/gcc.texi @@ -60,23 +60,10 @@ \global\setfont\defbf\ttbshape{10}{\magstep1} @end tex -@macro copyrightnotice +@copying Copyright @copyright{} 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -1999, 2000, 2001, 2002 Free Software Foundation, Inc. -@end macro -@ifnottex -@dircategory Programming -@direntry -* gcc: (gcc). The GNU Compiler Collection. -@end direntry -This file documents the use of the GNU compilers. -@sp 1 -Published by the Free Software Foundation@* -59 Temple Place - Suite 330@* -Boston, MA 02111-1307 USA -@sp 1 -@copyrightnotice{} -@sp 1 +1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with the @@ -94,6 +81,20 @@ included in the section entitled ``GNU Free Documentation License''. You have freedom to copy and modify this GNU Manual, like GNU software. Copies published by the Free Software Foundation raise funds for GNU development. +@end copying +@ifnottex +@dircategory Programming +@direntry +* gcc: (gcc). The GNU Compiler Collection. +@end direntry +This file documents the use of the GNU compilers. +@sp 1 +Published by the Free Software Foundation@* +59 Temple Place - Suite 330@* +Boston, MA 02111-1307 USA +@sp 1 +@insertcopying +@sp 1 @end ifnottex @setchapternewpage odd @@ -102,14 +103,12 @@ included in the section entitled ``GNU Free Documentation License''. @sp 2 @center Richard M. Stallman @sp 3 -@center Last updated 20 April 2002 +@center Last updated 30 December 2002 @sp 1 @center for GCC @value{version-GCC} @page @vskip 0pt plus 1filll -@copyrightnotice{} -@sp 2 For GCC Version @value{version-GCC}@* @sp 1 Published by the Free Software Foundation @* @@ -122,23 +121,7 @@ Printed copies are available for $50 each.@* ISBN 1-882114-37-X @end ifset @sp 1 -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or -any later version published by the Free Software Foundation; with the -Invariant Sections being ``GNU General Public License'', the Front-Cover -texts being (a) (see below), and with the Back-Cover Texts being (b) -(see below). A copy of the license is included in the section entitled -``GNU Free Documentation License''. - -(a) The FSF's Front-Cover Text is: - - A GNU Manual - -(b) The FSF's Back-Cover Text is: - - You have freedom to copy and modify this GNU Manual, like GNU - software. Copies published by the Free Software Foundation raise - funds for GNU development. +@insertcopying @end titlepage @summarycontents @contents @@ -165,7 +148,7 @@ Introduction, gccint, GNU Compiler Collection (GCC) Internals}. * C++ Extensions:: GNU extensions to the C++ language. * Objective-C:: GNU Objective-C runtime features. * Compatibility:: Binary Compatibility -* Gcov:: gcov: a GCC test coverage program. +* Gcov:: @command{gcov}---a test coverage program. * Trouble:: If you have trouble using GCC. * Bugs:: How, why and where to report bugs. * Service:: How to find suppliers of support for GCC. diff --git a/gcc/doc/gccint.texi b/gcc/doc/gccint.texi index 35bd02cc21a..0f95e12f1e8 100644 --- a/gcc/doc/gccint.texi +++ b/gcc/doc/gccint.texi @@ -46,23 +46,10 @@ \global\setfont\defbf\ttbshape{10}{\magstep1} @end tex -@macro copyrightnotice +@copying Copyright @copyright{} 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -1999, 2000, 2001, 2002 Free Software Foundation, Inc. -@end macro -@ifnottex -@dircategory Programming -@direntry -* gccint: (gccint). Internals of the GNU Compiler Collection. -@end direntry -This file documents the internals of the GNU compilers. -@sp 1 -Published by the Free Software Foundation@* -59 Temple Place - Suite 330@* -Boston, MA 02111-1307 USA -@sp 1 -@copyrightnotice{} -@sp 1 +1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. + Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or any later version published by the Free Software Foundation; with the @@ -80,6 +67,19 @@ included in the section entitled ``GNU Free Documentation License''. You have freedom to copy and modify this GNU Manual, like GNU software. Copies published by the Free Software Foundation raise funds for GNU development. +@end copying +@ifnottex +@dircategory Programming +@direntry +* gccint: (gccint). Internals of the GNU Compiler Collection. +@end direntry +This file documents the internals of the GNU compilers. +@sp 1 +Published by the Free Software Foundation@* +59 Temple Place - Suite 330@* +Boston, MA 02111-1307 USA +@sp 1 +@insertcopying @end ifnottex @setchapternewpage odd @@ -88,14 +88,12 @@ included in the section entitled ``GNU Free Documentation License''. @sp 2 @center Richard M. Stallman @sp 3 -@center Last updated 10 January 2002 +@center Last updated 28 December 2002 @sp 1 @center for GCC @value{version-GCC} @page @vskip 0pt plus 1filll -@copyrightnotice{} -@sp 2 For GCC Version @value{version-GCC}@* @sp 1 Published by the Free Software Foundation @* @@ -108,23 +106,7 @@ Printed copies are available for $50 each.@* ISBN 1-882114-37-X @end ifset @sp 1 -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or -any later version published by the Free Software Foundation; with the -Invariant Sections being ``GNU General Public License'', the Front-Cover -texts being (a) (see below), and with the Back-Cover Texts being (b) -(see below). A copy of the license is included in the section entitled -``GNU Free Documentation License''. - -(a) The FSF's Front-Cover Text is: - - A GNU Manual - -(b) The FSF's Back-Cover Text is: - - You have freedom to copy and modify this GNU Manual, like GNU - software. Copies published by the Free Software Foundation raise - funds for GNU development. +@insertcopying @end titlepage @summarycontents @contents diff --git a/gcc/doc/gcov.texi b/gcc/doc/gcov.texi index 9c0ac11d420..305a41a7f99 100644 --- a/gcc/doc/gcov.texi +++ b/gcc/doc/gcov.texi @@ -1,11 +1,12 @@ @c Copyright (C) 1996, 1997, 1999, 2000, 2001, -@c 2002 Free Software Foundation, Inc. +@c 2002, 2003 Free Software Foundation, Inc. @c This is part of the GCC manual. @c For copying conditions, see the file gcc.texi. @ignore @c man begin COPYRIGHT -Copyright @copyright{} 1996, 1997, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +Copyright @copyright{} 1996, 1997, 1999, 2000, 2001, 2002, 2003 +Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or @@ -31,7 +32,7 @@ included in the gfdl(7) man page. @end ignore @node Gcov -@chapter @command{gcov}: a Test Coverage Program +@chapter @command{gcov}---a Test Coverage Program @command{gcov} is a tool you can use in conjunction with GCC to test code coverage in your programs. diff --git a/gcc/doc/gty.texi b/gcc/doc/gty.texi index e0d9a33cde6..31d52522553 100644 --- a/gcc/doc/gty.texi +++ b/gcc/doc/gty.texi @@ -1,4 +1,4 @@ -@c Copyright (C) 2002 +@c Copyright (C) 2002, 2003 @c Free Software Foundation, Inc. @c This is part of the GCC manual. @c For copying conditions, see the file gcc.texi. @@ -184,10 +184,10 @@ specify the real type of a field identified by @code{use_param1} through @findex use_params @item use_params -When a structure contains another structure that is parameterised, -there's no need to do anything special, the inner stucture inherits the +When a structure contains another structure that is parameterized, +there's no need to do anything special, the inner structure inherits the parameters of the outer one. When a structure contains a pointer to a -parameterised structure, the type machinery won't automatically detect +parameterized structure, the type machinery won't automatically detect this (it could, it just doesn't yet), so it's necessary to tell it that the pointed-to structure should use the same parameters as the outer structure. This is done by marking the pointer with the diff --git a/gcc/doc/headerdirs.texi b/gcc/doc/headerdirs.texi index 17db57f0560..beac0ddde22 100644 --- a/gcc/doc/headerdirs.texi +++ b/gcc/doc/headerdirs.texi @@ -15,7 +15,7 @@ are already suitable for ISO C and GNU CC, nothing special need be done). @code{GPLUSPLUS_INCLUDE_DIR} means the same thing for native and cross. It -is where @code{g++} looks first for header files. The C++ library +is where @command{g++} looks first for header files. The C++ library installs only target independent header files in that directory. @code{LOCAL_INCLUDE_DIR} is used only by native compilers. GNU CC diff --git a/gcc/doc/include/gcc-common.texi b/gcc/doc/include/gcc-common.texi index 800dfefe402..c2ff561ef34 100644 --- a/gcc/doc/include/gcc-common.texi +++ b/gcc/doc/include/gcc-common.texi @@ -6,6 +6,11 @@ @set version-GCC 3.3 +@c DEVELOPMENT is set to indicate an in-development version, +@c as compared to a release version. When making a release +@c branch, clear this. +@clear DEVELOPMENT + @c Common macros to support generating man pages: @macro gcctabopt{body} diff --git a/gcc/doc/include/texinfo.tex b/gcc/doc/include/texinfo.tex index 99113dd71ba..a8541dca605 100644 --- a/gcc/doc/include/texinfo.tex +++ b/gcc/doc/include/texinfo.tex @@ -3,10 +3,10 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2002-03-01.06} +\def\texinfoversion{2002-12-26.16} % -% Copyright (C) 1985, 86, 88, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, -% 2000, 01, 02 Free Software Foundation, Inc. +% Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, +% 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. % % This texinfo.tex file is free software; you can redistribute it and/or % modify it under the terms of the GNU General Public License as @@ -29,19 +29,17 @@ % % Please try the latest version of texinfo.tex before submitting bug % reports; you can get the latest version from: -% ftp://ftp.gnu.org/gnu/texinfo.tex +% ftp://ftp.gnu.org/gnu/texinfo/texinfo.tex % (and all GNU mirrors, see http://www.gnu.org/order/ftp.html) -% ftp://texinfo.org/texinfo/texinfo.tex % ftp://tug.org/tex/texinfo.tex % (and all CTAN mirrors, see http://www.ctan.org), % and /home/gd/gnu/doc/texinfo.tex on the GNU machines. % +% The GNU Texinfo home page is http://www.gnu.org/software/texinfo. +% % The texinfo.tex in any given Texinfo distribution could well be out % of date, so if that's what you're using, please check. % -% Texinfo has a small home page at http://texinfo.org/ and also -% http://www.gnu.org/software/texinfo. -% % Send bug reports to bug-texinfo@gnu.org. Please include including a % complete document in each bug report with which we can reproduce the % problem. Patches are, of course, greatly appreciated. @@ -53,7 +51,7 @@ % texindex foo.?? % tex foo.texi % tex foo.texi -% dvips foo.dvi -o # or whatever, to process the dvi file; this makes foo.ps. +% dvips foo.dvi -o # or whatever; this makes foo.ps. % The extra TeX runs get the cross-reference information correct. % Sometimes one run after texindex suffices, and sometimes you need more % than two; texi2dvi does it as many times as necessary. @@ -69,6 +67,13 @@ \everyjob{\message{[Texinfo version \texinfoversion]}% \catcode`+=\active \catcode`\_=\active} +\message{Basics,} +\chardef\other=12 + +% We never want plain's outer \+ definition in Texinfo. +% For @tex, we can use \tabalign. +\let\+ = \relax + % Save some parts of plain tex whose names we will redefine. \let\ptexb=\b \let\ptexbullet=\bullet @@ -79,19 +84,16 @@ \let\ptexend=\end \let\ptexequiv=\equiv \let\ptexexclam=\! +\let\ptexgtr=> +\let\ptexhat=^ \let\ptexi=\i \let\ptexlbrace=\{ +\let\ptexless=< +\let\ptexplus=+ \let\ptexrbrace=\} \let\ptexstar=\* \let\ptext=\t -% We never want plain's outer \+ definition in Texinfo. -% For @tex, we can use \tabalign. -\let\+ = \relax - -\message{Basics,} -\chardef\other=12 - % If this character appears in an error message or help string, it % starts a new line in the output. \newlinechar = `^^J @@ -142,36 +144,48 @@ % \def\gobble#1{} +% True if #1 is the empty string, i.e., called like `\ifempty{}'. +% +\def\ifempty#1{\ifemptyx #1\emptymarkA\emptymarkB}% +\def\ifemptyx#1#2\emptymarkB{\ifx #1\emptymarkA}% + +% Hyphenation fixes. \hyphenation{ap-pen-dix} \hyphenation{mini-buf-fer mini-buf-fers} \hyphenation{eshell} \hyphenation{white-space} % Margin to add to right of even pages, to left of odd pages. -\newdimen \bindingoffset -\newdimen \normaloffset +\newdimen\bindingoffset +\newdimen\normaloffset \newdimen\pagewidth \newdimen\pageheight % Sometimes it is convenient to have everything in the transcript file % and nothing on the terminal. We don't just call \tracingall here, -% since that produces some useless output on the terminal. +% since that produces some useless output on the terminal. We also make +% some effort to order the tracing commands to reduce output in the log +% file; cf. trace.sty in LaTeX. % \def\gloggingall{\begingroup \globaldefs = 1 \loggingall \endgroup}% -\ifx\eTeXversion\undefined -\def\loggingall{\tracingcommands2 \tracingstats2 - \tracingpages1 \tracingoutput1 \tracinglostchars1 - \tracingmacros2 \tracingparagraphs1 \tracingrestores1 - \showboxbreadth\maxdimen\showboxdepth\maxdimen -}% -\else -\def\loggingall{\tracingcommands3 \tracingstats2 - \tracingpages1 \tracingoutput1 \tracinglostchars1 - \tracingmacros2 \tracingparagraphs1 \tracingrestores1 - \tracingscantokens1 \tracingassigns1 \tracingifs1 - \tracinggroups1 \tracingnesting2 - \showboxbreadth\maxdimen\showboxdepth\maxdimen +\def\loggingall{% + \tracingstats2 + \tracingpages1 + \tracinglostchars2 % 2 gives us more in etex + \tracingparagraphs1 + \tracingoutput1 + \tracingmacros2 + \tracingrestores1 + \showboxbreadth\maxdimen \showboxdepth\maxdimen + \ifx\eTeXversion\undefined\else % etex gives us more logging + \tracingscantokens1 + \tracingifs1 + \tracinggroups1 + \tracingnesting2 + \tracingassigns1 + \fi + \tracingcommands3 % 3 gives us more in etex + \errorcontextlines\maxdimen }% -\fi % add check for \lastpenalty to plain's definitions. If the last thing % we did was a \nobreak, we don't want to insert more space. @@ -436,17 +450,6 @@ } -% Single-spacing is done by various environments (specifically, in -% \nonfillstart and \quotations). -\newskip\singlespaceskip \singlespaceskip = 12.5pt -\def\singlespace{% - % Why was this kern here? It messes up equalizing space above and below - % environments. --karl, 6may93 - %{\advance \baselineskip by -\singlespaceskip - %\kern \baselineskip}% - \setleading\singlespaceskip -} - %% Simple single-character @ commands % @@ prints an @ @@ -841,12 +844,6 @@ where each line of input produces a line of output.} % to set catcodes according to plain TeX first, to allow for subscripts, % superscripts, special math chars, etc. % -% @math does not do math typesetting in section titles, index -% entries, and other such contexts where the catcodes are set before -% @math gets a chance to work. This could perhaps be fixed, but for now -% at least we can have real math in the main text, where it's needed most. -% -% \let\implicitmath = $%$ font-lock fix % % One complication: _ usually means subscripts, but it could also mean @@ -857,12 +854,42 @@ where each line of input produces a line of output.} {\catcode95 = \active % 95 = _ \gdef\mathunderscore{% \catcode95=\active - \def_{\ifnum\fam=\slfam\_\else\sb\fi}% + \def_{\ifnum\fam=\slfam \_\else\sb\fi}% }} % -\def\math{\tex\mathcode`\_="8000\mathunderscore \implicitmath\finishmath} +% Another complication: we want \\ (and @\) to output a \ character. +% FYI, plain.tex uses \\ as a temporary control sequence (why?), but +% this is not advertised and we don't care. Texinfo does not +% otherwise define @\. +% +% The \mathchar is class=0=ordinary, family=7=ttfam, position=5C=\. +\def\mathbackslash{\ifnum\fam=\ttfam \mathchar"075C \else\backslash \fi} +% +\def\math{% + \tex + \mathcode`\_="8000 \mathunderscore + \let\\ = \mathbackslash + \mathactive + \implicitmath\finishmath} \def\finishmath#1{#1\implicitmath\Etex} +% Some active characters (such as <) are spaced differently in math. +% We have to reset their definitions in case the @math was an +% argument to a command which set the catcodes (such as @item or @section). +% +{ + \catcode`^ = \active + \catcode`< = \active + \catcode`> = \active + \catcode`+ = \active + \gdef\mathactive{% + \let^ = \ptexhat + \let< = \ptexless + \let> = \ptexgtr + \let+ = \ptexplus + } +} + % @bullet and @minus need the same treatment as @math, just above. \def\bullet{\implicitmath\ptexbullet\implicitmath} \def\minus{\implicitmath-\implicitmath} @@ -954,7 +981,7 @@ where each line of input produces a line of output.} \ifx\empty\imagewidth\else width \imagewidth \fi \ifx\empty\imageheight\else height \imageheight \fi \ifnum\pdftexversion<13 - #1.pdf% + #1.pdf% \else {#1.pdf}% \fi @@ -976,40 +1003,39 @@ where each line of input produces a line of output.} \openin 1 \jobname.toc \ifeof 1\else\begingroup \closein 1 - \indexnofonts - \def\tt{} - \let\_ = \normalunderscore % Thanh's hack / proper braces in bookmarks \edef\mylbrace{\iftrue \string{\else}\fi}\let\{=\mylbrace \edef\myrbrace{\iffalse{\else\string}\fi}\let\}=\myrbrace % \def\chapentry ##1##2##3{} - \let\appendixentry = \chapentry - \def\unnumbchapentry ##1##2{} \def\secentry ##1##2##3##4{\advancenumber{chap##2}} - \def\unnumbsecentry ##1##2{} \def\subsecentry ##1##2##3##4##5{\advancenumber{sec##2.##3}} - \def\unnumbsubsecentry ##1##2{} \def\subsubsecentry ##1##2##3##4##5##6{\advancenumber{subsec##2.##3.##4}} - \def\unnumbsubsubsecentry ##1##2{} + \let\appendixentry = \chapentry + \let\unnumbchapentry = \chapentry + \let\unnumbsecentry = \secentry + \let\unnumbsubsecentry = \subsecentry + \let\unnumbsubsubsecentry = \subsubsecentry \input \jobname.toc \def\chapentry ##1##2##3{% \pdfoutline goto name{\pdfmkpgn{##3}}count-\expnumber{chap##2}{##1}} - \let\appendixentry = \chapentry - \def\unnumbchapentry ##1##2{% - \pdfoutline goto name{\pdfmkpgn{##2}}{##1}} \def\secentry ##1##2##3##4{% \pdfoutline goto name{\pdfmkpgn{##4}}count-\expnumber{sec##2.##3}{##1}} - \def\unnumbsecentry ##1##2{% - \pdfoutline goto name{\pdfmkpgn{##2}}{##1}} \def\subsecentry ##1##2##3##4##5{% \pdfoutline goto name{\pdfmkpgn{##5}}count-\expnumber{subsec##2.##3.##4}{##1}} - \def\unnumbsubsecentry ##1##2{% - \pdfoutline goto name{\pdfmkpgn{##2}}{##1}} \def\subsubsecentry ##1##2##3##4##5##6{% \pdfoutline goto name{\pdfmkpgn{##6}}{##1}} - \def\unnumbsubsubsecentry ##1##2{% - \pdfoutline goto name{\pdfmkpgn{##2}}{##1}} + \let\appendixentry = \chapentry + \let\unnumbchapentry = \chapentry + \let\unnumbsecentry = \secentry + \let\unnumbsubsecentry = \subsecentry + \let\unnumbsubsubsecentry = \subsubsecentry + % + % Make special characters normal for writing to the pdf file. + % + \indexnofonts + \let\tt=\relax + \turnoffactive \input \jobname.toc \endgroup\fi }} @@ -1159,7 +1185,7 @@ where each line of input produces a line of output.} \newcount\mainmagstep \ifx\bigger\relax % not really supported. - \let\mainmagstep=\magstep1 + \mainmagstep=\magstep1 \setfont\textrm\rmshape{12}{1000} \setfont\texttt\ttshape{12}{1000} \else @@ -1220,6 +1246,7 @@ where each line of input produces a line of output.} \font\titlei=cmmi12 scaled \magstep3 \font\titlesy=cmsy10 scaled \magstep4 \def\authorrm{\secrm} +\def\authortt{\sectt} % Chapter (and unnumbered) fonts (17.28pt). \setfont\chaprm\rmbshape{12}{\magstep2} @@ -1334,6 +1361,7 @@ where each line of input produces a line of output.} \setfont\shortcontrm\rmshape{12}{1000} \setfont\shortcontbf\bxshape{12}{1000} \setfont\shortcontsl\slshape{12}{1000} +\setfont\shortconttt\ttshape{12}{1000} %% Add scribe-like font environments, plus @l for inline lisp (usually sans %% serif) and @ii for TeX italic @@ -1341,8 +1369,8 @@ where each line of input produces a line of output.} % \smartitalic{ARG} outputs arg in italics, followed by an italic correction % unless the following character is such as not to need one. \def\smartitalicx{\ifx\next,\else\ifx\next-\else\ifx\next.\else\/\fi\fi\fi} -\def\smartslanted#1{{\sl #1}\futurelet\next\smartitalicx} -\def\smartitalic#1{{\it #1}\futurelet\next\smartitalicx} +\def\smartslanted#1{{\ifusingtt\ttsl\sl #1}\futurelet\next\smartitalicx} +\def\smartitalic#1{{\ifusingtt\ttsl\it #1}\futurelet\next\smartitalicx} \let\i=\smartitalic \let\var=\smartslanted @@ -1431,11 +1459,19 @@ where each line of input produces a line of output.} \def\realdash{-} \def\codedash{-\discretionary{}{}{}} -\def\codeunder{\ifusingtt{\normalunderscore\discretionary{}{}{}}{\_}} +\def\codeunder{% + % this is all so @math{@code{var_name}+1} can work. In math mode, _ + % is "active" (mathcode"8000) and \normalunderscore (or \char95, etc.) + % will therefore expand the active definition of _, which is us + % (inside @code that is), therefore an endless loop. + \ifusingtt{\ifmmode + \mathchar"075F % class 0=ordinary, family 7=ttfam, pos 0x5F=_. + \else\normalunderscore \fi + \discretionary{}{}{}}% + {\_}% +} \def\codex #1{\tclose{#1}\endgroup} -%\let\exp=\tclose %Was temporary - % @kbd is like @code, except that if the argument is just one @key command, % then @kbd has no effect. @@ -1573,7 +1609,8 @@ where each line of input produces a line of output.} \let\subtitlerm=\tenrm \def\subtitlefont{\subtitlerm \normalbaselineskip = 13pt \normalbaselines}% % - \def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines}% + \def\authorfont{\authorrm \normalbaselineskip = 16pt \normalbaselines + \let\tt=\authortt}% % % Leave some space at the very top of the page. \vglue\titlepagetopglue @@ -1637,8 +1674,6 @@ where each line of input produces a line of output.} \global\let\contents = \relax \global\let\shortcontents = \relax \fi - % - \ifpdf \pdfmakepagedesttrue \fi } \def\finishtitlepage{% @@ -1856,10 +1891,18 @@ where each line of input produces a line of output.} % \parskip glue -- logically it's part of the @item we just started. \nobreak \vskip-\parskip % - % Stop a page break at the \parskip glue coming up. Unfortunately + % Stop a page break at the \parskip glue coming up. (Unfortunately % we can't prevent a possible page break at the following - % \baselineskip glue. - \nobreak + % \baselineskip glue.) However, if what follows is an environment + % such as @example, there will be no \parskip glue; then + % the negative vskip we just would cause the example and the item to + % crash together. So we use this bizarre value of 10001 as a signal + % to \aboveenvbreak to insert \parskip glue after all. + % (Possibly there are other commands that could be followed by + % @example which need the same treatment, but not section titles; or + % maybe section titles are the only special case and they should be + % penalty 10001...) + \penalty 10001 \endgroup \itemxneedsnegativevskipfalse \else @@ -2396,20 +2439,20 @@ width0pt\relax} \fi \let\item = \relax } -% Ignore @ignore ... @end ignore. -% -\def\ignore{\doignore{ignore}} - -% Also ignore @ifinfo, @ifhtml, @ifnottex, @html, @menu, -% @documentdescription, and @direntry text. +% Ignore @ignore, @ifhtml, @ifinfo, and the like. % -\def\ifinfo{\doignore{ifinfo}} +\def\direntry{\doignore{direntry}} +\def\documentdescriptionword{documentdescription} +\def\documentdescription{\doignore{documentdescription}} +\def\html{\doignore{html}} \def\ifhtml{\doignore{ifhtml}} +\def\ifinfo{\doignore{ifinfo}} \def\ifnottex{\doignore{ifnottex}} -\def\html{\doignore{html}} +\def\ifplaintext{\doignore{ifplaintext}} +\def\ifxml{\doignore{ifxml}} +\def\ignore{\doignore{ignore}} \def\menu{\doignore{menu}} -\def\documentdescription{\doignore{documentdescription}} -\def\direntry{\doignore{direntry}} +\def\xml{\doignore{xml}} % @dircategory CATEGORY -- specify a category of the dir file % which this file should belong to. Ignore this in TeX. @@ -2436,14 +2479,21 @@ width0pt\relax} \fi % We must not have @c interpreted as a control sequence. \catcode`\@ = 12 % - % Make the letter c a comment character so that the rest of the line - % will be ignored. This way, the document can have (for example) - % @c @end ifinfo - % and the @end ifinfo will be properly ignored. - % (We've just changed @ to catcode 12.) - \catcode`\c = 14 + \def\ignoreword{#1}% + \ifx\ignoreword\documentdescriptionword + % The c kludge breaks documentdescription, since + % `documentdescription' contains a `c'. Means not everything will + % be ignored inside @documentdescription, but oh well... + \else + % Make the letter c a comment character so that the rest of the line + % will be ignored. This way, the document can have (for example) + % @c @end ifinfo + % and the @end ifinfo will be properly ignored. + % (We've just changed @ to catcode 12.) + \catcode`\c = 14 + \fi % - % And now expand that command. + % And now expand the command defined above. \doignoretext } @@ -2462,7 +2512,7 @@ width0pt\relax} \fi \immediate\write16{If you are running another version of TeX, relax.} \immediate\write16{If you are running Unix TeX 3.0, kill this TeX process.} \immediate\write16{ Then upgrade your TeX installation if you can.} - \immediate\write16{ (See ftp://ftp.gnu.org/pub/gnu/TeX.README.)} + \immediate\write16{ (See ftp://ftp.gnu.org/non-gnu/TeX.README.)} \immediate\write16{If you are stuck with version 3.0, run the} \immediate\write16{ script ``tex3patch'' from the Texinfo distribution} \immediate\write16{ to use a workaround.} @@ -2484,7 +2534,7 @@ width0pt\relax} \fi % We must actually expand the ignored text to look for the @end % command, so that nested ignore constructs work. Thus, we put the % text into a \vbox and then do nothing with the result. To minimize - % the change of memory overflow, we follow the approach outlined on + % the chance of memory overflow, we follow the approach outlined on % page 401 of the TeXbook: make the current font be a dummy font. % \setbox0 = \vbox\bgroup @@ -2536,7 +2586,7 @@ width0pt\relax} \fi % Do minimal line-breaking. \pretolerance = 10000 % - % Do not execute instructions in @tex + % Do not execute instructions in @tex. \def\tex{\doignore{tex}}% % Do not execute macro definitions. % `c' is a comment character, so the word `macro' will get cut off. @@ -2634,19 +2684,21 @@ width0pt\relax} \fi \def\ifclearfail{\nestedignore{ifclear}} \defineunmatchedend{ifclear} -% @iftex, @ifnothtml, @ifnotinfo always succeed; we read the text -% following, through the first @end iftex (etc.). Make `@end iftex' -% (etc.) valid only after an @iftex. +% @iftex, @ifnothtml, @ifnotinfo, @ifnotplaintext always succeed; we +% read the text following, through the first @end iftex (etc.). Make +% `@end iftex' (etc.) valid only after an @iftex. % \def\iftex{\conditionalsucceed{iftex}} \def\ifnothtml{\conditionalsucceed{ifnothtml}} \def\ifnotinfo{\conditionalsucceed{ifnotinfo}} +\def\ifnotplaintext{\conditionalsucceed{ifnotplaintext}} \defineunmatchedend{iftex} \defineunmatchedend{ifnothtml} \defineunmatchedend{ifnotinfo} +\defineunmatchedend{ifnotplaintext} -% We can't just want to start a group at @iftex (for example) and end it -% at @end iftex, since then @set commands inside the conditional have no +% We can't just want to start a group at @iftex (etc.) and end it at +% @end iftex, since then @set commands inside the conditional have no % effect (they'd get reverted at the end of the group). So we must % define \Eiftex to redefine itself to be its previous value. (We can't % just define it to fail again with an ``unmatched end'' error, since @@ -2861,7 +2913,7 @@ width0pt\relax} \fi % If an index command is used in an @example environment, any spaces % therein should become regular spaces in the raw index file, not the -% expansion of \tie (\\leavevmode \penalty \@M \ ). +% expansion of \tie (\leavevmode \penalty \@M \ ). {\obeyspaces \gdef\unsepspaces{\obeyspaces\let =\space}} @@ -3524,13 +3576,18 @@ width0pt\relax} \fi \global\let\subsubsection = \numberedsubsubsec } +% we use \chapno to avoid indenting back +\def\appendixbox#1{% + \setbox0 = \hbox{\putwordAppendix{} \the\chapno}% + \hbox to \wd0{#1\hss}} + \outer\def\appendix{\parsearg\appendixyyy} \def\appendixyyy #1{\apphead0{#1}} % normally apphead0 calls appendixzzz \def\appendixzzz #1{% \secno=0 \subsecno=0 \subsubsecno=0 \global\advance \appendixno by 1 \message{\putwordAppendix\space \appendixletter}% -\chapmacro {#1}{\putwordAppendix{} \appendixletter}% +\chapmacro {#1}{\appendixbox{\putwordAppendix{} \appendixletter}}% \gdef\thissection{#1}% \gdef\thischaptername{#1}% \xdef\thischapter{\putwordAppendix{} \appendixletter: \noexpand\thischaptername}% @@ -3572,7 +3629,7 @@ width0pt\relax} \fi \unnumbchapmacro {#1}% \gdef\thischapter{#1}\gdef\thissection{#1}% \toks0 = {#1}% -\edef\temp{\noexpand\writetocentry{\realbackslash unnumbchapentry{\the\toks0}}}% +\edef\temp{\noexpand\writetocentry{\realbackslash unnumbchapentry{\the\toks0}{\the\chapno}}}% \temp \unnumbnoderef \global\let\section = \unnumberedsec @@ -3613,7 +3670,8 @@ width0pt\relax} \fi \def\unnumberedseczzz #1{% \plainsecheading {#1}\gdef\thissection{#1}% \toks0 = {#1}% -\edef\temp{\noexpand\writetocentry{\realbackslash unnumbsecentry{\the\toks0}}}% +\edef\temp{\noexpand\writetocentry{\realbackslash unnumbsecentry% + {\the\toks0}{\the\chapno}{\the\secno}}}% \temp \unnumbnoderef \nobreak @@ -3652,7 +3710,7 @@ width0pt\relax} \fi \plainsubsecheading {#1}\gdef\thissection{#1}% \toks0 = {#1}% \edef\temp{\noexpand\writetocentry{\realbackslash unnumbsubsecentry% - {\the\toks0}}}% + {\the\toks0}{\the\chapno}{\the\secno}{\the\subsecno}}}% \temp \unnumbnoderef \nobreak @@ -3693,7 +3751,7 @@ width0pt\relax} \fi \plainsubsubsecheading {#1}\gdef\thissection{#1}% \toks0 = {#1}% \edef\temp{\noexpand\writetocentry{\realbackslash unnumbsubsubsecentry% - {\the\toks0}}}% + {\the\toks0}{\the\chapno}{\the\secno}{\the\subsecno}{\the\subsubsecno}}}% \temp \unnumbnoderef \nobreak @@ -3892,7 +3950,16 @@ width0pt\relax} \fi \hangindent = \wd0 % zero if no section number \unhbox0 #3}% }% - \ifdim\parskip<10pt \nobreak\kern10pt\nobreak\kern-\parskip\fi \nobreak + % Add extra space after the heading -- either a line space or a + % paragraph space, whichever is more. (Some people like to set + % \parskip to large values for some reason.) + \nobreak + \ifdim\parskip>\normalbaselineskip + \kern\parskip + \else + \kern\normalbaselineskip + \fi + \nobreak } @@ -3905,7 +3972,7 @@ width0pt\relax} \fi % argument, which will end up as the last argument to the \...entry macro. % % We open the .toc file here instead of at @setfilename or any other -% given time so that @contents can be put in the document anywhere. +% fixed time so that @contents can be put in the document anywhere. % \newif\iftocfileopened \def\writetocentry#1{% @@ -3914,6 +3981,14 @@ width0pt\relax} \fi \global\tocfileopenedtrue \fi \iflinks \write\tocfile{#1{\folio}}\fi + % + % Tell \shipout to create a page destination if we're doing pdf, which + % will be the target of the links in the table of contents. We can't + % just do it on every page because the title pages are numbered 1 and + % 2 (the page numbers aren't printed), and so are the first two pages + % of the document. Thus, we'd have two destinations named `1', and + % two named `2'. + \ifpdf \pdfmakepagedesttrue \fi } \newskip\contentsrightmargin \contentsrightmargin=1in @@ -3973,16 +4048,17 @@ width0pt\relax} \fi \let\unnumbchapentry = \shortunnumberedentry % We want a true roman here for the page numbers. \secfonts - \let\rm=\shortcontrm \let\bf=\shortcontbf \let\sl=\shortcontsl + \let\rm=\shortcontrm \let\bf=\shortcontbf + \let\sl=\shortcontsl \let\tt=\shortconttt \rm \hyphenpenalty = 10000 \advance\baselineskip by 1pt % Open it up a little. \def\secentry ##1##2##3##4{} - \def\unnumbsecentry ##1##2{} \def\subsecentry ##1##2##3##4##5{} - \def\unnumbsubsecentry ##1##2{} \def\subsubsecentry ##1##2##3##4##5##6{} - \def\unnumbsubsubsecentry ##1##2{} + \let\unnumbsecentry = \secentry + \let\unnumbsubsecentry = \subsecentry + \let\unnumbsubsubsecentry = \subsubsecentry \openin 1 \jobname.toc \ifeof 1 \else \closein 1 @@ -4015,7 +4091,8 @@ width0pt\relax} \fi } % Appendices, in the main contents. -\def\appendixentry#1#2#3{\dochapentry{\putwordAppendix{} #2\labelspace#1}{#3}} +\def\appendixentry#1#2#3{% + \dochapentry{\appendixbox{\putwordAppendix{} #2}\labelspace#1}{#3}} % % Appendices, in the short toc. \let\shortappendixentry = \shortchapentry @@ -4039,21 +4116,21 @@ width0pt\relax} \fi } % Unnumbered chapters. -\def\unnumbchapentry#1#2{\dochapentry{#1}{#2}} -\def\shortunnumberedentry#1#2{\tocentry{#1}{\doshortpageno\bgroup#2\egroup}} +\def\unnumbchapentry#1#2#3{\dochapentry{#1}{#3}} +\def\shortunnumberedentry#1#2#3{\tocentry{#1}{\doshortpageno\bgroup#3\egroup}} % Sections. \def\secentry#1#2#3#4{\dosecentry{#2.#3\labelspace#1}{#4}} -\def\unnumbsecentry#1#2{\dosecentry{#1}{#2}} +\def\unnumbsecentry#1#2#3#4{\dosecentry{#1}{#4}} % Subsections. \def\subsecentry#1#2#3#4#5{\dosubsecentry{#2.#3.#4\labelspace#1}{#5}} -\def\unnumbsubsecentry#1#2{\dosubsecentry{#1}{#2}} +\def\unnumbsubsecentry#1#2#3#4#5{\dosubsecentry{#1}{#5}} % And subsubsections. \def\subsubsecentry#1#2#3#4#5#6{% \dosubsubsecentry{#2.#3.#4.#5\labelspace#1}{#6}} -\def\unnumbsubsubsecentry#1#2{\dosubsubsecentry{#1}{#2}} +\def\unnumbsubsubsecentry#1#2#3#4#5#6{\dosubsubsecentry{#1}{#6}} % This parameter controls the indentation of the various levels. \newdimen\tocindent \tocindent = 3pc @@ -4114,36 +4191,27 @@ width0pt\relax} \fi \message{environments,} % @foo ... @end foo. +% @point{}, @result{}, @expansion{}, @print{}, @equiv{}. +% % Since these characters are used in examples, it should be an even number of % \tt widths. Each \tt character is 1en, so two makes it 1em. -% Furthermore, these definitions must come after we define our fonts. -\newbox\dblarrowbox \newbox\longdblarrowbox -\newbox\pushcharbox \newbox\bullbox -\newbox\equivbox \newbox\errorbox - -%{\tentt -%\global\setbox\dblarrowbox = \hbox to 1em{\hfil$\Rightarrow$\hfil} -%\global\setbox\longdblarrowbox = \hbox to 1em{\hfil$\mapsto$\hfil} -%\global\setbox\pushcharbox = \hbox to 1em{\hfil$\dashv$\hfil} -%\global\setbox\equivbox = \hbox to 1em{\hfil$\ptexequiv$\hfil} -% Adapted from the manmac format (p.420 of TeXbook) -%\global\setbox\bullbox = \hbox to 1em{\kern.15em\vrule height .75ex width .85ex -% depth .1ex\hfil} -%} - -% @point{}, @result{}, @expansion{}, @print{}, @equiv{}. +% \def\point{$\star$} \def\result{\leavevmode\raise.15ex\hbox to 1em{\hfil$\Rightarrow$\hfil}} \def\expansion{\leavevmode\raise.1ex\hbox to 1em{\hfil$\mapsto$\hfil}} \def\print{\leavevmode\lower.1ex\hbox to 1em{\hfil$\dashv$\hfil}} \def\equiv{\leavevmode\lower.1ex\hbox to 1em{\hfil$\ptexequiv$\hfil}} +% The @error{} command. % Adapted from the TeXbook's \boxit. +% +\newbox\errorbox +% {\tentt \global\dimen0 = 3em}% Width of the box. \dimen2 = .55pt % Thickness of rules % The text. (`r' is open on the right, `e' somewhat less so on the left.) \setbox0 = \hbox{\kern-.75pt \tensf error\kern-1.5pt} - +% \global\setbox\errorbox=\hbox to \dimen0{\hfil \hsize = \dimen0 \advance\hsize by -5.8pt % Space to left+right. \advance\hsize by -2\dimen2 % Rules. @@ -4154,8 +4222,7 @@ width0pt\relax} \fi \kern3pt\vrule width\dimen2}% Space to right. \hrule height\dimen2} \hfil} - -% The @error{} command. +% \def\error{\leavevmode\lower.7ex\copy\errorbox} % @tex ... @end tex escapes into raw Tex temporarily. @@ -4195,9 +4262,9 @@ width0pt\relax} \fi \def\@{@}% \let\Etex=\endgroup} -% Define @lisp ... @endlisp. +% Define @lisp ... @end lisp. % @lisp does a \begingroup so it can rebind things, -% including the definition of @endlisp (which normally is erroneous). +% including the definition of @end lisp (which normally is erroneous). % Amount to narrow the margins by for @lisp. \newskip\lispnarrowing \lispnarrowing=0.4in @@ -4226,15 +4293,18 @@ width0pt\relax} \fi % Make spacing and below environment symmetrical. We use \parskip here % to help in doing that, since in @example-like environments \parskip % is reset to zero; thus the \afterenvbreak inserts no space -- but the -% start of the next paragraph will insert \parskip +% start of the next paragraph will insert \parskip. % \def\aboveenvbreak{{% - \ifnum\lastpenalty < 10000 + % =10000 instead of <10000 because of a special case in \itemzzz, q.v. + \ifnum \lastpenalty=10000 \else \advance\envskipamount by \parskip \endgraf \ifdim\lastskip<\envskipamount \removelastskip - \penalty-50 + % it's not a good place to break if the last penalty was \nobreak + % or better ... + \ifnum\lastpenalty>10000 \else \penalty-50 \fi \vskip\envskipamount \fi \fi @@ -4313,7 +4383,6 @@ width0pt\relax} \fi \inENV % This group ends at the end of the body \hfuzz = 12pt % Don't be fussy \sepspaces % Make spaces be word-separators rather than space tokens. - \singlespace \let\par = \lisppar % don't ignore blank lines \obeylines % each line of input is a line of output \parskip = 0pt @@ -4428,7 +4497,6 @@ width0pt\relax} \fi \def\quotation{% \begingroup\inENV %This group ends at the end of the @quotation body {\parskip=0pt \aboveenvbreak}% because \aboveenvbreak inserts \parskip - \singlespace \parindent=0pt % We have retained a nonzero parskip for the environment, since we're % doing normal filling. So to avoid extra space below the environment... @@ -4451,10 +4519,14 @@ width0pt\relax} \fi % % [Knuth]: Donald Ervin Knuth, 1996. The TeXbook. % -% [Knuth] p. 344; only we need to do '@' too +% [Knuth] p.344; only we need to do the other characters Texinfo sets +% active too. Otherwise, they get lost as the first character on a +% verbatim line. \def\dospecials{% - \do\ \do\\\do\@\do\{\do\}\do\$\do\&% - \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~} + \do\ \do\\\do\{\do\}\do\$\do\&% + \do\#\do\^\do\^^K\do\_\do\^^A\do\%\do\~% + \do\<\do\>\do\|\do\@\do+\do\"% +} % % [Knuth] p. 380 \def\uncatcodespecials{% @@ -4541,7 +4613,7 @@ width0pt\relax} \fi % % For Texinfo it's a lot easier than for LaTeX, % because texinfo's \verbatim doesn't stop at '\end{verbatim}': -% we need not redefine '\', '{' and '}' +% we need not redefine '\', '{' and '}'. % % Inspired by LaTeX's verbatim command set [latex.ltx] %% Include LaTeX hack for completeness -- never know @@ -4551,9 +4623,14 @@ width0pt\relax} \fi %% \catcode`\\=12|gdef|doverbatim#1@end verbatim[ %% #1|endgroup|def|Everbatim[]|end[verbatim]] %% |endgroup +% \begingroup \catcode`\ =\active - \gdef\doverbatim#1@end verbatim{#1\end{verbatim}} + \obeylines % + % ignore everything up to the first ^^M, that's the newline at the end + % of the @verbatim input line itself. Otherwise we get an extra blank + % line in the output. + \gdef\doverbatim#1^^M#2@end verbatim{#2\end{verbatim}}% \endgroup % \def\verbatim{% @@ -4595,24 +4672,94 @@ width0pt\relax} \fi \endgroup\nonfillfinish\endgroup } +% @copying ... @end copying. +% Save the text away for @insertcopying later. Many commands won't be +% allowed in this context, but that's ok. +% +% We save the uninterpreted tokens, rather than creating a box. +% Saving the text in a box would be much easier, but then all the +% typesetting commands (@smallbook, font changes, etc.) have to be done +% beforehand -- and a) we want @copying to be done first in the source +% file; b) letting users define the frontmatter in as flexible order as +% possible is very desirable. +% +\def\copying{\begingroup + % Define a command to swallow text until we reach `@end copying'. + % \ is the escape char in this texinfo.tex file, so it is the + % delimiter for the command; @ will be the escape char when we read + % it, but that doesn't matter. + \long\def\docopying##1\end copying{\gdef\copyingtext{##1}\enddocopying}% + % + % We must preserve ^^M's in the input file; see \insertcopying below. + \catcode`\^^M = \active + \docopying +} + +% What we do to finish off the copying text. +% +\def\enddocopying{\endgroup\ignorespaces} + +% @insertcopying. Here we must play games with ^^M's. On the one hand, +% we need them to delimit commands such as `@end quotation', so they +% must be active. On the other hand, we certainly don't want every +% end-of-line to be a \par, as would happen with the normal active +% definition of ^^M. On the third hand, two ^^M's in a row should still +% generate a \par. +% +% Our approach is to make ^^M insert a space and a penalty1 normally; +% then it can also check if \lastpenalty=1. If it does, then manually +% do \par. +% +% This messes up the normal definitions of @c[omment], so we redefine +% it. Similarly for @ignore. (These commands are used in the gcc +% manual for man page generation.) +% +% Seems pretty fragile, most line-oriented commands will presumably +% fail, but for the limited use of getting the copying text (which +% should be quite simple) inserted, we can hope it's ok. +% +{\catcode`\^^M=\active % +\gdef\insertcopying{\begingroup % + \parindent = 0pt % looks wrong on title page + \def^^M{% + \ifnum \lastpenalty=1 % + \par % + \else % + \space \penalty 1 % + \fi % + }% + % + % Fix @c[omment] for catcode 13 ^^M's. + \def\c##1^^M{\ignorespaces}% + \let\comment = \c % + % + % Don't bother jumping through all the hoops that \doignore does, it + % would be very hard since the catcodes are already set. + \long\def\ignore##1\end ignore{\ignorespaces}% + % + \copyingtext % +\endgroup}% +} \message{defuns,} % @defun etc. % Allow user to change definition object font (\df) internally -\def\setdeffont #1 {\csname DEF#1\endcsname} +\def\setdeffont#1 {\csname DEF#1\endcsname} \newskip\defbodyindent \defbodyindent=.4in \newskip\defargsindent \defargsindent=50pt -\newskip\deftypemargin \deftypemargin=12pt \newskip\deflastargmargin \deflastargmargin=18pt \newcount\parencount -% define \functionparens, which makes ( and ) and & do special things. -% \functionparens affects the group it is contained in. + +% We want ()&[] to print specially on the defun line. +% \def\activeparens{% -\catcode`\(=\active \catcode`\)=\active \catcode`\&=\active -\catcode`\[=\active \catcode`\]=\active} + \catcode`\(=\active \catcode`\)=\active + \catcode`\&=\active + \catcode`\[=\active \catcode`\]=\active +} % Make control sequences which act like normal parenthesis chars. \let\lparen = ( \let\rparen = ) @@ -4663,84 +4810,117 @@ width0pt\relax} \fi \global\let& = \ampnr } -% First, defname, which formats the header line itself. -% #1 should be the function name. -% #2 should be the type of definition, such as "Function". - -\def\defname #1#2{% -% Get the values of \leftskip and \rightskip as they were -% outside the @def... -\dimen2=\leftskip -\advance\dimen2 by -\defbodyindent -\noindent -\setbox0=\hbox{\hskip \deflastargmargin{\rm #2}\hskip \deftypemargin}% -\dimen0=\hsize \advance \dimen0 by -\wd0 % compute size for first line -\dimen1=\hsize \advance \dimen1 by -\defargsindent %size for continuations -\parshape 2 0in \dimen0 \defargsindent \dimen1 -% Now output arg 2 ("Function" or some such) -% ending at \deftypemargin from the right margin, -% but stuck inside a box of width 0 so it does not interfere with linebreaking -{% Adjust \hsize to exclude the ambient margins, -% so that \rightline will obey them. -\advance \hsize by -\dimen2 -\rlap{\rightline{{\rm #2}\hskip -1.25pc }}}% -% Make all lines underfull and no complaints: -\tolerance=10000 \hbadness=10000 -\advance\leftskip by -\defbodyindent -\exdentamount=\defbodyindent -{\df #1}\enskip % Generate function name -} - -% Actually process the body of a definition -% #1 should be the terminating control sequence, such as \Edefun. -% #2 should be the "another name" control sequence, such as \defunx. -% #3 should be the control sequence that actually processes the header, -% such as \defunheader. - -\def\defparsebody #1#2#3{\begingroup\inENV% Environment for definitionbody -\medbreak % -% Define the end token that this defining construct specifies -% so that it will exit this group. -\def#1{\endgraf\endgroup\medbreak}% -\def#2{\begingroup\obeylines\activeparens\spacesplit#3}% -\parindent=0in -\advance\leftskip by \defbodyindent -\exdentamount=\defbodyindent -\begingroup % -\catcode 61=\active % 61 is `=' -\obeylines\activeparens\spacesplit#3} +% \defname, which formats the name of the @def (not the args). +% #1 is the function name. +% #2 is the type of definition, such as "Function". +% +\def\defname#1#2{% + % How we'll output the type name. Putting it in brackets helps + % distinguish it from the body text that may end up on the next line + % just below it. + \ifempty{#2}% + \def\defnametype{}% + \else + \def\defnametype{[\rm #2]}% + \fi + % + % Get the values of \leftskip and \rightskip as they were outside the @def... + \dimen2=\leftskip + \advance\dimen2 by -\defbodyindent + % + % Figure out values for the paragraph shape. + \setbox0=\hbox{\hskip \deflastargmargin{\defnametype}}% + \dimen0=\hsize \advance \dimen0 by -\wd0 % compute size for first line + \dimen1=\hsize \advance \dimen1 by -\defargsindent % size for continuations + \parshape 2 0in \dimen0 \defargsindent \dimen1 + % + % Output arg 2 ("Function" or some such) but stuck inside a box of + % width 0 so it does not interfere with linebreaking. + \noindent + % + {% Adjust \hsize to exclude the ambient margins, + % so that \rightline will obey them. + \advance \hsize by -\dimen2 + \dimen3 = 0pt % was -1.25pc + \rlap{\rightline{\defnametype\kern\dimen3}}% + }% + % + % Allow all lines to be underfull without complaint: + \tolerance=10000 \hbadness=10000 + \advance\leftskip by -\defbodyindent + \exdentamount=\defbodyindent + {\df #1}\enskip % output function name + % \defunargs will be called next to output the arguments, if any. +} +% Common pieces to start any @def... % #1 is the \E... control sequence to end the definition (which we define). -% #2 is the \...x control sequence for consecutive fns (which we define). -% #3 is the control sequence to call to resume processing. +% #2 is the \...x control sequence (which our caller defines). +% #3 is the control sequence to process the header, such as \defunheader. +% +\def\parsebodycommon#1#2#3{% + \begingroup\inENV + % If there are two @def commands in a row, we'll have a \nobreak, + % which is there to keep the function description together with its + % header. But if there's nothing but headers, we want to allow a + % break after all. + \ifnum\lastpenalty=10000 \penalty0 \fi + \medbreak + % + % Define the \E... end token that this defining construct specifies + % so that it will exit this group. + \def#1{\endgraf\endgroup\medbreak}% + % + \parindent=0in + \advance\leftskip by \defbodyindent + \exdentamount=\defbodyindent +} + +% Common part of the \...x definitions. +% +\def\defxbodycommon{% + % As with \parsebodycommon above, allow line break if we have multiple + % x headers in a row. It's not a great place, though. + \ifnum\lastpenalty=10000 \penalty1000 \fi + % + \begingroup\obeylines +} + +% Process body of @defun, @deffn, @defmac, etc. +% +\def\defparsebody#1#2#3{% + \parsebodycommon{#1}{#2}{#3}% + \def#2{\defxbodycommon \activeparens \spacesplit#3}% + \catcode61=\active % 61 is `=' + \begingroup\obeylines\activeparens + \spacesplit#3% +} + +% #1, #2, #3 are the common arguments (see \parsebodycommon above). % #4, delimited by the space, is the class name. % -\def\defmethparsebody#1#2#3#4 {\begingroup\inENV % -\medbreak % -% Define the end token that this defining construct specifies -% so that it will exit this group. -\def#1{\endgraf\endgroup\medbreak}% -\def#2##1 {\begingroup\obeylines\activeparens\spacesplit{#3{##1}}}% -\parindent=0in -\advance\leftskip by \defbodyindent -\exdentamount=\defbodyindent -\begingroup\obeylines\activeparens\spacesplit{#3{#4}}} +\def\defmethparsebody#1#2#3#4 {% + \parsebodycommon{#1}{#2}{#3}% + \def#2##1 {\defxbodycommon \activeparens \spacesplit{#3{##1}}}% + \begingroup\obeylines\activeparens + % The \empty here prevents misinterpretation of a construct such as + % @deffn {whatever} {Enharmonic comma} + % See comments at \deftpparsebody, although in our case we don't have + % to remove the \empty afterwards, since it is empty. + \spacesplit{#3{#4}}\empty +} % Used for @deftypemethod and @deftypeivar. -% #1 is the \E... control sequence to end the definition (which we define). -% #2 is the \...x control sequence for consecutive fns (which we define). -% #3 is the control sequence to call to resume processing. +% #1, #2, #3 are the common arguments (see \defparsebody). % #4, delimited by a space, is the class name. % #5 is the method's return type. % -\def\deftypemethparsebody#1#2#3#4 #5 {\begingroup\inENV - \medbreak - \def#1{\endgraf\endgroup\medbreak}% - \def#2##1 ##2 {\begingroup\obeylines\activeparens\spacesplit{#3{##1}{##2}}}% - \parindent=0in - \advance\leftskip by \defbodyindent - \exdentamount=\defbodyindent - \begingroup\obeylines\activeparens\spacesplit{#3{#4}{#5}}} +\def\deftypemethparsebody#1#2#3#4 #5 {% + \parsebodycommon{#1}{#2}{#3}% + \def#2##1 ##2 {\defxbodycommon \activeparens \spacesplit{#3{##1}{##2}}}% + \begingroup\obeylines\activeparens + \spacesplit{#3{#4}{#5}}% +} % Used for @deftypeop. The change from \deftypemethparsebody is an % extra argument at the beginning which is the `category', instead of it @@ -4749,64 +4929,48 @@ width0pt\relax} \fi % input at hand. Thus also need a control sequence (passed as #5) for % the \E... definition to assign the category name to. % -\def\deftypeopparsebody#1#2#3#4#5 #6 {\begingroup\inENV - \medbreak - \def#1{\endgraf\endgroup\medbreak}% - \def#2##1 ##2 ##3 {% - \def#4{##1}% - \begingroup\obeylines\activeparens\spacesplit{#3{##2}{##3}}}% - \parindent=0in - \advance\leftskip by \defbodyindent - \exdentamount=\defbodyindent - \begingroup\obeylines\activeparens\spacesplit{#3{#5}{#6}}} - -\def\defopparsebody #1#2#3#4#5 {\begingroup\inENV % -\medbreak % -% Define the end token that this defining construct specifies -% so that it will exit this group. -\def#1{\endgraf\endgroup\medbreak}% -\def#2##1 ##2 {\def#4{##1}% -\begingroup\obeylines\activeparens\spacesplit{#3{##2}}}% -\parindent=0in -\advance\leftskip by \defbodyindent -\exdentamount=\defbodyindent -\begingroup\obeylines\activeparens\spacesplit{#3{#5}}} +\def\deftypeopparsebody#1#2#3#4#5 #6 {% + \parsebodycommon{#1}{#2}{#3}% + \def#2##1 ##2 ##3 {\def#4{##1}% + \defxbodycommon \activeparens \spacesplit{#3{##2}{##3}}}% + \begingroup\obeylines\activeparens + \spacesplit{#3{#5}{#6}}% +} + +% For @defop. +\def\defopparsebody #1#2#3#4#5 {% + \parsebodycommon{#1}{#2}{#3}% + \def#2##1 ##2 {\def#4{##1}% + \defxbodycommon \activeparens \spacesplit{#3{##2}}}% + \begingroup\obeylines\activeparens + \spacesplit{#3{#5}}% +} % These parsing functions are similar to the preceding ones % except that they do not make parens into active characters. % These are used for "variables" since they have no arguments. - -\def\defvarparsebody #1#2#3{\begingroup\inENV% Environment for definitionbody -\medbreak % -% Define the end token that this defining construct specifies -% so that it will exit this group. -\def#1{\endgraf\endgroup\medbreak}% -\def#2{\begingroup\obeylines\spacesplit#3}% -\parindent=0in -\advance\leftskip by \defbodyindent -\exdentamount=\defbodyindent -\begingroup % -\catcode 61=\active % -\obeylines\spacesplit#3} - -% This is used for \def{tp,vr}parsebody. It could probably be used for -% some of the others, too, with some judicious conditionals. % -\def\parsebodycommon#1#2#3{% - \begingroup\inENV % - \medbreak % - % Define the end token that this defining construct specifies - % so that it will exit this group. - \def#1{\endgraf\endgroup\medbreak}% - \def#2##1 {\begingroup\obeylines\spacesplit{#3{##1}}}% - \parindent=0in - \advance\leftskip by \defbodyindent - \exdentamount=\defbodyindent +\def\defvarparsebody #1#2#3{% + \parsebodycommon{#1}{#2}{#3}% + \def#2{\defxbodycommon \spacesplit#3}% + \catcode61=\active % + \begingroup\obeylines + \spacesplit#3% +} + +% @defopvar. +\def\defopvarparsebody #1#2#3#4#5 {% + \parsebodycommon{#1}{#2}{#3}% + \def#2##1 ##2 {\def#4{##1}% + \defxbodycommon \spacesplit{#3{##2}}}% \begingroup\obeylines + \spacesplit{#3{#5}}% } \def\defvrparsebody#1#2#3#4 {% \parsebodycommon{#1}{#2}{#3}% + \def#2##1 {\defxbodycommon \spacesplit{#3{##1}}}% + \begingroup\obeylines \spacesplit{#3{#4}}% } @@ -4821,6 +4985,8 @@ width0pt\relax} \fi % \def\deftpparsebody #1#2#3#4 {% \parsebodycommon{#1}{#2}{#3}% + \def#2##1 {\defxbodycommon \spacesplit{#3{##1}}}% + \begingroup\obeylines \spacesplit{\parsetpheaderline{#3{#4}}}\empty } @@ -4837,32 +5003,22 @@ width0pt\relax} \fi #1{\removeemptybraces#2\relax}{#3}% }% -\def\defopvarparsebody #1#2#3#4#5 {\begingroup\inENV % -\medbreak % -% Define the end token that this defining construct specifies -% so that it will exit this group. -\def#1{\endgraf\endgroup\medbreak}% -\def#2##1 ##2 {\def#4{##1}% -\begingroup\obeylines\spacesplit{#3{##2}}}% -\parindent=0in -\advance\leftskip by \defbodyindent -\exdentamount=\defbodyindent -\begingroup\obeylines\spacesplit{#3{#5}}} - -% Split up #2 at the first space token. +% Split up #2 (the rest of the input line) at the first space token. % call #1 with two arguments: % the first is all of #2 before the space token, % the second is all of #2 after that space token. % If #2 contains no space token, all of it is passed as the first arg % and the second is passed as empty. - -{\obeylines -\gdef\spacesplit#1#2^^M{\endgroup\spacesplitfoo{#1}#2 \relax\spacesplitfoo}% -\long\gdef\spacesplitfoo#1#2 #3#4\spacesplitfoo{% -\ifx\relax #3% -#1{#2}{}\else #1{#2}{#3#4}\fi}} - -% So much for the things common to all kinds of definitions. +% +{\obeylines % + \gdef\spacesplit#1#2^^M{\endgroup\spacesplitx{#1}#2 \relax\spacesplitx}% + \long\gdef\spacesplitx#1#2 #3#4\spacesplitx{% + \ifx\relax #3% + #1{#2}{}% + \else % + #1{#2}{#3#4}% + \fi}% +} % Define @defun. @@ -5273,7 +5429,7 @@ width0pt\relax} \fi \message{Warning: redefining \the\macname}% \else \expandafter\ifx\csname \the\macname\endcsname \relax - \else \errmessage{The name \the\macname\space is reserved}\fi + \else \errmessage{Macro name \the\macname\space already defined}\fi \global\cslet{macsave.\the\macname}{\the\macname}% \global\expandafter\let\csname ismacro.\the\macname\endcsname=1% % Add the macroname to \macrolist @@ -6019,11 +6175,13 @@ should work if nowhere else does.} } % Parameters in order: 1) textheight; 2) textwidth; 3) voffset; -% 4) hoffset; 5) binding offset; 6) topskip. We also call -% \setleading{\textleading}, so the caller should define \textleading. -% The caller should also set \parskip. +% 4) hoffset; 5) binding offset; 6) topskip; 7) physical page height; 8) +% physical page width. +% +% We also call \setleading{\textleading}, so the caller should define +% \textleading. The caller should also set \parskip. % -\def\internalpagesizes#1#2#3#4#5#6{% +\def\internalpagesizes#1#2#3#4#5#6#7#8{% \voffset = #3\relax \topskip = #6\relax \splittopskip = \topskip @@ -6042,6 +6200,11 @@ should work if nowhere else does.} \normaloffset = #4\relax \bindingoffset = #5\relax % + \ifpdf + \pdfpageheight #7\relax + \pdfpagewidth #8\relax + \fi + % \setleading{\textleading} % \parindent = \defaultparindent @@ -6063,7 +6226,10 @@ should work if nowhere else does.} \textleading = 13.2pt % % If page is nothing but text, make it come out even. - \internalpagesizes{46\baselineskip}{6in}{\voffset}{.25in}{\bindingoffset}{36pt}% + \internalpagesizes{46\baselineskip}{6in}% + {\voffset}{.25in}% + {\bindingoffset}{36pt}% + {11in}{8.5in}% }} % Use @smallbook to reset parameters for 7x9.5 (or so) format. @@ -6071,13 +6237,15 @@ should work if nowhere else does.} \parskip = 2pt plus 1pt \textleading = 12pt % - \internalpagesizes{7.5in}{5.in}{\voffset}{.25in}{\bindingoffset}{16pt}% + \internalpagesizes{7.5in}{5in}% + {\voffset}{.25in}% + {\bindingoffset}{16pt}% + {9.25in}{7in}% % \lispnarrowing = 0.3in \tolerance = 700 \hfuzz = 1pt \contentsrightmargin = 0pt - \deftypemargin = 0pt \defbodyindent = .5cm \smallenvironments }} @@ -6085,12 +6253,27 @@ should work if nowhere else does.} % Use @afourpaper to print on European A4 paper. \def\afourpaper{{\globaldefs = 1 \parskip = 3pt plus 2pt minus 1pt - \textleading = 12pt + \textleading = 13.2pt % - \internalpagesizes{53\baselineskip}{160mm}{\voffset}{4mm}{\bindingoffset}{44pt}% + % Double-side printing via postscript on Laserjet 4050 + % prints double-sided nicely when \bindingoffset=10mm and \hoffset=-6mm. + % To change the settings for a different printer or situation, adjust + % \normaloffset until the front-side and back-side texts align. Then + % do the same for \bindingoffset. You can set these for testing in + % your texinfo source file like this: + % @tex + % \global\normaloffset = -6mm + % \global\bindingoffset = 10mm + % @end tex + \internalpagesizes{51\baselineskip}{160mm} + {\voffset}{\hoffset}% + {\bindingoffset}{44pt}% + {297mm}{210mm}% % \tolerance = 700 \hfuzz = 1pt + \contentsrightmargin = 0pt + \defbodyindent = 5mm }} % Use @afivepaper to print on European A5 paper. @@ -6100,37 +6283,42 @@ should work if nowhere else does.} \parskip = 2pt plus 1pt minus 0.1pt \textleading = 12.5pt % - \internalpagesizes{166mm}{120mm}{\voffset}{-8mm}{\bindingoffset}{8pt}% + \internalpagesizes{160mm}{120mm}% + {\voffset}{\hoffset}% + {\bindingoffset}{8pt}% + {210mm}{148mm}% % \lispnarrowing = 0.2in \tolerance = 800 \hfuzz = 1.2pt - \contentsrightmargin = 0mm - \deftypemargin = 0pt + \contentsrightmargin = 0pt \defbodyindent = 2mm \tableindent = 12mm % \smallenvironments }} -% A specific text layout, 24x15cm overall, intended for A4 paper. Top margin -% 29mm, hence bottom margin 28mm, nominal side margin 3cm. +% A specific text layout, 24x15cm overall, intended for A4 paper. \def\afourlatex{{\globaldefs = 1 - \textleading = 13.6pt - % \afourpaper - \internalpagesizes{237mm}{150mm}{3.6mm}{3.6mm}{3mm}{7mm}% + \internalpagesizes{237mm}{150mm}% + {\voffset}{4.6mm}% + {\bindingoffset}{7mm}% + {297mm}{210mm}% % - % Must explicitly reset to 0 because we call \afourpaper, apparently, - % although this does not entirely make sense. + % Must explicitly reset to 0 because we call \afourpaper. \globaldefs = 0 }} -% Use @afourwide to print on European A4 paper in wide format. -\def\afourwide{% +% Use @afourwide to print on A4 paper in landscape format. +\def\afourwide{{\globaldefs = 1 \afourpaper - \internalpagesizes{6.5in}{9.5in}{\hoffset}{\normaloffset}{\bindingoffset}{7mm}% -} + \internalpagesizes{241mm}{165mm}% + {\voffset}{-2.95mm}% + {\bindingoffset}{7mm}% + {297mm}{210mm}% + \globaldefs = 0 +}} % @pagesizes TEXTHEIGHT[,TEXTWIDTH] % Perhaps we should allow setting the margins, \topskip, \parskip, @@ -6145,7 +6333,16 @@ should work if nowhere else does.} \parskip = 3pt plus 2pt minus 1pt \setleading{\textleading}% % - \internalpagesizes{#1}{\hsize}{\voffset}{\normaloffset}{\bindingoffset}{44pt}% + \dimen0 = #1 + \advance\dimen0 by \voffset + % + \dimen2 = \hsize + \advance\dimen2 by \normaloffset + % + \internalpagesizes{#1}{\hsize}% + {\voffset}{\normaloffset}% + {\bindingoffset}{44pt}% + {\dimen0}{\dimen2}% }} % Set default to letter. @@ -6269,16 +6466,8 @@ should work if nowhere else does.} @let+=@normalplus @let$=@normaldollar}%$ font-lock fix -@def@normalturnoffactive{@let"=@normaldoublequote -@let\=@normalbackslash -@let~=@normaltilde -@let^=@normalcaret -@let_=@normalunderscore -@let|=@normalverticalbar -@let<=@normalless -@let>=@normalgreater -@let+=@normalplus -@let$=@normaldollar}%$ font-lock fix +% Same as @turnoffactive except for \. +@def@normalturnoffactive{@turnoffactive @let\=@normalbackslash} % Make _ and + \other characters, temporarily. % This is canceled by @fixbackslash. diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index fd518693f5a..88f24e82cd0 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -58,7 +58,7 @@ @end ifnothtml @c Part 2 Summary Description and Copyright -@macro copyrightnotice +@copying Copyright @copyright{} 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. @sp 1 @@ -79,9 +79,9 @@ Free Documentation License}''. You have freedom to copy and modify this GNU Manual, like GNU software. Copies published by the Free Software Foundation raise funds for GNU development. -@end macro +@end copying @ifinfo -@copyrightnotice{} +@insertcopying @end ifinfo @c Part 3 Titlepage and Copyright @@ -93,7 +93,7 @@ Free Documentation License}''. @c The following two commands start the copyright page. @page @vskip 0pt plus 1filll -@copyrightnotice{} +@insertcopying @end titlepage @c Part 4 Top node and Master Menu @@ -197,7 +197,7 @@ not yet been merged into the main part of this manual. @ifhtml @uref{./index.html,,Return to the GCC Installation page} -@copyrightnotice{} +@insertcopying @end ifhtml @end ifset @@ -559,12 +559,8 @@ whether you use the GNU assembler. On any other system, @item @samp{hppa1.0-@var{any}-@var{any}} @item @samp{hppa1.1-@var{any}-@var{any}} @item @samp{i386-@var{any}-sysv} -@item @samp{i386-@var{any}-isc} -@item @samp{i860-@var{any}-bsd} @item @samp{m68k-bull-sysv} @item @samp{m68k-hp-hpux} -@item @samp{m68k-sony-bsd} -@item @samp{m68k-altos-sysv} @item @samp{m68000-hp-hpux} @item @samp{m68000-att-sysv} @item @samp{@var{any}-lynx-lynxos} @@ -720,8 +716,8 @@ Specify which cpu variant the compiler should generate code for by default. This is currently only supported on some ports, specifically arm, powerpc, and SPARC@. If configure does not recognize the model name (e.g.@: arm700, -603e, or ultrasparc) you provide, please check the configure script -for a complete list of supported models. +603e, or ultrasparc) you provide, please check the +@file{gcc/config.gcc} script for a complete list of supported models. @item --enable-altivec Specify that the target supports AltiVec vector enhancements. This @@ -822,8 +818,8 @@ option. This option has no effect on the other hosts. @item --nfp Specify that the machine does not have a floating point unit. This -option only applies to @samp{m68k-sun-sunos@var{n}} and -@samp{m68k-isi-bsd}. On any other system, @option{--nfp} has no effect. +option only applies to @samp{m68k-sun-sunos@var{n}}. On any other +system, @option{--nfp} has no effect. @item --enable-checking @itemx --enable-checking=@var{list} @@ -983,7 +979,7 @@ parser sources, releases contain the Bison-generated files and you do not need Bison installed to build them. When building from CVS or snapshots, or if you modify Texinfo -documentation, you need version 4.1 or later of Texinfo installed if you +documentation, you need version 4.2 or later of Texinfo installed if you want Info documentation to be regenerated. Releases contain Info documentation pre-built for the unmodified documentation in the release. @@ -1277,6 +1273,11 @@ testsuite at @file{libjava/testsuite/libjava.mauve/mauve}, or by specifying the location of that tree when invoking @samp{make}, as in @samp{make MAUVEDIR=~/mauve check}. +@uref{http://www-124.ibm.com/developerworks/oss/cvs/jikes/~checkout~/jacks/jacks.html,,Jacks} +is a free test suite that tests Java compiler front ends. This suite +can be run as part of libgcj testing by placing the Jacks tree within +the libjava testsuite at @file{libjava/testsuite/libjava.jacks/jacks}. + @section How to interpret test results After the testsuite has run you'll find various @file{*.sum} and @file{*.log} @@ -1368,6 +1369,34 @@ in @file{@var{libdir}} (normally @file{@var{prefix}/lib}); internal parts of the compiler in @file{@var{libdir}/gcc-lib}; documentation in info format in @file{@var{infodir}} (normally @file{@var{prefix}/info}). +When installing cross-compilers, GCC's executables +are not only installed into @file{@var{bindir}}, that +is, @file{@var{exec-prefix}/bin}, but additionally into +@file{@var{exec-prefix}/@var{target-alias}/bin}, if that directory +exists. Typically, such @dfn{tooldirs} hold target-specific +binutils, including assembler and linker. + +Installation into a temporary staging area or into a @command{chroot} +jail can be achieved with the command + +@example +make DESTDIR=@var{path-to-rootdir} install +@end example + +@noindent where @var{path-to-rootdir} is the absolute path of +a directory relative to which all installation paths will be +interpreted. Note that the directory specified by @code{DESTDIR} +need not exist yet; it will be created if necessary. + +There is a subtle point with tooldirs and @code{DESTDIR}: +If you relocate a cross-compiler installation with +e.g.@: @samp{DESTDIR=@var{rootdir}}, then the directory +@file{@var{rootdir}/@var{exec-prefix}/@var{target-alias}/bin} will +be filled with duplicated GCC executables only if it already exists, +it will not be created otherwise. This is regarded as a feature, +not as a bug, because it gives slightly more control to the packagers +using the @code{DESTDIR} feature. + If you built a released version of GCC using @samp{make bootstrap} then please quickly review the build status page for your release, available from @uref{http://gcc.gnu.org/buildstat.html}. @@ -1434,7 +1463,7 @@ If you find a bug, please report it following our @uref{../bugs.html,,bug reporting guidelines}. If you want to print the GCC manuals, do @samp{cd @var{objdir}; make -dvi}. You will need to have @command{texi2dvi} (version at least 4.1) +dvi}. You will need to have @command{texi2dvi} (version at least 4.2) and @TeX{} installed. This creates a number of @file{.dvi} files in subdirectories of @file{@var{objdir}}; these may be converted for printing with programs such as @command{dvips}. You can also @@ -2039,7 +2068,7 @@ and tested on @samp{i386-*-freebsd4.5} and @samp{alpha-*-freebsd5.0}. The static library may be incorrectly built (symbols are missing at link time). There is a rare timing-based startup hang (probably involves an -assupmtion about the thread library). Multi-threaded boehm-gc (required for +assumption about the thread library). Multi-threaded boehm-gc (required for libjava) exposes severe threaded signal-handling bugs on FreeBSD before 4.5-RELEASE. The alpha port may not fully bootstrap without some manual intervention: @command{gcjh} will crash with a floating-point exception while @@ -2223,8 +2252,8 @@ applied in the GCC source tree, fixes the compatibility problems. Currently Glibc 2.2.3 (and older releases) and GCC 3.0 are out of sync since the latest exception handling changes for GCC@. Compiling glibc with GCC 3.0 will give a binary incompatible glibc and therefore cause -lots of problems and might make your system completly unusable. This -will definitly need fixes in glibc but might also need fixes in GCC@. We +lots of problems and might make your system completely unusable. This +will definitely need fixes in glibc but might also need fixes in GCC@. We strongly advise to wait for glibc 2.2.4 and to read the release notes of glibc 2.2.4 whether patches for GCC 3.0 are needed. You can use glibc 2.2.3 with GCC 3.0, just do not try to recompile it. @@ -2909,7 +2938,7 @@ or newer for a working GCC@. @end html @heading @anchor{powerpc-*-netbsd*}powerpc-*-netbsd* PowerPC system in big endian mode running NetBSD@. To build the -documentation you will need Texinfo version 4.1 (NetBSD 1.5.1 included +documentation you will need Texinfo version 4.2 (NetBSD 1.5.1 included Texinfo version 3.12). @html diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index fe214602a1e..4d1b4528bab 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -1,12 +1,12 @@ @c Copyright (C) 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -@c 2000, 2001, 2002 Free Software Foundation, Inc. +@c 2000, 2001, 2002, 2003 Free Software Foundation, Inc. @c This is part of the GCC manual. @c For copying conditions, see the file gcc.texi. @ignore @c man begin COPYRIGHT Copyright @copyright{} 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, -1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or @@ -264,7 +264,6 @@ in the following sections. @gccoptlist{ -falign-functions=@var{n} -falign-jumps=@var{n} @gol -falign-labels=@var{n} -falign-loops=@var{n} @gol --fbounds-check @gol -fbranch-probabilities -fcaller-saves -fcprop-registers @gol -fcse-follow-jumps -fcse-skip-blocks -fdata-sections @gol -fdelayed-branch -fdelete-null-pointer-checks @gol @@ -290,7 +289,7 @@ in the following sections. -fsched-spec-load-dangerous -fsignaling-nans @gol -fsingle-precision-constant -fssa -fssa-ccp -fssa-dce @gol -fstrength-reduce -fstrict-aliasing -ftracer -fthread-jumps @gol --ftrapv -funroll-all-loops -funroll-loops @gol +-funroll-all-loops -funroll-loops @gol --param @var{name}=@var{value} -O -O0 -O1 -O2 -O3 -Os} @@ -344,7 +343,7 @@ in the following sections. @emph{M68hc1x Options} @gccoptlist{ --m6811 -m6812 -m68hc11 -m68hc12 @gol +-m6811 -m6812 -m68hc11 -m68hc12 -m68hcs12 @gol -mauto-incdec -minmax -mlong-calls -mshort @gol -msoft-reg-count=@var{count}} @@ -367,22 +366,6 @@ in the following sections. -msoft-float -msoft-quad-float -msparclite -mstack-bias @gol -msupersparc -munaligned-doubles -mv8} -@emph{Convex Options} -@gccoptlist{ --mc1 -mc2 -mc32 -mc34 -mc38 @gol --margcount -mnoargcount @gol --mlong32 -mlong64 @gol --mvolatile-cache -mvolatile-nocache} - -@emph{AMD29K Options} -@gccoptlist{ --m29000 -m29050 -mbw -mnbw -mdw -mndw @gol --mlarge -mnormal -msmall @gol --mkernel-registers -mno-reuse-arg-regs @gol --mno-stack-check -mno-storem-bug @gol --mreuse-arg-regs -msoft-float -mstack-check @gol --mstorem-bug -muser-registers} - @emph{ARM Options} @gccoptlist{ -mapcs-frame -mno-apcs-frame @gol @@ -397,7 +380,6 @@ in the following sections. -mthumb-interwork -mno-thumb-interwork @gol -mcpu=@var{name} -march=@var{name} -mfpe=@var{name} @gol -mstructure-size-boundary=@var{n} @gol --mbsd -mxopen -mno-symrename @gol -mabort-on-noreturn @gol -mlong-calls -mno-long-calls @gol -msingle-pic-base -mno-single-pic-base @gol @@ -566,10 +548,6 @@ in the following sections. @gccoptlist{ -mvms-return-codes} -@emph{Clipper Options} -@gccoptlist{ --mc300 -mc400} - @emph{H8/300 Options} @gccoptlist{ -mrelax -mh -ms -mn -mint32 -malign-300} @@ -730,7 +708,8 @@ in the following sections. -fstack-limit-register=@var{reg} -fstack-limit-symbol=@var{sym} @gol -fargument-alias -fargument-noalias @gol -fargument-noalias-global -fleading-underscore @gol --ftls-model=@var{model}} +-ftls-model=@var{model} @gol +-ftrapv -fbounds-check} @end table @menu @@ -1079,7 +1058,7 @@ ISO C90 as modified in amendment 1. @itemx iso9899:1999 @itemx iso9899:199x ISO C99. Note that this standard is not yet fully supported; see -@w{@uref{http://gcc.gnu.org/c99status.html}} for more information. The +@w{@uref{http://gcc.gnu.org/gcc-3.3/c99status.html}} for more information. The names @samp{c9x} and @samp{iso9899:199x} are deprecated. @item gnu89 @@ -1543,7 +1522,7 @@ You should rewrite your code to avoid these warnings if you are concerned about the fact that code generated by G++ may not be binary compatible with code generated by other compilers. -The known incompatibilites at this point include: +The known incompatibilities at this point include: @itemize @bullet @@ -1608,7 +1587,7 @@ struct C : public B, public A @{@}; @end smallexample @noindent -G++ will place the @code{A} base class of @code{C} at a non-zero offset; +G++ will place the @code{A} base class of @code{C} at a nonzero offset; it should be placed at offset zero. G++ mistakenly believes that the @code{A} data member of @code{B} is already at offset zero. @@ -1625,7 +1604,7 @@ void f(typename Q<int>::X) @{@} @end smallexample @noindent -Instantions of these templates may be mangled incorrectly. +Instantiations of these templates may be mangled incorrectly. @end itemize @@ -2518,7 +2497,7 @@ Warn if floating point values are used in equality comparisons. The idea behind this is that sometimes it is convenient (for the programmer) to consider floating-point values as approximations to infinitely precise real numbers. If you are doing this, then you need -to compute (by analysing the code, or in some other way) the maximum or +to compute (by analyzing the code, or in some other way) the maximum or likely maximum error that the computation introduces, and allow for it when performing comparisons (and when producing output, but that's a different problem). In particular, instead of testing for equality, you @@ -2975,19 +2954,19 @@ Compress DWARF2 debugging information by eliminating duplicated information about each symbol. This option only makes sense when generating DWARF2 debugging information with @option{-gdwarf-2}. -@cindex @code{prof} +@cindex @command{prof} @item -p @opindex p Generate extra code to write profile information suitable for the -analysis program @code{prof}. You must use this option when compiling +analysis program @command{prof}. You must use this option when compiling the source files you want data about, and you must also use it when linking. -@cindex @code{gprof} +@cindex @command{gprof} @item -pg @opindex pg Generate extra code to write profile information suitable for the -analysis program @code{gprof}. You must use this option when compiling +analysis program @command{gprof}. You must use this option when compiling the source files you want data about, and you must also use it when linking. @@ -3027,7 +3006,7 @@ optimization and code generation options plus @option{-fbranch-probabilities} (@pxref{Optimize Options,,Options that Control Optimization}). -The other use of @option{-fprofile-arcs} is for use with @code{gcov}, +The other use of @option{-fprofile-arcs} is for use with @command{gcov}, when it is used with the @option{-ftest-coverage} option. With @option{-fprofile-arcs}, for each function of your program GCC @@ -3041,17 +3020,17 @@ block must be created to hold the instrumentation code. @need 2000 @item -ftest-coverage @opindex ftest-coverage -Create data files for the @code{gcov} code-coverage utility -(@pxref{Gcov,, @code{gcov}: a GCC Test Coverage Program}). See +Create data files for the @command{gcov} code-coverage utility +(@pxref{Gcov,, @command{gcov}---a Test Coverage Program}). See @option{-fprofile-arcs} option above for a description of @var{auxname}. @table @gcctabopt @item @var{auxname}.bb -A mapping from basic blocks to line numbers, which @code{gcov} uses to +A mapping from basic blocks to line numbers, which @command{gcov} uses to associate basic block execution counts with line numbers. @item @var{auxname}.bbg -A list of all arcs in the program flow graph. This allows @code{gcov} +A list of all arcs in the program flow graph. This allows @command{gcov} to reconstruct the program flow graph, so that it can compute all basic block and arc execution counts from the information in the @file{@var{auxname}.da} file. @@ -3150,7 +3129,7 @@ Dump after local register allocation, to @file{@var{file}.23.lreg}. Dump after loop optimization, to @file{@var{file}.12.loop}. @item M @opindex dM -Dump after performing the machine dependent reorganisation pass, to +Dump after performing the machine dependent reorganization pass, to @file{@var{file}.33.mach}. @item n @opindex dn @@ -3177,7 +3156,7 @@ Dump after the second CSE pass (including the jump optimization that sometimes follows CSE), to @file{@var{file}.17.cse2}. @item u @opindex du -Dump after null pointer ellimination pass ti @file{@var{file}.08.null}. +Dump after null pointer elimination pass to @file{@var{file}.08.null}. @item w @opindex dw Dump after the second flow pass, to @file{@var{file}.26.flow2}. @@ -3388,7 +3367,22 @@ is used when GCC itself is being built.) @xref{Spec Files}. @cindex optimize options @cindex options, optimization -These options control various sorts of optimizations: +These options control various sorts of optimizations. + +Without any optimization option, the compiler's goal is to reduce the +cost of compilation and to make debugging produce the expected +results. Statements are independent: if you stop the program with a +breakpoint between statements, you can then assign a new value to any +variable or change the program counter to any other statement in the +function and get exactly the results you would expect from the source +code. + +Turning on optimization flags makes the compiler attempt to improve +the performance and/or code size at the expense of compilation time +and possibly the ability to debug the program. + +Not all optimizations are controlled directly by a flag. Only +optimizations that have a flag are listed. @table @gcctabopt @item -O @@ -3398,17 +3392,25 @@ These options control various sorts of optimizations: Optimize. Optimizing compilation takes somewhat more time, and a lot more memory for a large function. -Without @option{-O}, the compiler's goal is to reduce the cost of -compilation and to make debugging produce the expected results. -Statements are independent: if you stop the program with a breakpoint -between statements, you can then assign a new value to any variable or -change the program counter to any other statement in the function and -get exactly the results you would expect from the source code. - With @option{-O}, the compiler tries to reduce code size and execution time, without performing any optimizations that take a great deal of compilation time. +@option{-O} turns on the following optimization flags: +@gccoptlist{-fdefer-pop +-fmerge-constants +-fthread-jumps +-floop-optimize +-fcrossjumping +-fif-conversion +-fif-conversion2 +-fdelayed-branch +-fguess-branch-probability +-fcprop-registers} + +@option{-O} also turns on @option{-fomit-frame-pointer} on machines +where doing so does not interfere with debugging. + @item -O2 @opindex O2 Optimize even more. GCC performs nearly all supported optimizations @@ -3417,11 +3419,25 @@ perform loop unrolling or function inlining when you specify @option{-O2}. As compared to @option{-O}, this option increases both compilation time and the performance of the generated code. -@option{-O2} turns on all optional optimizations except for loop -unrolling, function inlining, and register renaming. It also turns on -the @option{-fforce-mem} and @option{-fstrict-aliasing} option on all -machines and frame pointer elimination on machines where doing so does -not interfere with debugging. +@option{-O2} turns on all optimization flags specified by @option{-O}. It +also turns on the following optimization flags: +@gccoptlist{-fforce-mem +-foptimize-sibling-calls +-fstrength-reduce +-fcse-follow-jumps -fcse-skip-blocks +-frerun-cse-after-loop -frerun-loop-opt +-fgcse -fgcse-lm -fgcse-sm +-fdelete-null-pointer-checks +-fexpensive-optimizations +-fregmove +-fschedule-insns -fschedule-insns2 +-fsched-interblock -fsched-spec +-fcaller-saves +-fpeephole2 +-freorder-blocks -freorder-functions +-fstrict-aliasing +-falign-functions -falign-jumps +-falign-loops -falign-labels} Please note the warning under @option{-fgcse} about invoking @option{-O2} on programs that use computed gotos. @@ -3434,7 +3450,7 @@ Optimize yet more. @option{-O3} turns on all optimizations specified by @item -O0 @opindex O0 -Do not optimize. +Do not optimize. This is the default. @item -Os @opindex Os @@ -3442,33 +3458,27 @@ Optimize for size. @option{-Os} enables all @option{-O2} optimizations that do not typically increase code size. It also performs further optimizations designed to reduce code size. +@option{-Os} disables the following optimization flags: +@gccoptlist{-falign-functions -falign-jumps -falign-loops +-falign-labels -freorder-blocks -fprefetch-loop-arrays} + If you use multiple @option{-O} options, with or without level numbers, the last such option is the one that is effective. @end table Options of the form @option{-f@var{flag}} specify machine-independent flags. Most flags have both positive and negative forms; the negative -form of @option{-ffoo} would be @option{-fno-foo}. In the table below, -only one of the forms is listed---the one which is not the default. -You can figure out the other form by either removing @samp{no-} or -adding it. - -@table @gcctabopt -@item -ffloat-store -@opindex ffloat-store -Do not store floating point variables in registers, and inhibit other -options that might change whether a floating point value is taken from a -register or memory. +form of @option{-ffoo} would be @option{-fno-foo}. In the table +below, only one of the forms is listed---the one you typically will +use. You can figure out the other form by either removing @samp{no-} +or adding it. -@cindex floating point precision -This option prevents undesirable excess precision on machines such as -the 68000 where the floating registers (of the 68881) keep more -precision than a @code{double} is supposed to have. Similarly for the -x86 architecture. For most programs, the excess precision does only -good, but a few programs rely on the precise definition of IEEE floating -point. Use @option{-ffloat-store} for such programs, after modifying -them to store all pertinent intermediate computations into variables. +The following options control specific optimizations. They are either +activated by @option{-O} options or are related to ones that are. You +can use the following flags in the rare cases when ``fine-tuning'' of +optimizations to be performed is desired. +@table @gcctabopt @item -fno-default-inline @opindex fno-default-inline Do not make member functions inline by default merely because they are @@ -3484,13 +3494,17 @@ returns. For machines which must pop arguments after a function call, the compiler normally lets arguments accumulate on the stack for several function calls and pops them all at once. +Disabled at levels @option{-O}, @option{-O2}, @option{-O3}, @option{-Os}. + @item -fforce-mem @opindex fforce-mem Force memory operands to be copied into registers before doing arithmetic on them. This produces better code by making all memory references potential common subexpressions. When they are not common subexpressions, instruction combination should eliminate the separate -register-load. The @option{-O2} option turns on this option. +register-load. + +Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. @item -fforce-addr @opindex fforce-addr @@ -3513,14 +3527,13 @@ machine-description macro @code{FRAME_POINTER_REQUIRED} controls whether a target machine supports this flag. @xref{Registers,,Register Usage, gccint, GNU Compiler Collection (GCC) Internals}. +Enabled at levels @option{-O}, @option{-O2}, @option{-O3}, @option{-Os}. + @item -foptimize-sibling-calls @opindex foptimize-sibling-calls Optimize sibling and tail recursive calls. -@item -ftrapv -@opindex ftrapv -This option generates traps for signed overflow on addition, subtraction, -multiplication operations. +Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. @item -fno-inline @opindex fno-inline @@ -3538,11 +3551,13 @@ If all calls to a given function are integrated, and the function is declared @code{static}, then the function is normally not output as assembler code in its own right. +Enabled at level @option{-O3}. + @item -finline-limit=@var{n} @opindex finline-limit By default, gcc limits the size of functions that can be inlined. This flag allows the control of this limit for functions that are explicitly marked as -inline (ie marked with the inline keyword or defined within the class +inline (i.e., marked with the inline keyword or defined within the class definition in c++). @var{n} is the size of functions that can be inlined in number of pseudo instructions (not counting parameter handling). The default value of @var{n} is 600. @@ -3575,10 +3590,13 @@ optimization is turned on, use the @option{-fno-keep-static-consts} option. @item -fmerge-constants Attempt to merge identical constants (string constants and floating point -constants) accross compilation units. +constants) across compilation units. + +This option is the default for optimized compilation if the assembler and +linker support it. Use @option{-fno-merge-constants} to inhibit this +behavior. -This option is default for optimized compilation if assembler and linker -support it. Use @option{-fno-merge-constants} to inhibit this behavior. +Enabled at levels @option{-O}, @option{-O2}, @option{-O3}, @option{-Os}. @item -fmerge-all-constants Attempt to merge identical constants and identical variables. @@ -3590,12 +3608,6 @@ types. Languages like C or C++ require each non-automatic variable to have distinct location, so using this option will result in non-conforming behavior. -@item -fnew-ra -@opindex fnew-ra -Use a graph coloring register allocator. Currently this option is meant -for testing, so we are interested to hear about miscompilations with -@option{-fnew-ra}. - @item -fno-branch-count-reg @opindex fno-branch-count-reg Do not use ``decrement and branch'' instructions on a count register, @@ -3604,6 +3616,9 @@ register, compare it against zero, then branch based upon the result. This option is only meaningful on architectures that support such instructions, which include x86, PowerPC, IA-64 and S/390. +The default is @option{-fbranch-count-reg}, enabled when +@option{-fstrength-reduce} is enabled. + @item -fno-function-cse @opindex fno-function-cse Do not put function addresses in registers; make each instruction that @@ -3613,88 +3628,7 @@ This option results in less efficient code, but some strange hacks that alter the assembler output may be confused by the optimizations performed when this option is not used. -@item -ffast-math -@opindex ffast-math -Sets @option{-fno-math-errno}, @option{-funsafe-math-optimizations}, @* -@option{-fno-trapping-math}, @option{-ffinite-math-only} and @* -@option{-fno-signaling-nans}. - -This option causes the preprocessor macro @code{__FAST_MATH__} to be defined. - -This option should never be turned on by any @option{-O} option since -it can result in incorrect output for programs which depend on -an exact implementation of IEEE or ISO rules/specifications for -math functions. - -@item -fno-math-errno -@opindex fno-math-errno -Do not set ERRNO after calling math functions that are executed -with a single instruction, e.g., sqrt. A program that relies on -IEEE exceptions for math error handling may want to use this flag -for speed while maintaining IEEE arithmetic compatibility. - -This option should never be turned on by any @option{-O} option since -it can result in incorrect output for programs which depend on -an exact implementation of IEEE or ISO rules/specifications for -math functions. - -The default is @option{-fmath-errno}. - -@item -funsafe-math-optimizations -@opindex funsafe-math-optimizations -Allow optimizations for floating-point arithmetic that (a) assume -that arguments and results are valid and (b) may violate IEEE or -ANSI standards. When used at link-time, it may include libraries -or startup files that change the default FPU control word or other -similar optimizations. - -This option should never be turned on by any @option{-O} option since -it can result in incorrect output for programs which depend on -an exact implementation of IEEE or ISO rules/specifications for -math functions. - -The default is @option{-fno-unsafe-math-optimizations}. - -@item -ffinite-math-only -@opindex ffinite-math-only -Allow optimizations for floating-point arithmetic that assume -that arguments and results are not NaNs or +-Infs. - -This option should never be turned on by any @option{-O} option since -it can result in incorrect output for programs which depend on -an exact implementation of IEEE or ISO rules/specifications. - -The default is @option{-fno-finite-math-only}. - -@item -fno-trapping-math -@opindex fno-trapping-math -Compile code assuming that floating-point operations cannot generate -user-visible traps. These traps include division by zero, overflow, -underflow, inexact result and invalid operation. This option implies -@option{-fno-signaling-nans}. Setting this option may allow faster -code if one relies on ``non-stop'' IEEE arithmetic, for example. - -This option should never be turned on by any @option{-O} option since -it can result in incorrect output for programs which depend on -an exact implementation of IEEE or ISO rules/specifications for -math functions. - -The default is @option{-ftrapping-math}. - -@item -fsignaling-nans -@opindex fsignaling-nans -Compile code assuming that IEEE signaling NaNs may generate user-visible -traps during floating-point operations. Setting this option disables -optimizations that may change the number of exceptions visible with -signaling NaNs. This option implies @option{-ftrapping-math}. - -This option causes the preprocessor macro @code{__SUPPORT_SNAN__} to -be defined. - -The default is @option{-fno-signaling-nans}. - -This option is experimental and does not currently guarantee to -disable all GCC optimizations that affect signaling NaN behavior. +The default is @option{-ffunction-cse} @item -fno-zero-initialized-in-bss @opindex fno-zero-initialized-in-bss @@ -3709,33 +3643,13 @@ assumptions based on that. The default is @option{-fzero-initialized-in-bss}. -@item -fbounds-check -@opindex fbounds-check -For front-ends that support it, generate additional code to check that -indices used to access arrays are within the declared range. This is -currenly only supported by the Java and Fortran 77 front-ends, where -this option defaults to true and false respectively. - -@end table - -The following options control specific optimizations. The @option{-O2} -option turns on all of these optimizations except @option{-funroll-loops} -and @option{-funroll-all-loops}. On most machines, the @option{-O} option -turns on the @option{-fthread-jumps} and @option{-fdelayed-branch} options, -but specific machines may handle it differently. - -You can use the following flags in the rare cases when ``fine-tuning'' -of optimizations to be performed is desired. - -Not all of the optimizations performed by GCC have @option{-f} options -to control them. - -@table @gcctabopt @item -fstrength-reduce @opindex fstrength-reduce Perform the optimizations of loop strength reduction and elimination of iteration variables. +Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. + @item -fthread-jumps @opindex fthread-jumps Perform optimizations where we check to see if a jump branches to a @@ -3744,6 +3658,8 @@ so, the first branch is redirected to either the destination of the second branch or a point immediately following it, depending on whether the condition is known to be true or false. +Enabled at levels @option{-O}, @option{-O2}, @option{-O3}, @option{-Os}. + @item -fcse-follow-jumps @opindex fcse-follow-jumps In common subexpression elimination, scan through jump instructions @@ -3752,6 +3668,8 @@ example, when CSE encounters an @code{if} statement with an @code{else} clause, CSE will follow the jump when the condition tested is false. +Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. + @item -fcse-skip-blocks @opindex fcse-skip-blocks This is similar to @option{-fcse-follow-jumps}, but causes CSE to @@ -3760,15 +3678,21 @@ encounters a simple @code{if} statement with no else clause, @option{-fcse-skip-blocks} causes CSE to follow the jump around the body of the @code{if}. +Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. + @item -frerun-cse-after-loop @opindex frerun-cse-after-loop Re-run common subexpression elimination after loop optimizations has been performed. +Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. + @item -frerun-loop-opt @opindex frerun-loop-opt Run the loop optimizer twice. +Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. + @item -fgcse @opindex fgcse Perform a global common subexpression elimination pass. @@ -3776,9 +3700,11 @@ This pass also performs global constant and copy propagation. @emph{Note:} When compiling a program using computed gotos, a GCC extension, you may get better runtime performance if you disable -the global common subexpression elmination pass by adding +the global common subexpression elimination pass by adding @option{-fno-gcse} to the command line. +Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. + @item -fgcse-lm @opindex fgcse-lm When @option{-fgcse-lm} is enabled, global common subexpression elimination will @@ -3786,6 +3712,8 @@ attempt to move loads which are only killed by stores into themselves. This allows a loop containing a load/store sequence to be changed to a load outside the loop, and a copy/store within the loop. +Enabled by default when gcse is enabled. + @item -fgcse-sm @opindex fgcse-sm When @option{-fgcse-sm} is enabled, A store motion pass is run after global common @@ -3793,17 +3721,23 @@ subexpression elimination. This pass will attempt to move stores out of loops. When used in conjunction with @option{-fgcse-lm}, loops containing a load/store sequence can be changed to a load before the loop and a store after the loop. +Enabled by default when gcse is enabled. + @item -floop-optimize @opindex floop-optimize Perform loop optimizations: move constant expressions out of loops, simplify exit test conditions and optionally do strength-reduction and loop unrolling as well. +Enabled at levels @option{-O}, @option{-O2}, @option{-O3}, @option{-Os}. + @item -fcrossjumping @opindex crossjumping Perform cross-jumping transformation. This transformation unifies equivalent code and save code size. The resulting code may or may not perform better than without cross-jumping. +Enabled at levels @option{-O}, @option{-O2}, @option{-O3}, @option{-Os}. + @item -fif-conversion @opindex if-conversion Attempt to transform conditional jumps into branch-less equivalents. This @@ -3811,11 +3745,15 @@ include use of conditional moves, min, max, set flags and abs instructions, and some tricks doable by standard arithmetics. The use of conditional execution on chips where it is available is controlled by @code{if-conversion2}. +Enabled at levels @option{-O}, @option{-O2}, @option{-O3}, @option{-Os}. + @item -fif-conversion2 @opindex if-conversion2 Use conditional execution (where available) to transform conditional jumps into branch-less equivalents. +Enabled at levels @option{-O}, @option{-O2}, @option{-O3}, @option{-Os}. + @item -fdelete-null-pointer-checks @opindex fdelete-null-pointer-checks Use global dataflow analysis to identify and eliminate useless checks @@ -3828,10 +3766,14 @@ safely dereference null pointers. Use @option{-fno-delete-null-pointer-checks} to disable this optimization for programs which depend on that behavior. +Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. + @item -fexpensive-optimizations @opindex fexpensive-optimizations Perform a number of minor optimizations that are relatively expensive. +Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. + @item -foptimize-register-move @itemx -fregmove @opindex foptimize-register-move @@ -3839,18 +3781,21 @@ Perform a number of minor optimizations that are relatively expensive. Attempt to reassign register numbers in move instructions and as operands of other simple instructions in order to maximize the amount of register tying. This is especially helpful on machines with two-operand -instructions. GCC enables this optimization by default with @option{-O2} -or higher. +instructions. Note @option{-fregmove} and @option{-foptimize-register-move} are the same optimization. +Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. + @item -fdelayed-branch @opindex fdelayed-branch If supported for the target machine, attempt to reorder instructions to exploit instruction slots available after delayed branch instructions. +Enabled at levels @option{-O}, @option{-O2}, @option{-O3}, @option{-Os}. + @item -fschedule-insns @opindex fschedule-insns If supported for the target machine, attempt to reorder instructions to @@ -3859,6 +3804,8 @@ helps machines that have slow floating point or memory load instructions by allowing other instructions to be issued until the result of the load or floating point instruction is required. +Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. + @item -fschedule-insns2 @opindex fschedule-insns2 Similar to @option{-fschedule-insns}, but requests an additional pass of @@ -3866,6 +3813,8 @@ instruction scheduling after register allocation has been done. This is especially useful on machines with a relatively small number of registers and where memory load instructions take more than one cycle. +Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. + @item -fno-sched-interblock @opindex fno-sched-interblock Don't schedule instructions across basic blocks. This is normally @@ -3890,28 +3839,6 @@ Allow speculative motion of more load instructions. This only makes sense when scheduling before register allocation, i.e.@: with @option{-fschedule-insns} or at @option{-O2} or higher. -@item -ffunction-sections -@itemx -fdata-sections -@opindex ffunction-sections -@opindex fdata-sections -Place each function or data item into its own section in the output -file if the target supports arbitrary sections. The name of the -function or the name of the data item determines the section's name -in the output file. - -Use these options on systems where the linker can perform optimizations -to improve locality of reference in the instruction space. HPPA -processors running HP-UX and SPARC processors running Solaris 2 have -linkers with such optimizations. Other systems using the ELF object format -as well as AIX may have these optimizations in the future. - -Only use these options when there are significant benefits from doing -so. When you specify these options, the assembler and linker will -create larger object and executable files and will also be slower. -You will not be able to use @code{gprof} on all systems if you -specify this option and you may have problems with debugging if -you specify both this option and @option{-g}. - @item -fcaller-saves @opindex fcaller-saves Enable values to be allocated in registers that will be clobbered by @@ -3922,33 +3849,7 @@ seems to result in better code than would otherwise be produced. This option is always enabled by default on certain machines, usually those which have no call-preserved registers to use instead. -For all machines, optimization level 2 and higher enables this flag by -default. - -@item -ftracer -@opindex ftracer -Perform tail duplication to enlarge superblock size. This transformation -simplifies the control flow of the function allowing other optimizations to do -better job. - -@item -funroll-loops -@opindex funroll-loops -Unroll loops whose number of iterations can be determined at compile -time or upon entry to the loop. @option{-funroll-loops} implies both -@option{-fstrength-reduce} and @option{-frerun-cse-after-loop}. This -option makes code larger, and may or may not make it run faster. - -@item -funroll-all-loops -@opindex funroll-all-loops -Unroll all loops, even if their number of iterations is uncertain when -the loop is entered. This usually makes programs run more slowly. -@option{-funroll-all-loops} implies the same options as -@option{-funroll-loops}, - -@item -fprefetch-loop-arrays -@opindex fprefetch-loop-arrays -If supported by the target machine, generate instructions to prefetch -memory to improve the performance of loops that access large arrays. +Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. @item -fmove-all-movables @opindex fmove-all-movables @@ -3986,27 +3887,10 @@ between @option{-fno-peephole} and @option{-fno-peephole2} is in how they are implemented in the compiler; some targets use one, some use the other, a few use both. -@item -fbranch-probabilities -@opindex fbranch-probabilities -After running a program compiled with @option{-fprofile-arcs} -(@pxref{Debugging Options,, Options for Debugging Your Program or -@command{gcc}}), you can compile it a second time using -@option{-fbranch-probabilities}, to improve optimizations based on -the number of times each branch was taken. When the program -compiled with @option{-fprofile-arcs} exits it saves arc execution -counts to a file called @file{@var{sourcename}.da} for each source -file The information in this data file is very dependent on the -structure of the generated code, so you must use the same source code -and the same optimization options for both compilations. - -With @option{-fbranch-probabilities}, GCC puts a @samp{REG_EXEC_COUNT} -note on the first instruction of each basic block, and a -@samp{REG_BR_PROB} note on each @samp{JUMP_INSN} and @samp{CALL_INSN}. -These can be used to improve optimization. Currently, they are only -used in one place: in @file{reorg.c}, instead of guessing which path a -branch is mostly to take, the @samp{REG_BR_PROB} values are used to -exactly determine which path is taken more often. +@option{-fpeephole} is enabled by default. +@option{-fpeephole2} enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. +@item -fbranch-probabilities @item -fno-guess-branch-probability @opindex fno-guess-branch-probability Do not guess branch probabilities using a randomized model. @@ -4023,11 +3907,16 @@ non-determinism is of paramount import. This switch allows users to reduce non-determinism, possibly at the expense of inferior optimization. +The default is @option{-fguess-branch-probability} at levels +@option{-O}, @option{-O2}, @option{-O3}, @option{-Os}. + @item -freorder-blocks @opindex freorder-blocks Reorder basic blocks in the compiled function in order to reduce number of taken branches and improve code locality. +Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. + @item -freorder-functions @opindex freorder-functions Reorder basic blocks in the compiled function in order to reduce number of @@ -4035,11 +3924,13 @@ taken branches and improve code locality. This is implemented by using special subsections @code{text.hot} for most frequently executed functions and @code{text.unlikely} for unlikely executed functions. Reordering is done by the linker so object file format must support named sections and linker must -place them in resonable way. +place them in a reasonable way. Also profile feedback must be available in to make this option effective. See @option{-fprofile-arcs} for details. +Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. + @item -fstrict-aliasing @opindex fstrict-aliasing Allows the compiler to assume the strictest aliasing rules applicable to @@ -4085,8 +3976,7 @@ node, an alias set for the node. Nodes in different alias sets are not allowed to alias. For an example, see the C front-end function @code{c_get_alias_set}. -For all machines, optimization level 2 and higher enables this flag by -default. +Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. @item -falign-functions @itemx -falign-functions=@var{n} @@ -4105,6 +3995,8 @@ in that case, it is rounded up. If @var{n} is not specified, use a machine-dependent default. +Enabled at levels @option{-O2}, @option{-O3}. + @item -falign-labels @itemx -falign-labels=@var{n} @opindex falign-labels @@ -4119,6 +4011,8 @@ are greater than this value, then their values are used instead. If @var{n} is not specified, use a machine-dependent default which is very likely to be @samp{1}, meaning no alignment. +Enabled at levels @option{-O2}, @option{-O3}. + @item -falign-loops @itemx -falign-loops=@var{n} @opindex falign-loops @@ -4129,6 +4023,8 @@ operations. If @var{n} is not specified, use a machine-dependent default. +Enabled at levels @option{-O2}, @option{-O3}. + @item -falign-jumps @itemx -falign-jumps=@var{n} @opindex falign-jumps @@ -4139,6 +4035,220 @@ need be executed. If @var{n} is not specified, use a machine-dependent default. +Enabled at levels @option{-O2}, @option{-O3}. + +@item -frename-registers +@opindex frename-registers +Attempt to avoid false dependencies in scheduled code by making use +of registers left over after register allocation. This optimization +will most benefit processors with lots of registers. It can, however, +make debugging impossible, since variables will no longer stay in +a ``home register''. + +Enabled at levels @option{-O3}. + +@item -fno-cprop-registers +@opindex fno-cprop-registers +After register allocation and post-register allocation instruction splitting, +we perform a copy-propagation pass to try to reduce scheduling dependencies +and occasionally eliminate the copy. + +Disabled at levels @option{-O}, @option{-O2}, @option{-O3}, @option{-Os}. + +@end table + +The following options control compiler behavior regarding floating +point arithmetic. These options trade off between speed and +correctness. All must be specifically enabled. + +@table @gcctabopt +@item -ffloat-store +@opindex ffloat-store +Do not store floating point variables in registers, and inhibit other +options that might change whether a floating point value is taken from a +register or memory. + +@cindex floating point precision +This option prevents undesirable excess precision on machines such as +the 68000 where the floating registers (of the 68881) keep more +precision than a @code{double} is supposed to have. Similarly for the +x86 architecture. For most programs, the excess precision does only +good, but a few programs rely on the precise definition of IEEE floating +point. Use @option{-ffloat-store} for such programs, after modifying +them to store all pertinent intermediate computations into variables. + +@item -ffast-math +@opindex ffast-math +Sets @option{-fno-math-errno}, @option{-funsafe-math-optimizations}, @* +@option{-fno-trapping-math}, @option{-ffinite-math-only} and @* +@option{-fno-signaling-nans}. + +This option causes the preprocessor macro @code{__FAST_MATH__} to be defined. + +This option should never be turned on by any @option{-O} option since +it can result in incorrect output for programs which depend on +an exact implementation of IEEE or ISO rules/specifications for +math functions. + +@item -fno-math-errno +@opindex fno-math-errno +Do not set ERRNO after calling math functions that are executed +with a single instruction, e.g., sqrt. A program that relies on +IEEE exceptions for math error handling may want to use this flag +for speed while maintaining IEEE arithmetic compatibility. + +This option should never be turned on by any @option{-O} option since +it can result in incorrect output for programs which depend on +an exact implementation of IEEE or ISO rules/specifications for +math functions. + +The default is @option{-fmath-errno}. + +@item -funsafe-math-optimizations +@opindex funsafe-math-optimizations +Allow optimizations for floating-point arithmetic that (a) assume +that arguments and results are valid and (b) may violate IEEE or +ANSI standards. When used at link-time, it may include libraries +or startup files that change the default FPU control word or other +similar optimizations. + +This option should never be turned on by any @option{-O} option since +it can result in incorrect output for programs which depend on +an exact implementation of IEEE or ISO rules/specifications for +math functions. + +The default is @option{-fno-unsafe-math-optimizations}. + +@item -ffinite-math-only +@opindex ffinite-math-only +Allow optimizations for floating-point arithmetic that assume +that arguments and results are not NaNs or +-Infs. + +This option should never be turned on by any @option{-O} option since +it can result in incorrect output for programs which depend on +an exact implementation of IEEE or ISO rules/specifications. + +The default is @option{-fno-finite-math-only}. + +@item -fno-trapping-math +@opindex fno-trapping-math +Compile code assuming that floating-point operations cannot generate +user-visible traps. These traps include division by zero, overflow, +underflow, inexact result and invalid operation. This option implies +@option{-fno-signaling-nans}. Setting this option may allow faster +code if one relies on ``non-stop'' IEEE arithmetic, for example. + +This option should never be turned on by any @option{-O} option since +it can result in incorrect output for programs which depend on +an exact implementation of IEEE or ISO rules/specifications for +math functions. + +The default is @option{-ftrapping-math}. + +@item -fsignaling-nans +@opindex fsignaling-nans +Compile code assuming that IEEE signaling NaNs may generate user-visible +traps during floating-point operations. Setting this option disables +optimizations that may change the number of exceptions visible with +signaling NaNs. This option implies @option{-ftrapping-math}. + +This option causes the preprocessor macro @code{__SUPPORT_SNAN__} to +be defined. + +The default is @option{-fno-signaling-nans}. + +This option is experimental and does not currently guarantee to +disable all GCC optimizations that affect signaling NaN behavior. + +@item -fsingle-precision-constant +@opindex fsingle-precision-constant +Treat floating point constant as single precision constant instead of +implicitly converting it to double precision constant. + + +@end table + +The following options control optimizations that may improve +performance, but are not enabled by any @option{-O} options. This +section includes experimental options that may produce broken code. + +@table @gcctabopt +@item -fbranch-probabilities +@opindex fbranch-probabilities +After running a program compiled with @option{-fprofile-arcs} +(@pxref{Debugging Options,, Options for Debugging Your Program or +@command{gcc}}), you can compile it a second time using +@option{-fbranch-probabilities}, to improve optimizations based on +the number of times each branch was taken. When the program +compiled with @option{-fprofile-arcs} exits it saves arc execution +counts to a file called @file{@var{sourcename}.da} for each source +file The information in this data file is very dependent on the +structure of the generated code, so you must use the same source code +and the same optimization options for both compilations. + +With @option{-fbranch-probabilities}, GCC puts a @samp{REG_EXEC_COUNT} +note on the first instruction of each basic block, and a +@samp{REG_BR_PROB} note on each @samp{JUMP_INSN} and @samp{CALL_INSN}. +These can be used to improve optimization. Currently, they are only +used in one place: in @file{reorg.c}, instead of guessing which path a +branch is mostly to take, the @samp{REG_BR_PROB} values are used to +exactly determine which path is taken more often. + +@item -fnew-ra +@opindex fnew-ra +Use a graph coloring register allocator. Currently this option is meant +for testing, so we are interested to hear about miscompilations with +@option{-fnew-ra}. + +@item -ftracer +@opindex ftracer +Perform tail duplication to enlarge superblock size. This transformation +simplifies the control flow of the function allowing other optimizations to do +better job. + +@item -funroll-loops +@opindex funroll-loops +Unroll loops whose number of iterations can be determined at compile +time or upon entry to the loop. @option{-funroll-loops} implies both +@option{-fstrength-reduce} and @option{-frerun-cse-after-loop}. This +option makes code larger, and may or may not make it run faster. + +@item -funroll-all-loops +@opindex funroll-all-loops +Unroll all loops, even if their number of iterations is uncertain when +the loop is entered. This usually makes programs run more slowly. +@option{-funroll-all-loops} implies the same options as +@option{-funroll-loops}, + +@item -fprefetch-loop-arrays +@opindex fprefetch-loop-arrays +If supported by the target machine, generate instructions to prefetch +memory to improve the performance of loops that access large arrays. + +Disabled at level @option{-Os}. + +@item -ffunction-sections +@itemx -fdata-sections +@opindex ffunction-sections +@opindex fdata-sections +Place each function or data item into its own section in the output +file if the target supports arbitrary sections. The name of the +function or the name of the data item determines the section's name +in the output file. + +Use these options on systems where the linker can perform optimizations +to improve locality of reference in the instruction space. HPPA +processors running HP-UX and SPARC processors running Solaris 2 have +linkers with such optimizations. Other systems using the ELF object format +as well as AIX may have these optimizations in the future. + +Only use these options when there are significant benefits from doing +so. When you specify these options, the assembler and linker will +create larger object and executable files and will also be slower. +You will not be able to use @code{gprof} on all systems if you +specify this option and you may have problems with debugging if +you specify both this option and @option{-g}. + @item -fssa @opindex fssa Perform optimizations in static single assignment form. Each function's @@ -4156,24 +4266,6 @@ Perform Sparse Conditional Constant Propagation in SSA form. Requires Perform aggressive dead-code elimination in SSA form. Requires @option{-fssa}. Like @option{-fssa}, this is an experimental feature. -@item -fsingle-precision-constant -@opindex fsingle-precision-constant -Treat floating point constant as single precision constant instead of -implicitly converting it to double precision constant. - -@item -frename-registers -@opindex frename-registers -Attempt to avoid false dependencies in scheduled code by making use -of registers left over after register allocation. This optimization -will most benefit processors with lots of registers. It can, however, -make debugging impossible, since variables will no longer stay in -a ``home register''. - -@item -fno-cprop-registers -@opindex fno-cprop-registers -After register allocation and post-register allocation instruction splitting, -we perform a copy-propagation pass to try to reduce scheduling dependencies -and occasionally eliminate the copy. @item --param @var{name}=@var{value} @opindex param @@ -4239,8 +4331,9 @@ function given basic block needs to have to be considered hot @item tracer-dynamic-coverage @itemx tracer-dynamic-coverage-feedback -This value is used to limit superblock formation once given percentage of -executed instructions is covered. This limits unnecesary code size expansion. +This value is used to limit superblock formation once the given percentage of +executed instructions is covered. This limits unnecessary code size +expansion. The @option{tracer-dynamic-coverage-feedback} is used only when profile feedback is available. The real profiles (as opposed to statically estimated @@ -4248,7 +4341,7 @@ ones) are much less balanced allowing the threshold to be larger value. @item tracer-max-code-growth Stop tail duplication once code growth has reached given percentage. This is -rather hokey argument, as most of the duplicates will be elliminated later in +rather hokey argument, as most of the duplicates will be eliminated later in cross jumping, so it may be set to much higher values than is the desired code growth. @@ -4263,7 +4356,7 @@ threshold (in percent). Stop forward growth if the best edge do have probability lower than this threshold. -Similary to @option{tracer-dynamic-coverage} two values are present, one for +Similarly to @option{tracer-dynamic-coverage} two values are present, one for compilation for profile feedback and one for compilation without. The value for compilation with profile feedback needs to be more conservative (higher) in order to make tracer effective. @@ -4564,7 +4657,7 @@ If a standard system include directory, or a directory specified with option will be ignored. The directory will still be searched but as a system directory at its normal position in the system include chain. This is to ensure that GCC's procedure to fix buggy system headers and -the ordering for the include_next directive are not inadvertantly changed. +the ordering for the include_next directive are not inadvertently changed. If you really need to change the search order for system directories, use the @option{-nostdinc} and/or @option{-isystem} options. @@ -5216,8 +5309,6 @@ that macro, which enables you to change the defaults. * M68hc1x Options:: * VAX Options:: * SPARC Options:: -* Convex Options:: -* AMD29K Options:: * ARM Options:: * MN10200 Options:: * MN10300 Options:: @@ -5232,7 +5323,6 @@ that macro, which enables you to change the defaults. * Intel 960 Options:: * DEC Alpha Options:: * DEC Alpha/VMS Options:: -* Clipper Options:: * H8/300 Options:: * SH Options:: * System V Options:: @@ -5449,6 +5539,12 @@ when the compiler is configured for 68HC11-based systems. Generate output for a 68HC12. This is the default when the compiler is configured for 68HC12-based systems. +@item -m68S12 +@itemx -m68hcs12 +@opindex m68S12 +@opindex m68hcs12 +Generate output for a 68HCS12. + @item -mauto-incdec @opindex mauto-incdec Enable the use of 68HC12 pre and post auto-increment and auto-decrement @@ -5763,195 +5859,6 @@ when making stack frame references. Otherwise, assume no such offset is present. @end table -@node Convex Options -@subsection Convex Options -@cindex Convex options - -These @samp{-m} options are defined for Convex: - -@table @gcctabopt -@item -mc1 -@opindex mc1 -Generate output for C1. The code will run on any Convex machine. -The preprocessor symbol @code{__convex__c1__} is defined. - -@item -mc2 -@opindex mc2 -Generate output for C2. Uses instructions not available on C1. -Scheduling and other optimizations are chosen for max performance on C2. -The preprocessor symbol @code{__convex_c2__} is defined. - -@item -mc32 -@opindex mc32 -Generate output for C32xx. Uses instructions not available on C1. -Scheduling and other optimizations are chosen for max performance on C32. -The preprocessor symbol @code{__convex_c32__} is defined. - -@item -mc34 -@opindex mc34 -Generate output for C34xx. Uses instructions not available on C1. -Scheduling and other optimizations are chosen for max performance on C34. -The preprocessor symbol @code{__convex_c34__} is defined. - -@item -mc38 -@opindex mc38 -Generate output for C38xx. Uses instructions not available on C1. -Scheduling and other optimizations are chosen for max performance on C38. -The preprocessor symbol @code{__convex_c38__} is defined. - -@item -margcount -@opindex margcount -Generate code which puts an argument count in the word preceding each -argument list. This is compatible with regular CC, and a few programs -may need the argument count word. GDB and other source-level debuggers -do not need it; this info is in the symbol table. - -@item -mnoargcount -@opindex mnoargcount -Omit the argument count word. This is the default. - -@item -mvolatile-cache -@opindex mvolatile-cache -Allow volatile references to be cached. This is the default. - -@item -mvolatile-nocache -@opindex mvolatile-nocache -Volatile references bypass the data cache, going all the way to memory. -This is only needed for multi-processor code that does not use standard -synchronization instructions. Making non-volatile references to volatile -locations will not necessarily work. - -@item -mlong32 -@opindex mlong32 -Type long is 32 bits, the same as type int. This is the default. - -@item -mlong64 -@opindex mlong64 -Type long is 64 bits, the same as type long long. This option is useless, -because no library support exists for it. -@end table - -@node AMD29K Options -@subsection AMD29K Options -@cindex AMD29K options - -These @samp{-m} options are defined for the AMD Am29000: - -@table @gcctabopt -@item -mdw -@opindex mdw -@cindex DW bit (29k) -Generate code that assumes the @code{DW} bit is set, i.e., that byte and -halfword operations are directly supported by the hardware. This is the -default. - -@item -mndw -@opindex mndw -Generate code that assumes the @code{DW} bit is not set. - -@item -mbw -@opindex mbw -@cindex byte writes (29k) -Generate code that assumes the system supports byte and halfword write -operations. This is the default. - -@item -mnbw -@opindex mnbw -Generate code that assumes the systems does not support byte and -halfword write operations. @option{-mnbw} implies @option{-mndw}. - -@item -msmall -@opindex msmall -@cindex memory model (29k) -Use a small memory model that assumes that all function addresses are -either within a single 256 KB segment or at an absolute address of less -than 256k. This allows the @code{call} instruction to be used instead -of a @code{const}, @code{consth}, @code{calli} sequence. - -@item -mnormal -@opindex mnormal -Use the normal memory model: Generate @code{call} instructions only when -calling functions in the same file and @code{calli} instructions -otherwise. This works if each file occupies less than 256 KB but allows -the entire executable to be larger than 256 KB@. This is the default. - -@item -mlarge -@opindex mlarge -Always use @code{calli} instructions. Specify this option if you expect -a single file to compile into more than 256 KB of code. - -@item -m29050 -@opindex m29050 -@cindex processor selection (29k) -Generate code for the Am29050. - -@item -m29000 -@opindex m29000 -Generate code for the Am29000. This is the default. - -@item -mkernel-registers -@opindex mkernel-registers -@cindex kernel and user registers (29k) -Generate references to registers @code{gr64-gr95} instead of to -registers @code{gr96-gr127}. This option can be used when compiling -kernel code that wants a set of global registers disjoint from that used -by user-mode code. - -Note that when this option is used, register names in @samp{-f} flags -must use the normal, user-mode, names. - -@item -muser-registers -@opindex muser-registers -Use the normal set of global registers, @code{gr96-gr127}. This is the -default. - -@item -mstack-check -@itemx -mno-stack-check -@opindex mstack-check -@opindex mno-stack-check -@cindex stack checks (29k) -Insert (or do not insert) a call to @code{__msp_check} after each stack -adjustment. This is often used for kernel code. - -@item -mstorem-bug -@itemx -mno-storem-bug -@opindex mstorem-bug -@opindex mno-storem-bug -@cindex storem bug (29k) -@option{-mstorem-bug} handles 29k processors which cannot handle the -separation of a mtsrim insn and a storem instruction (most 29000 chips -to date, but not the 29050). - -@item -mno-reuse-arg-regs -@itemx -mreuse-arg-regs -@opindex mno-reuse-arg-regs -@opindex mreuse-arg-regs -@option{-mno-reuse-arg-regs} tells the compiler to only use incoming argument -registers for copying out arguments. This helps detect calling a function -with fewer arguments than it was declared with. - -@item -mno-impure-text -@itemx -mimpure-text -@opindex mno-impure-text -@opindex mimpure-text -@option{-mimpure-text}, used in addition to @option{-shared}, tells the compiler to -not pass @option{-assert pure-text} to the linker when linking a shared object. - -@item -msoft-float -@opindex msoft-float -Generate output containing library calls for floating point. -@strong{Warning:} the requisite libraries are not part of GCC@. -Normally the facilities of the machine's usual C compiler are used, but -this can't be done directly in cross-compilation. You must make your -own arrangements to provide suitable library functions for -cross-compilation. - -@item -mno-multm -@opindex mno-multm -Do not generate multm or multmu instructions. This is useful for some embedded -systems which do not have trap handlers for these instructions. -@end table - @node ARM Options @subsection ARM Options @cindex ARM options @@ -6116,25 +6023,6 @@ These are deprecated aliases for @option{-malignment-traps}. @opindex mshort-load-words This are deprecated aliases for @option{-mno-alignment-traps}. -@item -mbsd -@opindex mbsd -This option only applies to RISC iX@. Emulate the native BSD-mode -compiler. This is the default if @option{-ansi} is not specified. - -@item -mxopen -@opindex mxopen -This option only applies to RISC iX@. Emulate the native X/Open-mode -compiler. - -@item -mno-symrename -@opindex mno-symrename -This option only applies to RISC iX@. Do not run the assembler -post-processor, @samp{symrename}, after code has been assembled. -Normally it is necessary to modify some of the standard symbols in -preparation for linking with the RISC iX C library; this option -suppresses this pass. The post-processor is never run when the -compiler is built for cross-compilation. - @item -mcpu=@var{name} @opindex mcpu This specifies the name of the target ARM processor. GCC uses this name @@ -6476,9 +6364,9 @@ underscore as prefix on each name. Include (or omit) additional debugging information (about registers used in each stack frame) as specified in the 88open Object Compatibility Standard, ``OCS''@. This extra information allows debugging of code that -has had the frame pointer eliminated. The default for DG/UX, SVr4, and -Delta 88 SVr3.2 is to include this information; other 88k configurations -omit this information by default. +has had the frame pointer eliminated. The default for SVr4 and Delta 88 +SVr3.2 is to include this information; other 88k configurations omit this +information by default. @item -mocs-frame-position @opindex mocs-frame-position @@ -6486,7 +6374,7 @@ omit this information by default. When emitting COFF debugging information for automatic variables and parameters stored on the stack, use the offset from the canonical frame address, which is the stack pointer (register 31) on entry to the -function. The DG/UX, SVr4, Delta88 SVr3.2, and BCS configurations use +function. The SVr4 and Delta88 SVr3.2, and BCS configurations use @option{-mocs-frame-position}; other 88k configurations have the default @option{-mno-ocs-frame-position}. @@ -6573,9 +6461,8 @@ that is used on System V release 4. SVr4. @end enumerate -@option{-msvr4} is the default for the m88k-motorola-sysv4 and -m88k-dg-dgux m88k configurations. @option{-msvr3} is the default for all -other m88k configurations. +@option{-msvr4} is the default for the m88k-motorola-sysv4 configuration. +@option{-msvr3} is the default for all other m88k configurations. @item -mversion-03.00 @opindex mversion-03.00 @@ -6781,7 +6668,7 @@ The @option{-mcpu} options automatically enable or disable other @table @samp @item common -@option{-mno-power}, @option{-mno-powerc} +@option{-mno-power}, @option{-mno-powerpc} @item power @itemx power2 @@ -7481,7 +7368,7 @@ In processor names, a final @samp{000} can be abbreviated as @samp{k} GCC defines two macros based on the value of this option. The first is @samp{_MIPS_ARCH}, which gives the name of target architecture, as a string. The second has the form @samp{_MIPS_ARCH_@var{foo}}, -where @var{foo} is the capitialized value of @samp{_MIPS_ARCH}@. +where @var{foo} is the capitalized value of @samp{_MIPS_ARCH}@. For example, @samp{-march=r2000} will set @samp{_MIPS_ARCH} to @samp{"r2000"} and define the macro @samp{_MIPS_ARCH_R2000}. @@ -7892,7 +7779,7 @@ for @var{unit} are: @item 387 Use the standard 387 floating point coprocessor present majority of chips and emulated otherwise. Code compiled with this option will run almost everywhere. -The temporary results are computed in 80bit precesion instead of precision +The temporary results are computed in 80bit precision instead of precision specified by the type resulting in slightly different results compared to most of other chips. See @option{-ffloat-store} for more detailed description. @@ -7918,7 +7805,7 @@ code that expects temporaries to be 80bit. This is the default choice for x86-64 compiler. @item sse,387 -Attempt to utilize both instruction sets at once. This effectivly double the +Attempt to utilize both instruction sets at once. This effectively double the amount of available registers and on chips with separate execution units for 387 and SSE the execution resources too. Use this option with care, as it is still experimental, because gcc register allocator does not model separate @@ -7984,9 +7871,11 @@ boundary. Aligning @code{double} variables on a two word boundary will produce code that runs somewhat faster on a @samp{Pentium} at the expense of more memory. -@strong{Warning:} if you use the @samp{-malign-double} switch, +@strong{Warning:} if you use the @option{-malign-double} switch, structures containing the above types will be aligned differently than -the published application binary interface specifications for the 386. +the published application binary interface specifications for the 386 +and will not be binary compatible with structures in code compiled +without that switch. @item -m128bit-long-double @opindex m128bit-long-double @@ -8687,7 +8576,7 @@ arithmetic instead of IEEE single and double precision. @opindex mno-explicit-relocs Older Alpha assemblers provided no way to generate symbol relocations except via assembler macros. Use of these macros does not allow -optimial instruction scheduling. GNU binutils as of version 2.12 +optimal instruction scheduling. GNU binutils as of version 2.12 supports a new syntax that allows the compiler to explicitly mark which relocations should apply to which instructions. This option is mostly useful for debugging, as GCC detects the capabilities of @@ -8795,22 +8684,6 @@ Return VMS condition codes from main. The default is to return POSIX style condition (e.g.@ error) codes. @end table -@node Clipper Options -@subsection Clipper Options - -These @samp{-m} options are defined for the Clipper implementations: - -@table @gcctabopt -@item -mc300 -@opindex mc300 -Produce code for a C300 Clipper processor. This is the default. - -@item -mc400 -@opindex mc400 -Produce code for a C400 Clipper processor, i.e.@: use floating point -registers f8--f15. -@end table - @node H8/300 Options @subsection H8/300 Options @@ -9773,7 +9646,7 @@ targets default to @option{-m64}. @opindex mmvcle @opindex mno-mvcle Generate (or do not generate) code using the @code{mvcle} instruction -to perform block moves. When @option{-mno-mvcle} is specifed, +to perform block moves. When @option{-mno-mvcle} is specified, use a @code{mvc} loop instead. This is the default. @item -mdebug @@ -10541,6 +10414,18 @@ can figure out the other form by either removing @samp{no-} or adding it. @table @gcctabopt +@item -fbounds-check +@opindex fbounds-check +For front-ends that support it, generate additional code to check that +indices used to access arrays are within the declared range. This is +currently only supported by the Java and Fortran 77 front-ends, where +this option defaults to true and false respectively. + +@item -ftrapv +@opindex ftrapv +This option generates traps for signed overflow on addition, subtraction, +multiplication operations. + @item -fexceptions @opindex fexceptions Enable exception handling. Generates extra code needed to propagate @@ -10787,7 +10672,7 @@ Pack all structure members together without holes. @strong{Warning:} the @option{-fpack-struct} switch causes GCC to generate code that is not binary compatible with code generated without that switch. -Additionally, it makes the code suboptimial. +Additionally, it makes the code suboptimal. Use it to conform to a non-default application binary interface. @item -finstrument-functions @@ -11115,16 +11000,16 @@ prototype information about standard system functions. This option applies only to @code{protoize}. @item -c @var{compilation-options} -Use @var{compilation-options} as the options when running @code{gcc} to +Use @var{compilation-options} as the options when running @command{gcc} to produce the @samp{.X} files. The special option @option{-aux-info} is -always passed in addition, to tell @code{gcc} to write a @samp{.X} file. +always passed in addition, to tell @command{gcc} to write a @samp{.X} file. Note that the compilation options must be given as a single argument to @code{protoize} or @code{unprotoize}. If you want to specify several -@code{gcc} options, you must quote the entire set of compilation options +@command{gcc} options, you must quote the entire set of compilation options to make them a single word in the shell. -There are certain @code{gcc} arguments that you cannot use, because they +There are certain @command{gcc} arguments that you cannot use, because they would produce the wrong kind of output. These include @option{-g}, @option{-O}, @option{-c}, @option{-S}, and @option{-o} If you include these in the @var{compilation-options}, they are ignored. @@ -11177,12 +11062,12 @@ Use the program @var{program} as the compiler. Normally, the name Work quietly. Most warnings are suppressed. @item -v -Print the version number, just like @option{-v} for @code{gcc}. +Print the version number, just like @option{-v} for @command{gcc}. @end table If you need special compiler options to compile one of your program's source files, then you should generate that file's @samp{.X} file -specially, by running @code{gcc} on that source file with the +specially, by running @command{gcc} on that source file with the appropriate options and the option @option{-aux-info}. Then run @code{protoize} on the entire set of files. @code{protoize} will use the existing @samp{.X} file because it is newer than the source file. diff --git a/gcc/doc/md.texi b/gcc/doc/md.texi index 3ed88d02729..453741e6958 100644 --- a/gcc/doc/md.texi +++ b/gcc/doc/md.texi @@ -898,7 +898,7 @@ digit is used together with letters within the same alternative, the digit should come last. This number is allowed to be more than a single digit. If multiple -digits are encountered consecutavely, they are interpreted as a single +digits are encountered consecutively, they are interpreted as a single decimal integer. There is scant chance for ambiguity, since to-date it has never been desirable that @samp{10} be interpreted as matching either operand 1 @emph{or} operand 0. Should this be desired, one @@ -965,7 +965,7 @@ The machine description macro @code{REG_CLASS_FROM_LETTER} has first cut at the otherwise unused letters. If it evaluates to @code{NO_REGS}, then @code{EXTRA_CONSTRAINT} is evaluated. -A typical use for @code{EXTRA_CONSTRANT} would be to distinguish certain +A typical use for @code{EXTRA_CONSTRAINT} would be to distinguish certain types of memory references that affect other insn operands. @end ifset @end table @@ -1376,60 +1376,6 @@ An item in the constant pool A symbol in the text segment of the current file @end table -@item AMD 29000 family---@file{a29k.h} -@table @code -@item l -Local register 0 - -@item b -Byte Pointer (@samp{BP}) register - -@item q -@samp{Q} register - -@item h -Special purpose register - -@item A -First accumulator register - -@item a -Other accumulator register - -@item f -Floating point register - -@item I -Constant greater than 0, less than 0x100 - -@item J -Constant greater than 0, less than 0x10000 - -@item K -Constant whose high 24 bits are on (1) - -@item L -16-bit constant whose high 8 bits are on (1) - -@item M -32-bit constant whose high 16 bits are on (1) - -@item N -32-bit negative constant that fits in 8 bits - -@item O -The constant 0x80000000 or, on the 29050, any 32-bit constant -whose low 16 bits are 0. - -@item P -16-bit negative constant that fits in 8 bits - -@item G -@itemx H -A floating point constant (in @code{asm} statements, use the machine -independent @samp{E} or @samp{F} instead) -@end table - @item AVR family---@file{avr.h} @table @code @item l @@ -1609,7 +1555,7 @@ Second floating point register @samp{c} register @item C -Specifies constant that can be easilly constructed in SSE register without +Specifies constant that can be easily constructed in SSE register without loading it from memory. @item d @@ -2494,8 +2440,7 @@ Write the generated insn as a @code{parallel} with elements being a @code{set} of one register from the appropriate memory location (you may also need @code{use} or @code{clobber} elements). Use a @code{match_parallel} (@pxref{RTL Template}) to recognize the insn. See -@file{a29k.md} and @file{rs6000.md} for examples of the use of this insn -pattern. +@file{rs6000.md} for examples of the use of this insn pattern. @cindex @samp{store_multiple} instruction pattern @item @samp{store_multiple} @@ -5368,7 +5313,7 @@ The first one is a data dependence delay determining @dfn{instruction latency time}. The instruction execution is not started until all source data have been evaluated by prior instructions (there are more complex cases when the instruction execution starts even when the data -are not availaible but will be ready in given time after the +are not available but will be ready in given time after the instruction execution start). Taking the data dependence delays into account is simple. The data dependence (true, output, and anti-dependence) delay between two instructions is given by a diff --git a/gcc/doc/objc.texi b/gcc/doc/objc.texi index 3b652551e7c..c25fdb16411 100644 --- a/gcc/doc/objc.texi +++ b/gcc/doc/objc.texi @@ -423,7 +423,7 @@ as @code{NXConstantString}'s structure: libraries may choose to inherit the customized constant string class from a different class than @code{Object}. There is no requirement in the methods the constant string class has to implement, but the final -ivar layour of the class must be the compatible with the given +ivar layout of the class must be the compatible with the given structure. When the compiler creates the statically allocated constant string diff --git a/gcc/doc/passes.texi b/gcc/doc/passes.texi index 423434d3c52..4a1d1e6871e 100644 --- a/gcc/doc/passes.texi +++ b/gcc/doc/passes.texi @@ -206,7 +206,7 @@ the input file name. @cindex sibling call optimization @item -Sibiling call optimization. This pass performs tail recursion +Sibling call optimization. This pass performs tail recursion elimination, and tail and sibling call optimizations. The purpose of these optimizations is to reduce the overhead of function calls, whenever possible. @@ -286,10 +286,9 @@ the input file name. @opindex fssa-ccp @item SSA Conditional Constant Propagation. Turned on by the @option{-fssa-ccp} -SSA Aggressive Dead Code Elimination. Turned on by the @option{-fssa-dce} option. This pass performs conditional constant propagation to simplify instructions including conditional branches. This pass is more aggressive -than the constant propgation done by the CSE and GCSE pases, but operates +than the constant propagation done by the CSE and GCSE passes, but operates in linear time. @opindex dW @@ -461,7 +460,7 @@ appending @samp{.sched} to the input file name. @cindex register allocation @item -Register allocation. These passes make sure that all occurences of pseudo +Register allocation. These passes make sure that all occurrences of pseudo registers are eliminated, either by allocating them to a hard register, replacing them by an equivalent expression (e.g.@: a constant) or by placing them on the stack. This is done in several subpasses: diff --git a/gcc/doc/rtl.texi b/gcc/doc/rtl.texi index 1c9a4e49230..a0c1f39403d 100644 --- a/gcc/doc/rtl.texi +++ b/gcc/doc/rtl.texi @@ -1,4 +1,4 @@ -@c Copyright (C) 1988, 1989, 1992, 1994, 1997, 1998, 1999, 2000, 2001, 2002 +@c Copyright (C) 1988, 1989, 1992, 1994, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @c Free Software Foundation, Inc. @c This is part of the GCC manual. @c For copying conditions, see the file gcc.texi. @@ -244,7 +244,7 @@ from an @samp{md} file, the vector value of this operand may be omitted. An omitted vector is effectively the same as a vector of no elements. @item B -@samp{B} indicates a pointer to basic block strucure. +@samp{B} indicates a pointer to basic block structure. @item 0 @samp{0} means a slot whose contents do not fit any normal category. @@ -2841,7 +2841,7 @@ labels: @code{LABEL_NORMAL}, @code{LABEL_STATIC_ENTRY}, that do not have type @code{LABEL_NORMAL} are @dfn{alternate entry points} to the current function. These may be static (visible only in the containing translation unit), global (exposed to all translation -units), or weak (global, but can be overriden by another symbol with the +units), or weak (global, but can be overridden by another symbol with the same name). Much of the compiler treats all four kinds of label identically. Some diff --git a/gcc/doc/service.texi b/gcc/doc/service.texi index 863774483c8..4cc2b70888c 100644 --- a/gcc/doc/service.texi +++ b/gcc/doc/service.texi @@ -1,5 +1,5 @@ @c Copyright (C) 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, -@c 1999, 2000, 2001 Free Software Foundation, Inc. +@c 1999, 2000, 2001, 2002 Free Software Foundation, Inc. @c This is part of the GCC manual. @c For copying conditions, see the file gcc.texi. @@ -24,7 +24,5 @@ The service directory is found at @uref{http://www.gnu.org/prep/service.html}. @end itemize -@c For further information, see -@c @uref{http://gcc.gnu.org/cgi-bin/fom.cgi?file=12}. -@c FIXME: this URL may be too volatile, this FAQ entry needs to move to -@c the regular web pages before we can uncomment the reference. +For further information, see +@uref{http://gcc.gnu.org/faq.html#support}. diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi index e337a50ac51..f10a800862b 100644 --- a/gcc/doc/sourcebuild.texi +++ b/gcc/doc/sourcebuild.texi @@ -867,7 +867,7 @@ the compiler with optimization. FIXME: describe this. @item gcc.c-torture -This contains particlar code fragments which have historically broken easily. +This contains particular code fragments which have historically broken easily. These tests are run with multiple optimization options, so tests for features which only break at some optimization levels belong here. This also contains tests to check that certain optimizations occur. It might be worthwhile to diff --git a/gcc/doc/standards.texi b/gcc/doc/standards.texi index 8c37fccd440..c939498d398 100644 --- a/gcc/doc/standards.texi +++ b/gcc/doc/standards.texi @@ -79,7 +79,7 @@ as @dfn{AMD1}; the amended standard is sometimes known as @dfn{C94} or A new edition of the ISO C standard was published in 1999 as ISO/IEC 9899:1999, and is commonly known as @dfn{C99}. GCC has incomplete support for this standard version; see -@uref{http://gcc.gnu.org/c99status.html} for details. To select this +@uref{http://gcc.gnu.org/gcc-3.3/c99status.html} for details. To select this standard, use @option{-std=c99} or @option{-std=iso9899:1999}. (While in development, drafts of this standard version were referred to as @dfn{C9X}.) @@ -189,4 +189,4 @@ conformance and compatibility of the Ada compiler. Fortran}, for details of the Fortran language supported by GCC@. @xref{Compatibility,,Compatibility with the Java Platform, gcj, GNU gcj}, -for details of compatibility between @code{gcj} and the Java Platform. +for details of compatibility between @command{gcj} and the Java Platform. diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi index 4b885113797..aba22195fbb 100644 --- a/gcc/doc/tm.texi +++ b/gcc/doc/tm.texi @@ -390,7 +390,7 @@ the target makefile fragment or if none of the options listed in @findex RELATIVE_PREFIX_NOT_LINKDIR @item RELATIVE_PREFIX_NOT_LINKDIR -Define this macro to tell @code{gcc} that it should only translate +Define this macro to tell @command{gcc} that it should only translate a @option{-B} prefix into a @option{-L} linker option if the prefix indicates an absolute file name. @@ -2304,7 +2304,7 @@ which is the register value plus a displacement. @findex MODE_BASE_REG_CLASS @item MODE_BASE_REG_CLASS (@var{mode}) This is a variation of the @code{BASE_REG_CLASS} macro which allows -the selection of a base register in a mode depenedent manner. If +the selection of a base register in a mode dependent manner. If @var{mode} is VOIDmode then it should return the same value as @code{BASE_REG_CLASS}. @@ -4179,7 +4179,7 @@ not support varargs. @findex TARGET_ASM_OUTPUT_MI_VCALL_THUNK @deftypefn {Target Hook} void TARGET_ASM_OUTPUT_MI_VCALL_THUNK (FILE *@var{file}, tree @var{thunk_fndecl}, HOST_WIDE_INT @var{delta}, int @var{vcall_offset}, tree @var{function}) A function like @code{TARGET_ASM_OUTPUT_MI_THUNK}, except that if -@var{vcall_offset} is non-zero, an additional adjustment should be made +@var{vcall_offset} is nonzero, an additional adjustment should be made after adding @code{delta}. In particular, if @var{p} is the adjusted pointer, the following adjustment should be made: @@ -6931,7 +6931,7 @@ When arbitrary sections are available, there are two variants, depending upon how the code in @file{crtstuff.c} is called. On systems that support a @dfn{.init} section which is executed at program startup, parts of @file{crtstuff.c} are compiled into that section. The -program is linked by the @code{gcc} driver like this: +program is linked by the @command{gcc} driver like this: @example ld -o @var{output_file} crti.o crtbegin.o @dots{} -lgcc crtend.o crtn.o @@ -9044,7 +9044,7 @@ structure, which are defined by the @code{IFCVT_EXTRA_FIELDS} macro. @findex IFCVT_EXTRA_FIELDS @item IFCVT_EXTRA_FIELDS If defined, it should expand to a set of field declarations that will be -added to the @code{struct ce_if_block} structure. These should be intialized +added to the @code{struct ce_if_block} structure. These should be initialized by the @code{IFCVT_INIT_EXTRA_FIELDS} macro. @end table diff --git a/gcc/doc/trouble.texi b/gcc/doc/trouble.texi index d6ba63259d6..4a8f0c32fd1 100644 --- a/gcc/doc/trouble.texi +++ b/gcc/doc/trouble.texi @@ -338,47 +338,6 @@ you cannot successfully use @samp{$} in identifiers on the RS/6000 due to a restriction in the IBM assembler. GAS supports these identifiers. -@item -@opindex mno-serialize-volatile -There is an assembler bug in versions of DG/UX prior to 5.4.2.01 that -occurs when the @samp{fldcr} instruction is used. GCC uses -@samp{fldcr} on the 88100 to serialize volatile memory references. Use -the option @option{-mno-serialize-volatile} if your version of the -assembler has this bug. - -@item -On VMS, GAS versions 1.38.1 and earlier may cause spurious warning -messages from the linker. These warning messages complain of mismatched -psect attributes. You can ignore them. - -@item -On NewsOS version 3, if you include both of the files @file{stddef.h} -and @file{sys/types.h}, you get an error because there are two typedefs -of @code{size_t}. You should change @file{sys/types.h} by adding these -lines around the definition of @code{size_t}: - -@smallexample -#ifndef _SIZE_T -#define _SIZE_T -@var{actual-typedef-here} -#endif -@end smallexample - -@cindex Alliant -@item -On the Alliant, the system's own convention for returning structures -and unions is unusual, and is not compatible with GCC no matter -what options are used. - -@cindex RT PC -@cindex IBM RT PC -@item -@opindex mhc-struct-return -On the IBM RT PC, the MetaWare HighC compiler (hc) uses a different -convention for structure and union returning. Use the option -@option{-mhc-struct-return} to tell GCC to use a convention compatible -with it. - @cindex VAX calling convention @cindex Ultrix calling convention @item @@ -395,42 +354,10 @@ these options to produce code compatible with the Fortran compiler: @end smallexample @item -On the WE32k, you may find that programs compiled with GCC do not -work with the standard shared C library. You may need to link with -the ordinary C compiler. If you do so, you must specify the following -options: - -@smallexample --L/usr/local/lib/gcc-lib/we32k-att-sysv/2.8.1 -lgcc -lc_s -@end smallexample - -The first specifies where to find the library @file{libgcc.a} -specified with the @option{-lgcc} option. - -GCC does linking by invoking @command{ld}, just as @command{cc} does, and -there is no reason why it @emph{should} matter which compilation program -you use to invoke @command{ld}. If someone tracks this problem down, -it can probably be fixed easily. - -@item On the Alpha, you may get assembler errors about invalid syntax as a result of floating point constants. This is due to a bug in the C library functions @code{ecvt}, @code{fcvt} and @code{gcvt}. Given valid floating point numbers, they sometimes print @samp{NaN}. - -@item -On Irix 4.0.5F (and perhaps in some other versions), an assembler bug -sometimes reorders instructions incorrectly when optimization is turned -on. If you think this may be happening to you, try using the GNU -assembler; GAS version 2.1 supports ECOFF on Irix. - -@opindex noasmopt -Or use the @option{-noasmopt} option when you compile GCC with itself, -and then again when you compile your program. (This is a temporary -kludge to turn off assembler optimization on Irix.) If this proves to -be what you need, edit the assembler spec in the file @file{specs} so -that it unconditionally passes @option{-O0} to the assembler, and never -passes @option{-O2} or @option{-O3}. @end itemize @node External Bugs @@ -959,9 +886,9 @@ int Foo::bar = 0; @end example Other C++ compilers may not correctly implement the standard behavior. -As a result, when you switch to @code{g++} from one of these compilers, +As a result, when you switch to @command{g++} from one of these compilers, you may discover that a program that appeared to work correctly in fact -does not conform to the standard: @code{g++} reports as undefined +does not conform to the standard: @command{g++} reports as undefined symbols any static data members that lack definitions. @node Temporaries diff --git a/gcc/expr.c b/gcc/expr.c index e5f7ae51783..9af65672015 100644 --- a/gcc/expr.c +++ b/gcc/expr.c @@ -1,6 +1,6 @@ /* Convert tree expression to rtl instructions, for GNU compiler. Copyright (C) 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, - 2000, 2001, 2002 Free Software Foundation, Inc. + 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GCC. @@ -2436,7 +2436,7 @@ emit_group_store (orig_dst, src, ssize) { dst = gen_reg_rtx (GET_MODE (orig_dst)); /* Make life a bit easier for combine. */ - emit_move_insn (dst, const0_rtx); + emit_move_insn (dst, CONST0_RTX (GET_MODE (orig_dst))); } /* Process the pieces. */ @@ -4020,7 +4020,8 @@ expand_assignment (to, from, want_value, suggest_reg) problem. */ if (TREE_CODE (to) == COMPONENT_REF || TREE_CODE (to) == BIT_FIELD_REF - || TREE_CODE (to) == ARRAY_REF || TREE_CODE (to) == ARRAY_RANGE_REF) + || TREE_CODE (to) == ARRAY_REF || TREE_CODE (to) == ARRAY_RANGE_REF + || TREE_CODE (TREE_TYPE (to)) == ARRAY_TYPE) { enum machine_mode mode1; HOST_WIDE_INT bitsize, bitpos; @@ -8213,7 +8214,7 @@ expand_expr (exp, target, tmode, modifier) build (RDIV_EXPR, type, build_real (type, dconst1), TREE_OPERAND (exp, 1))), - target, tmode, unsignedp); + target, tmode, modifier); this_optab = sdiv_optab; goto binop; diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog index 8b378cf0f1a..3d035527fa6 100644 --- a/gcc/f/ChangeLog +++ b/gcc/f/ChangeLog @@ -1,3 +1,66 @@ +2003-01-30 Toon Moene <toon@moene.indiv.nluug.nl> + + * news.texi: Document fixing PR fortran/7681 + and PR optimization/9258. + +2003-01-26 Toon Moene <toon@moene.indiv.nluug.nl> + + * lang-specs.h: Revert change to solve 9038. + * news.texi: Document this. + +2003-01-26 Christian Cornelssen <ccorn@cs.tu-berlin.de> + + * Make-lang.in (f77.install-common, f77.install-info) + (f77.install-man, f77.uninstall): Prepend $(DESTDIR) to + destination paths in all (un)installation commands. + +2003-01-05 Steven Bosscher <s.bosscher@student.tudelft.nl> + + PR Fortran/9038 + * lang-specs.h: Prevent -f<option> from being passed + to cc1. + * news.texi: Document this fix. + +2003-01-03 Bud Davis <bdavis11@directvinternet.com> + + * stc.c (ffestc_R810): Allow any kind integer in + case statements. + * ste.c (ffeste_R810): Give error message when + case selector exceeds its valid values. + +2003-01-01 Andreas Jaeger <aj@suse.de> + + * f/Make-lang.in ($(srcdir)/f/BUGS): Add include path for + gcc-common.texi. + ($(srcdir)/f/NEWS): Likewise. + +2002-12-28 Joseph S. Myers <jsm@polyomino.org.uk> + + * g77.texi: Use @copying. + +2002-12-23 Joseph S. Myers <jsm@polyomino.org.uk> + + * root.texi: Include gcc-common.texi. + * bugs.texi, news.texi: Don't include root.texi as part of full + manual. + * g77.texi: Update for use of gcc-common.texi. + * Make-lang.in ($(srcdir)/f/g77.info, f/g77.dvi): Depend on + $(srcdir)/doc/include/gcc-common.texi. + +2002-12-19 Kazu Hirata <kazu@cs.umass.edu> + + * intdoc.in: Fix typos. + +2002-12-18 Kazu Hirata <kazu@cs.umass.edu> + + * g77.texi: Fix typos. + * intdoc.texi: Likewise. + * news.texi: Follow spelling conventions. + +Mon Dec 16 13:55:24 2002 Mark Mitchell <mark@codesourcery.com> + + * root.texi (DEVELOPMENT): @clear it. + 2002-11-20 Toon Moene <toon@moene.indiv.nluug.nl> * invoke.texi: Explain the purpose of -fmove-all-movables, diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in index df31b1a6168..cdeb764e5fa 100644 --- a/gcc/f/Make-lang.in +++ b/gcc/f/Make-lang.in @@ -1,5 +1,5 @@ # Top level makefile fragment for GNU Fortran. -*-makefile-*- -# Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. #This file is part of GNU Fortran. @@ -153,7 +153,8 @@ $(srcdir)/f/g77.info: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \ $(srcdir)/f/news.texi $(srcdir)/f/intdoc.texi \ $(srcdir)/f/root.texi $(srcdir)/doc/include/fdl.texi \ $(srcdir)/doc/include/gpl.texi \ - $(srcdir)/doc/include/funding.texi + $(srcdir)/doc/include/funding.texi \ + $(srcdir)/doc/include/gcc-common.texi if [ x$(BUILD_INFO) = xinfo ]; then \ rm -f $(srcdir)/f/g77.info-*; \ cd $(srcdir)/f && $(MAKEINFO) -I../doc/include -o g77.info g77.texi; \ @@ -164,7 +165,8 @@ f/g77.dvi: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \ $(srcdir)/f/news.texi $(srcdir)/f/intdoc.texi \ $(srcdir)/f/root.texi $(srcdir)/doc/include/fdl.texi \ $(srcdir)/doc/include/gpl.texi \ - $(srcdir)/doc/include/funding.texi + $(srcdir)/doc/include/funding.texi \ + $(srcdir)/doc/include/gcc-common.texi s=`cd $(srcdir); ${PWD}`; export s; \ cd f && $(TEXI2DVI) -I $$s/doc/include $$s/f/g77.texi @@ -224,11 +226,11 @@ f/ansify$(build_exeext): f/ansify.c hconfig.h $(SYSTEM_H) $(srcdir)/f/BUGS: f/bugs0.texi f/bugs.texi f/root.texi cd $(srcdir)/f; $(MAKEINFO) -D BUGSONLY --no-header --no-split \ - --no-validate -o BUGS bugs0.texi + --no-validate -I../doc/include -o BUGS bugs0.texi $(srcdir)/f/NEWS: f/news0.texi f/news.texi f/root.texi cd $(srcdir)/f; $(MAKEINFO) -D NEWSONLY --no-header --no-split \ - --no-validate -o NEWS news0.texi + --no-validate -I../doc/include -o NEWS news0.texi f77.rebuilt: f/g77.info $(srcdir)/f/BUGS \ $(srcdir)/f/NEWS @@ -244,13 +246,13 @@ f77.install-normal: f77.install-common: installdirs -if [ -f f771$(exeext) ] ; then \ if [ -f g77-cross$(exeext) ] ; then \ - rm -f $(bindir)/$(G77_CROSS_NAME)$(exeext); \ - $(INSTALL_PROGRAM) g77-cross$(exeext) $(bindir)/$(G77_CROSS_NAME)$(exeext); \ - chmod a+x $(bindir)/$(G77_CROSS_NAME)$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$(G77_CROSS_NAME)$(exeext); \ + $(INSTALL_PROGRAM) g77-cross$(exeext) $(DESTDIR)$(bindir)/$(G77_CROSS_NAME)$(exeext); \ + chmod a+x $(DESTDIR)$(bindir)/$(G77_CROSS_NAME)$(exeext); \ else \ - rm -f $(bindir)/$(G77_INSTALL_NAME)$(exeext); \ - $(INSTALL_PROGRAM) g77$(exeext) $(bindir)/$(G77_INSTALL_NAME)$(exeext); \ - chmod a+x $(bindir)/$(G77_INSTALL_NAME)$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$(G77_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) g77$(exeext) $(DESTDIR)$(bindir)/$(G77_INSTALL_NAME)$(exeext); \ + chmod a+x $(DESTDIR)$(bindir)/$(G77_INSTALL_NAME)$(exeext); \ fi ; \ else true; fi @if [ -f f77-install-ok -o -f $(srcdir)/f77-install-ok ]; then \ @@ -267,43 +269,43 @@ f77.install-common: installdirs # to do the install. The sed rule was copied from stmp-int-hdrs. f77.install-info: f77.info installdirs if [ -f $(srcdir)/f/g77.info ] ; then \ - rm -f $(infodir)/g77.info*; \ + rm -f $(DESTDIR)$(infodir)/g77.info*; \ for f in $(srcdir)/f/g77.info*; do \ realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \ - $(INSTALL_DATA) $$f $(infodir)/$$realfile; \ + $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$realfile; \ done; \ - chmod a-x $(infodir)/g77.info*; \ + chmod a-x $(DESTDIR)$(infodir)/g77.info*; \ else true; fi @if [ -f $(srcdir)/f/g77.info ] ; then \ if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ - echo " install-info --info-dir=$(infodir) $(infodir)/g77.info"; \ - install-info --info-dir=$(infodir) $(infodir)/g77.info || : ; \ + echo " install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info"; \ + install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info || : ; \ else : ; fi; \ else : ; fi f77.install-man: $(GENERATED_MANPAGES) installdirs -if [ -f f771$(exeext) ] ; then \ if [ -f g77-cross$(exeext) ] ; then \ - rm -f $(man1dir)/$(G77_CROSS_NAME)$(man1ext); \ - $(INSTALL_DATA) $(srcdir)/f/g77.1 $(man1dir)/$(G77_CROSS_NAME)$(man1ext); \ - chmod a-x $(man1dir)/$(G77_CROSS_NAME)$(man1ext); \ + rm -f $(DESTDIR)$(man1dir)/$(G77_CROSS_NAME)$(man1ext); \ + $(INSTALL_DATA) $(srcdir)/f/g77.1 $(DESTDIR)$(man1dir)/$(G77_CROSS_NAME)$(man1ext); \ + chmod a-x $(DESTDIR)$(man1dir)/$(G77_CROSS_NAME)$(man1ext); \ else \ - rm -f $(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \ - $(INSTALL_DATA) $(srcdir)/f/g77.1 $(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \ - chmod a-x $(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \ + rm -f $(DESTDIR)$(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \ + $(INSTALL_DATA) $(srcdir)/f/g77.1 $(DESTDIR)$(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \ + chmod a-x $(DESTDIR)$(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \ fi; \ else true; fi f77.uninstall: installdirs if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \ - echo " install-info --delete --info-dir=$(infodir) $(infodir)/g77.info"; \ - install-info --delete --info-dir=$(infodir) $(infodir)/g77.info || : ; \ + echo " install-info --delete --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info"; \ + install-info --delete --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/g77.info || : ; \ else : ; fi - rm -rf $(bindir)/$(G77_INSTALL_NAME)$(exeext); \ - rm -rf $(bindir)/$(G77_CROSS_NAME)$(exeext); \ - rm -rf $(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \ - rm -rf $(man1dir)/$(G77_CROSS_NAME)$(man1ext); \ - rm -rf $(infodir)/g77.info* + rm -rf $(DESTDIR)$(bindir)/$(G77_INSTALL_NAME)$(exeext); \ + rm -rf $(DESTDIR)$(bindir)/$(G77_CROSS_NAME)$(exeext); \ + rm -rf $(DESTDIR)$(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \ + rm -rf $(DESTDIR)$(man1dir)/$(G77_CROSS_NAME)$(man1ext); \ + rm -rf $(DESTDIR)$(infodir)/g77.info* # # Clean hooks: # A lot of the ancillary files are deleted by the main makefile. diff --git a/gcc/f/bugs.texi b/gcc/f/bugs.texi index f82d1bda2a6..176072c0d21 100644 --- a/gcc/f/bugs.texi +++ b/gcc/f/bugs.texi @@ -1,4 +1,4 @@ -@c Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. +@c Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. @c This is part of the G77 manual. @c For copying conditions, see the file g77.texi. @@ -11,9 +11,8 @@ @set last-update-bugs 2002-02-01 -@include root.texi - @ifset DOC-BUGS +@include root.texi @c The immediately following lines apply to the BUGS file @c which is derived from this file. @emph{Note:} This file is automatically generated from the files diff --git a/gcc/f/g77.texi b/gcc/f/g77.texi index 9ab2527795a..1ae25e44d30 100644 --- a/gcc/f/g77.texi +++ b/gcc/f/g77.texi @@ -24,33 +24,6 @@ @c and make sure the following does NOT begin with '@c': @c @clear USING -@c 6/27/96 FSF DO wants smallbook fmt for 1st bound edition. (from gcc.texi) -@c @smallbook - -@c i also commented out the finalout command, so if there *are* any -@c overfulls, you'll (hopefully) see the rectangle in the right hand -@c margin. -- burley 1999-03-13 (from mew's comment in gcc.texi). -@c @finalout - -@macro gcctabopt{body} -@code{\body\} -@end macro -@macro gccoptlist{body} -@smallexample -\body\ -@end smallexample -@end macro -@c Makeinfo handles the above macro OK, TeX needs manual line breaks; -@c they get lost at some point in handling the macro. But if @macro is -@c used here rather than @alias, it produces double line breaks. -@iftex -@alias gol = * -@end iftex -@ifnottex -@macro gol -@end macro -@end ifnottex - @ifset INTERNALS @ifset USING @settitle Using and Porting GNU Fortran @@ -89,6 +62,29 @@ @c \global\normaloffset =0.75in @c @end tex +@copying +Copyright @copyright{} @value{copyrights-g77} Free Software Foundation, Inc. + +Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU Free Documentation License, Version 1.1 or +any later version published by the Free Software Foundation; with the +Invariant Sections being ``GNU General Public License'' and ``Funding +Free Software'', the Front-Cover +texts being (a) (see below), and with the Back-Cover Texts being (b) +(see below). A copy of the license is included in the section entitled +``GNU Free Documentation License''. + +(a) The FSF's Front-Cover Text is: + + A GNU Manual + +(b) The FSF's Back-Cover Text is: + + You have freedom to copy and modify this GNU Manual, like GNU + software. Copies published by the Free Software Foundation raise + funds for GNU development. +@end copying + @ifinfo @dircategory Programming @direntry @@ -114,27 +110,7 @@ Published by the Free Software Foundation 59 Temple Place - Suite 330 Boston, MA 02111-1307 USA -Copyright (C) @value{copyrights-g77} Free Software Foundation, Inc. - - -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or -any later version published by the Free Software Foundation; with the -Invariant Sections being ``GNU General Public License'' and ``Funding -Free Software'', the Front-Cover -texts being (a) (see below), and with the Back-Cover Texts being (b) -(see below). A copy of the license is included in the section entitled -``GNU Free Documentation License''. - -(a) The FSF's Front-Cover Text is: - - A GNU Manual - -(b) The FSF's Back-Cover Text is: - - You have freedom to copy and modify this GNU Manual, like GNU - software. Copies published by the Free Software Foundation raise - funds for GNU development. +@insertcopying @end ifinfo Contributed by James Craig Burley (@email{@value{email-burley}}). @@ -142,7 +118,6 @@ Inspired by a first pass at translating @file{g77-0.5.16/f/DOC} that was contributed to Craig by David Ronis (@email{ronis@@onsager.chem.mcgill.ca}). @setchapternewpage odd -@c @finalout @titlepage @ifset INTERNALS @ifset USING @@ -164,8 +139,6 @@ was contributed to Craig by David Ronis (@email{ronis@@onsager.chem.mcgill.ca}). @center for version @value{which-g77} @page @vskip 0pt plus 1filll -Copyright @copyright{} @value{copyrights-g77} Free Software Foundation, Inc. -@sp 2 For the @value{which-g77} Version* @sp 1 Published by the Free Software Foundation @* @@ -175,24 +148,7 @@ Boston, MA 02111-1307, USA@* @c Printed copies are available for $? each.@* @c ISBN ??? @sp 1 -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or -any later version published by the Free Software Foundation; with the -Invariant Sections being ``GNU General Public License'' and ``Funding -Free Software'', the Front-Cover -texts being (a) (see below), and with the Back-Cover Texts being (b) -(see below). A copy of the license is included in the section entitled -``GNU Free Documentation License''. - -(a) The FSF's Front-Cover Text is: - - A GNU Manual - -(b) The FSF's Back-Cover Text is: - - You have freedom to copy and modify this GNU Manual, like GNU - software. Copies published by the Free Software Foundation raise - funds for GNU development. +@insertcopying @end titlepage @summarycontents @contents @@ -1045,7 +1001,7 @@ As such, GNU users rarely need consider just what kind of underlying hardware (or, in many cases, operating system) they are using at any particular time. They can use and write software designed for a general-purpose, -widely portable, heterogenous environment---the GNU environment. +widely portable, heterogeneous environment---the GNU environment. In line with this philosophy, GNU Fortran must evolve into a product that is widely ported and portable not only in the sense that it can @@ -7512,7 +7468,7 @@ set up this kind of aliasing. (The FORTRAN 77 standard's prohibition of this sort of overlap, generally referred to therein as ``storage -assocation'', appears in Sections 15.9.3.6. +association'', appears in Sections 15.9.3.6. This prohibition allows implementations, such as @command{g77}, to, for example, implement the passing of procedures and even values in @code{COMMON} via copy operations into local, diff --git a/gcc/f/intdoc.in b/gcc/f/intdoc.in index 3ed3e10e408..9d00bc761a6 100644 --- a/gcc/f/intdoc.in +++ b/gcc/f/intdoc.in @@ -646,7 +646,7 @@ magnitude truncated and its sign preserved, converted to type @code{INTEGER(KIND=6)}. If @var{@1@} is type @code{COMPLEX}, its real part -is truncated and converted, and its imaginary part is disgregarded. +is truncated and converted, and its imaginary part is disregarded. @xref{Int Intrinsic}. @@ -661,7 +661,7 @@ magnitude truncated and its sign preserved, converted to type @code{INTEGER(KIND=6)}. If @var{@1@} is type @code{COMPLEX}, its real part -is truncated and converted, and its imaginary part is disgregarded. +is truncated and converted, and its imaginary part is disregarded. @xref{Int Intrinsic}. @@ -676,7 +676,7 @@ magnitude truncated and its sign preserved, converted to type @code{INTEGER(KIND=2)}. If @var{@1@} is type @code{COMPLEX}, its real part -is truncated and converted, and its imaginary part is disgregarded. +is truncated and converted, and its imaginary part is disregarded. @xref{Int Intrinsic}. diff --git a/gcc/f/intdoc.texi b/gcc/f/intdoc.texi index e4706267e53..b86cb1b975b 100644 --- a/gcc/f/intdoc.texi +++ b/gcc/f/intdoc.texi @@ -6543,7 +6543,7 @@ magnitude truncated and its sign preserved, converted to type @code{INTEGER(KIND=6)}. If @var{A} is type @code{COMPLEX}, its real part -is truncated and converted, and its imaginary part is disgregarded. +is truncated and converted, and its imaginary part is disregarded. @xref{Int Intrinsic}. @@ -6578,7 +6578,7 @@ magnitude truncated and its sign preserved, converted to type @code{INTEGER(KIND=2)}. If @var{A} is type @code{COMPLEX}, its real part -is truncated and converted, and its imaginary part is disgregarded. +is truncated and converted, and its imaginary part is disregarded. @xref{Int Intrinsic}. @@ -9418,7 +9418,7 @@ magnitude truncated and its sign preserved, converted to type @code{INTEGER(KIND=6)}. If @var{A} is type @code{COMPLEX}, its real part -is truncated and converted, and its imaginary part is disgregarded. +is truncated and converted, and its imaginary part is disregarded. @xref{Int Intrinsic}. diff --git a/gcc/f/lang-specs.h b/gcc/f/lang-specs.h index 602028d136e..62b78c6f361 100644 --- a/gcc/f/lang-specs.h +++ b/gcc/f/lang-specs.h @@ -1,5 +1,5 @@ /* lang-specs.h file for Fortran - Copyright (C) 1995, 1996, 1997, 1999, 2000, 2002 + Copyright (C) 1995, 1996, 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. Contributed by James Craig Burley. diff --git a/gcc/f/news.texi b/gcc/f/news.texi index 2d0dc0f49ef..33116e4bddc 100644 --- a/gcc/f/news.texi +++ b/gcc/f/news.texi @@ -1,4 +1,4 @@ -@c Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +@c Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 @c Free Software Foundation, Inc. @c This is part of the G77 manual. @c For copying conditions, see the file g77.texi. @@ -8,13 +8,12 @@ @c Keep this the same as the dates above, since it's used @c in the standalone derivations of this file (e.g. NEWS). -@set copyrights-news 1995,1996,1997,1998,1999,2000,2001,2002 +@set copyrights-news 1995,1996,1997,1998,1999,2000,2001,2002,2003 -@set last-update-news 2002-11-19 - -@include root.texi +@set last-update-news 2003-01-30 @ifset DOC-NEWS +@include root.texi @c The immediately following lines apply to the NEWS file @c which is derived from this file. @emph{Note:} This file is automatically generated from the files @@ -185,7 +184,7 @@ Incorrect output with 0-based array of characters Double complex zero ** double precision number -> NaN instead of zero @end table @item -Richard Henderson (@email{rth@@redhat.com}) analysed and improved the handling +Richard Henderson (@email{rth@@redhat.com}) analyzed and improved the handling of (no-)aliasing information for dummy arguments and improved the optimization of induction variables in unrolled loops. @end itemize @@ -195,8 +194,12 @@ of induction variables in unrolled loops. @item Problem Reports fixed (in chronological order of submission): @table @code +@item 7681 +ICE in compensate_edge, at reg-stack.c:2591 @item 8308 gcc-3.x does not compile files with suffix .r (RATFOR) [Fixed in 3.2.1] +@item 9258 +[3.2/3.3/3.4 regression] ICE in compensate_edge, at reg-stack.c:2589 @end table @end itemize diff --git a/gcc/f/root.texi b/gcc/f/root.texi index 45a36c209d4..d8619cc376d 100644 --- a/gcc/f/root.texi +++ b/gcc/f/root.texi @@ -1,9 +1,4 @@ -@c DEVELOPMENT is set to indicate an in-development version, -@c as compared to a release version. When making a release -@c (e.g. a release branch in the CVS repository for gcc), -@c clear this and set the version information correctly. -@set DEVELOPMENT -@set version-gcc 3.3 +@include gcc-common.texi @set email-general gcc@@gcc.gnu.org @set email-help gcc-help@@gcc.gnu.org @@ -12,7 +7,7 @@ @set path-g77 gcc/gcc/f @set path-libf2c gcc/libf2c -@set which-g77 GCC-@value{version-gcc} +@set which-g77 GCC-@value{version-GCC} @set which-gcc GCC @set email-burley craig@@jcb-sc.com diff --git a/gcc/f/stc.c b/gcc/f/stc.c index 1f17766d9ac..a28e3a949e6 100644 --- a/gcc/f/stc.c +++ b/gcc/f/stc.c @@ -1,5 +1,5 @@ /* stc.c -- Implementation File (module.c template V1.0) - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 1997, 2003 Free Software Foundation, Inc. Contributed by James Craig Burley. This file is part of GNU Fortran. @@ -9195,18 +9195,13 @@ ffestc_R810 (ffesttCaseList cases, ffelexToken name) ffebad_finish (); continue; } - if (((caseobj->expr1 != NULL) && ((ffeinfo_basictype (ffebld_info (caseobj->expr1)) - != s->type) - || (ffeinfo_kindtype (ffebld_info (caseobj->expr1)) - != s->kindtype))) + != s->type))) || ((caseobj->range) && (caseobj->expr2 != NULL) && ((ffeinfo_basictype (ffebld_info (caseobj->expr2)) - != s->type) - || (ffeinfo_kindtype (ffebld_info (caseobj->expr2)) - != s->kindtype)))) + != s->type)))) { ffebad_start (FFEBAD_CASE_TYPE_DISAGREE); ffebad_here (0, ffelex_token_where_line (caseobj->t), diff --git a/gcc/f/ste.c b/gcc/f/ste.c index d7d84954eef..a620acd1f15 100644 --- a/gcc/f/ste.c +++ b/gcc/f/ste.c @@ -1,5 +1,5 @@ /* ste.c -- Implementation File (module.c template V1.0) - Copyright (C) 1995, 1996, 2000, 2002 Free Software Foundation, Inc. + Copyright (C) 1995, 1996, 2000, 2002, 2003 Free Software Foundation, Inc. Contributed by James Craig Burley. This file is part of GNU Fortran. @@ -2725,7 +2725,15 @@ ffeste_R810 (ffestw block, unsigned long casenum) } else pushok = pushcase (texprlow, convert, tlabel, &duplicate); - assert (pushok == 0); + assert((pushok !=2) || (pushok !=0)); + if (pushok==2) + { + ffebad_start_msg ("SELECT (at %0) has duplicate cases -- check integer overflow of CASE(s)", + FFEBAD_severityFATAL); + ffebad_here (0, ffestw_line (block), ffestw_col (block)); + ffebad_finish (); + ffestw_set_select_texpr (block, error_mark_node); + } c = c->next_stmt; /* Unlink prev. */ c->previous_stmt->previous_stmt->next_stmt = c; diff --git a/gcc/final.c b/gcc/final.c index 312ae76f8fc..94a0f4c53a4 100644 --- a/gcc/final.c +++ b/gcc/final.c @@ -1269,7 +1269,7 @@ shorten_branches (first) } } - INSN_ADDRESSES (uid) = insn_current_address; + INSN_ADDRESSES (uid) = insn_current_address + insn_lengths[uid]; if (GET_CODE (insn) == NOTE || GET_CODE (insn) == BARRIER || GET_CODE (insn) == CODE_LABEL) diff --git a/gcc/fixinc/fixfixes.c b/gcc/fixinc/fixfixes.c index ad54960d13b..9c775b55425 100644 --- a/gcc/fixinc/fixfixes.c +++ b/gcc/fixinc/fixfixes.c @@ -597,47 +597,44 @@ FIX_PROC_HEAD( wrap_fix ) tSCC z_no_wrap_pat[] = "^#if.*__need_"; static regex_t no_wrapping_re; /* assume zeroed data */ - char z_fixname[ 64 ]; - tCC* pz_src = p_fixd->fix_name; - tCC* pz_name = z_fixname; - char* pz_dst = z_fixname; - int do_end = 0; - size_t len = 0; - IGNORE_ARG(filname); + tCC* pz_name = NULL; if (no_wrapping_re.allocated == 0) compile_re( z_no_wrap_pat, &no_wrapping_re, 0, "no-wrap pattern", "wrap-fix" ); - for (;;) { - char ch = *pz_src++; - - if (ch == NUL) { - *pz_dst++ = ch; - break; - } else if (! ISALNUM (ch)) { - *pz_dst++ = '_'; - } else { - *pz_dst++ = TOUPPER (ch); - } - - if (++len >= sizeof( z_fixname )) { - void* p = xmalloc( len + strlen( pz_src ) + 1 ); - memcpy( p, (void*)z_fixname, len ); - pz_name = (tCC*)p; - pz_dst = (char*)pz_name + len; - } - } - /* * IF we do *not* match the no-wrap re, then we have a double negative. * A double negative means YES. */ - if (regexec (&no_wrapping_re, text, 0, NULL, 0) != 0) + if (regexec( &no_wrapping_re, text, 0, NULL, 0 ) != 0) { - printf( "#ifndef FIXINC_%s_CHECK\n", pz_name ); - printf( "#define FIXINC_%s_CHECK 1\n\n", pz_name ); - do_end = 1; + /* + * A single file can get wrapped more than once by different fixes. + * A single fix can wrap multiple files. Therefore, guard with + * *both* the fix name and the file name. + */ + size_t ln = strlen( filname ) + strlen( p_fixd->fix_name ) + 14; + char* pz = xmalloc( ln ); + pz_name = pz; + sprintf( pz, "FIXINC_WRAP_%s-%s", filname, p_fixd->fix_name ); + + for (pz += 12; 1; pz++) { + char ch = *pz; + + if (ch == NUL) + break; + + if (! ISALNUM( ch )) { + *pz = '_'; + } + else { + *pz = TOUPPER( ch ); + } + } + + printf( "#ifndef %s\n", pz_name ); + printf( "#define %s 1\n\n", pz_name ); } if (p_fixd->patch_args[1] == (tCC*)NULL) @@ -650,11 +647,10 @@ FIX_PROC_HEAD( wrap_fix ) fputs( p_fixd->patch_args[2], stdout ); } - if (do_end != 0) - printf( "\n#endif /* FIXINC_%s_CHECK */\n", pz_name ); - - if (pz_name != z_fixname) + if (pz_name != NULL) { + printf( "\n#endif /* %s */\n", pz_name ); free( (void*)pz_name ); + } } diff --git a/gcc/function.c b/gcc/function.c index 26334f124da..481146352db 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -3045,10 +3045,7 @@ purge_addressof_1 (loc, insn, force, store, ht) rtx sub, insns; if (GET_CODE (XEXP (x, 0)) != MEM) - { - put_addressof_into_stack (x, ht); - return true; - } + put_addressof_into_stack (x, ht); /* We must create a copy of the rtx because it was created by overwriting a REG rtx which is always shared. */ diff --git a/gcc/gccbug.in b/gcc/gccbug.in index 9619e61222c..4da84150b6c 100755 --- a/gcc/gccbug.in +++ b/gcc/gccbug.in @@ -198,7 +198,7 @@ EOF done # spam does not need to be listed here -CATEGORIES="ada bootstrap c++ c debug fortran java libf2c libgcj libobjc libstdc++ middle-end objc optimization other preprocessor target web" +CATEGORIES="ada bootstrap c++ c debug driver fortran inline-asm java libf2c libgcj libobjc libstdc++ middle-end objc optimization other preprocessor target web" case "$FORMAT" in lisp) echo "$CATEGORIES" | \ diff --git a/gcc/gcse.c b/gcc/gcse.c index 9e4cccb136e..e2a70161b64 100644 --- a/gcc/gcse.c +++ b/gcc/gcse.c @@ -4128,6 +4128,7 @@ constprop_register (insn, from, to, alter_jumps) conditional branch instructions first. */ if (alter_jumps && (sset = single_set (insn)) != NULL + && NEXT_INSN (insn) && any_condjump_p (NEXT_INSN (insn)) && onlyjump_p (NEXT_INSN (insn))) { rtx dest = SET_DEST (sset); @@ -4278,6 +4279,9 @@ do_local_cprop (x, insn, alter_jumps, libcall_sp) rtx this_rtx = l->loc; rtx note; + if (l->in_libcall) + continue; + if (CONSTANT_P (this_rtx)) newcnst = this_rtx; if (REG_P (this_rtx) && REGNO (this_rtx) >= FIRST_PSEUDO_REGISTER @@ -4376,6 +4380,7 @@ local_cprop_pass (alter_jumps) rtx insn; struct reg_use *reg_used; rtx libcall_stack[MAX_NESTED_LIBCALLS + 1], *libcall_sp; + bool changed = false; cselib_init (); libcall_sp = &libcall_stack[MAX_NESTED_LIBCALLS]; @@ -4407,13 +4412,24 @@ local_cprop_pass (alter_jumps) reg_used++, reg_use_count--) if (do_local_cprop (reg_used->reg_rtx, insn, alter_jumps, libcall_sp)) - break; + { + changed = true; + break; + } } while (reg_use_count); } cselib_process_insn (insn); } cselib_finish (); + /* Global analysis may get into infinite loops for unreachable blocks. */ + if (changed && alter_jumps) + { + delete_unreachable_blocks (); + free_reg_set_mem (); + alloc_reg_set_mem (max_reg_num ()); + compute_sets (get_insns ()); + } } /* Forward propagate copies. This includes copies and constants. Return @@ -4502,6 +4518,9 @@ one_cprop_pass (pass, alter_jumps) fprintf (gcse_file, "%d const props, %d copy props\n\n", const_prop_count, copy_prop_count); } + /* Global analysis may get into infinite loops for unreachable blocks. */ + if (changed && alter_jumps) + delete_unreachable_blocks (); return changed; } diff --git a/gcc/gengtype-lex.l b/gcc/gengtype-lex.l index 91cdde29580..38e470de468 100644 --- a/gcc/gengtype-lex.l +++ b/gcc/gengtype-lex.l @@ -20,11 +20,12 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ %{ +#include "hconfig.h" +#include "system.h" + #define malloc xmalloc #define realloc xrealloc -#include "hconfig.h" -#include "system.h" #include "gengtype.h" #include "gengtype-yacc.h" diff --git a/gcc/ggc-page.c b/gcc/ggc-page.c index f210af93abe..cd393166737 100644 --- a/gcc/ggc-page.c +++ b/gcc/ggc-page.c @@ -1491,10 +1491,10 @@ ggc_collect () /* Avoid frequent unnecessary work by skipping collection if the total allocations haven't expanded much since the last collection. */ - size_t allocated_last_gc = + float allocated_last_gc = MAX (G.allocated_last_gc, (size_t)PARAM_VALUE (GGC_MIN_HEAPSIZE) * 1024); - size_t min_expand = allocated_last_gc * PARAM_VALUE (GGC_MIN_EXPAND) / 100; + float min_expand = allocated_last_gc * PARAM_VALUE (GGC_MIN_EXPAND) / 100; if (G.allocated < allocated_last_gc + min_expand) return; diff --git a/gcc/gthr-rtems.h b/gcc/gthr-rtems.h index 23e35d7403f..8cb951ef587 100644 --- a/gcc/gthr-rtems.h +++ b/gcc/gthr-rtems.h @@ -1,7 +1,7 @@ /* RTEMS threads compatibily routines for libgcc2 and libobjc. by: Rosimildo da Silva( rdasilva@connecttel.com ) */ /* Compile this one with gcc. */ -/* Copyright (C) 1997, 1999, 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. This file is part of GCC. @@ -37,6 +37,7 @@ extern "C" { #define __GTHREADS 1 #define __GTHREAD_ONCE_INIT 0 +#define __GTHREAD_MUTEX_INIT 0 #define __GTHREAD_MUTEX_INIT_FUNCTION rtems_gxx_mutex_init /* avoid depedency on rtems specific headers */ diff --git a/gcc/ifcvt.c b/gcc/ifcvt.c index 42c5fb50bdb..969106290ba 100644 --- a/gcc/ifcvt.c +++ b/gcc/ifcvt.c @@ -645,8 +645,8 @@ noce_emit_store_flag (if_info, x, reversep, normalize) end_sequence (); } - /* Don't even try if the comparison operands are weird. */ - if (cond_complex) + /* Don't even try if the comparison operands or the mode of X are weird. */ + if (cond_complex || !SCALAR_INT_MODE_P (GET_MODE (x))) return NULL_RTX; return emit_store_flag (x, code, XEXP (cond, 0), @@ -1770,14 +1770,22 @@ noce_process_if_block (ce_info) else { insn_b = prev_nonnote_insn (if_info.cond_earliest); + /* We're going to be moving the evaluation of B down from above + COND_EARLIEST to JUMP. Make sure the relevant data is still + intact. */ if (! insn_b || GET_CODE (insn_b) != INSN || (set_b = single_set (insn_b)) == NULL_RTX || ! rtx_equal_p (x, SET_DEST (set_b)) + || reg_overlap_mentioned_p (x, SET_SRC (set_b)) + || modified_between_p (SET_SRC (set_b), + PREV_INSN (if_info.cond_earliest), jump) + /* Likewise with X. In particular this can happen when + noce_get_condition looks farther back in the instruction + stream than one might expect. */ || reg_overlap_mentioned_p (x, cond) || reg_overlap_mentioned_p (x, a) - || reg_overlap_mentioned_p (x, SET_SRC (set_b)) - || modified_between_p (x, if_info.cond_earliest, NEXT_INSN (jump))) + || modified_between_p (x, PREV_INSN (if_info.cond_earliest), jump)) insn_b = set_b = NULL_RTX; } b = (set_b ? SET_SRC (set_b) : x); diff --git a/gcc/integrate.c b/gcc/integrate.c index 6746b3f450f..88a80ee6f47 100644 --- a/gcc/integrate.c +++ b/gcc/integrate.c @@ -3002,15 +3002,17 @@ set_decl_abstract_flags (decl, setting) from its DECL_SAVED_INSNS. Used for inline functions that are output at end of compilation instead of where they came in the source. */ +static GTY(()) struct function *old_cfun; + void output_inline_function (fndecl) tree fndecl; { - struct function *old_cfun = cfun; enum debug_info_type old_write_symbols = write_symbols; const struct gcc_debug_hooks *const old_debug_hooks = debug_hooks; struct function *f = DECL_SAVED_INSNS (fndecl); + old_cfun = cfun; cfun = f; current_function_decl = fndecl; diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index c6d0de1c1e3..00caee619bf 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,3 +1,103 @@ +2003-01-30 Tom Tromey <tromey@redhat.com> + + * jcf-parse.c (read_class): Update identifier's class value if it + changed during parsing. + +2003-01-29 Tom Tromey <tromey@redhat.com> + + * parse.y (patch_assignment): Only transform the rhs of an + assignment when compiling to native. + +2003-01-28 Tom Tromey <tromey@redhat.com> + + * lex.c (java_lex): Don't include UEOF as part of token. + (java_read_unicode): Error if \u sequence prematurely terminated. + +2003-01-27 Tom Tromey <tromey@redhat.com> + + * parse.y (java_check_regular_methods): Check for construct after + checking types in throws clause. + +2003-01-26 Christian Cornelssen <ccorn@cs.tu-berlin.de> + + * Make-lang.in (java.install-common, java.uninstall) + (java.install-info, java.install-man): Prepend $(DESTDIR) + to destination paths in all (un)installation commands. + (java.install-common): Rewrite $(LN) command to support + DESTDIR with "ln" as well as with "ln -s". + +2003-01-24 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * jcf-io.c (caching_stat): Cast the 3rd arg of scandir to void*. + * jcf-write.c (generate_bytecode_insns): Avoid signed/unsigned + warning. + +2003-01-21 Tom Tromey <tromey@redhat.com> + + * parse.y (method_header): Native method can't be strictfp. + No method can be transient or volatile. + +2003-01-14 Andrew Haley <aph@redhat.com> + + * decl.c (java_init_decl_processing): _Jv_NewMultiArray is a + varargs function -- correct. + + * parse.y (patch_assignment): Copy the rhs of an assignment into a + temporary if the RHS is a reference. + +2003-01-05 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * lang.c (dump_compound_expr): Prototype. + +2003-01-03 Tom Tromey <tromey@redhat.com> + + Fix for PR java/8712: + * expr.c (build_instanceof): Build an NE_EXPR, not a COND_EXPR, + when simply checking against `null'. + +2003-01-03 Tom Tromey <tromey@redhat.com> + + * gcj.texi (Standard Properties): Document http.proxyHost and + http.proxyPort. + +2003-01-03 Tom Tromey <tromey@redhat.com> + + * gcj.texi (GNU Classpath Properties): Document new properties. + +2002-12-30 DJ Delorie <dj@redhat.com> + + * Make-lang.in: Protect against texi2pod/pod2man failing. + +2002-12-28 Joseph S. Myers <jsm@polyomino.org.uk> + + * gcj.texi: Use @copying. + +2002-12-23 Joseph S. Myers <jsm@polyomino.org.uk> + + * gcj.texi: Include Cover Texts in man page. + +2002-12-23 Joseph S. Myers <jsm@polyomino.org.uk> + + * gcj.texi: Include gcc-common.texi. + * Make-lang.in ($(srcdir)/java/gcj.info, java/gcj.dvi): Depend on + $(srcdir)/doc/include/gcc-common.texi. + +2002-12-22 Anthony Green <green@redhat.com> + + * gcj.texi (Limitations): Add note about org.xml.sax and + org.w3c.dom. + +2002-12-20 Tom Tromey <tromey@redhat.com> + + * jcf-write.c (generate_bytecode_insns) [SWITCH_EXPR]: Handle case + where minimum case value is Integer.MIN_VALUE. + Fixes PR java/8955. + +2002-12-18 Andrew Haley <aph@redhat.com> + + * parse.y (patch_invoke): Force evaluation order when `check' is + set. For PR libgcj/8945. + 2002-12-05 Ranjit Mathew <rmathew@hotmail.com> Andrew Haley <aph@redhat.com> diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in index fc0e40b5161..eea7dd2ee9b 100644 --- a/gcc/java/Make-lang.in +++ b/gcc/java/Make-lang.in @@ -170,53 +170,54 @@ java.install-normal: java.install-common: installdirs -if [ -f $(GCJ)$(exeext) ]; then \ if [ -f $(GCJ)-cross$(exeext) ]; then \ - rm -f $(bindir)/$(JAVA_CROSS_NAME)$(exeext); \ - $(INSTALL_PROGRAM) $(GCJ)-cross$(exeext) $(bindir)/$(JAVA_CROSS_NAME)$(exeext); \ - chmod a+x $(bindir)/$(JAVA_CROSS_NAME)$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$(JAVA_CROSS_NAME)$(exeext); \ + $(INSTALL_PROGRAM) $(GCJ)-cross$(exeext) $(DESTDIR)$(bindir)/$(JAVA_CROSS_NAME)$(exeext); \ + chmod a+x $(DESTDIR)$(bindir)/$(JAVA_CROSS_NAME)$(exeext); \ else \ - rm -f $(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \ - $(INSTALL_PROGRAM) $(GCJ)$(exeext) $(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \ - chmod a+x $(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \ - rm -f $(bindir)/$(JAVA_TARGET_INSTALL_NAME)$(exeext); \ - $(LN) $(bindir)/$(JAVA_INSTALL_NAME)$(exeext) $(bindir)/$(JAVA_TARGET_INSTALL_NAME)$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \ + $(INSTALL_PROGRAM) $(GCJ)$(exeext) $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \ + chmod a+x $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$(JAVA_TARGET_INSTALL_NAME)$(exeext); \ + ( cd $(DESTDIR)$(bindir) && \ + $(LN) $(JAVA_INSTALL_NAME)$(exeext) $(JAVA_TARGET_INSTALL_NAME)$(exeext) ); \ fi ; \ fi ; \ for tool in $(JAVA_TARGET_INDEPENDENT_BIN_TOOLS); do \ tool_transformed_name=`echo $$tool|sed '$(program_transform_name)'`; \ if [ -f $$tool$(exeext) ]; then \ - rm -f $(bindir)/$$tool_transformed_name$(exeext); \ - $(INSTALL_PROGRAM) $$tool$(exeext) $(bindir)/$$tool_transformed_name$(exeext); \ - chmod a+x $(bindir)/$$tool_transformed_name$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$$tool_transformed_name$(exeext); \ + $(INSTALL_PROGRAM) $$tool$(exeext) $(DESTDIR)$(bindir)/$$tool_transformed_name$(exeext); \ + chmod a+x $(DESTDIR)$(bindir)/$$tool_transformed_name$(exeext); \ fi ; \ done java.install-man: java.uninstall: - -rm -rf $(bindir)/$(JAVA_INSTALL_NAME)$(exeext) - -rm -rf $(bindir)/$(JAVA_CROSS_NAME)$(exeext) - -rm -rf $(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext) - -rm -rf $(man1dir)/$(JAVA_CROSS_NAME)$(man1ext) - -rm -rf $(man1dir)/gcjh$(man1ext) - -rm -rf $(man1dir)/jv-scan$(man1ext) - -rm -rf $(man1dir)/jcf-dump$(man1ext) - -rm -rf $(man1dir)/gij$(man1ext) - -rm -rf $(man1dir)/jv-convert$(man1ext) + -rm -rf $(DESTDIR)$(bindir)/$(JAVA_INSTALL_NAME)$(exeext) + -rm -rf $(DESTDIR)$(bindir)/$(JAVA_CROSS_NAME)$(exeext) + -rm -rf $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext) + -rm -rf $(DESTDIR)$(man1dir)/$(JAVA_CROSS_NAME)$(man1ext) + -rm -rf $(DESTDIR)$(man1dir)/gcjh$(man1ext) + -rm -rf $(DESTDIR)$(man1dir)/jv-scan$(man1ext) + -rm -rf $(DESTDIR)$(man1dir)/jcf-dump$(man1ext) + -rm -rf $(DESTDIR)$(man1dir)/gij$(man1ext) + -rm -rf $(DESTDIR)$(man1dir)/jv-convert$(man1ext) java.install-info: installdirs if [ -f jc1$(exeext) ] ; then \ if [ -f $(srcdir)/java/gcj.info ]; then \ - rm -f $(infodir)/gcj.info*; \ + rm -f $(DESTDIR)$(infodir)/gcj.info*; \ for f in $(srcdir)/java/gcj.info*; do \ realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \ - $(INSTALL_DATA) $$f $(infodir)/$$realfile; \ + $(INSTALL_DATA) $$f $(DESTDIR)$(infodir)/$$realfile; \ done; \ - chmod a-x $(infodir)/gcj.info*; \ + chmod a-x $(DESTDIR)$(infodir)/gcj.info*; \ else true; fi; \ else true; fi - -if [ -f jc1$(exeext) ] && [ -f $(infodir)/gcj.info ]; then \ + -if [ -f jc1$(exeext) ] && [ -f $(DESTDIR)$(infodir)/gcj.info ]; then \ if $(SHELL) -c 'install-info --version' >/dev/null 2>&1; then \ - install-info --dir-file=$(infodir)/dir $(infodir)/gcj.info; \ + install-info --dir-file=$(DESTDIR)$(infodir)/dir $(DESTDIR)$(infodir)/gcj.info; \ else true; fi; \ else true; fi @@ -336,104 +337,105 @@ java/jcf-path.o: java/jcf-path.c $(CONFIG_H) $(SYSTEM_H) java/jcf.h # Documentation $(srcdir)/java/gcj.info: $(srcdir)/java/gcj.texi \ - $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gpl.texi + $(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gpl.texi \ + $(srcdir)/doc/include/gcc-common.texi if test "x$(BUILD_INFO)" = xinfo; then \ rm -f $(srcdir)/java/gcc.info*; \ cd $(srcdir)/java && $(MAKEINFO) -I../doc/include -o gcj.info gcj.texi; \ else true; fi java/gcj.dvi: $(srcdir)/java/gcj.texi $(srcdir)/doc/include/fdl.texi \ - $(srcdir)/doc/include/gpl.texi + $(srcdir)/doc/include/gpl.texi $(srcdir)/doc/include/gcc-common.texi s=`cd $(srcdir); ${PWD}`; export s; \ cd java && $(TEXI2DVI) -I $$s/doc/include $$s/java/gcj.texi $(srcdir)/java/gcj.1: $(srcdir)/java/gcj.texi -$(TEXI2POD) -D gcj < $(srcdir)/java/gcj.texi > java/gcj.pod - ($(POD2MAN) --section=1 java/gcj.pod > java/gcj.1.T$$$$ && \ + -($(POD2MAN) --section=1 java/gcj.pod > java/gcj.1.T$$$$ && \ mv -f java/gcj.1.T$$$$ $(srcdir)/java/gcj.1) || \ (rm -f java/gcj.1.T$$$$ && exit 1) - rm -f java/gcj.pod + -rm -f java/gcj.pod $(srcdir)/java/gcjh.1: $(srcdir)/java/gcj.texi -$(TEXI2POD) -D gcjh < $(srcdir)/java/gcj.texi > java/gcjh.pod - ($(POD2MAN) --section=1 java/gcjh.pod > java/gcjh.1.T$$$$ && \ + -($(POD2MAN) --section=1 java/gcjh.pod > java/gcjh.1.T$$$$ && \ mv -f java/gcjh.1.T$$$$ $(srcdir)/java/gcjh.1) || \ (rm -f java/gcjh.1.T$$$$ && exit 1) - rm -f java/gcjh.pod + -rm -f java/gcjh.pod $(srcdir)/java/jv-scan.1: $(srcdir)/java/gcj.texi -$(TEXI2POD) -D jv-scan < $(srcdir)/java/gcj.texi > java/jv-scan.pod - ($(POD2MAN) --section=1 java/jv-scan.pod > java/jv-scan.1.T$$$$ && \ + -($(POD2MAN) --section=1 java/jv-scan.pod > java/jv-scan.1.T$$$$ && \ mv -f java/jv-scan.1.T$$$$ $(srcdir)/java/jv-scan.1) || \ (rm -f java/jv-scan.1.T$$$$ && exit 1) - rm -f java/jv-scan.pod + -rm -f java/jv-scan.pod $(srcdir)/java/jcf-dump.1: $(srcdir)/java/gcj.texi -$(TEXI2POD) -D jcf-dump < $(srcdir)/java/gcj.texi > java/jcf-dump.pod - ($(POD2MAN) --section=1 java/jcf-dump.pod > java/jcf-dump.1.T$$$$ && \ + -($(POD2MAN) --section=1 java/jcf-dump.pod > java/jcf-dump.1.T$$$$ && \ mv -f java/jcf-dump.1.T$$$$ $(srcdir)/java/jcf-dump.1) || \ (rm -f java/jcf-dump.1.T$$$$ && exit 1) - rm -f java/jcf-dump.pod + -rm -f java/jcf-dump.pod $(srcdir)/java/gij.1: $(srcdir)/java/gcj.texi -$(TEXI2POD) -D gij < $(srcdir)/java/gcj.texi > java/gij.pod - ($(POD2MAN) --section=1 java/gij.pod > java/gij.1.T$$$$ && \ + -($(POD2MAN) --section=1 java/gij.pod > java/gij.1.T$$$$ && \ mv -f java/gij.1.T$$$$ $(srcdir)/java/gij.1) || \ (rm -f java/gij.1.T$$$$ && exit 1) - rm -f java/gij.pod + -rm -f java/gij.pod $(srcdir)/java/jv-convert.1: $(srcdir)/java/gcj.texi -$(TEXI2POD) -D jv-convert < $(srcdir)/java/gcj.texi > java/jv-convert.pod - ($(POD2MAN) --section=1 java/jv-convert.pod > java/jv-convert.1.T$$$$ && \ + -($(POD2MAN) --section=1 java/jv-convert.pod > java/jv-convert.1.T$$$$ && \ mv -f java/jv-convert.1.T$$$$ $(srcdir)/java/jv-convert.1) || \ (rm -f java/jv-convert.1.T$$$$ && exit 1) - rm -f java/jv-convert.pod + -rm -f java/jv-convert.pod $(srcdir)/java/rmic.1: $(srcdir)/java/gcj.texi -$(TEXI2POD) -D rmic < $(srcdir)/java/gcj.texi > java/rmic.pod - ($(POD2MAN) --section=1 java/rmic.pod > java/rmic.1.T$$$$ && \ + -($(POD2MAN) --section=1 java/rmic.pod > java/rmic.1.T$$$$ && \ mv -f java/rmic.1.T$$$$ $(srcdir)/java/rmic.1) || \ (rm -f java/rmic.1.T$$$$ && exit 1) - rm -f java/rmic.pod + -rm -f java/rmic.pod $(srcdir)/java/rmiregistry.1: $(srcdir)/java/gcj.texi -$(TEXI2POD) -D rmiregistry < $(srcdir)/java/gcj.texi > java/rmiregistry.pod - ($(POD2MAN) --section=1 java/rmiregistry.pod > java/rmiregistry.1.T$$$$ && \ + -($(POD2MAN) --section=1 java/rmiregistry.pod > java/rmiregistry.1.T$$$$ && \ mv -f java/rmiregistry.1.T$$$$ $(srcdir)/java/rmiregistry.1) || \ (rm -f java/rmiregistry.1.T$$$$ && exit 1) - rm -f java/rmiregistry.pod + -rm -f java/rmiregistry.pod # Install the man pages. java.install-man: installdirs $(GENERATED_JAVA_MANPAGES) -if [ -f $(GCJ)$(exeext) ]; then \ if [ -f $(GCJ)-cross$(exeext) ]; then \ - rm -f $(man1dir)/$(JAVA_CROSS_NAME)$(man1ext); \ - $(INSTALL_DATA) $(srcdir)/java/gcj.1 $(man1dir)/$(JAVA_CROSS_NAME)$(man1ext); \ - chmod a-x $(man1dir)/$(JAVA_CROSS_NAME)$(man1ext); \ + rm -f $(DESTDIR)$(man1dir)/$(JAVA_CROSS_NAME)$(man1ext); \ + $(INSTALL_DATA) $(srcdir)/java/gcj.1 $(DESTDIR)$(man1dir)/$(JAVA_CROSS_NAME)$(man1ext); \ + chmod a-x $(DESTDIR)$(man1dir)/$(JAVA_CROSS_NAME)$(man1ext); \ else \ - rm -f $(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \ - $(INSTALL_DATA) $(srcdir)/java/gcj.1 $(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \ - chmod a-x $(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \ + rm -f $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \ + $(INSTALL_DATA) $(srcdir)/java/gcj.1 $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \ + chmod a-x $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \ fi ; \ fi - -rm -f $(man1dir)/gcjh$(man1ext) - -$(INSTALL_DATA) $(srcdir)/java/gcjh.1 $(man1dir)/gcjh$(man1ext) - -chmod a-x $(man1dir)/gcjh$(man1ext) - -rm -f $(man1dir)/jv-scan$(man1ext) - -$(INSTALL_DATA) $(srcdir)/java/jv-scan.1 $(man1dir)/jv-scan$(man1ext) - -chmod a-x $(man1dir)/jv-scan$(man1ext) - -rm -f $(man1dir)/jcf-dump$(man1ext) - -$(INSTALL_DATA) $(srcdir)/java/jcf-dump.1 $(man1dir)/jcf-dump$(man1ext) - -chmod a-x $(man1dir)/jcf-dump$(man1ext) - -rm -f $(man1dir)/gij$(man1ext) - -$(INSTALL_DATA) $(srcdir)/java/gij.1 $(man1dir)/gij$(man1ext) - -chmod a-x $(man1dir)/gij$(man1ext) - -rm -f $(man1dir)/jv-convert$(man1ext) - -$(INSTALL_DATA) $(srcdir)/java/jv-convert.1 $(man1dir)/jv-convert$(man1ext) - -chmod a-x $(man1dir)/jv-convert$(man1ext) - -rm -f $(man1dir)/rmic$(man1ext) - -$(INSTALL_DATA) $(srcdir)/java/rmic.1 $(man1dir)/rmic$(man1ext) - -chmod a-x $(man1dir)/rmic$(man1ext) - -rm -f $(man1dir)/rmiregistry$(man1ext) - -$(INSTALL_DATA) $(srcdir)/java/rmiregistry.1 $(man1dir)/rmiregistry$(man1ext) - -chmod a-x $(man1dir)/rmiregistry$(man1ext) + -rm -f $(DESTDIR)$(man1dir)/gcjh$(man1ext) + -$(INSTALL_DATA) $(srcdir)/java/gcjh.1 $(DESTDIR)$(man1dir)/gcjh$(man1ext) + -chmod a-x $(DESTDIR)$(man1dir)/gcjh$(man1ext) + -rm -f $(DESTDIR)$(man1dir)/jv-scan$(man1ext) + -$(INSTALL_DATA) $(srcdir)/java/jv-scan.1 $(DESTDIR)$(man1dir)/jv-scan$(man1ext) + -chmod a-x $(DESTDIR)$(man1dir)/jv-scan$(man1ext) + -rm -f $(DESTDIR)$(man1dir)/jcf-dump$(man1ext) + -$(INSTALL_DATA) $(srcdir)/java/jcf-dump.1 $(DESTDIR)$(man1dir)/jcf-dump$(man1ext) + -chmod a-x $(DESTDIR)$(man1dir)/jcf-dump$(man1ext) + -rm -f $(DESTDIR)$(man1dir)/gij$(man1ext) + -$(INSTALL_DATA) $(srcdir)/java/gij.1 $(DESTDIR)$(man1dir)/gij$(man1ext) + -chmod a-x $(DESTDIR)$(man1dir)/gij$(man1ext) + -rm -f $(DESTDIR)$(man1dir)/jv-convert$(man1ext) + -$(INSTALL_DATA) $(srcdir)/java/jv-convert.1 $(DESTDIR)$(man1dir)/jv-convert$(man1ext) + -chmod a-x $(DESTDIR)$(man1dir)/jv-convert$(man1ext) + -rm -f $(DESTDIR)$(man1dir)/rmic$(man1ext) + -$(INSTALL_DATA) $(srcdir)/java/rmic.1 $(DESTDIR)$(man1dir)/rmic$(man1ext) + -chmod a-x $(DESTDIR)$(man1dir)/rmic$(man1ext) + -rm -f $(DESTDIR)$(man1dir)/rmiregistry$(man1ext) + -$(INSTALL_DATA) $(srcdir)/java/rmiregistry.1 $(DESTDIR)$(man1dir)/rmiregistry$(man1ext) + -chmod a-x $(DESTDIR)$(man1dir)/rmiregistry$(man1ext) diff --git a/gcc/java/decl.c b/gcc/java/decl.c index 41aea0c28f5..476437ceadf 100644 --- a/gcc/java/decl.c +++ b/gcc/java/decl.c @@ -826,8 +826,10 @@ java_init_decl_processing () 0, NOT_BUILT_IN, NULL, NULL_TREE); DECL_IS_MALLOC (soft_anewarray_node) = 1; + /* There is no endlink here because _Jv_NewMultiArray is a varargs + function. */ t = tree_cons (NULL_TREE, ptr_type_node, - tree_cons (NULL_TREE, int_type_node, endlink)); + tree_cons (NULL_TREE, int_type_node, NULL_TREE)); soft_multianewarray_node = builtin_function ("_Jv_NewMultiArray", build_function_type (ptr_type_node, t), diff --git a/gcc/java/expr.c b/gcc/java/expr.c index 8db2670d0f9..9cf86ae384a 100644 --- a/gcc/java/expr.c +++ b/gcc/java/expr.c @@ -1255,9 +1255,7 @@ build_instanceof (value, type) /* Anything except `null' is an instance of Object. Likewise, if the object is known to be an instance of the class, then we only need to check for `null'. */ - expr = build (COND_EXPR, itype, - value, - boolean_true_node, boolean_false_node); + expr = build (NE_EXPR, itype, value, null_pointer_node); } else if (! TYPE_ARRAY_P (type) && ! TYPE_ARRAY_P (valtype) diff --git a/gcc/java/gcj.texi b/gcc/java/gcj.texi index 3397a423a87..cbc907cd8dc 100644 --- a/gcc/java/gcj.texi +++ b/gcc/java/gcj.texi @@ -2,6 +2,8 @@ @setfilename gcj.info @settitle Guide to GNU gcj +@include gcc-common.texi + @c Note: When reading this manual you'll find lots of strange @c circumlocutions like ``compiler for the Java language''. @c This is necessary due to Sun's restrictions on the use of @@ -11,40 +13,11 @@ @set copyrights-gcj 2001, 2002 @c Versions -@set version-gcc 3.3 -@set which-gcj GCC-@value{version-gcc} - -@macro gcctabopt{body} -@code{\body\} -@end macro - -@ifinfo -@format -@dircategory Programming -@direntry -* Gcj: (gcj). Ahead-of-time compiler for the Java language -@end direntry - -@dircategory Individual utilities -@direntry -* gcjh: (gcj)Invoking gcjh. - Generate header files from Java class files -* jv-scan: (gcj)Invoking jv-scan. - Print information about Java source files -* jcf-dump: (gcj)Invoking jcf-dump. - Print information about Java class files -* gij: (gcj)Invoking gij. GNU interpreter for Java bytecode -* jv-convert: (gcj)Invoking jv-convert. - Convert file from one encoding to another -* rmic: (gcj)Invoking rmic. - Generate stubs for Remote Method Invocation. -* rmiregistry: (gcj)Invoking rmiregistry. - The remote object registry. -@end direntry -@end format +@set which-gcj GCC-@value{version-GCC} +@copying @c man begin COPYRIGHT -Copyright (C) @value{copyrights-gcj} Free Software Foundation, Inc. +Copyright @copyright{} @value{copyrights-gcj} Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.1 or @@ -61,6 +34,8 @@ man page gfdl(7). @c man end @end ignore +@c man begin COPYRIGHT + (a) The FSF's Front-Cover Text is: A GNU Manual @@ -70,6 +45,35 @@ man page gfdl(7). You have freedom to copy and modify this GNU Manual, like GNU software. Copies published by the Free Software Foundation raise funds for GNU development. +@c man end +@end copying + +@ifinfo +@format +@dircategory Programming +@direntry +* Gcj: (gcj). Ahead-of-time compiler for the Java language +@end direntry + +@dircategory Individual utilities +@direntry +* gcjh: (gcj)Invoking gcjh. + Generate header files from Java class files +* jv-scan: (gcj)Invoking jv-scan. + Print information about Java source files +* jcf-dump: (gcj)Invoking jcf-dump. + Print information about Java class files +* gij: (gcj)Invoking gij. GNU interpreter for Java bytecode +* jv-convert: (gcj)Invoking jv-convert. + Convert file from one encoding to another +* rmic: (gcj)Invoking rmic. + Generate stubs for Remote Method Invocation. +* rmiregistry: (gcj)Invoking rmiregistry. + The remote object registry. +@end direntry +@end format + +@insertcopying @end ifinfo @titlepage @@ -78,31 +82,13 @@ man page gfdl(7). @page @vskip 0pt plus 1filll -Copyright @copyright{} @value{copyrights-gcj} Free Software Foundation, Inc. -@sp 2 For the @value{which-gcj} Version* @sp 1 Published by the Free Software Foundation @* 59 Temple Place - Suite 330@* Boston, MA 02111-1307, USA@* @sp 1 -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or -any later version published by the Free Software Foundation; with the -Invariant Sections being ``GNU General Public License'', the Front-Cover -texts being (a) (see below), and with the Back-Cover Texts being (b) -(see below). A copy of the license is included in the section entitled -``GNU Free Documentation License''. - -(a) The FSF's Front-Cover Text is: - - A GNU Manual - -(b) The FSF's Back-Cover Text is: - - You have freedom to copy and modify this GNU Manual, like GNU - software. Copies published by the Free Software Foundation raise - funds for GNU development. +@insertcopying @end titlepage @contents @page @@ -515,14 +501,25 @@ Sometimes the @code{libgcj} implementation of a method or class differs from the JDK implementation. This is not always a bug. Still, if it affects you, it probably makes sense to report it so that we can discuss the appropriate response. + +@item +@command{gcj} does not currently allow for piecemeal replacement of +components within @code{libgcj}. Unfortunately, programmers often want +to use newer versions of certain packages, such as those provided by +the Apache Software Foundation's Jakarta project. This has forced us +to place the @code{org.w3c.dom} and @code{org.xml.sax} packages into +their own libraries, separate from @code{libgcj}. If you intend to +use these classes, you must link them explicitly with +@code{-l-org-w3c-dom} and @code{-l-org-xml-sax}. Future versions of +@command{gcj} may not have this restriction. @end itemize @node Extensions @section Extra features unique to gcj -The main feature of @command{gcj} is that it can compile programs written in -the Java programming language to native code. Most extensions that have been -added are to facilitate this functionality. +The main feature of @command{gcj} is that it can compile programs +written in the Java programming language to native code. Most +extensions that have been added are to facilitate this functionality. @itemize @bullet @item @@ -2154,6 +2151,12 @@ Returned by @code{java.awt.Window.getWarningString()} when the window is The class name used for initializing the default @code{java.awt.Toolkit}. Defaults to @code{gnu.awt.gtk.GtkToolkit}. +@item http.proxyHost +Name of proxy host for http connections. + +@item http.proxyPort +Port number to use when a proxy host is in use. + @end table @node GNU Classpath Properties @@ -2171,6 +2174,15 @@ Enables printing serialization debugging by the @code{java.io.ObjectInput} and @code{java.io.ObjectOutput} classes when set to something else then the empty string. Only used when running a debug build of the library. +@item gnu.classpath.vm.shortname +This is a succint name of the virtual machine. For @code{libgcj}, +this will always be @samp{libgcj}. + +@item gnu.classpath.home.url +A base URL used for finding system property files (e.g., +@file{classpath.security}). By default this is a @samp{file:} URL +pointing to the @file{lib} directory under @samp{java.home}. + @end table @node libgcj Runtime Properties diff --git a/gcc/java/jcf-io.c b/gcc/java/jcf-io.c index 7b0eacacc2f..000a0249318 100644 --- a/gcc/java/jcf-io.c +++ b/gcc/java/jcf-io.c @@ -375,11 +375,10 @@ DEFUN(caching_stat, (filename, buf), /* Unfortunately, scandir is not fully standardized. In particular, the type of the function pointer passed as the third argument sometimes takes a "const struct dirent *" - parameter, and sometimes just a "struct dirent *". We rely - on the ability to interchange these two types of function - pointers. */ + parameter, and sometimes just a "struct dirent *". We cast + to (void *) so that either way it is quietly accepted. */ dent->num_files = scandir (filename, &dent->files, - java_or_class_file, + (void *) java_or_class_file, alphasort); *slot = dent; } diff --git a/gcc/java/jcf-parse.c b/gcc/java/jcf-parse.c index eeb262a4846..030edf30b00 100644 --- a/gcc/java/jcf-parse.c +++ b/gcc/java/jcf-parse.c @@ -1,5 +1,5 @@ /* Parser for Java(TM) .class files. - Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002 + Copyright (C) 1996, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GNU CC. @@ -548,6 +548,10 @@ read_class (name) read_zip_member(current_jcf, current_jcf->zipd, current_jcf->zipd->zipf); jcf_parse (current_jcf); + /* Parsing might change the class, in which case we have to + put it back where we found it. */ + if (current_class != class && icv != NULL_TREE) + TREE_TYPE (icv) = current_class; class = current_class; java_pop_parser_context (0); java_parser_context_restore_global (); diff --git a/gcc/java/jcf-write.c b/gcc/java/jcf-write.c index 47cfd11be8a..1574f5210be 100644 --- a/gcc/java/jcf-write.c +++ b/gcc/java/jcf-write.c @@ -1744,6 +1744,7 @@ generate_bytecode_insns (exp, target, state) else { HOST_WIDE_INT i; + unsigned HOST_WIDE_INT delta; /* Copy the chain of relocs into a sorted array. */ struct jcf_relocation **relocs = (struct jcf_relocation **) xmalloc (sw_state.num_cases * sizeof (struct jcf_relocation *)); @@ -1776,8 +1777,11 @@ generate_bytecode_insns (exp, target, state) handled by the parser. */ } - if (2 * sw_state.num_cases - >= sw_state.max_case - sw_state.min_case) + /* We could have DELTA < 0 if sw_state.min_case is + something like Integer.MIN_VALUE. That is why delta is + unsigned. */ + delta = sw_state.max_case - sw_state.min_case; + if (2 * (unsigned) sw_state.num_cases >= delta) { /* Use tableswitch. */ int index = 0; RESERVE (13 + 4 * (sw_state.max_case - sw_state.min_case + 1)); diff --git a/gcc/java/lang.c b/gcc/java/lang.c index 0d9605c09ff..c4ffd2e2932 100644 --- a/gcc/java/lang.c +++ b/gcc/java/lang.c @@ -76,6 +76,7 @@ static int inline_init_test_initialization PARAMS ((void * *, void *)); static bool java_can_use_bit_fields_p PARAMS ((void)); static int java_dump_tree PARAMS ((void *, tree)); +static void dump_compound_expr PARAMS ((dump_info_p, tree)); #ifndef TARGET_OBJECT_SUFFIX # define TARGET_OBJECT_SUFFIX ".o" diff --git a/gcc/java/lex.c b/gcc/java/lex.c index eecbcff81ce..e648686a3ce 100644 --- a/gcc/java/lex.c +++ b/gcc/java/lex.c @@ -555,23 +555,31 @@ java_read_unicode (lex, unicode_escape_p) while ((c = java_read_char (lex)) == 'u') ; - /* Unget the most recent character as it is not a `u'. */ - if (c == UEOF) - return UEOF; - lex->unget_value = c; - - /* Next should be 4 hex digits, otherwise it's an error. - The hex value is converted into the unicode, pushed into - the Unicode stream. */ - for (shift = 12; shift >= 0; shift -= 4) + shift = 12; + do { - if ((c = java_read_char (lex)) == UEOF) - return UEOF; + if (c == UEOF) + { + java_lex_error ("prematurely terminated \\u sequence", 0); + return UEOF; + } + if (hex_p (c)) unicode |= (unicode_t)(hex_value (c) << shift); else - java_lex_error ("Non hex digit in Unicode escape sequence", 0); + { + java_lex_error ("non-hex digit in \\u sequence", 0); + break; + } + + c = java_read_char (lex); + shift -= 4; } + while (shift >= 0); + + if (c != UEOF) + lex->unget_value = c; + lex->bs_count = 0; *unicode_escape_p = 1; return unicode; @@ -1536,7 +1544,7 @@ java_lex (java_lval) /* Keyword, boolean literal or null literal. */ for (first_unicode = c, all_ascii = 1, ascii_index = 0; - JAVA_PART_CHAR_P (c); c = java_get_unicode ()) + c != UEOF && JAVA_PART_CHAR_P (c); c = java_get_unicode ()) { java_unicode_2_utf8 (c); if (all_ascii && c >= 128) @@ -1546,7 +1554,8 @@ java_lex (java_lval) obstack_1grow (&temporary_obstack, '\0'); string = obstack_finish (&temporary_obstack); - java_unget_unicode (); + if (c != UEOF) + java_unget_unicode (); /* If we have something all ascii, we consider a keyword, a boolean literal, a null literal or an all ASCII identifier. Otherwise, diff --git a/gcc/java/parse.y b/gcc/java/parse.y index d457f1a046d..153928ee7b4 100644 --- a/gcc/java/parse.y +++ b/gcc/java/parse.y @@ -1,6 +1,6 @@ /* Source code parsing and tree node generation for the GNU compiler for the Java(TM) language. - Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Contributed by Alexandre Petit-Bianco (apbianco@cygnus.com) This file is part of GNU CC. @@ -4582,6 +4582,18 @@ method_header (flags, type, mdecl, throws) IDENTIFIER_POINTER (EXPR_WFL_NODE (id))); } + /* A native method can't be strictfp. */ + if ((flags & ACC_NATIVE) && (flags & ACC_STRICT)) + parse_error_context (id, "native method `%s' can't be strictfp", + IDENTIFIER_POINTER (EXPR_WFL_NODE (id))); + /* No such thing as a transient or volatile method. */ + if ((flags & ACC_TRANSIENT)) + parse_error_context (id, "method `%s' can't be transient", + IDENTIFIER_POINTER (EXPR_WFL_NODE (id))); + if ((flags & ACC_VOLATILE)) + parse_error_context (id, "method `%s' can't be volatile", + IDENTIFIER_POINTER (EXPR_WFL_NODE (id))); + /* Things to be checked when declaring a constructor */ if (!type) { @@ -6365,17 +6377,8 @@ java_check_regular_methods (class_decl) if (check_method_redefinition (class, method)) continue; - /* If we see one constructor a mark so we don't generate the - default one. Also skip other verifications: constructors - can't be inherited hence hiden or overriden */ - if (DECL_CONSTRUCTOR_P (method)) - { - saw_constructor = 1; - continue; - } - - /* We verify things thrown by the method. They must inherits from - java.lang.Throwable */ + /* We verify things thrown by the method. They must inherit from + java.lang.Throwable. */ for (mthrows = DECL_FUNCTION_THROWS (method); mthrows; mthrows = TREE_CHAIN (mthrows)) { @@ -6386,6 +6389,15 @@ java_check_regular_methods (class_decl) (DECL_NAME (TYPE_NAME (TREE_VALUE (mthrows))))); } + /* If we see one constructor a mark so we don't generate the + default one. Also skip other verifications: constructors + can't be inherited hence hidden or overridden. */ + if (DECL_CONSTRUCTOR_P (method)) + { + saw_constructor = 1; + continue; + } + sig = build_java_argument_signature (TREE_TYPE (method)); found = lookup_argument_method2 (class, DECL_NAME (method), sig); @@ -10789,7 +10801,11 @@ patch_invoke (patch, method, args) is NULL. */ if (check != NULL_TREE) { - patch = build (COMPOUND_EXPR, TREE_TYPE (patch), check, patch); + /* We have to call force_evaluation_order now because creating a + COMPOUND_EXPR wraps the arg list in a way that makes it + unrecognizable by force_evaluation_order later. Yuk. */ + patch = build (COMPOUND_EXPR, TREE_TYPE (patch), check, + force_evaluation_order (patch)); TREE_SIDE_EFFECTS (patch) = 1; } @@ -12856,6 +12872,43 @@ patch_assignment (node, wfl_op1) DECL_INITIAL (lvalue) = new_rhs; } + /* Copy the rhs if it's a reference. */ + if (! flag_check_references && ! flag_emit_class_files && optimize > 0) + { + switch (TREE_CODE (new_rhs)) + { + case ARRAY_REF: + case INDIRECT_REF: + case COMPONENT_REF: + /* Transform a = foo.bar + into a = { int tmp; tmp = foo.bar; tmp; ). + We need to ensure that if a read from memory fails + because of a NullPointerException, a destination variable + will remain unchanged. An explicit temporary does what + we need. + + If flag_check_references is set, this is unnecessary + because we'll check each reference before doing any + reads. If optimize is not set the result will never be + written to a stack slot that contains the LHS. */ + { + tree tmp = build_decl (VAR_DECL, get_identifier ("<tmp>"), + TREE_TYPE (new_rhs)); + tree block = build (BLOCK, TREE_TYPE (new_rhs), NULL); + tree assignment + = build (MODIFY_EXPR, TREE_TYPE (new_rhs), tmp, fold (new_rhs)); + BLOCK_VARS (block) = tmp; + BLOCK_EXPR_BODY (block) + = build (COMPOUND_EXPR, TREE_TYPE (new_rhs), assignment, tmp); + TREE_SIDE_EFFECTS (block) = 1; + new_rhs = block; + } + break; + default: + break; + } + } + TREE_OPERAND (node, 0) = lvalue; TREE_OPERAND (node, 1) = new_rhs; TREE_TYPE (node) = lhs_type; diff --git a/gcc/jump.c b/gcc/jump.c index ef031f2a8a1..1ddcdc3e973 100644 --- a/gcc/jump.c +++ b/gcc/jump.c @@ -1,6 +1,6 @@ /* Optimize jump instructions, for GNU compiler. Copyright (C) 1987, 1988, 1989, 1991, 1992, 1993, 1994, 1995, 1996, 1997 - 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GCC. @@ -59,6 +59,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA or even change what is live at any point. So perhaps let combiner do it. */ +static rtx next_nonnote_insn_in_loop PARAMS ((rtx)); static int init_label_info PARAMS ((rtx)); static void mark_all_labels PARAMS ((rtx)); static int duplicate_loop_exit_test PARAMS ((rtx)); @@ -119,6 +120,27 @@ cleanup_barriers () } } +/* Return the next insn after INSN that is not a NOTE and is in the loop, + i.e. when there is no such INSN before NOTE_INSN_LOOP_END return NULL_RTX. + This routine does not look inside SEQUENCEs. */ + +static rtx +next_nonnote_insn_in_loop (insn) + rtx insn; +{ + while (insn) + { + insn = NEXT_INSN (insn); + if (insn == 0 || GET_CODE (insn) != NOTE) + break; + if (GET_CODE (insn) == NOTE + && NOTE_LINE_NUMBER (insn) == NOTE_INSN_LOOP_END) + return NULL_RTX; + } + + return insn; +} + void copy_loop_headers (f) rtx f; @@ -137,7 +159,7 @@ copy_loop_headers (f) the values of regno_first_uid and regno_last_uid. */ if (GET_CODE (insn) == NOTE && NOTE_LINE_NUMBER (insn) == NOTE_INSN_LOOP_BEG - && (temp1 = next_nonnote_insn (insn)) != 0 + && (temp1 = next_nonnote_insn_in_loop (insn)) != 0 && any_uncondjump_p (temp1) && onlyjump_p (temp1)) { temp = PREV_INSN (insn); @@ -293,7 +315,8 @@ duplicate_loop_exit_test (loop_start) rtx insn, set, reg, p, link; rtx copy = 0, first_copy = 0; int num_insns = 0; - rtx exitcode = NEXT_INSN (JUMP_LABEL (next_nonnote_insn (loop_start))); + rtx exitcode + = NEXT_INSN (JUMP_LABEL (next_nonnote_insn_in_loop (loop_start))); rtx lastexit; int max_reg = max_reg_num (); rtx *reg_map = 0; diff --git a/gcc/loop.c b/gcc/loop.c index d7abe5ff654..2b4d8577326 100644 --- a/gcc/loop.c +++ b/gcc/loop.c @@ -3277,7 +3277,7 @@ loop_invariant_p (loop, x) These have always been created by the unroller and are set in the loop, hence are never invariant. */ - if (REGNO (x) >= regs->num) + if (REGNO (x) >= (unsigned) regs->num) return 0; if (regs->array[REGNO (x)].set_in_loop < 0) @@ -8624,11 +8624,12 @@ maybe_eliminate_biv (loop, bl, eliminate_p, threshold, insn_count) enum rtx_code code = GET_CODE (p); basic_block where_bb = 0; rtx where_insn = threshold >= insn_count ? 0 : p; + rtx note; /* If this is a libcall that sets a giv, skip ahead to its end. */ if (GET_RTX_CLASS (code) == 'i') { - rtx note = find_reg_note (p, REG_LIBCALL, NULL_RTX); + note = find_reg_note (p, REG_LIBCALL, NULL_RTX); if (note) { @@ -8646,6 +8647,8 @@ maybe_eliminate_biv (loop, bl, eliminate_p, threshold, insn_count) } } } + + /* Closely examine the insn if the biv is mentioned. */ if ((code == INSN || code == JUMP_INSN || code == CALL_INSN) && reg_mentioned_p (reg, PATTERN (p)) && ! maybe_eliminate_biv_1 (loop, PATTERN (p), p, bl, @@ -8657,6 +8660,12 @@ maybe_eliminate_biv (loop, bl, eliminate_p, threshold, insn_count) bl->regno, INSN_UID (p)); break; } + + /* If we are eliminating, kill REG_EQUAL notes mentioning the biv. */ + if (eliminate_p + && (note = find_reg_note (p, REG_EQUAL, NULL_RTX)) != NULL_RTX + && reg_mentioned_p (reg, XEXP (note, 0))) + remove_note (p, note); } if (p == loop->end) diff --git a/gcc/mklibgcc.in b/gcc/mklibgcc.in index 81d2e47f52b..3c3358a7b3a 100644 --- a/gcc/mklibgcc.in +++ b/gcc/mklibgcc.in @@ -1,6 +1,6 @@ #!/bin/sh # Construct makefile for libgcc. -# Copyright (C) 2000, 2002 Free Software Foundation, Inc. +# Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. # # This file is part of GCC. @@ -21,6 +21,8 @@ # LIB2_DIVMOD_FUNCS # DPBIT # DPBIT_FUNCS +# TPBIT +# TPBIT_FUNCS # LIBGCC # MULTILIBS # EXTRA_MULTILIB_PARTS @@ -174,6 +176,21 @@ if [ "$DPBIT" ]; then done fi +if [ "$TPBIT" ]; then + for name in $TPBIT_FUNCS; do + for ml in $MULTILIBS; do + dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'` + flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; + out="libgcc/${dir}/${name}${objext}" + + echo $out: $TPBIT $fpbit_c_dep + echo " $gcc_compile" -DFINE_GRAINED_LIBRARIES $flags -DL$name \ + -c $TPBIT -o $out + done + libgcc2_objs="$libgcc2_objs ${name}${objext}" + done +fi + for file in $LIB2ADD; do name=`echo $file | sed -e 's/[.][cSo]$//' -e 's/[.]asm$//' -e 's/[.]txt$//'` oname=`echo $name | sed -e 's,.*/,,'` @@ -436,10 +453,10 @@ for ml in $MULTILIBS; do dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'` flags=`echo ${ml} | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; if [ $dir != . ]; then - ldir='$(libsubdir)'/$dir + ldir='$(DESTDIR)$(libsubdir)'/$dir echo " if [ -d $ldir ]; then true; else mkdir $ldir; chmod a+rx $ldir; fi;" else - ldir='$(libsubdir)' + ldir='$(DESTDIR)$(libsubdir)' fi echo ' $(INSTALL_DATA)' ${dir}/libgcc.a ${ldir}/ echo ' $(RANLIB_FOR_TARGET)' ${ldir}/libgcc.a @@ -495,10 +512,10 @@ for f in $EXTRA_MULTILIB_PARTS; do dir=`echo ${ml} | sed -e 's/;.*$//' -e 's/=/$(EQ)/g'` if [ $dir != . ]; then out=${dir}/$f - ldir='$(libsubdir)'/$dir + ldir='$(DESTDIR)$(libsubdir)'/$dir else out=$f - ldir='$(libsubdir)' + ldir='$(DESTDIR)$(libsubdir)' fi echo ' $(INSTALL_DATA)' $out $ldir/ done diff --git a/gcc/optabs.c b/gcc/optabs.c index 9da95e1de72..0e204c28a2d 100644 --- a/gcc/optabs.c +++ b/gcc/optabs.c @@ -1,6 +1,6 @@ /* Expand the basic unary and binary arithmetic operations, for GNU compiler. Copyright (C) 1987, 1988, 1992, 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2001 Free Software Foundation, Inc. + 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GCC. @@ -40,6 +40,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "reload.h" #include "ggc.h" #include "real.h" +#include "basic-block.h" /* Each optab contains info on how this target machine can perform a particular operation @@ -1306,6 +1307,8 @@ expand_binop (mode, binoptab, op0, op1, target, unsignedp, methods) copy_rtx (xop0), copy_rtx (xop1))); } + else + target = xtarget; return target; } @@ -3241,10 +3244,26 @@ emit_libcall_block (insns, target, result, equiv) /* Encapsulate the block so it gets manipulated as a unit. */ if (!flag_non_call_exceptions || !may_trap_p (equiv)) { - REG_NOTES (first) = gen_rtx_INSN_LIST (REG_LIBCALL, last, - REG_NOTES (first)); - REG_NOTES (last) = gen_rtx_INSN_LIST (REG_RETVAL, first, - REG_NOTES (last)); + /* We can't attach the REG_LIBCALL and REG_RETVAL notes + when the encapsulated region would not be in one basic block, + i.e. when there is a control_flow_insn_p insn between FIRST and LAST. + */ + bool attach_libcall_retval_notes = true; + next = NEXT_INSN (last); + for (insn = first; insn != next; insn = NEXT_INSN (insn)) + if (control_flow_insn_p (insn)) + { + attach_libcall_retval_notes = false; + break; + } + + if (attach_libcall_retval_notes) + { + REG_NOTES (first) = gen_rtx_INSN_LIST (REG_LIBCALL, last, + REG_NOTES (first)); + REG_NOTES (last) = gen_rtx_INSN_LIST (REG_RETVAL, first, + REG_NOTES (last)); + } } } diff --git a/gcc/po/ChangeLog b/gcc/po/ChangeLog index 9c901b49cc0..edaf5520be0 100644 --- a/gcc/po/ChangeLog +++ b/gcc/po/ChangeLog @@ -1,3 +1,7 @@ +2002-12-30 Joseph S. Myers <jsm@polyomino.org.uk> + + * gcc.pot: Regenerate. + 2002-05-16 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> * exgettext: Allow for PWDCMD to override hardcoded pwd. diff --git a/gcc/po/gcc.pot b/gcc/po/gcc.pot index fd7713d79c6..81002a2cfd9 100644 --- a/gcc/po/gcc.pot +++ b/gcc/po/gcc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-04-23 14:22+0200\n" +"POT-Creation-Date: 2002-12-30 18:56+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -15,140 +15,55 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: attribs.c:307 +#: attribs.c:185 #, c-format msgid "`%s' attribute directive ignored" msgstr "" -#: attribs.c:315 +#: attribs.c:193 #, c-format msgid "wrong number of arguments specified for `%s' attribute" msgstr "" -#: attribs.c:332 +#: attribs.c:210 #, c-format msgid "`%s' attribute does not apply to types" msgstr "" -#: attribs.c:369 +#: attribs.c:247 #, c-format msgid "`%s' attribute only applies to function types" msgstr "" -#: attribs.c:461 attribs.c:483 attribs.c:505 attribs.c:536 attribs.c:558 -#: attribs.c:583 attribs.c:606 attribs.c:636 attribs.c:674 attribs.c:721 -#: attribs.c:751 attribs.c:781 attribs.c:804 attribs.c:1049 attribs.c:1071 -#: attribs.c:1147 attribs.c:1203 attribs.c:1264 attribs.c:1298 attribs.c:1549 -#: config/arm/arm.c:2007 config/arm/arm.c:2034 config/avr/avr.c:4683 -#: config/h8300/h8300.c:3407 config/h8300/h8300.c:3432 config/i386/i386.c:1268 -#: config/i386/winnt.c:74 +#: attribs.c:404 c-common.c:5253 c-common.c:5275 c-common.c:5297 +#: c-common.c:5328 c-common.c:5350 c-common.c:5375 c-common.c:5398 +#: c-common.c:5428 c-common.c:5466 c-common.c:5513 c-common.c:5543 +#: c-common.c:5573 c-common.c:5596 c-common.c:5853 c-common.c:5875 +#: c-common.c:5918 c-common.c:5995 c-common.c:6051 c-common.c:6112 +#: c-common.c:6146 c-common.c:6500 config/arm/arm.c:2098 config/arm/arm.c:2125 +#: config/avr/avr.c:4774 config/h8300/h8300.c:3649 config/h8300/h8300.c:3674 +#: config/i386/i386.c:1396 config/i386/winnt.c:76 #, c-format msgid "`%s' attribute ignored" msgstr "" -#: attribs.c:837 -#, c-format -msgid "unknown machine mode `%s'" -msgstr "" - -#: attribs.c:840 -#, c-format -msgid "no data type for mode `%s'" -msgstr "" - -#: attribs.c:873 -msgid "section attribute cannot be specified for local variables" -msgstr "" - -#: attribs.c:884 -#, c-format -msgid "section of `%s' conflicts with previous declaration" -msgstr "" - -#: attribs.c:893 -#, c-format -msgid "section attribute not allowed for `%s'" -msgstr "" - -#: attribs.c:900 -msgid "section attributes are not supported for this target" -msgstr "" - -#: attribs.c:942 -msgid "requested alignment is not a constant" -msgstr "" - -#: attribs.c:947 -msgid "requested alignment is not a power of 2" -msgstr "" - -#: attribs.c:952 -msgid "requested alignment is too large" -msgstr "" - -#: attribs.c:979 -#, c-format -msgid "alignment may not be specified for `%s'" -msgstr "" - -#: attribs.c:1024 -#, c-format -msgid "`%s' defined both normally and as an alias" -msgstr "" - -#: attribs.c:1034 -msgid "alias arg not a string" -msgstr "" - -#: attribs.c:1081 -msgid "visibility arg not a string" -msgstr "" - -#: attribs.c:1089 -msgid "visibility arg must be one of \"hidden\", \"protected\" or \"internal\"" -msgstr "" - -#: attribs.c:1114 attribs.c:1170 -#, c-format -msgid "`%s' attribute applies only to functions" -msgstr "" - -#: attribs.c:1121 attribs.c:1177 -#, c-format -msgid "can't set `%s' attribute after definition" -msgstr "" - -#: attribs.c:1261 -#, c-format -msgid "`%s' attribute ignored for `%s'" -msgstr "" - -#: attribs.c:1326 -#, c-format -msgid "invalid vector type for attribute `%s'" -msgstr "" - -#: attribs.c:1350 attribs.c:1382 -msgid "no vector mode with the size and type specified could be found" -msgstr "" - -#: builtins.c:281 +#: builtins.c:285 msgid "offset outside bounds of constant string" msgstr "" -#: builtins.c:761 +#: builtins.c:765 msgid "second arg to `__builtin_prefetch' must be a constant" msgstr "" -#: builtins.c:768 +#: builtins.c:772 msgid "invalid second arg to __builtin_prefetch; using zero" msgstr "" -#: builtins.c:775 +#: builtins.c:779 msgid "third arg to `__builtin_prefetch' must be a constant" msgstr "" -#: builtins.c:782 +#: builtins.c:786 msgid "invalid third arg to __builtin_prefetch; using zero" msgstr "" @@ -159,1297 +74,1449 @@ msgstr "" #. port (i860) that used this code, and I'm unconvinced it could actually #. handle the general case. So we no longer try to handle anything #. weird and make the backend absorb the evil. -#: builtins.c:2764 +#: builtins.c:2864 msgid "__builtin_saveregs not supported by this target" msgstr "" -#: builtins.c:2806 +#: builtins.c:2906 msgid "argument of `__builtin_args_info' must be constant" msgstr "" -#: builtins.c:2812 +#: builtins.c:2912 msgid "argument of `__builtin_args_info' out of range" msgstr "" -#: builtins.c:2818 +#: builtins.c:2918 msgid "missing argument in `__builtin_args_info'" msgstr "" -#: builtins.c:2850 +#: builtins.c:2949 msgid "`va_start' used in function with fixed args" msgstr "" -#: builtins.c:2869 +#: builtins.c:2968 msgid "second parameter of `va_start' not last named argument" msgstr "" #. Evidently an out of date version of <stdarg.h>; can't validate #. va_start's second argument, but can still work as intended. -#: builtins.c:2874 +#: builtins.c:2973 msgid "`__builtin_next_arg' called without an argument" msgstr "" -#: builtins.c:2978 +#: builtins.c:3059 msgid "too many arguments to function `va_start'" msgstr "" -#: builtins.c:3079 +#: builtins.c:3161 msgid "first argument to `va_arg' not of type `va_list'" msgstr "" #. Unfortunately, this is merely undefined, rather than a constraint #. violation, so we cannot make this an error. If this call is never #. executed, the program is still strictly conforming. -#: builtins.c:3111 +#: builtins.c:3193 #, c-format msgid "`%s' is promoted to `%s' when passed through `...'" msgstr "" -#: builtins.c:3116 +#: builtins.c:3198 #, c-format msgid "(so you should pass `%s' not `%s' to `va_arg')" msgstr "" -#: builtins.c:3247 +#: builtins.c:3329 msgid "invalid arg to `__builtin_frame_address'" msgstr "" -#: builtins.c:3249 +#: builtins.c:3331 msgid "invalid arg to `__builtin_return_address'" msgstr "" -#: builtins.c:3263 +#: builtins.c:3345 msgid "unsupported arg to `__builtin_frame_address'" msgstr "" -#: builtins.c:3265 +#: builtins.c:3347 msgid "unsupported arg to `__builtin_return_address'" msgstr "" -#: builtins.c:3433 +#: builtins.c:3515 msgid "second arg to `__builtin_expect' must be a constant" msgstr "" -#: builtins.c:3914 +#: builtins.c:4010 msgid "__builtin_longjmp second argument must be 1" msgstr "" #. just do library call, if unknown builtin -#: builtins.c:3987 c-common.c:3829 +#: builtins.c:4074 c-common.c:4437 #, c-format msgid "built-in function `%s' not currently supported" msgstr "" -#: c-common.c:554 -#, c-format -msgid "`%s' is not defined outside of function scope" +#: builtins.c:4147 +msgid "target format does not support infinity" msgstr "" -#: c-common.c:594 -msgid "" -"concatenation of string literals with __FUNCTION__ is deprecated. This " -"feature will be removed in future" +#: c-common.c:1163 +#, c-format +msgid "`%s' is not defined outside of function scope" msgstr "" -#: c-common.c:663 +#: c-common.c:1184 #, c-format msgid "" "string length `%d' is greater than the length `%d' ISO C%d compilers are " "required to support" msgstr "" -#: c-common.c:711 +#: c-common.c:1242 +msgid "concatenation of string literals with __FUNCTION__ is deprecated" +msgstr "" + +#: c-common.c:1338 msgid "overflow in constant expression" msgstr "" -#: c-common.c:732 +#: c-common.c:1359 msgid "integer overflow in expression" msgstr "" -#: c-common.c:741 +#: c-common.c:1368 msgid "floating point overflow in expression" msgstr "" -#: c-common.c:747 +#: c-common.c:1374 msgid "vector overflow in expression" msgstr "" #. This detects cases like converting -129 or 256 to unsigned char. -#: c-common.c:770 +#: c-common.c:1397 msgid "large integer implicitly truncated to unsigned type" msgstr "" -#: c-common.c:772 +#: c-common.c:1399 msgid "negative integer implicitly converted to unsigned type" msgstr "" -#: c-common.c:820 +#: c-common.c:1447 msgid "overflow in implicit constant conversion" msgstr "" -#: c-common.c:968 +#: c-common.c:1595 #, c-format msgid "operation on `%s' may be undefined" msgstr "" -#: c-common.c:1259 +#: c-common.c:1886 msgid "expression statement has incomplete type" msgstr "" -#: c-common.c:1292 +#: c-common.c:1919 msgid "case label does not reduce to an integer constant" msgstr "" -#: c-common.c:1593 +#: c-common.c:2223 msgid "invalid truth-value expression" msgstr "" -#: c-common.c:1644 +#: c-common.c:2274 #, c-format msgid "invalid operands to binary %s" msgstr "" -#: c-common.c:1880 c-common.c:1889 +#: c-common.c:2508 msgid "comparison is always false due to limited range of data type" msgstr "" -#: c-common.c:1882 c-common.c:1891 +#: c-common.c:2510 msgid "comparison is always true due to limited range of data type" msgstr "" -#: c-common.c:1961 +#: c-common.c:2580 msgid "comparison of unsigned expression >= 0 is always true" msgstr "" -#: c-common.c:1970 +#: c-common.c:2589 msgid "comparison of unsigned expression < 0 is always false" msgstr "" -#: c-common.c:2017 +#: c-common.c:2636 msgid "pointer of type `void *' used in arithmetic" msgstr "" -#: c-common.c:2023 +#: c-common.c:2642 msgid "pointer to a function used in arithmetic" msgstr "" -#: c-common.c:2029 +#: c-common.c:2648 msgid "pointer to member function used in arithmetic" msgstr "" -#: c-common.c:2035 +#: c-common.c:2654 msgid "pointer to a member used in arithmetic" msgstr "" -#: c-common.c:2122 f/com.c:14845 +#: c-common.c:2741 f/com.c:14690 msgid "struct type value used where scalar is required" msgstr "" -#: c-common.c:2126 f/com.c:14849 +#: c-common.c:2745 f/com.c:14694 msgid "union type value used where scalar is required" msgstr "" -#: c-common.c:2130 f/com.c:14853 +#: c-common.c:2749 f/com.c:14698 msgid "array type value used where scalar is required" msgstr "" -#: c-common.c:2250 f/com.c:14979 +#: c-common.c:2869 f/com.c:14831 msgid "suggest parentheses around assignment used as truth value" msgstr "" -#: c-common.c:2294 c-common.c:2326 +#: c-common.c:2913 c-common.c:2945 msgid "invalid use of `restrict'" msgstr "" -#: c-common.c:2441 -msgid "__alignof__ applied to an incomplete type" +#: c-common.c:3059 +msgid "invalid application of `sizeof' to a function type" +msgstr "" + +#: c-common.c:3069 +#, c-format +msgid "invalid application of `%s' to a void type" +msgstr "" + +#: c-common.c:3075 +#, c-format +msgid "invalid application of `%s' to an incomplete type" msgstr "" -#: c-common.c:2467 +#: c-common.c:3116 msgid "`__alignof' applied to a bit-field" msgstr "" -#: c-common.c:2960 +#: c-common.c:3596 #, c-format msgid "cannot disable built-in function `%s'" msgstr "" -#: c-common.c:3137 c-typeck.c:1794 +#: c-common.c:3765 c-typeck.c:1734 #, c-format msgid "too few arguments to function `%s'" msgstr "" -#: c-common.c:3143 c-typeck.c:1647 +#: c-common.c:3771 c-typeck.c:1587 #, c-format msgid "too many arguments to function `%s'" msgstr "" -#: c-common.c:3162 +#: c-common.c:3790 #, c-format msgid "non-floating-point argument to function `%s'" msgstr "" -#: c-common.c:3431 +#: c-common.c:4059 msgid "pointers are not permitted as case values" msgstr "" -#: c-common.c:3437 +#: c-common.c:4065 msgid "ISO C++ forbids range expressions in switch statements" msgstr "" -#: c-common.c:3439 +#: c-common.c:4067 msgid "ISO C forbids range expressions in switch statements" msgstr "" -#: c-common.c:3469 +#: c-common.c:4097 msgid "empty range specified" msgstr "" -#: c-common.c:3520 +#: c-common.c:4148 msgid "duplicate (or overlapping) case value" msgstr "" -#: c-common.c:3522 +#: c-common.c:4150 msgid "this is the first entry overlapping that value" msgstr "" -#: c-common.c:3526 +#: c-common.c:4154 msgid "duplicate case value" msgstr "" -#: c-common.c:3527 +#: c-common.c:4155 msgid "previously used here" msgstr "" -#: c-common.c:3531 +#: c-common.c:4159 msgid "multiple default labels in one switch" msgstr "" -#: c-common.c:3532 +#: c-common.c:4160 msgid "this is the first default label" msgstr "" -#: c-common.c:3560 +#: c-common.c:4188 msgid "ISO C++ forbids taking the address of a label" msgstr "" -#: c-common.c:3562 +#: c-common.c:4190 msgid "ISO C forbids taking the address of a label" msgstr "" -#: c-common.c:4166 -msgid "-Wformat-y2k ignored without -Wformat" +#: c-common.c:5213 +#, c-format +msgid "declaration of `%s' shadows %s" msgstr "" -#: c-common.c:4168 -msgid "-Wformat-extra-args ignored without -Wformat" +#: c-common.c:5629 +#, c-format +msgid "unknown machine mode `%s'" msgstr "" -#: c-common.c:4170 -msgid "-Wformat-nonliteral ignored without -Wformat" +#: c-common.c:5632 +#, c-format +msgid "no data type for mode `%s'" msgstr "" -#: c-common.c:4172 -msgid "-Wformat-security ignored without -Wformat" +#: c-common.c:5641 c-common.c:6242 +#, c-format +msgid "unable to emulate '%s'" msgstr "" -#: c-common.c:4174 -msgid "-Wmissing-format-attribute ignored without -Wformat" +#: c-common.c:5677 +msgid "section attribute cannot be specified for local variables" msgstr "" -#: c-common.c:4272 +#: c-common.c:5688 #, c-format -msgid "declaration of `%s' shadows %s" +msgid "section of `%s' conflicts with previous declaration" msgstr "" -#: c-convert.c:80 c-typeck.c:1048 c-typeck.c:4049 cp/typeck.c:1675 -#: cp/typeck.c:6176 -msgid "void value not ignored as it ought to be" +#: c-common.c:5697 +#, c-format +msgid "section attribute not allowed for `%s'" msgstr "" -#: c-convert.c:112 java/typeck.c:150 -msgid "conversion to non-scalar type requested" +#: c-common.c:5704 +msgid "section attributes are not supported for this target" +msgstr "" + +#: c-common.c:5746 +msgid "requested alignment is not a constant" +msgstr "" + +#: c-common.c:5751 +msgid "requested alignment is not a power of 2" msgstr "" -#: c-decl.c:587 +#: c-common.c:5756 +msgid "requested alignment is too large" +msgstr "" + +#: c-common.c:5783 #, c-format -msgid "unknown C standard `%s'" +msgid "alignment may not be specified for `%s'" +msgstr "" + +#: c-common.c:5828 +#, c-format +msgid "`%s' defined both normally and as an alias" +msgstr "" + +#: c-common.c:5838 +msgid "alias arg not a string" +msgstr "" + +#: c-common.c:5885 +msgid "visibility arg not a string" +msgstr "" + +#: c-common.c:5894 +msgid "" +"visibility arg must be one of \"default\", \"hidden\", \"protected\" or " +"\"internal\"" +msgstr "" + +#: c-common.c:5928 +msgid "tls_model arg not a string" +msgstr "" + +#: c-common.c:5937 +msgid "" +"tls_model arg must be one of \"local-exec\", \"initial-exec\", \"local-" +"dynamic\" or \"global-dynamic\"" +msgstr "" + +#: c-common.c:5962 c-common.c:6018 +#, c-format +msgid "`%s' attribute applies only to functions" +msgstr "" + +#: c-common.c:5969 c-common.c:6025 +#, c-format +msgid "can't set `%s' attribute after definition" +msgstr "" + +#: c-common.c:6109 +#, c-format +msgid "`%s' attribute ignored for `%s'" msgstr "" -#: c-decl.c:748 +#: c-common.c:6174 +#, c-format +msgid "invalid vector type for attribute `%s'" +msgstr "" + +#: c-common.c:6198 c-common.c:6230 +msgid "no vector mode with the size and type specified could be found" +msgstr "" + +#: c-common.c:6329 +msgid "nonnull attribute without arguments on a non-prototype" +msgstr "" + +#: c-common.c:6344 +#, c-format +msgid "nonnull argument has invalid operand number (arg %lu)" +msgstr "" + +#: c-common.c:6363 +#, c-format +msgid "" +"nonnull argument with out-of-range operand number (arg %lu, operand %lu)" +msgstr "" + +#: c-common.c:6371 +#, c-format +msgid "nonnull argument references non-pointer operand (arg %lu, operand %lu)" +msgstr "" + +#: c-common.c:6457 +#, c-format +msgid "null argument where non-null required (arg %lu)" +msgstr "" + +#: c-convert.c:80 c-typeck.c:988 c-typeck.c:4045 cp/typeck.c:1617 +#: cp/typeck.c:5855 +msgid "void value not ignored as it ought to be" +msgstr "" + +#: c-convert.c:112 java/typeck.c:150 +msgid "conversion to non-scalar type requested" +msgstr "" + +#: c-decl.c:336 #, c-format msgid "array `%s' assumed to have one element" msgstr "" -#: c-decl.c:924 +#: c-decl.c:522 #, c-format msgid "`struct %s' incomplete in scope ending here" msgstr "" -#: c-decl.c:927 +#: c-decl.c:525 #, c-format msgid "`union %s' incomplete in scope ending here" msgstr "" -#: c-decl.c:930 +#: c-decl.c:528 #, c-format msgid "`enum %s' incomplete in scope ending here" msgstr "" -#: c-decl.c:1044 c-decl.c:1185 java/decl.c:1371 +#: c-decl.c:642 c-decl.c:767 java/decl.c:1399 #, c-format msgid "label `%s' used but not defined" msgstr "" -#: c-decl.c:1050 c-decl.c:1192 java/decl.c:1377 +#: c-decl.c:648 c-decl.c:774 java/decl.c:1405 #, c-format msgid "label `%s' defined but not used" msgstr "" -#: c-decl.c:1309 cp/decl.c:3125 +#: c-decl.c:889 cp/decl.c:3058 #, c-format msgid "function `%s' redeclared as inline" msgstr "" -#: c-decl.c:1311 cp/decl.c:3127 +#: c-decl.c:891 cp/decl.c:3060 #, c-format msgid "previous declaration of function `%s' with attribute noinline" msgstr "" -#: c-decl.c:1318 cp/decl.c:3134 +#: c-decl.c:898 cp/decl.c:3067 #, c-format msgid "function `%s' redeclared with attribute noinline" msgstr "" -#: c-decl.c:1320 cp/decl.c:3136 +#: c-decl.c:900 cp/decl.c:3069 #, c-format msgid "previous declaration of function `%s' was inline" msgstr "" -#: c-decl.c:1349 c-decl.c:1395 +#: c-decl.c:929 c-decl.c:975 #, c-format msgid "shadowing built-in function `%s'" msgstr "" -#: c-decl.c:1351 +#: c-decl.c:931 #, c-format msgid "shadowing library function `%s'" msgstr "" -#: c-decl.c:1357 +#: c-decl.c:937 #, c-format msgid "library function `%s' declared as non-function" msgstr "" -#: c-decl.c:1361 c-decl.c:1364 +#: c-decl.c:941 c-decl.c:944 #, c-format msgid "built-in function `%s' declared as non-function" msgstr "" -#: c-decl.c:1368 objc/objc-act.c:2292 objc/objc-act.c:5994 +#: c-decl.c:948 objc/objc-act.c:2384 objc/objc-act.c:6154 #, c-format msgid "`%s' redeclared as different kind of symbol" msgstr "" -#: c-decl.c:1369 c-decl.c:1560 c-decl.c:1705 objc/objc-act.c:2294 -#: objc/objc-act.c:5996 objc/objc-act.c:6051 +#: c-decl.c:949 c-decl.c:1140 c-decl.c:1147 c-decl.c:1154 c-decl.c:1299 +#: objc/objc-act.c:2386 objc/objc-act.c:6156 objc/objc-act.c:6211 #, c-format msgid "previous declaration of `%s'" msgstr "" #. If types don't match for a built-in, throw away the built-in. -#: c-decl.c:1464 +#: c-decl.c:1044 #, c-format msgid "conflicting types for built-in function `%s'" msgstr "" -#: c-decl.c:1507 c-decl.c:1526 +#: c-decl.c:1087 c-decl.c:1106 #, c-format msgid "conflicting types for `%s'" msgstr "" -#: c-decl.c:1549 +#: c-decl.c:1129 msgid "" "a parameter list with an ellipsis can't match an empty parameter name list " "declaration" msgstr "" -#: c-decl.c:1555 +#: c-decl.c:1135 msgid "" "an argument type that has a default promotion can't match an empty parameter " "name list declaration" msgstr "" -#: c-decl.c:1570 c-decl.c:1593 +#: c-decl.c:1146 +#, c-format +msgid "thread-local declaration of `%s' follows non thread-local declaration" +msgstr "" + +#: c-decl.c:1153 +#, c-format +msgid "non thread-local declaration of `%s' follows thread-local declaration" +msgstr "" + +#: c-decl.c:1164 c-decl.c:1187 #, c-format msgid "redefinition of `%s'" msgstr "" -#: c-decl.c:1573 +#: c-decl.c:1167 #, c-format msgid "redeclaration of `%s'" msgstr "" -#: c-decl.c:1576 +#: c-decl.c:1170 #, c-format msgid "conflicting declarations of `%s'" msgstr "" -#: c-decl.c:1620 +#: c-decl.c:1214 #, c-format msgid "prototype for `%s' follows" msgstr "" -#: c-decl.c:1621 c-decl.c:1629 c-decl.c:1640 +#: c-decl.c:1215 c-decl.c:1223 c-decl.c:1234 msgid "non-prototype definition here" msgstr "" -#: c-decl.c:1628 +#: c-decl.c:1222 #, c-format msgid "prototype for `%s' follows and number of arguments doesn't match" msgstr "" -#: c-decl.c:1638 +#: c-decl.c:1232 #, c-format msgid "prototype for `%s' follows and argument %d doesn't match" msgstr "" -#: c-decl.c:1656 +#: c-decl.c:1250 #, c-format msgid "`%s' declared inline after being called" msgstr "" -#: c-decl.c:1662 +#: c-decl.c:1256 #, c-format msgid "`%s' declared inline after its definition" msgstr "" -#: c-decl.c:1669 +#: c-decl.c:1263 #, c-format msgid "static declaration for `%s' follows non-static" msgstr "" -#: c-decl.c:1677 +#: c-decl.c:1271 #, c-format msgid "non-static declaration for `%s' follows static" msgstr "" -#: c-decl.c:1684 +#: c-decl.c:1278 #, c-format msgid "const declaration for `%s' follows non-const" msgstr "" -#: c-decl.c:1691 +#: c-decl.c:1285 #, c-format msgid "type qualifiers for `%s' conflict with previous decl" msgstr "" -#: c-decl.c:1704 +#: c-decl.c:1298 #, c-format msgid "redundant redeclaration of `%s' in same scope" msgstr "" -#: c-decl.c:2008 java/decl.c:1070 +#: c-decl.c:1599 java/decl.c:1098 #, c-format msgid "declaration of `%s' shadows a parameter" msgstr "" -#: c-decl.c:2011 java/decl.c:1073 +#: c-decl.c:1602 java/decl.c:1101 #, c-format msgid "declaration of `%s' shadows a symbol from the parameter list" msgstr "" -#: c-decl.c:2032 cp/decl.c:4233 +#: c-decl.c:1623 cp/decl.c:4176 msgid "a parameter" msgstr "" -#: c-decl.c:2034 cp/decl.c:4250 +#: c-decl.c:1625 cp/decl.c:4193 msgid "a previous local" msgstr "" #. XXX shadow warnings in outer-more namespaces -#: c-decl.c:2038 cp/decl.c:4254 +#: c-decl.c:1629 cp/decl.c:4197 msgid "a global declaration" msgstr "" -#: c-decl.c:2082 +#: c-decl.c:1673 #, c-format msgid "nested extern declaration of `%s'" msgstr "" -#: c-decl.c:2101 java/decl.c:1023 +#: c-decl.c:1692 java/decl.c:1051 #, c-format msgid "`%s' used prior to declaration" msgstr "" -#: c-decl.c:2115 c-decl.c:2290 +#: c-decl.c:1706 c-decl.c:1881 #, c-format msgid "`%s' was declared implicitly `extern' and later `static'" msgstr "" -#: c-decl.c:2218 cp/decl.c:4092 +#: c-decl.c:1809 cp/decl.c:4035 msgid "type mismatch with previous external decl" msgstr "" -#: c-decl.c:2219 +#: c-decl.c:1810 #, c-format msgid "previous external decl of `%s'" msgstr "" -#: c-decl.c:2232 +#: c-decl.c:1823 msgid "type mismatch with previous implicit declaration" msgstr "" -#: c-decl.c:2234 +#: c-decl.c:1825 #, c-format msgid "previous implicit declaration of `%s'" msgstr "" -#: c-decl.c:2269 +#: c-decl.c:1860 #, c-format msgid "`%s' was previously implicitly declared to return `int'" msgstr "" -#: c-decl.c:2294 +#: c-decl.c:1885 #, c-format msgid "`%s' was declared `extern' and later `static'" msgstr "" -#: c-decl.c:2318 +#: c-decl.c:1909 #, c-format msgid "extern declaration of `%s' doesn't match global one" msgstr "" -#: c-decl.c:2360 +#: c-decl.c:1951 #, c-format msgid "`%s' locally external but globally static" msgstr "" -#: c-decl.c:2481 +#: c-decl.c:2073 #, c-format msgid "function `%s' was previously declared within a block" msgstr "" -#: c-decl.c:2501 c-decl.c:2503 +#: c-decl.c:2093 c-decl.c:2095 #, c-format msgid "implicit declaration of function `%s'" msgstr "" -#: c-decl.c:2582 +#: c-decl.c:2174 #, c-format msgid "label %s referenced outside of any function" msgstr "" -#: c-decl.c:2639 +#: c-decl.c:2231 #, c-format msgid "duplicate label declaration `%s'" msgstr "" -#: c-decl.c:2642 +#: c-decl.c:2234 msgid "this is a previous declaration" msgstr "" -#: c-decl.c:3098 +#: c-decl.c:2657 msgid "unnamed struct/union that defines no instances" msgstr "" -#: c-decl.c:3117 +#: c-decl.c:2676 msgid "useless keyword or type name in empty declaration" msgstr "" -#: c-decl.c:3124 +#: c-decl.c:2683 msgid "two types specified in one empty declaration" msgstr "" -#: c-decl.c:3129 c-parse.y:731 c-parse.y:733 parse.y:739 parse.y:1824 -#: objc-parse.y:768 objc-parse.y:770 objc-parse.y:3002 +#: c-decl.c:2688 c-parse.y:753 c-parse.y:755 parse.y:765 parse.y:1835 +#: objc-parse.y:800 objc-parse.y:802 objc-parse.y:3043 msgid "empty declaration" msgstr "" -#: c-decl.c:3159 +#: c-decl.c:2718 msgid "" -"ISO C89 does not support `static' or type qualifiers in parameter array " +"ISO C90 does not support `static' or type qualifiers in parameter array " "declarators" msgstr "" -#: c-decl.c:3161 -msgid "ISO C89 does not support `[*]' array declarators" +#: c-decl.c:2720 +msgid "ISO C90 does not support `[*]' array declarators" msgstr "" -#: c-decl.c:3164 +#: c-decl.c:2723 msgid "GCC does not yet properly implement `[*]' array declarators" msgstr "" -#: c-decl.c:3183 +#: c-decl.c:2742 msgid "static or type qualifiers in abstract declarator" msgstr "" -#: c-decl.c:3257 +#: c-decl.c:2816 #, c-format msgid "`%s' is usually a function" msgstr "" -#: c-decl.c:3271 +#: c-decl.c:2825 #, c-format -msgid "typedef `%s' is initialized" +msgid "typedef `%s' is initialized (use __typeof__ instead)" msgstr "" -#: c-decl.c:3278 +#: c-decl.c:2831 #, c-format msgid "function `%s' is initialized like a variable" msgstr "" #. DECL_INITIAL in a PARM_DECL is really DECL_ARG_TYPE. -#: c-decl.c:3285 +#: c-decl.c:2838 #, c-format msgid "parameter `%s' is initialized" msgstr "" -#: c-decl.c:3305 c-typeck.c:4846 +#: c-decl.c:2858 c-typeck.c:4854 msgid "variable-sized object may not be initialized" msgstr "" -#: c-decl.c:3311 +#: c-decl.c:2864 #, c-format msgid "variable `%s' has initializer but incomplete type" msgstr "" -#: c-decl.c:3317 +#: c-decl.c:2870 #, c-format msgid "elements of array `%s' have incomplete type" msgstr "" -#: c-decl.c:3330 +#: c-decl.c:2883 #, c-format msgid "declaration of `%s' has `extern' and is initialized" msgstr "" -#: c-decl.c:3369 c-decl.c:5999 cp/decl.c:7359 cp/decl.c:13616 +#: c-decl.c:2932 c-decl.c:5694 cp/decl.c:7353 cp/decl.c:13860 #, c-format msgid "inline function `%s' given attribute noinline" msgstr "" -#: c-decl.c:3452 +#: c-decl.c:3006 #, c-format msgid "initializer fails to determine size of `%s'" msgstr "" -#: c-decl.c:3457 +#: c-decl.c:3011 #, c-format msgid "array size missing in `%s'" msgstr "" -#: c-decl.c:3473 +#: c-decl.c:3027 #, c-format msgid "zero or negative size array `%s'" msgstr "" -#: c-decl.c:3501 +#: c-decl.c:3055 #, c-format msgid "storage size of `%s' isn't known" msgstr "" -#: c-decl.c:3511 +#: c-decl.c:3065 #, c-format msgid "storage size of `%s' isn't constant" msgstr "" -#: c-decl.c:3570 +#: c-decl.c:3125 #, c-format msgid "ignoring asm-specifier for non-static local variable `%s'" msgstr "" -#: c-decl.c:3634 +#: c-decl.c:3190 #, c-format msgid "ISO C forbids parameter `%s' shadowing typedef" msgstr "" -#: c-decl.c:3938 cp/decl.c:10164 +#: c-decl.c:3535 cp/decl.c:10433 msgid "`long long long' is too long for GCC" msgstr "" -#: c-decl.c:3943 -msgid "ISO C89 does not support `long long'" +#: c-decl.c:3540 +msgid "ISO C90 does not support `long long'" msgstr "" -#: c-decl.c:3948 cp/decl.c:10169 +#: c-decl.c:3549 c-decl.c:3552 cp/decl.c:10438 #, c-format msgid "duplicate `%s'" msgstr "" -#: c-decl.c:3954 cp/decl.c:10193 +#: c-decl.c:3562 cp/decl.c:10445 +msgid "`__thread' before `extern'" +msgstr "" + +#: c-decl.c:3564 cp/decl.c:10447 +msgid "`__thread' before `static'" +msgstr "" + +#: c-decl.c:3572 cp/decl.c:10474 #, c-format msgid "two or more data types in declaration of `%s'" msgstr "" -#: c-decl.c:3974 cp/decl.c:10198 +#: c-decl.c:3592 cp/decl.c:10479 #, c-format msgid "`%s' fails to be a typedef or built in type" msgstr "" -#: c-decl.c:4013 +#: c-decl.c:3631 #, c-format msgid "type defaults to `int' in declaration of `%s'" msgstr "" -#: c-decl.c:4042 +#: c-decl.c:3660 #, c-format msgid "both long and short specified for `%s'" msgstr "" -#: c-decl.c:4046 cp/decl.c:10313 +#: c-decl.c:3664 cp/decl.c:10594 #, c-format msgid "long or short specified with char for `%s'" msgstr "" -#: c-decl.c:4053 cp/decl.c:10317 +#: c-decl.c:3671 cp/decl.c:10598 #, c-format msgid "long or short specified with floating type for `%s'" msgstr "" -#: c-decl.c:4056 +#: c-decl.c:3674 msgid "the only valid combination is `long double'" msgstr "" -#: c-decl.c:4062 +#: c-decl.c:3680 #, c-format msgid "both signed and unsigned specified for `%s'" msgstr "" -#: c-decl.c:4064 cp/decl.c:10306 +#: c-decl.c:3682 cp/decl.c:10587 #, c-format msgid "long, short, signed or unsigned invalid for `%s'" msgstr "" -#: c-decl.c:4070 cp/decl.c:10326 +#: c-decl.c:3688 cp/decl.c:10607 #, c-format msgid "long, short, signed or unsigned used invalidly for `%s'" msgstr "" -#: c-decl.c:4089 cp/decl.c:10347 +#: c-decl.c:3706 cp/decl.c:10628 #, c-format msgid "complex invalid for `%s'" msgstr "" -#: c-decl.c:4131 -msgid "ISO C89 does not support complex types" +#: c-decl.c:3748 +msgid "ISO C90 does not support complex types" msgstr "" -#: c-decl.c:4143 +#: c-decl.c:3760 msgid "ISO C does not support plain `complex' meaning `double complex'" msgstr "" -#: c-decl.c:4149 c-decl.c:4161 +#: c-decl.c:3766 c-decl.c:3778 msgid "ISO C does not support complex integer types" msgstr "" -#: c-decl.c:4176 c-decl.c:4608 cp/decl.c:10962 +#: c-decl.c:3793 c-decl.c:4246 cp/decl.c:11241 msgid "duplicate `const'" msgstr "" -#: c-decl.c:4178 c-decl.c:4612 cp/decl.c:10966 +#: c-decl.c:3795 c-decl.c:4250 cp/decl.c:11245 msgid "duplicate `restrict'" msgstr "" -#: c-decl.c:4180 c-decl.c:4610 cp/decl.c:10964 +#: c-decl.c:3797 c-decl.c:4248 cp/decl.c:11243 msgid "duplicate `volatile'" msgstr "" -#: c-decl.c:4202 cp/decl.c:10502 +#: c-decl.c:3825 cp/decl.c:10791 #, c-format msgid "multiple storage classes in declaration of `%s'" msgstr "" -#: c-decl.c:4211 +#: c-decl.c:3835 msgid "function definition declared `auto'" msgstr "" -#: c-decl.c:4213 +#: c-decl.c:3837 msgid "function definition declared `register'" msgstr "" -#: c-decl.c:4215 +#: c-decl.c:3839 msgid "function definition declared `typedef'" msgstr "" -#: c-decl.c:4228 +#: c-decl.c:3841 +msgid "function definition declared `__thread'" +msgstr "" + +#: c-decl.c:3854 #, c-format msgid "storage class specified for structure field `%s'" msgstr "" -#: c-decl.c:4232 cp/decl.c:10549 +#: c-decl.c:3858 cp/decl.c:10838 #, c-format msgid "storage class specified for parameter `%s'" msgstr "" -#: c-decl.c:4235 cp/decl.c:10551 +#: c-decl.c:3861 cp/decl.c:10840 msgid "storage class specified for typename" msgstr "" -#: c-decl.c:4247 cp/decl.c:10565 +#: c-decl.c:3873 cp/decl.c:10855 #, c-format msgid "`%s' initialized and declared `extern'" msgstr "" -#: c-decl.c:4249 cp/decl.c:10568 +#: c-decl.c:3875 cp/decl.c:10858 #, c-format msgid "`%s' has both `extern' and initializer" msgstr "" -#: c-decl.c:4253 cp/decl.c:10572 +#: c-decl.c:3880 cp/decl.c:10866 +#, c-format +msgid "top-level declaration of `%s' specifies `auto'" +msgstr "" + +#: c-decl.c:3885 cp/decl.c:10862 #, c-format msgid "nested function `%s' declared `extern'" msgstr "" -#: c-decl.c:4256 cp/decl.c:10576 +#: c-decl.c:3891 cp/decl.c:10872 #, c-format -msgid "top-level declaration of `%s' specifies `auto'" +msgid "function-scope `%s' implicitly auto and declared `__thread'" msgstr "" #. Only the innermost declarator (making a parameter be of #. array type which is converted to pointer type) #. may have static or type qualifiers. -#: c-decl.c:4291 c-decl.c:4480 +#: c-decl.c:3930 c-decl.c:4118 msgid "static or type qualifiers in non-parameter array declarator" msgstr "" -#: c-decl.c:4335 +#: c-decl.c:3974 #, c-format msgid "declaration of `%s' as array of voids" msgstr "" -#: c-decl.c:4341 +#: c-decl.c:3980 #, c-format msgid "declaration of `%s' as array of functions" msgstr "" -#: c-decl.c:4362 +#: c-decl.c:3985 c-decl.c:5250 +msgid "invalid use of structure with flexible array member" +msgstr "" + +#: c-decl.c:4004 #, c-format msgid "size of array `%s' has non-integer type" msgstr "" -#: c-decl.c:4367 +#: c-decl.c:4009 #, c-format msgid "ISO C forbids zero-size array `%s'" msgstr "" -#: c-decl.c:4374 +#: c-decl.c:4016 #, c-format msgid "size of array `%s' is negative" msgstr "" -#: c-decl.c:4387 +#: c-decl.c:4029 #, c-format -msgid "ISO C89 forbids array `%s' whose size can't be evaluated" +msgid "ISO C90 forbids array `%s' whose size can't be evaluated" msgstr "" -#: c-decl.c:4390 +#: c-decl.c:4032 #, c-format -msgid "ISO C89 forbids variable-size array `%s'" +msgid "ISO C90 forbids variable-size array `%s'" msgstr "" -#: c-decl.c:4420 c-decl.c:4634 cp/decl.c:11172 +#: c-decl.c:4062 c-decl.c:4272 cp/decl.c:11450 #, c-format msgid "size of array `%s' is too large" msgstr "" -#: c-decl.c:4437 -msgid "ISO C89 does not support flexible array members" +#: c-decl.c:4075 +msgid "ISO C90 does not support flexible array members" msgstr "" -#: c-decl.c:4447 +#: c-decl.c:4085 msgid "array type has incomplete element type" msgstr "" -#: c-decl.c:4454 c-decl.c:4684 +#: c-decl.c:4092 c-decl.c:4322 msgid "ISO C forbids const or volatile function types" msgstr "" -#: c-decl.c:4500 cp/decl.c:10713 +#: c-decl.c:4138 cp/decl.c:10998 #, c-format msgid "`%s' declared as function returning a function" msgstr "" -#: c-decl.c:4505 cp/decl.c:10718 +#: c-decl.c:4143 cp/decl.c:11003 #, c-format msgid "`%s' declared as function returning an array" msgstr "" -#: c-decl.c:4533 +#: c-decl.c:4171 msgid "ISO C forbids qualified void function return type" msgstr "" -#: c-decl.c:4537 +#: c-decl.c:4175 msgid "type qualifiers ignored on function return type" msgstr "" -#: c-decl.c:4566 c-decl.c:4649 c-decl.c:4773 c-decl.c:4863 +#: c-decl.c:4204 c-decl.c:4287 c-decl.c:4411 c-decl.c:4503 msgid "ISO C forbids qualified function types" msgstr "" -#: c-decl.c:4606 cp/decl.c:10958 +#: c-decl.c:4244 cp/decl.c:11237 msgid "invalid type modifier within pointer declarator" msgstr "" -#: c-decl.c:4704 cp/decl.c:11450 +#: c-decl.c:4342 cp/decl.c:11732 #, c-format msgid "variable or field `%s' declared void" msgstr "" -#: c-decl.c:4737 +#: c-decl.c:4375 msgid "attributes in parameter array declarator ignored" msgstr "" -#: c-decl.c:4762 +#: c-decl.c:4400 msgid "invalid type modifier within array declarator" msgstr "" -#: c-decl.c:4807 +#: c-decl.c:4445 #, c-format msgid "field `%s' declared as a function" msgstr "" -#: c-decl.c:4813 +#: c-decl.c:4451 #, c-format msgid "field `%s' has incomplete type" msgstr "" -#: c-decl.c:4845 c-decl.c:4847 c-decl.c:4854 +#: c-decl.c:4483 c-decl.c:4485 c-decl.c:4487 c-decl.c:4494 #, c-format msgid "invalid storage class for function `%s'" msgstr "" -#: c-decl.c:4869 +#: c-decl.c:4509 msgid "`noreturn' function returns non-void value" msgstr "" -#: c-decl.c:4884 +#: c-decl.c:4524 msgid "cannot inline function `main'" msgstr "" -#: c-decl.c:4937 +#: c-decl.c:4577 #, c-format msgid "variable `%s' declared `inline'" msgstr "" -#: c-decl.c:5010 c-decl.c:6051 +#. A mere warning is sure to result in improper semantics +#. at runtime. Don't bother to allow this to compile. +#: c-decl.c:4605 cp/decl.c:9511 +msgid "thread-local storage not supported for this target" +msgstr "" + +#: c-decl.c:4660 c-decl.c:5746 msgid "function declaration isn't a prototype" msgstr "" -#: c-decl.c:5016 +#: c-decl.c:4666 msgid "parameter names (without types) in function declaration" msgstr "" -#: c-decl.c:5048 c-decl.c:6431 +#: c-decl.c:4698 c-decl.c:6116 #, c-format msgid "parameter `%s' has incomplete type" msgstr "" -#: c-decl.c:5051 +#: c-decl.c:4701 msgid "parameter has incomplete type" msgstr "" -#: c-decl.c:5072 +#: c-decl.c:4722 #, c-format msgid "parameter `%s' points to incomplete type" msgstr "" -#: c-decl.c:5075 +#: c-decl.c:4725 msgid "parameter points to incomplete type" msgstr "" -#: c-decl.c:5140 +#: c-decl.c:4790 #, c-format msgid "parameter `%s' has just a forward declaration" msgstr "" -#: c-decl.c:5181 +#: c-decl.c:4831 msgid "`void' in parameter list must be the entire list" msgstr "" -#: c-decl.c:5212 +#: c-decl.c:4862 #, c-format msgid "`struct %s' declared inside parameter list" msgstr "" -#: c-decl.c:5215 +#: c-decl.c:4865 #, c-format msgid "`union %s' declared inside parameter list" msgstr "" -#: c-decl.c:5218 +#: c-decl.c:4868 #, c-format msgid "`enum %s' declared inside parameter list" msgstr "" -#: c-decl.c:5225 +#: c-decl.c:4875 msgid "anonymous struct declared inside parameter list" msgstr "" -#: c-decl.c:5227 +#: c-decl.c:4877 msgid "anonymous union declared inside parameter list" msgstr "" -#: c-decl.c:5229 +#: c-decl.c:4879 msgid "anonymous enum declared inside parameter list" msgstr "" -#: c-decl.c:5233 +#: c-decl.c:4883 msgid "" "its scope is only this definition or declaration, which is probably not what " "you want" msgstr "" -#: c-decl.c:5312 +#: c-decl.c:4960 #, c-format msgid "redefinition of `union %s'" msgstr "" -#: c-decl.c:5315 +#: c-decl.c:4962 #, c-format msgid "redefinition of `struct %s'" msgstr "" -#: c-decl.c:5354 -msgid "unnamed fields of type other than struct or union are not allowed" +#: c-decl.c:5033 cp/decl.c:7125 +msgid "declaration does not declare anything" msgstr "" -#: c-decl.c:5395 c-decl.c:5398 +#: c-decl.c:5075 c-decl.c:5078 #, c-format msgid "%s defined inside parms" msgstr "" -#: c-decl.c:5396 c-decl.c:5399 c-decl.c:5410 +#: c-decl.c:5076 c-decl.c:5079 c-decl.c:5090 msgid "union" msgstr "" -#: c-decl.c:5396 c-decl.c:5399 +#: c-decl.c:5076 c-decl.c:5079 msgid "structure" msgstr "" -#: c-decl.c:5409 +#: c-decl.c:5089 #, c-format msgid "%s has no %s" msgstr "" -#: c-decl.c:5410 +#: c-decl.c:5090 msgid "struct" msgstr "" -#: c-decl.c:5411 +#: c-decl.c:5091 msgid "named members" msgstr "" -#: c-decl.c:5411 +#: c-decl.c:5091 msgid "members" msgstr "" -#: c-decl.c:5450 +#: c-decl.c:5130 #, c-format msgid "nested redefinition of `%s'" msgstr "" -#: c-decl.c:5463 +#: c-decl.c:5143 #, c-format msgid "bit-field `%s' width not an integer constant" msgstr "" -#: c-decl.c:5474 +#: c-decl.c:5154 #, c-format msgid "bit-field `%s' has invalid type" msgstr "" -#: c-decl.c:5486 +#: c-decl.c:5166 #, c-format msgid "bit-field `%s' type invalid in ISO C" msgstr "" -#: c-decl.c:5497 +#: c-decl.c:5177 #, c-format msgid "negative width in bit-field `%s'" msgstr "" -#: c-decl.c:5499 +#: c-decl.c:5179 #, c-format msgid "width of `%s' exceeds its type" msgstr "" -#: c-decl.c:5501 +#: c-decl.c:5181 #, c-format msgid "zero width for bit-field `%s'" msgstr "" -#: c-decl.c:5515 +#: c-decl.c:5195 #, c-format msgid "`%s' is narrower than values of its type" msgstr "" -#: c-decl.c:5561 +#: c-decl.c:5241 msgid "flexible array member in union" msgstr "" -#: c-decl.c:5563 +#: c-decl.c:5243 msgid "flexible array member not at end of struct" msgstr "" -#: c-decl.c:5565 +#: c-decl.c:5245 msgid "flexible array member in otherwise empty struct" msgstr "" -#: c-decl.c:5590 +#: c-decl.c:5275 #, c-format msgid "duplicate member `%s'" msgstr "" -#: c-decl.c:5634 +#: c-decl.c:5319 msgid "union cannot be made transparent" msgstr "" #. This enum is a named one that has been declared already. -#: c-decl.c:5728 +#: c-decl.c:5424 #, c-format msgid "redeclaration of `enum %s'" msgstr "" -#: c-decl.c:5762 +#: c-decl.c:5458 msgid "enum defined inside parms" msgstr "" -#: c-decl.c:5795 +#: c-decl.c:5491 msgid "enumeration values exceed range of largest integer" msgstr "" -#: c-decl.c:5904 +#: c-decl.c:5600 #, c-format msgid "enumerator value for `%s' not integer constant" msgstr "" -#: c-decl.c:5917 +#: c-decl.c:5613 msgid "overflow in enumeration values" msgstr "" -#: c-decl.c:5922 +#: c-decl.c:5618 msgid "ISO C restricts enumerator values to range of `int'" msgstr "" -#: c-decl.c:6005 +#: c-decl.c:5700 msgid "return type is an incomplete type" msgstr "" -#: c-decl.c:6013 +#: c-decl.c:5708 msgid "return type defaults to `int'" msgstr "" -#: c-decl.c:6060 +#: c-decl.c:5755 #, c-format msgid "no previous prototype for `%s'" msgstr "" -#: c-decl.c:6067 +#: c-decl.c:5762 #, c-format msgid "`%s' was used with no prototype before its definition" msgstr "" -#: c-decl.c:6073 +#: c-decl.c:5768 #, c-format msgid "no previous declaration for `%s'" msgstr "" -#: c-decl.c:6080 +#: c-decl.c:5775 #, c-format msgid "`%s' was used with no declaration before its definition" msgstr "" -#: c-decl.c:6104 c-decl.c:6667 +#: c-decl.c:5799 c-decl.c:6352 #, c-format msgid "return type of `%s' is not `int'" msgstr "" -#: c-decl.c:6120 +#: c-decl.c:5815 #, c-format msgid "first argument of `%s' should be `int'" msgstr "" -#: c-decl.c:6129 +#: c-decl.c:5824 #, c-format msgid "second argument of `%s' should be `char **'" msgstr "" -#: c-decl.c:6138 +#: c-decl.c:5833 #, c-format msgid "third argument of `%s' should probably be `char **'" msgstr "" -#: c-decl.c:6147 +#: c-decl.c:5842 #, c-format msgid "`%s' takes only zero or two arguments" msgstr "" -#: c-decl.c:6150 +#: c-decl.c:5845 #, c-format msgid "`%s' is normally a non-static function" msgstr "" -#: c-decl.c:6258 +#: c-decl.c:5943 msgid "parm types given both in parmlist and separately" msgstr "" -#: c-decl.c:6279 +#: c-decl.c:5964 msgid "parameter name omitted" msgstr "" -#: c-decl.c:6283 c-decl.c:6385 +#: c-decl.c:5968 c-decl.c:6070 #, c-format msgid "parameter `%s' declared void" msgstr "" -#: c-decl.c:6359 +#: c-decl.c:6044 msgid "parameter name missing from parameter list" msgstr "" -#: c-decl.c:6378 +#: c-decl.c:6063 #, c-format msgid "multiple parameters named `%s'" msgstr "" -#: c-decl.c:6400 c-decl.c:6402 +#: c-decl.c:6085 c-decl.c:6087 #, c-format msgid "type of `%s' defaults to `int'" msgstr "" -#: c-decl.c:6438 +#: c-decl.c:6123 #, c-format msgid "declaration for parameter `%s' but no such parameter" msgstr "" -#: c-decl.c:6486 +#: c-decl.c:6171 msgid "number of arguments doesn't match prototype" msgstr "" -#: c-decl.c:6516 +#: c-decl.c:6201 #, c-format msgid "promoted argument `%s' doesn't match prototype" msgstr "" -#: c-decl.c:6526 +#: c-decl.c:6211 #, c-format msgid "argument `%s' doesn't match prototype" msgstr "" -#: c-decl.c:6699 cp/decl.c:14311 +#: c-decl.c:6384 cp/decl.c:14547 msgid "no return statement in function returning non-void" msgstr "" -#: c-decl.c:6855 +#: c-decl.c:6536 msgid "this function may return with or without a value" msgstr "" -#: c-decl.c:6875 +#: c-decl.c:6556 #, c-format msgid "size of return value of `%s' is %u bytes" msgstr "" -#: c-decl.c:6879 +#: c-decl.c:6560 #, c-format msgid "size of return value of `%s' is larger than %d bytes" msgstr "" @@ -1457,889 +1524,946 @@ msgstr "" #. If we get here, declarations have been used in a for loop without #. the C99 for loop scope. This doesn't make much sense, so don't #. allow it. -#: c-decl.c:6934 +#: c-decl.c:6615 msgid "`for' loop initial declaration used outside C99 mode" msgstr "" -#: c-decl.c:6958 +#: c-decl.c:6639 #, c-format msgid "`struct %s' declared in `for' loop initial declaration" msgstr "" -#: c-decl.c:6961 +#: c-decl.c:6642 #, c-format msgid "`union %s' declared in `for' loop initial declaration" msgstr "" -#: c-decl.c:6964 +#: c-decl.c:6645 #, c-format msgid "`enum %s' declared in `for' loop initial declaration" msgstr "" -#: c-decl.c:6972 +#: c-decl.c:6653 #, c-format msgid "declaration of non-variable `%s' in `for' loop initial declaration" msgstr "" -#: c-decl.c:6974 +#: c-decl.c:6655 #, c-format msgid "declaration of static variable `%s' in `for' loop initial declaration" msgstr "" -#: c-decl.c:6976 +#: c-decl.c:6657 #, c-format msgid "declaration of `extern' variable `%s' in `for' loop initial declaration" msgstr "" -#: c-format.c:128 c-format.c:210 +#: c-format.c:109 c-format.c:191 msgid "format string arg not a string type" msgstr "" -#: c-format.c:143 +#: c-format.c:124 msgid "args to be formatted is not '...'" msgstr "" -#: c-format.c:152 +#: c-format.c:133 msgid "strftime formats cannot format arguments" msgstr "" -#: c-format.c:187 c-format.c:289 +#: c-format.c:168 c-format.c:270 msgid "format string has invalid operand number" msgstr "" -#: c-format.c:221 +#: c-format.c:202 msgid "function does not return string type" msgstr "" -#: c-format.c:252 +#: c-format.c:233 msgid "unrecognized format specifier" msgstr "" -#: c-format.c:265 +#: c-format.c:246 #, c-format msgid "`%s' is an unrecognized format function type" msgstr "" -#: c-format.c:299 +#: c-format.c:280 msgid "format string arg follows the args to be formatted" msgstr "" -#: c-format.c:620 +#: c-format.c:601 msgid "` ' flag" msgstr "" -#: c-format.c:620 +#: c-format.c:601 msgid "the ` ' printf flag" msgstr "" -#: c-format.c:621 c-format.c:692 +#: c-format.c:602 c-format.c:673 msgid "`+' flag" msgstr "" -#: c-format.c:621 +#: c-format.c:602 msgid "the `+' printf flag" msgstr "" -#: c-format.c:622 c-format.c:668 +#: c-format.c:603 c-format.c:649 msgid "`#' flag" msgstr "" -#: c-format.c:622 +#: c-format.c:603 msgid "the `#' printf flag" msgstr "" -#: c-format.c:623 c-format.c:666 +#: c-format.c:604 c-format.c:647 msgid "`0' flag" msgstr "" -#: c-format.c:623 +#: c-format.c:604 msgid "the `0' printf flag" msgstr "" -#: c-format.c:624 c-format.c:665 c-format.c:695 +#: c-format.c:605 c-format.c:646 c-format.c:676 msgid "`-' flag" msgstr "" -#: c-format.c:624 +#: c-format.c:605 msgid "the `-' printf flag" msgstr "" -#: c-format.c:625 c-format.c:649 +#: c-format.c:606 c-format.c:630 msgid "`'' flag" msgstr "" -#: c-format.c:625 +#: c-format.c:606 msgid "the `'' printf flag" msgstr "" -#: c-format.c:626 c-format.c:650 +#: c-format.c:607 c-format.c:631 msgid "`I' flag" msgstr "" -#: c-format.c:626 +#: c-format.c:607 msgid "the `I' printf flag" msgstr "" -#: c-format.c:627 c-format.c:647 c-format.c:669 c-format.c:696 c-format.c:1790 +#: c-format.c:608 c-format.c:628 c-format.c:650 c-format.c:677 c-format.c:1702 msgid "field width" msgstr "" -#: c-format.c:627 +#: c-format.c:608 msgid "field width in printf format" msgstr "" -#: c-format.c:628 +#: c-format.c:609 msgid "precision" msgstr "" -#: c-format.c:628 +#: c-format.c:609 msgid "precision in printf format" msgstr "" -#: c-format.c:629 c-format.c:648 c-format.c:699 +#: c-format.c:610 c-format.c:629 c-format.c:680 msgid "length modifier" msgstr "" -#: c-format.c:629 +#: c-format.c:610 msgid "length modifier in printf format" msgstr "" -#: c-format.c:645 +#: c-format.c:626 msgid "assignment suppression" msgstr "" -#: c-format.c:645 +#: c-format.c:626 msgid "the assignment suppression scanf feature" msgstr "" -#: c-format.c:646 +#: c-format.c:627 msgid "`a' flag" msgstr "" -#: c-format.c:646 +#: c-format.c:627 msgid "the `a' scanf flag" msgstr "" -#: c-format.c:647 +#: c-format.c:628 msgid "field width in scanf format" msgstr "" -#: c-format.c:648 +#: c-format.c:629 msgid "length modifier in scanf format" msgstr "" -#: c-format.c:649 +#: c-format.c:630 msgid "the `'' scanf flag" msgstr "" -#: c-format.c:650 +#: c-format.c:631 msgid "the `I' scanf flag" msgstr "" -#: c-format.c:664 +#: c-format.c:645 msgid "`_' flag" msgstr "" -#: c-format.c:664 +#: c-format.c:645 msgid "the `_' strftime flag" msgstr "" -#: c-format.c:665 +#: c-format.c:646 msgid "the `-' strftime flag" msgstr "" -#: c-format.c:666 +#: c-format.c:647 msgid "the `0' strftime flag" msgstr "" -#: c-format.c:667 c-format.c:691 +#: c-format.c:648 c-format.c:672 msgid "`^' flag" msgstr "" -#: c-format.c:667 +#: c-format.c:648 msgid "the `^' strftime flag" msgstr "" -#: c-format.c:668 +#: c-format.c:649 msgid "the `#' strftime flag" msgstr "" -#: c-format.c:669 +#: c-format.c:650 msgid "field width in strftime format" msgstr "" -#: c-format.c:670 +#: c-format.c:651 msgid "`E' modifier" msgstr "" -#: c-format.c:670 +#: c-format.c:651 msgid "the `E' strftime modifier" msgstr "" -#: c-format.c:671 +#: c-format.c:652 msgid "`O' modifier" msgstr "" -#: c-format.c:671 +#: c-format.c:652 msgid "the `O' strftime modifier" msgstr "" -#: c-format.c:672 +#: c-format.c:653 msgid "the `O' modifier" msgstr "" -#: c-format.c:690 +#: c-format.c:671 msgid "fill character" msgstr "" -#: c-format.c:690 +#: c-format.c:671 msgid "fill character in strfmon format" msgstr "" -#: c-format.c:691 +#: c-format.c:672 msgid "the `^' strfmon flag" msgstr "" -#: c-format.c:692 +#: c-format.c:673 msgid "the `+' strfmon flag" msgstr "" -#: c-format.c:693 +#: c-format.c:674 msgid "`(' flag" msgstr "" -#: c-format.c:693 +#: c-format.c:674 msgid "the `(' strfmon flag" msgstr "" -#: c-format.c:694 +#: c-format.c:675 msgid "`!' flag" msgstr "" -#: c-format.c:694 +#: c-format.c:675 msgid "the `!' strfmon flag" msgstr "" -#: c-format.c:695 +#: c-format.c:676 msgid "the `-' strfmon flag" msgstr "" -#: c-format.c:696 +#: c-format.c:677 msgid "field width in strfmon format" msgstr "" -#: c-format.c:697 +#: c-format.c:678 msgid "left precision" msgstr "" -#: c-format.c:697 +#: c-format.c:678 msgid "left precision in strfmon format" msgstr "" -#: c-format.c:698 +#: c-format.c:679 msgid "right precision" msgstr "" -#: c-format.c:698 +#: c-format.c:679 msgid "right precision in strfmon format" msgstr "" -#: c-format.c:699 +#: c-format.c:680 msgid "length modifier in strfmon format" msgstr "" -#: c-format.c:998 +#: c-format.c:983 #, c-format msgid "function might be possible candidate for `%s' format attribute" msgstr "" -#: c-format.c:1122 c-format.c:1143 c-format.c:2200 +#: c-format.c:1107 c-format.c:1128 c-format.c:2112 msgid "missing $ operand number in format" msgstr "" -#: c-format.c:1153 +#: c-format.c:1138 #, c-format msgid "%s does not support %%n$ operand number formats" msgstr "" -#: c-format.c:1160 +#: c-format.c:1145 msgid "operand number out of range in format" msgstr "" -#: c-format.c:1183 +#: c-format.c:1168 #, c-format msgid "format argument %d used more than once in %s format" msgstr "" -#: c-format.c:1233 +#: c-format.c:1218 #, c-format msgid "format argument %d unused before used argument %d in $-style format" msgstr "" -#: c-format.c:1330 +#: c-format.c:1322 msgid "format not a string literal, format string not checked" msgstr "" -#: c-format.c:1344 +#: c-format.c:1336 msgid "format not a string literal and no format arguments" msgstr "" -#: c-format.c:1346 +#: c-format.c:1338 msgid "format not a string literal, argument types not checked" msgstr "" -#: c-format.c:1359 +#: c-format.c:1351 msgid "too many arguments for format" msgstr "" -#: c-format.c:1362 +#: c-format.c:1354 msgid "unused arguments in $-style format" msgstr "" -#: c-format.c:1365 -msgid "zero-length format string" +#: c-format.c:1357 +#, c-format +msgid "zero-length %s format string" msgstr "" -#: c-format.c:1368 +#: c-format.c:1361 msgid "format is a wide character string" msgstr "" -#: c-format.c:1371 +#: c-format.c:1364 msgid "unterminated format string" msgstr "" -#. FIXME: this warning should go away once Marc Espie's -#. __attribute__((nonnull)) patch is in. Instead, checking for -#. nonnull attributes should probably change this function to act -#. specially if info == NULL and add a res->number_null entry for -#. that case, or maybe add a function pointer to be called at -#. the end instead of hardcoding check_format_info_main. -#: c-format.c:1478 -msgid "null format string" -msgstr "" - -#: c-format.c:1669 +#: c-format.c:1581 msgid "embedded `\\0' in format" msgstr "" -#: c-format.c:1684 +#: c-format.c:1596 #, c-format msgid "spurious trailing `%%' in format" msgstr "" -#: c-format.c:1723 c-format.c:1960 +#: c-format.c:1635 c-format.c:1872 #, c-format msgid "repeated %s in format" msgstr "" -#: c-format.c:1736 +#: c-format.c:1648 msgid "missing fill character at end of strfmon format" msgstr "" -#: c-format.c:1756 c-format.c:1874 c-format.c:2154 c-format.c:2207 +#: c-format.c:1687 c-format.c:1786 c-format.c:2066 c-format.c:2119 msgid "too few arguments for format" msgstr "" -#: c-format.c:1816 +#: c-format.c:1728 #, c-format msgid "zero width in %s format" msgstr "" -#: c-format.c:1835 +#: c-format.c:1747 #, c-format msgid "empty left precision in %s format" msgstr "" -#: c-format.c:1889 +#: c-format.c:1801 msgid "field precision" msgstr "" -#: c-format.c:1904 +#: c-format.c:1816 #, c-format msgid "empty precision in %s format" msgstr "" -#: c-format.c:1944 +#: c-format.c:1856 #, c-format msgid "%s does not support the `%s' %s length modifier" msgstr "" -#: c-format.c:1994 +#: c-format.c:1906 msgid "conversion lacks type at end of format" msgstr "" -#: c-format.c:2005 +#: c-format.c:1917 #, c-format msgid "unknown conversion type character `%c' in format" msgstr "" -#: c-format.c:2008 +#: c-format.c:1920 #, c-format msgid "unknown conversion type character 0x%x in format" msgstr "" -#: c-format.c:2015 +#: c-format.c:1927 #, c-format msgid "%s does not support the `%%%c' %s format" msgstr "" -#: c-format.c:2031 +#: c-format.c:1943 #, c-format msgid "%s used with `%%%c' %s format" msgstr "" -#: c-format.c:2040 +#: c-format.c:1952 #, c-format msgid "%s does not support %s" msgstr "" -#: c-format.c:2049 +#: c-format.c:1961 #, c-format msgid "%s does not support %s with the `%%%c' %s format" msgstr "" -#: c-format.c:2082 +#: c-format.c:1994 #, c-format msgid "%s ignored with %s and `%%%c' %s format" msgstr "" -#: c-format.c:2086 +#: c-format.c:1998 #, c-format msgid "%s ignored with %s in %s format" msgstr "" -#: c-format.c:2092 +#: c-format.c:2004 #, c-format msgid "use of %s and %s together with `%%%c' %s format" msgstr "" -#: c-format.c:2096 +#: c-format.c:2008 #, c-format msgid "use of %s and %s together in %s format" msgstr "" -#: c-format.c:2115 +#: c-format.c:2027 #, c-format msgid "`%%%c' yields only last 2 digits of year in some locales" msgstr "" -#: c-format.c:2118 +#: c-format.c:2030 #, c-format msgid "`%%%c' yields only last 2 digits of year" msgstr "" #. The end of the format string was reached. -#: c-format.c:2134 +#: c-format.c:2046 #, c-format msgid "no closing `]' for `%%[' format" msgstr "" -#: c-format.c:2147 +#: c-format.c:2059 #, c-format msgid "use of `%s' length modifier with `%c' type character" msgstr "" -#: c-format.c:2168 +#: c-format.c:2080 #, c-format msgid "%s does not support the `%%%s%c' %s format" msgstr "" -#: c-format.c:2183 +#: c-format.c:2095 msgid "operand number specified with suppressed assignment" msgstr "" -#: c-format.c:2185 +#: c-format.c:2097 msgid "operand number specified for format taking no argument" msgstr "" -#: c-format.c:2299 +#: c-format.c:2211 #, c-format msgid "writing through null pointer (arg %d)" msgstr "" -#: c-format.c:2308 +#: c-format.c:2220 #, c-format msgid "reading through null pointer (arg %d)" msgstr "" -#: c-format.c:2328 +#: c-format.c:2240 #, c-format msgid "writing into constant object (arg %d)" msgstr "" -#: c-format.c:2338 +#: c-format.c:2250 #, c-format msgid "extra type qualifiers in format argument (arg %d)" msgstr "" -#: c-format.c:2345 +#: c-format.c:2257 #, c-format msgid "format argument is not a pointer (arg %d)" msgstr "" -#: c-format.c:2347 +#: c-format.c:2259 #, c-format msgid "format argument is not a pointer to a pointer (arg %d)" msgstr "" -#: c-format.c:2418 +#: c-format.c:2330 msgid "pointer" msgstr "" -#: c-format.c:2420 +#: c-format.c:2332 msgid "different type" msgstr "" -#: c-format.c:2441 +#: c-format.c:2353 #, c-format msgid "%s is not type %s (arg %d)" msgstr "" -#: c-format.c:2444 +#: c-format.c:2356 #, c-format msgid "%s format, %s arg (arg %d)" msgstr "" -#: c-lex.c:298 -msgid "badly nested C headers from preprocessor" +#: c-lex.c:153 +msgid "YYDEBUG not defined" msgstr "" -#: c-lex.c:348 -#, c-format -msgid "ignoring #pragma %s %s" +#: c-lex.c:290 +msgid "badly nested C headers from preprocessor" msgstr "" -#: c-lex.c:350 +#: c-lex.c:333 #, c-format -msgid "ignoring #pragma %s" +msgid "ignoring #pragma %s %s" msgstr "" -#: c-lex.c:400 +#: c-lex.c:383 #, c-format msgid "universal-character-name '\\U%08x' not valid in identifier" msgstr "" -#: c-lex.c:646 +#: c-lex.c:629 #, c-format msgid "universal-character-name '\\u%04x' not valid in identifier" msgstr "" -#: c-lex.c:732 +#: c-lex.c:692 #, c-format msgid "stray '%c' in program" msgstr "" -#: c-lex.c:734 +#: c-lex.c:694 #, c-format msgid "stray '\\%o' in program" msgstr "" -#: c-lex.c:832 -msgid "too many decimal points in floating constant" +#: c-lex.c:850 +msgid "this decimal constant is unsigned only in ISO C90" msgstr "" -#: c-lex.c:834 -msgid "decimal point in exponent - impossible!" +#: c-lex.c:853 +msgid "this decimal constant would be unsigned in ISO C90" msgstr "" -#. Possible future extension: silently ignore _ in numbers, -#. permitting cosmetic grouping - e.g. 0x8000_0000 == 0x80000000 -#. but somewhat easier to read. Ada has this? -#: c-lex.c:845 -msgid "underscore in number" +#: c-lex.c:869 +#, c-format +msgid "integer constant is too large for \"%s\" type" msgstr "" -#: c-lex.c:907 -msgid "numeric constant with no digits" +#: c-lex.c:937 +#, c-format +msgid "floating constant exceeds range of \"%s\"" msgstr "" -#: c-lex.c:910 -msgid "numeric constant contains digits beyond the radix" +#: c-lex.c:973 cpplex.c:330 cpplex.c:668 cpplex.c:1942 +msgid "ignoring invalid multibyte character" msgstr "" -#: c-lex.c:921 -msgid "hexadecimal floating constant has no exponent" +#: c-opts.c:353 +#, c-format +msgid "missing argument to \"-%s\"" msgstr "" -#: c-lex.c:933 -msgid "floating constant exponent has no digits" +#: c-opts.c:357 +#, c-format +msgid "no class name specified with \"-%s\"" msgstr "" -#: c-lex.c:953 -msgid "more than one 'f' suffix on floating constant" +#: c-opts.c:364 +#, c-format +msgid "missing filename after \"-%s\"" msgstr "" -#: c-lex.c:956 -msgid "traditional C rejects the 'f' suffix" +#: c-opts.c:369 +#, c-format +msgid "missing target after \"-%s\"" msgstr "" -#: c-lex.c:963 -msgid "more than one 'l' suffix on floating constant" +#: c-opts.c:503 +#, c-format +msgid "options array incorrectly sorted: %s is before %s" msgstr "" -#: c-lex.c:966 -msgid "traditional C rejects the 'l' suffix" +#: c-opts.c:548 +#, c-format +msgid "too many filenames given. Type %s --help for usage" msgstr "" -#: c-lex.c:974 -msgid "more than one 'i' or 'j' suffix on floating constant" +#: c-opts.c:934 +msgid "-Wno-strict-prototypes is not supported in C++" msgstr "" -#: c-lex.c:976 c-lex.c:1081 -msgid "ISO C forbids imaginary numeric constants" +#: c-opts.c:1014 +#, c-format +msgid "switch \"%s\" is no longer supported" msgstr "" -#: c-lex.c:981 -msgid "invalid suffix on floating constant" +#: c-opts.c:1030 +#, c-format +msgid "switch \"%s\" is deprecated, please see documentation for details" msgstr "" -#: c-lex.c:990 -msgid "both 'f' and 'l' suffixes on floating constant" +#: c-opts.c:1143 +msgid "" +"-fhandle-exceptions has been renamed to -fexceptions (and is now on by " +"default)" msgstr "" -#: c-lex.c:1008 -msgid "hexadecimal floating constants are only valid in C99" +#: c-opts.c:1263 +msgid "output filename specified twice" msgstr "" -#: c-lex.c:1022 -msgid "floating point number exceeds range of 'double'" +#: c-opts.c:1377 +msgid "-Wformat-y2k ignored without -Wformat" msgstr "" -#: c-lex.c:1050 -msgid "two 'u' suffixes on integer constant" +#: c-opts.c:1379 +msgid "-Wformat-extra-args ignored without -Wformat" msgstr "" -#: c-lex.c:1053 -msgid "traditional C rejects the 'u' suffix" +#: c-opts.c:1381 +msgid "-Wformat-zero-length ignored without -Wformat" msgstr "" -#: c-lex.c:1064 -msgid "three 'l' suffixes on integer constant" +#: c-opts.c:1383 +msgid "-Wformat-nonliteral ignored without -Wformat" msgstr "" -#: c-lex.c:1066 -msgid "'lul' is not a valid integer suffix" +#: c-opts.c:1385 +msgid "-Wformat-security ignored without -Wformat" msgstr "" -#: c-lex.c:1068 -msgid "'Ll' and 'lL' are not valid integer suffixes" +#: c-opts.c:1387 +msgid "-Wmissing-format-attribute ignored without -Wformat" msgstr "" -#: c-lex.c:1071 -msgid "ISO C89 forbids long long integer constants" +#: c-opts.c:1409 +#, c-format +msgid "opening output file %s" msgstr "" -#: c-lex.c:1079 -msgid "more than one 'i' or 'j' suffix on integer constant" +#: c-opts.c:1464 +#, c-format +msgid "opening dependency file %s" msgstr "" -#: c-lex.c:1086 -msgid "invalid suffix on integer constant" +#: c-opts.c:1474 +#, c-format +msgid "closing dependency file %s" msgstr "" -#: c-lex.c:1094 +#: c-opts.c:1477 #, c-format -msgid "" -"integer constant is too large for this configuration of the compiler - " -"truncated to %d bits" +msgid "when writing output to %s" msgstr "" -#: c-lex.c:1178 -msgid "width of integer constant is different in traditional C" +#: c-opts.c:1557 +msgid "to generate dependencies you must specify either -M or -MM" msgstr "" -#: c-lex.c:1180 -msgid "integer constant is unsigned in ISO C, signed in traditional C" +#: c-opts.c:1704 +#, c-format +msgid "\"-%s\" is valid for %s but not for %s" msgstr "" -#: c-lex.c:1182 -msgid "width of integer constant may change on other systems in traditional C" +#. To keep the lines from getting too long for some compilers, limit +#. to about 500 characters (6 lines) per chunk. +#: c-opts.c:1714 +msgid "" +"Switches:\n" +" -include <file> Include the contents of <file> before other " +"files\n" +" -imacros <file> Accept definition of macros in <file>\n" +" -iprefix <path> Specify <path> as a prefix for next two options\n" +" -iwithprefix <dir> Add <dir> to the end of the system include path\n" +" -iwithprefixbefore <dir> Add <dir> to the end of the main include path\n" +" -isystem <dir> Add <dir> to the start of the system include " +"path\n" msgstr "" -#: c-lex.c:1192 -#, c-format -msgid "integer constant larger than the maximum value of %s" +#: c-opts.c:1723 +msgid "" +" -idirafter <dir> Add <dir> to the end of the system include path\n" +" -I <dir> Add <dir> to the end of the main include path\n" +" -I- Fine-grained include path control; see info " +"docs\n" +" -nostdinc Do not search system include directories\n" +" (dirs specified with -isystem will still be " +"used)\n" +" -nostdinc++ Do not search system include directories for C+" +"+\n" +" -o <file> Put output into <file>\n" msgstr "" -#: c-lex.c:1195 -msgid "an unsigned long long int" +#: c-opts.c:1732 +msgid "" +" -trigraphs Support ISO C trigraphs\n" +" -std=<std name> Specify the conformance standard; one of:\n" +" gnu89, gnu99, c89, c99, iso9899:1990,\n" +" iso9899:199409, iso9899:1999, c++98\n" +" -w Inhibit warning messages\n" +" -W[no-]trigraphs Warn if trigraphs are encountered\n" +" -W[no-]comment{s} Warn if one comment starts inside another\n" msgstr "" -#: c-lex.c:1196 -msgid "a long long int" +#: c-opts.c:1741 +msgid "" +" -W[no-]traditional Warn about features not present in traditional " +"C\n" +" -W[no-]undef Warn if an undefined macro is used by #if\n" +" -W[no-]import Warn about the use of the #import directive\n" msgstr "" -#: c-lex.c:1197 -msgid "an unsigned long int" +#: c-opts.c:1746 +msgid "" +" -W[no-]error Treat all warnings as errors\n" +" -W[no-]system-headers Do not suppress warnings from system headers\n" +" -W[no-]all Enable most preprocessor warnings\n" msgstr "" -#: c-lex.c:1201 -msgid "decimal constant is so large that it is unsigned" +#: c-opts.c:1751 +msgid "" +" -M Generate make dependencies\n" +" -MM As -M, but ignore system header files\n" +" -MD Generate make dependencies and compile\n" +" -MMD As -MD, but ignore system header files\n" +" -MF <file> Write dependency output to the given file\n" +" -MG Treat missing header file as generated files\n" msgstr "" -#: c-lex.c:1210 -msgid "complex integer constant is too wide for 'complex int'" +#: c-opts.c:1759 +msgid "" +" -MP\t\t\t Generate phony targets for all headers\n" +" -MQ <target> Add a MAKE-quoted target\n" +" -MT <target> Add an unquoted target\n" msgstr "" -#: c-lex.c:1221 -msgid "integer constant is larger than the maximum value for its type" +#: c-opts.c:1764 +msgid "" +" -D<macro> Define a <macro> with string '1' as its value\n" +" -D<macro>=<val> Define a <macro> with <val> as its value\n" +" -A<question>=<answer> Assert the <answer> to <question>\n" +" -A-<question>=<answer> Disable the <answer> to <question>\n" +" -U<macro> Undefine <macro> \n" +" -v Display the version number\n" msgstr "" -#: c-lex.c:1225 -#, c-format -msgid "missing white space after number '%.*s'" +#: c-opts.c:1772 +msgid "" +" -H Print the name of header files as they are used\n" +" -C Do not discard comments\n" +" -dM Display a list of macro definitions active at " +"end\n" +" -dD Preserve macro definitions in output\n" +" -dN As -dD except that only the names are preserved\n" +" -dI Include #include directives in the output\n" msgstr "" -#: c-lex.c:1261 cpplex.c:1850 -msgid "ignoring invalid multibyte character" +#: c-opts.c:1780 +msgid "" +" -f[no-]preprocessed Treat the input file as already preprocessed\n" +" -ftabstop=<number> Distance between tab stops for column reporting\n" +" -P Do not generate #line directives\n" +" -remap Remap file names when including files\n" +" --help Display this information\n" msgstr "" #. Like YYERROR but do call yyerror. -#: c-parse.y:56 parse.y:51 objc-parse.y:57 +#: c-parse.y:55 parse.y:48 objc-parse.y:56 msgid "syntax error" msgstr "" -#: /usr/share/bison/bison.simple:176 /usr/share/bison.simple:112 +#: /usr/share/bison/bison.simple:179 msgid "syntax error: cannot back up" msgstr "" -#: c-parse.y:286 objc-parse.y:308 +#: c-parse.y:325 objc-parse.y:347 msgid "ISO C forbids an empty source file" msgstr "" -#: c-parse.y:322 c-typeck.c:6861 objc-parse.y:345 +#: c-parse.y:366 c-typeck.c:6867 objc-parse.y:389 msgid "argument of `asm' is not a constant string" msgstr "" -#: c-parse.y:330 objc-parse.y:353 +#: c-parse.y:374 objc-parse.y:397 msgid "ISO C forbids data definition with no type or storage class" msgstr "" -#: c-parse.y:332 objc-parse.y:355 +#: c-parse.y:376 objc-parse.y:399 msgid "data definition has no type or storage class" msgstr "" -#: c-parse.y:345 objc-parse.y:368 +#: c-parse.y:389 objc-parse.y:412 msgid "ISO C does not allow extra `;' outside of a function" msgstr "" -#: c-parse.y:405 cppexp.c:697 +#: c-parse.y:449 cppexp.c:1312 msgid "traditional C rejects the unary plus operator" msgstr "" -#: c-parse.y:467 objc-parse.y:490 +#: c-parse.y:496 objc-parse.y:519 msgid "`sizeof' applied to a bit-field" msgstr "" -#: c-parse.y:550 objc-parse.y:573 +#: c-parse.y:583 objc-parse.y:606 msgid "ISO C forbids omitting the middle term of a ?: expression" msgstr "" -#: c-parse.y:599 objc-parse.y:622 +#: c-parse.y:632 objc-parse.y:655 msgid "ISO C89 forbids compound literals" msgstr "" -#: c-parse.y:613 objc-parse.y:636 +#: c-parse.y:646 objc-parse.y:669 msgid "ISO C forbids braced-groups within expressions" msgstr "" -#: c-parse.y:644 objc-parse.y:667 +#: c-parse.y:677 objc-parse.y:700 msgid "first argument to __builtin_choose_expr not a constant" msgstr "" -#: c-parse.y:687 -msgid "traditional C rejects string concatenation" -msgstr "" - -#: c-parse.y:702 objc-parse.y:739 -msgid "ISO C does not permit use of `varargs.h'" +#: c-parse.y:721 objc-parse.y:768 +msgid "traditional C rejects ISO C style function definitions" msgstr "" -#: c-parse.y:963 c-parse.y:969 c-parse.y:975 c-parse.y:981 c-parse.y:1002 -#: c-parse.y:1008 c-parse.y:1014 c-parse.y:1020 c-parse.y:1053 c-parse.y:1059 -#: c-parse.y:1065 c-parse.y:1071 c-parse.y:1116 c-parse.y:1122 c-parse.y:1128 -#: c-parse.y:1134 parse.y:1904 parse.y:1911 parse.y:1946 objc-parse.y:1000 -#: objc-parse.y:1006 objc-parse.y:1012 objc-parse.y:1018 objc-parse.y:1039 -#: objc-parse.y:1045 objc-parse.y:1051 objc-parse.y:1057 objc-parse.y:1090 -#: objc-parse.y:1096 objc-parse.y:1102 objc-parse.y:1108 objc-parse.y:1153 -#: objc-parse.y:1159 objc-parse.y:1165 objc-parse.y:1171 +#: c-parse.y:985 c-parse.y:991 c-parse.y:997 c-parse.y:1003 c-parse.y:1024 +#: c-parse.y:1030 c-parse.y:1036 c-parse.y:1042 c-parse.y:1075 c-parse.y:1081 +#: c-parse.y:1087 c-parse.y:1093 c-parse.y:1138 c-parse.y:1144 c-parse.y:1150 +#: c-parse.y:1156 parse.y:1915 parse.y:1922 parse.y:1957 objc-parse.y:1032 +#: objc-parse.y:1038 objc-parse.y:1044 objc-parse.y:1050 objc-parse.y:1071 +#: objc-parse.y:1077 objc-parse.y:1083 objc-parse.y:1089 objc-parse.y:1122 +#: objc-parse.y:1128 objc-parse.y:1134 objc-parse.y:1140 objc-parse.y:1185 +#: objc-parse.y:1191 objc-parse.y:1197 objc-parse.y:1203 #, c-format msgid "`%s' is not at beginning of declaration" msgstr "" -#: c-parse.y:1421 objc-parse.y:1467 +#: c-parse.y:1441 objc-parse.y:1497 msgid "ISO C forbids empty initializer braces" msgstr "" -#: c-parse.y:1435 objc-parse.y:1481 +#: c-parse.y:1455 objc-parse.y:1511 msgid "ISO C89 forbids specifying subobject to initialize" msgstr "" -#: c-parse.y:1438 objc-parse.y:1484 +#: c-parse.y:1458 objc-parse.y:1514 msgid "obsolete use of designated initializer without `='" msgstr "" -#: c-parse.y:1442 objc-parse.y:1488 +#: c-parse.y:1462 objc-parse.y:1518 msgid "obsolete use of designated initializer with `:'" msgstr "" -#: c-parse.y:1471 +#: c-parse.y:1489 objc-parse.y:1545 msgid "ISO C forbids specifying range of elements to initialize" msgstr "" -#: c-parse.y:1479 c-parse.y:1509 objc-parse.y:1519 objc-parse.y:1549 +#: c-parse.y:1497 c-parse.y:1528 objc-parse.y:1553 objc-parse.y:1584 msgid "ISO C forbids nested functions" msgstr "" -#: c-parse.y:1683 objc-parse.y:1725 +#: c-parse.y:1703 objc-parse.y:1761 msgid "ISO C forbids forward references to `enum' types" msgstr "" -#: c-parse.y:1695 parse.y:2361 objc-parse.y:1737 +#: c-parse.y:1715 parse.y:2385 objc-parse.y:1773 msgid "comma at end of enumerator list" msgstr "" -#: c-parse.y:1703 objc-parse.y:1745 +#: c-parse.y:1723 objc-parse.y:1781 msgid "no semicolon at end of struct or union" msgstr "" -#: c-parse.y:1712 objc-parse.y:1754 objc-parse.y:2824 +#: c-parse.y:1732 objc-parse.y:1790 objc-parse.y:2865 msgid "extra semicolon in struct or union specified" msgstr "" -#: c-parse.y:1725 objc-parse.y:1781 +#: c-parse.y:1745 objc-parse.y:1817 msgid "ISO C doesn't support unnamed structs/unions" msgstr "" -#: c-parse.y:1734 objc-parse.y:1790 +#: c-parse.y:1754 objc-parse.y:1826 msgid "ISO C forbids member declarations with no members" msgstr "" -#: c-parse.y:1893 objc-parse.y:1949 +#: c-parse.y:1913 objc-parse.y:1985 msgid "deprecated use of label at end of compound statement" msgstr "" -#: c-parse.y:1910 objc-parse.y:1966 +#: c-parse.y:1930 objc-parse.y:2002 msgid "ISO C89 forbids mixed declarations and code" msgstr "" -#: c-parse.y:1985 objc-parse.y:2045 +#: c-parse.y:2005 objc-parse.y:2081 msgid "ISO C forbids label declarations" msgstr "" -#: c-parse.y:2035 parse.y:1604 objc-parse.y:2095 +#: c-parse.y:2055 parse.y:1627 objc-parse.y:2131 msgid "braced-group within expression allowed only inside a function" msgstr "" -#: c-parse.y:2162 objc-parse.y:2222 +#: c-parse.y:2182 objc-parse.y:2258 msgid "empty body in an else-statement" msgstr "" -#: c-parse.y:2283 objc-parse.y:2343 +#: c-parse.y:2303 objc-parse.y:2379 msgid "ISO C forbids `goto *expr;'" msgstr "" -#: c-parse.y:2383 objc-parse.y:2443 +#: c-parse.y:2403 objc-parse.y:2479 msgid "ISO C forbids forward parameter declarations" msgstr "" @@ -2349,175 +2473,181 @@ msgstr "" #. it caused problems with the code in expand_builtin which #. tries to verify that BUILT_IN_NEXT_ARG is being used #. correctly. -#: c-parse.y:2409 objc-parse.y:2469 +#: c-parse.y:2429 objc-parse.y:2505 msgid "ISO C requires a named argument before `...'" msgstr "" -#: c-parse.y:2504 objc-parse.y:2564 +#: c-parse.y:2526 objc-parse.y:2602 msgid "`...' in old-style identifier list" msgstr "" -#: /usr/share/bison/bison.simple:821 +#: /usr/share/bison/bison.simple:795 msgid "parse error; also virtual memory exhausted" msgstr "" -#: /usr/share/bison/bison.simple:825 /usr/share/bison.simple:654 cp/spew.c:343 +#: /usr/share/bison/bison.simple:799 cp/spew.c:364 msgid "parse error" msgstr "" -#: /usr/share/bison/bison.simple:950 /usr/share/bison.simple:367 +#: /usr/share/bison/bison.simple:924 msgid "parser stack overflow" msgstr "" -#: c-parse.y:2826 cp/spew.c:1477 objc-parse.y:3514 +#: c-parse.y:2838 cp/spew.c:1521 objc-parse.y:3538 #, c-format msgid "%s at end of input" msgstr "" -#: c-parse.y:2832 cp/spew.c:1483 objc-parse.y:3520 +#: c-parse.y:2844 cp/spew.c:1527 objc-parse.y:3544 #, c-format msgid "%s before %s'%c'" msgstr "" -#: c-parse.y:2834 cp/spew.c:1485 objc-parse.y:3522 +#: c-parse.y:2846 cp/spew.c:1529 objc-parse.y:3546 #, c-format msgid "%s before %s'\\x%x'" msgstr "" -#: c-parse.y:2838 cp/spew.c:1489 objc-parse.y:3526 +#: c-parse.y:2850 cp/spew.c:1533 objc-parse.y:3550 #, c-format msgid "%s before string constant" msgstr "" -#: c-parse.y:2840 cp/spew.c:1491 objc-parse.y:3528 +#: c-parse.y:2852 cp/spew.c:1535 objc-parse.y:3552 #, c-format msgid "%s before numeric constant" msgstr "" -#: c-parse.y:2842 objc-parse.y:3530 +#: c-parse.y:2854 objc-parse.y:3554 #, c-format msgid "%s before \"%s\"" msgstr "" -#: c-parse.y:2844 objc-parse.y:3532 +#: c-parse.y:2856 objc-parse.y:3556 #, c-format msgid "%s before '%s' token" msgstr "" -#: c-parse.y:2980 objc-parse.y:3711 -#, c-format -msgid "syntax error at '%s' token" +#: c-parse.y:2921 +msgid "traditional C rejects string concatenation" msgstr "" -#: c-parse.y:3010 cp/lex.c:861 objc-parse.y:3741 -msgid "YYDEBUG not defined" +#: c-parse.y:3047 objc-parse.y:3780 +#, c-format +msgid "syntax error at '%s' token" msgstr "" -#: c-pragma.c:109 +#: c-pragma.c:107 msgid "" "#pragma pack (pop) encountered without matching #pragma pack (push, <n>)" msgstr "" -#: c-pragma.c:127 +#: c-pragma.c:125 #, c-format msgid "" "#pragma pack(pop, %s) encountered without matching #pragma pack(push, %s, " "<n>)" msgstr "" -#: c-pragma.c:162 +#: c-pragma.c:145 msgid "#pragma pack(push[, id], <n>) is not supported on this target" msgstr "" -#: c-pragma.c:164 +#: c-pragma.c:147 msgid "#pragma pack(pop[, id], <n>) is not supported on this target" msgstr "" -#: c-pragma.c:184 +#: c-pragma.c:167 msgid "missing '(' after '#pragma pack' - ignored" msgstr "" -#: c-pragma.c:197 c-pragma.c:247 +#: c-pragma.c:180 c-pragma.c:230 msgid "malformed '#pragma pack' - ignored" msgstr "" -#: c-pragma.c:202 +#: c-pragma.c:185 msgid "malformed '#pragma pack(push[, id], <n>)' - ignored" msgstr "" -#: c-pragma.c:204 +#: c-pragma.c:187 msgid "malformed '#pragma pack(pop[, id])' - ignored" msgstr "" -#: c-pragma.c:213 +#: c-pragma.c:196 #, c-format msgid "unknown action '%s' for '#pragma pack' - ignored" msgstr "" -#: c-pragma.c:250 +#: c-pragma.c:233 msgid "junk at end of '#pragma pack'" msgstr "" -#: c-pragma.c:264 +#: c-pragma.c:247 #, c-format msgid "alignment must be a small power of two, not %d" msgstr "" -#: c-pragma.c:329 c-pragma.c:334 +#: c-pragma.c:280 +#, c-format +msgid "" +"applying #pragma weak `%s' after first use results in unspecified behavior" +msgstr "" + +#: c-pragma.c:321 c-pragma.c:326 msgid "malformed #pragma weak, ignored" msgstr "" -#: c-pragma.c:338 +#: c-pragma.c:330 msgid "junk at end of #pragma weak" msgstr "" -#: c-pragma.c:369 c-pragma.c:374 +#: c-pragma.c:365 c-pragma.c:370 msgid "malformed #pragma redefine_extname, ignored" msgstr "" -#: c-pragma.c:379 +#: c-pragma.c:375 msgid "junk at end of #pragma redefine_extname" msgstr "" -#: c-pragma.c:386 c-pragma.c:461 +#: c-pragma.c:382 c-pragma.c:463 msgid "#pragma redefine_extname conflicts with declaration" msgstr "" -#: c-pragma.c:410 +#: c-pragma.c:413 msgid "malformed #pragma extern_prefix, ignored" msgstr "" -#: c-pragma.c:415 +#: c-pragma.c:418 msgid "junk at end of #pragma extern_prefix" msgstr "" -#: c-pragma.c:447 +#: c-pragma.c:450 msgid "asm declaration conficts with previous rename" msgstr "" -#: c-semantics.c:563 +#: c-semantics.c:565 msgid "break statement not within loop or switch" msgstr "" -#: c-semantics.c:581 +#: c-semantics.c:583 msgid "continue statement not within a loop" msgstr "" -#: c-semantics.c:676 +#: c-semantics.c:678 msgid "destructor needed for `%#D'" msgstr "" -#: c-semantics.c:677 +#: c-semantics.c:679 msgid "where case label appears here" msgstr "" -#: c-semantics.c:680 +#: c-semantics.c:682 msgid "" "(enclose actions of previous case statements requiring destructors in their " "own scope.)" msgstr "" -#: c-semantics.c:723 c-typeck.c:6889 cp/semantics.c:872 +#: c-semantics.c:725 c-typeck.c:6893 cp/semantics.c:897 #, c-format msgid "%s qualifier ignored on asm" msgstr "" @@ -2527,7 +2657,7 @@ msgstr "" msgid "`%s' has an incomplete type" msgstr "" -#: c-typeck.c:145 cp/call.c:2592 +#: c-typeck.c:145 cp/call.c:2740 msgid "invalid use of void expression" msgstr "" @@ -2535,7 +2665,7 @@ msgstr "" msgid "invalid use of flexible array member" msgstr "" -#: c-typeck.c:159 cp/typeck2.c:227 +#: c-typeck.c:159 msgid "invalid use of array with unspecified bounds" msgstr "" @@ -2554,1280 +2684,1327 @@ msgstr "" msgid "function types not truly compatible in ISO C" msgstr "" -#: c-typeck.c:598 +#: c-typeck.c:603 msgid "types are not quite compatible" msgstr "" -#: c-typeck.c:751 -msgid "sizeof applied to a function type" -msgstr "" - -#: c-typeck.c:757 -msgid "sizeof applied to a void type" -msgstr "" - -#: c-typeck.c:764 -msgid "sizeof applied to an incomplete type" -msgstr "" - -#: c-typeck.c:817 c-typeck.c:2706 +#: c-typeck.c:757 c-typeck.c:2673 msgid "arithmetic on pointer to an incomplete type" msgstr "" -#: c-typeck.c:1196 +#: c-typeck.c:1136 #, c-format msgid "%s has no member named `%s'" msgstr "" -#: c-typeck.c:1229 +#: c-typeck.c:1169 #, c-format msgid "request for member `%s' in something not a structure or union" msgstr "" -#: c-typeck.c:1261 +#: c-typeck.c:1201 msgid "dereferencing pointer to incomplete type" msgstr "" -#: c-typeck.c:1265 +#: c-typeck.c:1205 msgid "dereferencing `void *' pointer" msgstr "" -#: c-typeck.c:1282 cp/typeck.c:2357 +#: c-typeck.c:1222 cp/typeck.c:2357 #, c-format msgid "invalid type argument of `%s'" msgstr "" -#: c-typeck.c:1301 cp/typeck.c:2383 +#: c-typeck.c:1241 cp/typeck.c:2383 msgid "subscript missing in array reference" msgstr "" -#: c-typeck.c:1322 cp/typeck.c:2425 +#: c-typeck.c:1262 cp/typeck.c:2425 msgid "array subscript has type `char'" msgstr "" -#: c-typeck.c:1330 c-typeck.c:1419 cp/typeck.c:2432 cp/typeck.c:2511 +#: c-typeck.c:1270 c-typeck.c:1359 cp/typeck.c:2432 cp/typeck.c:2511 msgid "array subscript is not an integer" msgstr "" -#: c-typeck.c:1363 +#: c-typeck.c:1303 msgid "ISO C forbids subscripting `register' array" msgstr "" -#: c-typeck.c:1365 -msgid "ISO C89 forbids subscripting non-lvalue array" +#: c-typeck.c:1305 +msgid "ISO C90 forbids subscripting non-lvalue array" msgstr "" -#: c-typeck.c:1398 +#: c-typeck.c:1338 msgid "subscript has type `char'" msgstr "" -#: c-typeck.c:1414 cp/typeck.c:2506 +#: c-typeck.c:1354 cp/typeck.c:2506 msgid "subscripted value is neither array nor pointer" msgstr "" -#: c-typeck.c:1468 +#: c-typeck.c:1408 #, c-format msgid "`%s' undeclared here (not in a function)" msgstr "" -#: c-typeck.c:1475 +#: c-typeck.c:1415 #, c-format msgid "`%s' undeclared (first use in this function)" msgstr "" -#: c-typeck.c:1480 +#: c-typeck.c:1420 msgid "(Each undeclared identifier is reported only once" msgstr "" -#: c-typeck.c:1481 +#: c-typeck.c:1421 msgid "for each function it appears in.)" msgstr "" -#: c-typeck.c:1498 +#: c-typeck.c:1438 #, c-format msgid "local declaration of `%s' hides instance variable" msgstr "" -#: c-typeck.c:1563 +#: c-typeck.c:1504 msgid "called object is not a function" msgstr "" -#: c-typeck.c:1650 cp/typeck.c:3145 +#: c-typeck.c:1590 cp/typeck.c:2831 msgid "too many arguments to function" msgstr "" -#: c-typeck.c:1671 +#: c-typeck.c:1611 #, c-format msgid "type of formal parameter %d is incomplete" msgstr "" -#: c-typeck.c:1684 +#: c-typeck.c:1624 #, c-format msgid "%s as integer rather than floating due to prototype" msgstr "" -#: c-typeck.c:1687 +#: c-typeck.c:1627 #, c-format msgid "%s as integer rather than complex due to prototype" msgstr "" -#: c-typeck.c:1690 +#: c-typeck.c:1630 #, c-format msgid "%s as complex rather than floating due to prototype" msgstr "" -#: c-typeck.c:1693 +#: c-typeck.c:1633 #, c-format msgid "%s as floating rather than integer due to prototype" msgstr "" -#: c-typeck.c:1696 +#: c-typeck.c:1636 #, c-format msgid "%s as complex rather than integer due to prototype" msgstr "" -#: c-typeck.c:1699 +#: c-typeck.c:1639 #, c-format msgid "%s as floating rather than complex due to prototype" msgstr "" -#: c-typeck.c:1709 +#: c-typeck.c:1649 #, c-format msgid "%s as `float' rather than `double' due to prototype" msgstr "" -#: c-typeck.c:1727 +#: c-typeck.c:1667 #, c-format msgid "%s with different width due to prototype" msgstr "" -#: c-typeck.c:1761 +#: c-typeck.c:1701 #, c-format msgid "%s as unsigned due to prototype" msgstr "" -#: c-typeck.c:1763 +#: c-typeck.c:1703 #, c-format msgid "%s as signed due to prototype" msgstr "" -#: c-typeck.c:1797 cp/typeck.c:3253 +#: c-typeck.c:1737 cp/typeck.c:2935 msgid "too few arguments to function" msgstr "" -#: c-typeck.c:1839 +#: c-typeck.c:1779 msgid "suggest parentheses around + or - inside shift" msgstr "" -#: c-typeck.c:1846 +#: c-typeck.c:1786 msgid "suggest parentheses around && within ||" msgstr "" -#: c-typeck.c:1855 +#: c-typeck.c:1795 msgid "suggest parentheses around arithmetic in operand of |" msgstr "" -#: c-typeck.c:1858 +#: c-typeck.c:1798 msgid "suggest parentheses around comparison in operand of |" msgstr "" -#: c-typeck.c:1867 +#: c-typeck.c:1807 msgid "suggest parentheses around arithmetic in operand of ^" msgstr "" -#: c-typeck.c:1870 +#: c-typeck.c:1810 msgid "suggest parentheses around comparison in operand of ^" msgstr "" -#: c-typeck.c:1877 +#: c-typeck.c:1817 msgid "suggest parentheses around + or - in operand of &" msgstr "" -#: c-typeck.c:1880 +#: c-typeck.c:1820 msgid "suggest parentheses around comparison in operand of &" msgstr "" -#: c-typeck.c:1887 +#: c-typeck.c:1827 msgid "comparisons like X<=Y<=Z do not have their mathematical meaning" msgstr "" -#: c-typeck.c:2047 c-typeck.c:2080 +#: c-typeck.c:1987 c-typeck.c:2022 msgid "division by zero" msgstr "" -#: c-typeck.c:2125 cp/typeck.c:3514 +#: c-typeck.c:2067 cp/typeck.c:3196 msgid "right shift count is negative" msgstr "" -#: c-typeck.c:2132 cp/typeck.c:3520 +#: c-typeck.c:2074 cp/typeck.c:3202 msgid "right shift count >= width of type" msgstr "" -#: c-typeck.c:2153 cp/typeck.c:3539 +#: c-typeck.c:2095 cp/typeck.c:3221 msgid "left shift count is negative" msgstr "" -#: c-typeck.c:2156 cp/typeck.c:3541 +#: c-typeck.c:2098 cp/typeck.c:3223 msgid "left shift count >= width of type" msgstr "" -#: c-typeck.c:2177 +#: c-typeck.c:2119 msgid "shift count is negative" msgstr "" -#: c-typeck.c:2179 +#: c-typeck.c:2121 msgid "shift count >= width of type" msgstr "" -#: c-typeck.c:2196 cp/typeck.c:3576 +#: c-typeck.c:2138 cp/typeck.c:3258 msgid "comparing floating point with == or != is unsafe" msgstr "" -#: c-typeck.c:2220 c-typeck.c:2226 +#: c-typeck.c:2164 c-typeck.c:2170 msgid "ISO C forbids comparison of `void *' with function pointer" msgstr "" -#: c-typeck.c:2229 c-typeck.c:2269 c-typeck.c:2297 +#: c-typeck.c:2173 c-typeck.c:2213 c-typeck.c:2241 msgid "comparison of distinct pointer types lacks a cast" msgstr "" -#: c-typeck.c:2243 c-typeck.c:2248 c-typeck.c:2317 c-typeck.c:2322 +#: c-typeck.c:2187 c-typeck.c:2192 c-typeck.c:2261 c-typeck.c:2266 msgid "comparison between pointer and integer" msgstr "" -#: c-typeck.c:2264 c-typeck.c:2292 +#: c-typeck.c:2208 c-typeck.c:2236 msgid "ISO C forbids ordered comparisons of pointers to functions" msgstr "" -#: c-typeck.c:2289 +#: c-typeck.c:2233 msgid "comparison of complete and incomplete pointers" msgstr "" -#: c-typeck.c:2305 c-typeck.c:2312 +#: c-typeck.c:2249 c-typeck.c:2256 msgid "ordered comparison of pointer with integer zero" msgstr "" -#: c-typeck.c:2336 cp/typeck.c:3709 +#: c-typeck.c:2280 cp/typeck.c:3391 msgid "unordered comparison on non-floating point argument" msgstr "" -#: c-typeck.c:2545 +#: c-typeck.c:2491 msgid "comparison between signed and unsigned" msgstr "" -#: c-typeck.c:2591 cp/typeck.c:3953 +#: c-typeck.c:2537 cp/typeck.c:3635 msgid "comparison of promoted ~unsigned with constant" msgstr "" -#: c-typeck.c:2599 cp/typeck.c:3961 +#: c-typeck.c:2545 cp/typeck.c:3643 msgid "comparison of promoted ~unsigned with unsigned" msgstr "" -#: c-typeck.c:2658 +#: c-typeck.c:2625 msgid "pointer of type `void *' used in subtraction" msgstr "" -#: c-typeck.c:2660 +#: c-typeck.c:2627 msgid "pointer to a function used in subtraction" msgstr "" -#: c-typeck.c:2757 +#: c-typeck.c:2724 msgid "wrong type argument to unary plus" msgstr "" -#: c-typeck.c:2768 +#: c-typeck.c:2737 msgid "wrong type argument to unary minus" msgstr "" -#: c-typeck.c:2780 +#: c-typeck.c:2754 msgid "ISO C does not support `~' for complex conjugation" msgstr "" -#: c-typeck.c:2786 +#: c-typeck.c:2760 msgid "wrong type argument to bit-complement" msgstr "" -#: c-typeck.c:2797 +#: c-typeck.c:2769 msgid "wrong type argument to abs" msgstr "" -#: c-typeck.c:2809 +#: c-typeck.c:2781 msgid "wrong type argument to conjugation" msgstr "" -#: c-typeck.c:2823 +#: c-typeck.c:2795 msgid "wrong type argument to unary exclamation mark" msgstr "" -#: c-typeck.c:2866 +#: c-typeck.c:2838 msgid "ISO C does not support `++' and `--' on complex types" msgstr "" -#: c-typeck.c:2881 c-typeck.c:2913 +#: c-typeck.c:2853 c-typeck.c:2885 msgid "wrong type argument to increment" msgstr "" -#: c-typeck.c:2883 c-typeck.c:2915 +#: c-typeck.c:2855 c-typeck.c:2887 msgid "wrong type argument to decrement" msgstr "" -#: c-typeck.c:2904 +#: c-typeck.c:2876 msgid "increment of pointer to unknown structure" msgstr "" -#: c-typeck.c:2906 +#: c-typeck.c:2878 msgid "decrement of pointer to unknown structure" msgstr "" -#: c-typeck.c:3043 +#: c-typeck.c:3015 msgid "ISO C forbids the address of a cast expression" msgstr "" -#: c-typeck.c:3053 +#: c-typeck.c:3025 msgid "invalid lvalue in unary `&'" msgstr "" -#: c-typeck.c:3085 +#: c-typeck.c:3057 #, c-format msgid "attempt to take address of bit-field structure member `%s'" msgstr "" -#: c-typeck.c:3194 c-typeck.c:4624 c-typeck.c:4640 c-typeck.c:4656 -#: final.c:2975 final.c:2977 gcc.c:4466 rtl-error.c:121 tradcif.y:532 -#: tradcpp.c:4138 config/cris/cris.c:515 cp/typeck.c:4661 java/expr.c:386 -#: java/verify.c:1464 java/verify.c:1465 java/verify.c:1480 +#: c-typeck.c:3166 c-typeck.c:4632 c-typeck.c:4648 c-typeck.c:4664 +#: final.c:3146 final.c:3148 gcc.c:4397 rtl-error.c:122 toplev.c:1694 +#: config/cris/cris.c:529 cp/typeck.c:4341 java/expr.c:364 java/verify.c:1467 +#: java/verify.c:1468 java/verify.c:1483 #, c-format msgid "%s" msgstr "" -#: c-typeck.c:3255 +#: c-typeck.c:3227 msgid "ISO C forbids use of conditional expressions as lvalues" msgstr "" -#: c-typeck.c:3258 +#: c-typeck.c:3230 msgid "ISO C forbids use of compound expressions as lvalues" msgstr "" -#: c-typeck.c:3261 +#: c-typeck.c:3233 msgid "ISO C forbids use of cast expressions as lvalues" msgstr "" -#: c-typeck.c:3278 +#: c-typeck.c:3250 #, c-format msgid "%s of read-only member `%s'" msgstr "" -#: c-typeck.c:3282 +#: c-typeck.c:3254 #, c-format msgid "%s of read-only variable `%s'" msgstr "" -#: c-typeck.c:3285 +#: c-typeck.c:3257 #, c-format msgid "%s of read-only location" msgstr "" -#: c-typeck.c:3304 +#: c-typeck.c:3276 #, c-format msgid "cannot take address of bit-field `%s'" msgstr "" -#: c-typeck.c:3332 +#: c-typeck.c:3304 #, c-format msgid "global register variable `%s' used in nested function" msgstr "" -#: c-typeck.c:3336 +#: c-typeck.c:3308 #, c-format msgid "register variable `%s' used in nested function" msgstr "" -#: c-typeck.c:3343 +#: c-typeck.c:3315 #, c-format msgid "address of global register variable `%s' requested" msgstr "" -#: c-typeck.c:3355 +#: c-typeck.c:3327 msgid "cannot put object with volatile field into register" msgstr "" -#: c-typeck.c:3359 +#: c-typeck.c:3331 #, c-format msgid "address of register variable `%s' requested" msgstr "" -#: c-typeck.c:3467 +#: c-typeck.c:3439 msgid "signed and unsigned type in conditional expression" msgstr "" -#: c-typeck.c:3474 +#: c-typeck.c:3446 msgid "ISO C forbids conditional expr with only one void side" msgstr "" -#: c-typeck.c:3490 c-typeck.c:3497 +#: c-typeck.c:3462 c-typeck.c:3469 msgid "ISO C forbids conditional expr between `void *' and function pointer" msgstr "" -#: c-typeck.c:3503 +#: c-typeck.c:3475 msgid "pointer type mismatch in conditional expression" msgstr "" -#: c-typeck.c:3510 c-typeck.c:3520 +#: c-typeck.c:3482 c-typeck.c:3492 msgid "pointer/integer type mismatch in conditional expression" msgstr "" -#: c-typeck.c:3534 +#: c-typeck.c:3506 msgid "type mismatch in conditional expression" msgstr "" -#: c-typeck.c:3605 cp/typeck.c:4918 +#: c-typeck.c:3577 cp/typeck.c:4597 msgid "left-hand operand of comma expression has no effect" msgstr "" -#: c-typeck.c:3644 +#: c-typeck.c:3621 msgid "cast specifies array type" msgstr "" -#: c-typeck.c:3650 +#: c-typeck.c:3627 msgid "cast specifies function type" msgstr "" -#: c-typeck.c:3660 +#: c-typeck.c:3637 msgid "ISO C forbids casting nonscalar to the same type" msgstr "" -#: c-typeck.c:3679 +#: c-typeck.c:3656 msgid "ISO C forbids casts to union type" msgstr "" -#: c-typeck.c:3694 +#: c-typeck.c:3671 msgid "cast to union type from type not present in union" msgstr "" -#: c-typeck.c:3745 +#: c-typeck.c:3722 msgid "cast adds new qualifiers to function type" msgstr "" #. There are qualifiers present in IN_OTYPE that are not #. present in IN_TYPE. -#: c-typeck.c:3750 +#: c-typeck.c:3727 msgid "cast discards qualifiers from pointer target type" msgstr "" -#: c-typeck.c:3765 +#: c-typeck.c:3742 msgid "cast increases required alignment of target type" msgstr "" -#: c-typeck.c:3771 cp/typeck.c:5348 +#: c-typeck.c:3748 cp/typeck.c:5027 msgid "cast from pointer to integer of different size" msgstr "" -#: c-typeck.c:3776 +#: c-typeck.c:3753 msgid "cast does not match function type" msgstr "" -#: c-typeck.c:3783 cp/typeck.c:5355 +#: c-typeck.c:3760 cp/typeck.c:5034 msgid "cast to pointer from integer of different size" msgstr "" +#: c-typeck.c:3772 +msgid "type-punning to incomplete type might break strict-aliasing rules" +msgstr "" + +#: c-typeck.c:3776 +msgid "dereferencing type-punned pointer will break strict-aliasing rules" +msgstr "" + #. Now we have handled acceptable kinds of LHS that are not truly lvalues. #. Reject anything strange now. -#: c-typeck.c:3941 +#: c-typeck.c:3935 msgid "invalid lvalue in assignment" msgstr "" #. Convert new value to destination type. -#: c-typeck.c:3950 c-typeck.c:3975 c-typeck.c:3992 cp/typeck.c:5465 -#: cp/typeck.c:5616 +#: c-typeck.c:3944 c-typeck.c:3969 c-typeck.c:3986 cp/typeck.c:5145 +#: cp/typeck.c:5294 msgid "assignment" msgstr "" -#: c-typeck.c:4060 +#: c-typeck.c:4056 msgid "cannot pass rvalue to reference parameter" msgstr "" -#: c-typeck.c:4164 c-typeck.c:4231 +#: c-typeck.c:4160 c-typeck.c:4227 #, c-format msgid "%s makes qualified function pointer from unqualified" msgstr "" -#: c-typeck.c:4168 c-typeck.c:4211 +#: c-typeck.c:4164 c-typeck.c:4207 #, c-format msgid "%s discards qualifiers from pointer target type" msgstr "" -#: c-typeck.c:4174 +#: c-typeck.c:4170 msgid "ISO C prohibits argument conversion to union type" msgstr "" -#: c-typeck.c:4203 +#: c-typeck.c:4199 #, c-format msgid "ISO C forbids %s between function pointer and `void *'" msgstr "" -#: c-typeck.c:4220 +#: c-typeck.c:4216 #, c-format msgid "pointer targets in %s differ in signedness" msgstr "" -#: c-typeck.c:4236 +#: c-typeck.c:4232 #, c-format msgid "%s from incompatible pointer type" msgstr "" -#: c-typeck.c:4252 +#: c-typeck.c:4248 #, c-format msgid "%s makes pointer from integer without a cast" msgstr "" -#: c-typeck.c:4260 +#: c-typeck.c:4256 #, c-format msgid "%s makes integer from pointer without a cast" msgstr "" -#: c-typeck.c:4274 c-typeck.c:4277 +#: c-typeck.c:4270 c-typeck.c:4273 #, c-format msgid "incompatible type for argument %d of `%s'" msgstr "" -#: c-typeck.c:4281 +#: c-typeck.c:4277 #, c-format msgid "incompatible type for argument %d of indirect function call" msgstr "" -#: c-typeck.c:4285 +#: c-typeck.c:4281 #, c-format msgid "incompatible types in %s" msgstr "" #. Function name is known; supply it. -#: c-typeck.c:4340 +#: c-typeck.c:4339 +#, c-format +msgid "passing arg of `%s'" +msgstr "" + +#. Function name unknown (call through ptr). +#: c-typeck.c:4349 +msgid "passing arg of pointer to function" +msgstr "" + +#. Function name is known; supply it. +#: c-typeck.c:4357 #, c-format msgid "passing arg %d of `%s'" msgstr "" #. Function name unknown (call through ptr); just give arg number. -#: c-typeck.c:4350 +#: c-typeck.c:4367 #, c-format msgid "passing arg %d of pointer to function" msgstr "" -#: c-typeck.c:4416 +#: c-typeck.c:4433 msgid "initializer for static variable is not constant" msgstr "" -#: c-typeck.c:4422 +#: c-typeck.c:4439 msgid "initializer for static variable uses complicated arithmetic" msgstr "" -#: c-typeck.c:4430 +#: c-typeck.c:4447 msgid "aggregate initializer is not constant" msgstr "" -#: c-typeck.c:4432 +#: c-typeck.c:4449 msgid "aggregate initializer uses complicated arithmetic" msgstr "" -#: c-typeck.c:4439 +#: c-typeck.c:4456 msgid "traditional C rejects automatic aggregate initialization" msgstr "" -#: c-typeck.c:4627 c-typeck.c:4643 c-typeck.c:4659 +#: c-typeck.c:4635 c-typeck.c:4651 c-typeck.c:4667 #, c-format msgid "(near initialization for `%s')" msgstr "" -#: c-typeck.c:4710 cp/typeck2.c:513 +#: c-typeck.c:4718 cp/typeck2.c:505 msgid "char-array initialized from wide string" msgstr "" -#: c-typeck.c:4717 cp/typeck2.c:520 +#: c-typeck.c:4725 cp/typeck2.c:512 msgid "int-array initialized from non-wide string" msgstr "" -#: c-typeck.c:4735 cp/typeck2.c:536 +#: c-typeck.c:4743 cp/typeck2.c:528 msgid "initializer-string for array of chars is too long" msgstr "" -#: c-typeck.c:4773 +#: c-typeck.c:4781 msgid "array initialized from non-constant array expression" msgstr "" -#: c-typeck.c:4790 c-typeck.c:4792 c-typeck.c:4808 c-typeck.c:4829 -#: c-typeck.c:6229 +#: c-typeck.c:4798 c-typeck.c:4800 c-typeck.c:4816 c-typeck.c:4837 +#: c-typeck.c:6237 msgid "initializer element is not constant" msgstr "" -#: c-typeck.c:4824 +#: c-typeck.c:4832 msgid "initialization" msgstr "" -#: c-typeck.c:4835 c-typeck.c:6234 +#: c-typeck.c:4843 c-typeck.c:6242 msgid "initializer element is not computable at load time" msgstr "" -#: c-typeck.c:4850 cp/typeck2.c:613 +#: c-typeck.c:4858 cp/typeck2.c:605 msgid "invalid initializer" msgstr "" -#: c-typeck.c:5343 +#: c-typeck.c:5351 msgid "extra brace group at end of initializer" msgstr "" -#: c-typeck.c:5363 +#: c-typeck.c:5371 msgid "missing braces around initializer" msgstr "" -#: c-typeck.c:5423 +#: c-typeck.c:5431 msgid "braces around scalar initializer" msgstr "" -#: c-typeck.c:5471 +#: c-typeck.c:5479 msgid "initialization of flexible array member in a nested context" msgstr "" -#: c-typeck.c:5473 +#: c-typeck.c:5481 msgid "initialization of a flexible array member" msgstr "" -#: c-typeck.c:5504 +#: c-typeck.c:5512 msgid "missing initializer" msgstr "" -#: c-typeck.c:5530 +#: c-typeck.c:5538 msgid "empty scalar initializer" msgstr "" -#: c-typeck.c:5535 +#: c-typeck.c:5543 msgid "extra elements in scalar initializer" msgstr "" -#: c-typeck.c:5621 +#: c-typeck.c:5629 msgid "initialization designators may not nest" msgstr "" -#: c-typeck.c:5642 c-typeck.c:5713 +#: c-typeck.c:5650 c-typeck.c:5721 msgid "array index in non-array initializer" msgstr "" -#: c-typeck.c:5647 c-typeck.c:5765 +#: c-typeck.c:5655 c-typeck.c:5773 msgid "field name not in record or union initializer" msgstr "" -#: c-typeck.c:5709 c-typeck.c:5711 +#: c-typeck.c:5717 c-typeck.c:5719 msgid "nonconstant array index in initializer" msgstr "" -#: c-typeck.c:5716 +#: c-typeck.c:5724 msgid "array index in initializer exceeds array bounds" msgstr "" -#: c-typeck.c:5727 +#: c-typeck.c:5735 msgid "empty index range in initializer" msgstr "" -#: c-typeck.c:5736 +#: c-typeck.c:5744 msgid "array index range in initializer exceeds array bounds" msgstr "" -#: c-typeck.c:5777 +#: c-typeck.c:5785 #, c-format msgid "unknown field `%s' specified in initializer" msgstr "" -#: c-typeck.c:5814 c-typeck.c:5835 c-typeck.c:6296 +#: c-typeck.c:5822 c-typeck.c:5843 c-typeck.c:6304 msgid "initialized field with side-effects overwritten" msgstr "" -#: c-typeck.c:6506 +#: c-typeck.c:6514 msgid "excess elements in char array initializer" msgstr "" -#: c-typeck.c:6513 c-typeck.c:6559 +#: c-typeck.c:6521 c-typeck.c:6567 msgid "excess elements in struct initializer" msgstr "" -#: c-typeck.c:6574 +#: c-typeck.c:6582 msgid "non-static initialization of a flexible array member" msgstr "" -#: c-typeck.c:6636 +#: c-typeck.c:6644 msgid "excess elements in union initializer" msgstr "" -#: c-typeck.c:6657 +#: c-typeck.c:6665 msgid "traditional C rejects initialization of unions" msgstr "" -#: c-typeck.c:6720 +#: c-typeck.c:6728 msgid "excess elements in array initializer" msgstr "" -#: c-typeck.c:6749 +#: c-typeck.c:6757 msgid "excess elements in vector initializer" msgstr "" -#: c-typeck.c:6771 +#: c-typeck.c:6779 msgid "excess elements in scalar initializer" msgstr "" -#: c-typeck.c:6882 +#: c-typeck.c:6886 msgid "asm template is not a string constant" msgstr "" -#: c-typeck.c:6914 +#: c-typeck.c:6918 msgid "invalid lvalue in asm statement" msgstr "" -#: c-typeck.c:6985 +#: c-typeck.c:6993 msgid "modification by `asm'" msgstr "" -#: c-typeck.c:7004 cp/typeck.c:6464 +#: c-typeck.c:7012 cp/typeck.c:6152 msgid "function declared `noreturn' has a `return' statement" msgstr "" -#: c-typeck.c:7011 +#: c-typeck.c:7019 msgid "`return' with no value, in function returning non-void" msgstr "" -#: c-typeck.c:7017 +#: c-typeck.c:7025 msgid "`return' with a value, in function returning void" msgstr "" -#: c-typeck.c:7021 +#: c-typeck.c:7029 msgid "return" msgstr "" -#: c-typeck.c:7073 +#: c-typeck.c:7081 msgid "function returns address of local variable" msgstr "" -#: c-typeck.c:7129 cp/semantics.c:527 +#: c-typeck.c:7137 cp/semantics.c:555 msgid "switch quantity not an integer" msgstr "" -#: c-typeck.c:7139 +#: c-typeck.c:7147 msgid "`long' switch expression not converted to `int' in ISO C" msgstr "" -#: c-typeck.c:7174 cp/decl.c:5229 +#: c-typeck.c:7182 cp/decl.c:5173 msgid "case label not within a switch statement" msgstr "" -#: c-typeck.c:7176 cp/decl.c:5234 +#: c-typeck.c:7184 cp/decl.c:5178 msgid "`default' label not within a switch statement" msgstr "" -#: calls.c:1903 +#: calls.c:1921 #, c-format msgid "inlining failed in call to `%s'" msgstr "" -#: calls.c:1904 calls.c:2210 +#: calls.c:1922 calls.c:2228 msgid "called from here" msgstr "" -#: calls.c:2209 +#: calls.c:2227 #, c-format msgid "can't inline call to `%s'" msgstr "" -#: calls.c:2239 +#: calls.c:2257 msgid "function call has aggregate value" msgstr "" -#: calls.c:4551 +#: calls.c:4614 msgid "variable offset is passed partially in stack and in reg" msgstr "" -#: calls.c:4553 +#: calls.c:4616 msgid "variable size is passed partially in stack and in reg" msgstr "" -#: cfgrtl.c:1723 +#: cfgloop.c:1106 +#, c-format +msgid "Size of loop %d should be %d, not %d." +msgstr "" + +#: cfgloop.c:1125 +#, c-format +msgid "Bb %d do not belong to loop %d." +msgstr "" + +#: cfgloop.c:1143 +#, c-format +msgid "Loop %d's header does not have exactly 2 entries." +msgstr "" + +#: cfgloop.c:1151 +#, c-format +msgid "Loop %d's latch does not have exactly 1 successor." +msgstr "" + +#: cfgloop.c:1156 +#, c-format +msgid "Loop %d's latch does not have header as successor." +msgstr "" + +#: cfgloop.c:1161 +#, c-format +msgid "Loop %d's latch does not belong directly to it." +msgstr "" + +#: cfgloop.c:1167 +#, c-format +msgid "Loop %d's header does not belong directly to it." +msgstr "" + +#: cfgrtl.c:1704 +#, c-format +msgid "bb %d on wrong place" +msgstr "" + +#: cfgrtl.c:1710 +#, c-format +msgid "prev_bb of %d should be %d, not %d" +msgstr "" + +#: cfgrtl.c:1730 #, c-format msgid "end insn %d for block %d not found in the insn stream" msgstr "" -#: cfgrtl.c:1737 +#: cfgrtl.c:1744 #, c-format msgid "insn %d is in multiple basic blocks (%d and %d)" msgstr "" -#: cfgrtl.c:1749 +#: cfgrtl.c:1756 #, c-format msgid "head insn %d for block %d not found in the insn stream" msgstr "" -#: cfgrtl.c:1771 +#: cfgrtl.c:1778 #, c-format msgid "verify_flow_info: REG_BR_PROB does not match cfg %i %i" msgstr "" -#: cfgrtl.c:1778 +#: cfgrtl.c:1785 #, c-format msgid "verify_flow_info: Wrong count of block %i %i" msgstr "" -#: cfgrtl.c:1784 +#: cfgrtl.c:1791 #, c-format msgid "verify_flow_info: Wrong frequency of block %i %i" msgstr "" -#: cfgrtl.c:1792 +#: cfgrtl.c:1799 #, c-format msgid "verify_flow_info: Duplicate edge %i->%i" msgstr "" -#: cfgrtl.c:1798 +#: cfgrtl.c:1805 #, c-format msgid "verify_flow_info: Wrong probability of edge %i->%i %i" msgstr "" -#: cfgrtl.c:1804 +#: cfgrtl.c:1811 #, c-format msgid "verify_flow_info: Wrong count of edge %i->%i %i" msgstr "" -#: cfgrtl.c:1834 +#: cfgrtl.c:1841 #, c-format msgid "verify_flow_info: Incorrect blocks for fallthru %i->%i" msgstr "" -#: cfgrtl.c:1849 +#: cfgrtl.c:1856 #, c-format msgid "verify_flow_info: Incorrect fallthru %i->%i" msgstr "" -#: cfgrtl.c:1851 +#: cfgrtl.c:1858 msgid "wrong insn in the fallthru edge" msgstr "" -#: cfgrtl.c:1858 +#: cfgrtl.c:1865 #, c-format msgid "verify_flow_info: Basic block %d succ edge is corrupted" msgstr "" -#: cfgrtl.c:1874 +#: cfgrtl.c:1881 #, c-format msgid "Missing REG_EH_REGION note in the end of bb %i" msgstr "" -#: cfgrtl.c:1882 +#: cfgrtl.c:1889 #, c-format msgid "Too many outgoing branch edges from bb %i" msgstr "" -#: cfgrtl.c:1887 +#: cfgrtl.c:1894 #, c-format msgid "Fallthru edge after unconditional jump %i" msgstr "" -#: cfgrtl.c:1892 +#: cfgrtl.c:1899 #, c-format msgid "Wrong amount of branch edges after unconditional jump %i" msgstr "" -#: cfgrtl.c:1898 +#: cfgrtl.c:1905 #, c-format msgid "Wrong amount of branch edges after conditional jump %i" msgstr "" -#: cfgrtl.c:1903 +#: cfgrtl.c:1910 #, c-format msgid "Call edges for non-call insn in bb %i" msgstr "" -#: cfgrtl.c:1912 +#: cfgrtl.c:1919 #, c-format msgid "Abnormal edges for no purpose in bb %i" msgstr "" -#: cfgrtl.c:1927 +#: cfgrtl.c:1934 #, c-format msgid "missing barrier after block %i" msgstr "" -#: cfgrtl.c:1937 +#: cfgrtl.c:1944 #, c-format msgid "basic block %d pred edge is corrupted" msgstr "" -#: cfgrtl.c:1954 +#: cfgrtl.c:1961 #, c-format msgid "insn %d inside basic block %d but block_for_insn is NULL" msgstr "" -#: cfgrtl.c:1958 +#: cfgrtl.c:1965 #, c-format msgid "insn %d inside basic block %d but block_for_insn is %i" msgstr "" -#: cfgrtl.c:1972 cfgrtl.c:1982 +#: cfgrtl.c:1979 cfgrtl.c:1989 #, c-format msgid "NOTE_INSN_BASIC_BLOCK is missing for block %d" msgstr "" -#: cfgrtl.c:1995 +#: cfgrtl.c:2002 #, c-format msgid "NOTE_INSN_BASIC_BLOCK %d in middle of basic block %d" msgstr "" -#: cfgrtl.c:2007 +#: cfgrtl.c:2014 #, c-format msgid "in basic block %d:" msgstr "" -#: cfgrtl.c:2008 +#: cfgrtl.c:2015 msgid "flow control insn inside a basic block" msgstr "" -#: cfgrtl.c:2027 +#: cfgrtl.c:2034 #, c-format msgid "basic block %i edge lists are corrupted" msgstr "" -#: cfgrtl.c:2041 +#: cfgrtl.c:2049 msgid "basic blocks not numbered consecutively" msgstr "" -#: cfgrtl.c:2066 +#: cfgrtl.c:2074 msgid "insn outside basic block" msgstr "" -#: cfgrtl.c:2074 +#: cfgrtl.c:2082 msgid "return not followed by barrier" msgstr "" -#: cfgrtl.c:2079 +#: cfgrtl.c:2087 #, c-format msgid "number of bb notes in insn chain (%d) != n_basic_blocks (%d)" msgstr "" -#: cfgrtl.c:2083 +#: cfgrtl.c:2091 msgid "verify_flow_info failed" msgstr "" -#: collect2.c:439 +#: collect2.c:425 msgid "internal error" msgstr "" -#: collect2.c:940 +#: collect2.c:934 msgid "no arguments" msgstr "" -#: collect2.c:1269 collect2.c:1417 collect2.c:1450 +#: collect2.c:1263 collect2.c:1411 collect2.c:1444 #, c-format msgid "fopen %s" msgstr "" -#: collect2.c:1272 collect2.c:1422 collect2.c:1453 +#: collect2.c:1266 collect2.c:1416 collect2.c:1447 #, c-format msgid "fclose %s" msgstr "" -#: collect2.c:1281 +#: collect2.c:1275 #, c-format msgid "collect2 version %s" msgstr "" -#: collect2.c:1371 +#: collect2.c:1365 #, c-format msgid "%d constructor(s) found\n" msgstr "" -#: collect2.c:1372 +#: collect2.c:1366 #, c-format msgid "%d destructor(s) found\n" msgstr "" -#: collect2.c:1373 +#: collect2.c:1367 #, c-format msgid "%d frame table(s) found\n" msgstr "" -#: collect2.c:1514 +#: collect2.c:1508 #, c-format msgid "%s terminated with signal %d [%s]%s" msgstr "" -#: collect2.c:1533 +#: collect2.c:1527 #, c-format msgid "%s returned %d exit status" msgstr "" -#: collect2.c:1561 +#: collect2.c:1555 #, c-format msgid "[cannot find %s]" msgstr "" -#: collect2.c:1576 +#: collect2.c:1570 #, c-format msgid "cannot find `%s'" msgstr "" -#: collect2.c:1587 collect2.c:1590 +#: collect2.c:1581 collect2.c:1584 #, c-format msgid "redirecting stdout: %s" msgstr "" -#: collect2.c:1633 +#: collect2.c:1627 #, c-format msgid "[Leaving %s]\n" msgstr "" -#: collect2.c:1876 +#: collect2.c:1870 #, c-format msgid "" "\n" "write_c_file - output name is %s, prefix is %s\n" msgstr "" -#: collect2.c:2089 +#: collect2.c:2083 msgid "cannot find `nm'" msgstr "" -#: collect2.c:2099 collect2.c:2541 +#: collect2.c:2093 collect2.c:2535 msgid "pipe" msgstr "" -#: collect2.c:2103 collect2.c:2545 +#: collect2.c:2097 collect2.c:2539 msgid "fdopen" msgstr "" -#: collect2.c:2129 collect2.c:2571 +#: collect2.c:2123 collect2.c:2565 #, c-format msgid "dup2 %d 1" msgstr "" -#: collect2.c:2132 collect2.c:2135 collect2.c:2148 collect2.c:2574 -#: collect2.c:2577 collect2.c:2590 +#: collect2.c:2126 collect2.c:2129 collect2.c:2142 collect2.c:2568 +#: collect2.c:2571 collect2.c:2584 #, c-format msgid "close %d" msgstr "" -#: collect2.c:2138 +#: collect2.c:2132 collect2.c:2574 #, c-format -msgid "execvp %s" +msgid "execv %s" msgstr "" -#: collect2.c:2192 +#: collect2.c:2186 #, c-format msgid "init function found in object %s" msgstr "" -#: collect2.c:2200 +#: collect2.c:2194 #, c-format msgid "fini function found in object %s" msgstr "" -#: collect2.c:2223 collect2.c:2629 +#: collect2.c:2217 collect2.c:2623 msgid "fclose" msgstr "" -#: collect2.c:2268 +#: collect2.c:2262 #, c-format msgid "unable to open file '%s'" msgstr "" -#: collect2.c:2270 +#: collect2.c:2264 #, c-format msgid "unable to stat file '%s'" msgstr "" -#: collect2.c:2276 +#: collect2.c:2270 #, c-format msgid "unable to mmap file '%s'" msgstr "" -#: collect2.c:2429 +#: collect2.c:2423 msgid "not found\n" msgstr "" -#: collect2.c:2431 collect2.c:2608 +#: collect2.c:2425 collect2.c:2602 #, c-format msgid "dynamic dependency %s not found" msgstr "" -#: collect2.c:2451 +#: collect2.c:2445 #, c-format msgid "bad magic number in file '%s'" msgstr "" -#: collect2.c:2473 +#: collect2.c:2467 msgid "dynamic dependencies.\n" msgstr "" -#: collect2.c:2532 +#: collect2.c:2526 msgid "cannot find `ldd'" msgstr "" -#: collect2.c:2580 -#, c-format -msgid "execv %s" -msgstr "" - -#: collect2.c:2593 +#: collect2.c:2587 msgid "" "\n" "ldd output with constructors/destructors.\n" msgstr "" -#: collect2.c:2620 +#: collect2.c:2614 #, c-format msgid "unable to open dynamic dependency '%s'" msgstr "" -#: collect2.c:2734 +#: collect2.c:2728 #, c-format msgid "%s: not a COFF file" msgstr "" -#: collect2.c:2853 +#: collect2.c:2847 #, c-format msgid "%s: cannot open as COFF file" msgstr "" -#: collect2.c:2909 +#: collect2.c:2903 #, c-format msgid "library lib%s not found" msgstr "" -#: collect2.c:3036 +#: collect2.c:3030 #, c-format msgid "open %s" msgstr "" -#: collect2.c:3059 +#: collect2.c:3053 msgid "incompatibilities between object file & expected values" msgstr "" -#: collect2.c:3132 +#: collect2.c:3126 #, c-format msgid "" "\n" "Processing symbol table #%d, offset = 0x%.8lx, kind = %s\n" msgstr "" -#: collect2.c:3141 +#: collect2.c:3135 msgid "string section missing" msgstr "" -#: collect2.c:3144 +#: collect2.c:3138 msgid "section pointer missing" msgstr "" -#: collect2.c:3192 +#: collect2.c:3186 msgid "no symbol table found" msgstr "" -#: collect2.c:3205 +#: collect2.c:3199 msgid "no cmd_strings found" msgstr "" -#: collect2.c:3217 +#: collect2.c:3211 msgid "" "\n" "Updating header and load commands.\n" "\n" msgstr "" -#: collect2.c:3224 +#: collect2.c:3218 #, c-format msgid "load command map, %d cmds, new size %ld.\n" msgstr "" -#: collect2.c:3255 +#: collect2.c:3249 msgid "" "writing load commands.\n" "\n" msgstr "" -#: collect2.c:3275 +#: collect2.c:3269 #, c-format msgid "close %s" msgstr "" -#: collect2.c:3349 +#: collect2.c:3343 msgid "could not convert 0x%l.8x into a region" msgstr "" -#: collect2.c:3353 +#: collect2.c:3347 #, c-format msgid "%s function, region %d, offset = %ld (0x%.8lx)\n" msgstr "" -#: collect2.c:3480 +#: collect2.c:3474 msgid "bad magic number" msgstr "" -#: collect2.c:3481 +#: collect2.c:3475 msgid "bad header version" msgstr "" -#: collect2.c:3482 +#: collect2.c:3476 msgid "bad raw header version" msgstr "" -#: collect2.c:3483 +#: collect2.c:3477 msgid "raw header buffer too small" msgstr "" -#: collect2.c:3484 +#: collect2.c:3478 msgid "old raw header file" msgstr "" -#: collect2.c:3485 +#: collect2.c:3479 msgid "unsupported version" msgstr "" -#: collect2.c:3487 +#: collect2.c:3481 #, c-format msgid "unknown {de,en}code_mach_o_hdr return value %d" msgstr "" -#: collect2.c:3507 +#: collect2.c:3501 #, c-format msgid "fstat %s" msgstr "" -#: collect2.c:3544 collect2.c:3592 +#: collect2.c:3538 collect2.c:3586 #, c-format msgid "lseek %s 0" msgstr "" -#: collect2.c:3548 +#: collect2.c:3542 #, c-format msgid "read %s" msgstr "" -#: collect2.c:3551 +#: collect2.c:3545 #, c-format msgid "read %ld bytes, expected %ld, from %s" msgstr "" -#: collect2.c:3572 +#: collect2.c:3566 #, c-format msgid "msync %s" msgstr "" -#: collect2.c:3579 +#: collect2.c:3573 #, c-format msgid "munmap %s" msgstr "" -#: collect2.c:3596 +#: collect2.c:3590 #, c-format msgid "write %s" msgstr "" -#: collect2.c:3599 +#: collect2.c:3593 #, c-format msgid "wrote %ld bytes, expected %ld, to %s" msgstr "" -#: combine.c:12783 +#: combine.c:12966 #, c-format msgid "" ";; Combiner statistics: %d attempts, %d substitutions (%d requiring new " @@ -3836,7 +4013,7 @@ msgid "" "\n" msgstr "" -#: combine.c:12793 +#: combine.c:12976 #, c-format msgid "" "\n" @@ -3860,203 +4037,231 @@ msgstr "" msgid "conversion to incomplete type" msgstr "" -#: convert.c:396 convert.c:476 +#: convert.c:414 convert.c:494 msgid "can't convert between vector values of different size" msgstr "" -#: convert.c:402 +#: convert.c:420 msgid "aggregate value used where an integer was expected" msgstr "" -#: convert.c:454 f/com.c:1081 +#: convert.c:472 f/com.c:1100 msgid "pointer value used where a complex was expected" msgstr "" -#: convert.c:458 f/com.c:1083 +#: convert.c:476 f/com.c:1102 msgid "aggregate value used where a complex was expected" msgstr "" -#: convert.c:482 +#: convert.c:500 msgid "can't convert value to a vector" msgstr "" -#: cpperror.c:118 tradcpp.c:4694 +#: cpperror.c:113 msgid "warning: " msgstr "" -#: cpperror.c:120 +#: cpperror.c:115 msgid "internal error: " msgstr "" -#: cpperror.c:183 +#: cpperror.c:189 msgid "stdout" msgstr "" -#: cpperror.c:185 gcc.c:6311 tradcpp.c:4732 +#: cpperror.c:191 gcc.c:6444 #, c-format msgid "%s: %s" msgstr "" -#: cppexp.c:151 -msgid "floating point numbers are not valid in #if" +#: cppexp.c:199 +msgid "too many decimal points in number" msgstr "" -#: cppexp.c:173 -msgid "traditional C rejects the `U' suffix" +#: cppexp.c:219 +#, c-format +msgid "invalid digit \"%c\" in octal constant" msgstr "" -#: cppexp.c:177 -msgid "too many 'l' suffixes in integer constant" +#: cppexp.c:225 +msgid "use of C99 hexadecimal floating constant" msgstr "" -#: cppexp.c:182 -msgid "integer constant contains digits beyond the radix" +#: cppexp.c:234 +msgid "exponent has no digits" msgstr "" -#: cppexp.c:185 -msgid "integer constant out of range" +#: cppexp.c:241 +msgid "hexadecimal floating constants require an exponent" msgstr "" -#: cppexp.c:192 -msgid "integer constant is so large that it is unsigned" +#: cppexp.c:247 +#, c-format +msgid "invalid suffix \"%.*s\" on floating constant" msgstr "" -#: cppexp.c:201 +#: cppexp.c:257 cppexp.c:282 #, c-format -msgid "invalid suffix '%.*s' on integer constant" +msgid "traditional C rejects the \"%.*s\" suffix" msgstr "" -#: cppexp.c:234 +#: cppexp.c:268 +#, c-format +msgid "invalid suffix \"%.*s\" on integer constant" +msgstr "" + +#: cppexp.c:289 +msgid "use of C99 long long integer constant" +msgstr "" + +#: cppexp.c:295 +msgid "imaginary constants are a GCC extension" +msgstr "" + +#: cppexp.c:383 +msgid "integer constant is too large for its type" +msgstr "" + +#: cppexp.c:395 +msgid "integer constant is so large that it is unsigned" +msgstr "" + +#: cppexp.c:482 msgid "missing ')' after \"defined\"" msgstr "" -#: cppexp.c:241 +#: cppexp.c:489 msgid "operator \"defined\" requires an identifier" msgstr "" -#: cppexp.c:249 +#: cppexp.c:497 #, c-format msgid "(\"%s\" is an alternative token for \"%s\" in C++)" msgstr "" -#: cppexp.c:261 +#: cppexp.c:507 msgid "this use of \"defined\" may not be portable" msgstr "" -#: cppexp.c:309 -msgid "string constants are not valid in #if" +#: cppexp.c:545 +msgid "floating constant in preprocessor expression" msgstr "" -#: cppexp.c:313 -#, c-format -msgid "invalid character '%c' in #if" +#: cppexp.c:551 +msgid "imaginary number in preprocessor expression" msgstr "" -#: cppexp.c:315 +#: cppexp.c:596 #, c-format -msgid "invalid character '\\%03o' in #if" +msgid "ISO C++ does not permit \"%s\" in #if" msgstr "" -#: cppexp.c:333 +#: cppexp.c:604 #, c-format -msgid "ISO C++ does not permit \"%s\" in #if" +msgid "\"%s\" is not defined" msgstr "" -#: cppexp.c:344 +#: cppexp.c:737 cppexp.c:772 #, c-format -msgid "\"%s\" is not defined" +msgid "missing binary operator before token \"%s\"" msgstr "" -#: cppexp.c:370 +#: cppexp.c:756 #, c-format -msgid "\"%s\" is not valid in #if expressions" +msgid "invalid character '%c' in #if" msgstr "" -#: cppexp.c:386 -msgid "integer overflow in preprocessor expression" +#: cppexp.c:758 +#, c-format +msgid "invalid character '\\%03o' in #if" msgstr "" -#: cppexp.c:616 -msgid "missing binary operator" +#: cppexp.c:763 +#, c-format +msgid "token \"%s\" is not valid in preprocessor expressions" msgstr "" -#: cppexp.c:651 +#: cppexp.c:782 msgid "void expression between '(' and ')'" msgstr "" -#: cppexp.c:653 +#: cppexp.c:785 +msgid "#if with no expression" +msgstr "" + +#: cppexp.c:787 #, c-format msgid "operator '%s' has no right operand" msgstr "" -#: cppexp.c:665 -#, c-format -msgid "impossible operator '%s'" +#: cppexp.c:813 +msgid " ':' without preceding '?'" msgstr "" -#: cppexp.c:741 tradcif.y:111 tradcif.y:122 -msgid "division by zero in #if" +#: cppexp.c:840 +msgid "unbalanced stack in #if" msgstr "" -#: cppexp.c:776 -msgid "comma operator in operand of #if" +#: cppexp.c:862 +#, c-format +msgid "impossible operator '%u'" msgstr "" -#: cppexp.c:781 -msgid "syntax error '?' without following ':'" +#: cppexp.c:954 +msgid "missing ')' in expression" msgstr "" -#: cppexp.c:784 -msgid "syntax error ':' without preceding '?'" +#: cppexp.c:975 +msgid "'?' without following ':'" msgstr "" -#: cppexp.c:792 -msgid "missing ')' in expression" +#: cppexp.c:985 +msgid "integer overflow in preprocessor expression" msgstr "" -#: cppexp.c:799 +#: cppexp.c:990 msgid "missing '(' in expression" msgstr "" -#: cppexp.c:825 +#: cppexp.c:1026 #, c-format -msgid "missing binary operator before '%s'" +msgid "the left operand of \"%s\" changes sign when promoted" msgstr "" -#: cppexp.c:831 +#: cppexp.c:1031 #, c-format -msgid "operator '%s' has no left operand" +msgid "the right operand of \"%s\" changes sign when promoted" msgstr "" -#: cppexp.c:870 -msgid "unbalanced stack in #if" +#: cppexp.c:1414 +msgid "comma operator in operand of #if" msgstr "" -#: cppexp.c:875 -msgid "#if with no expression" +#: cppexp.c:1551 +msgid "division by zero in #if" msgstr "" -#: cppfiles.c:395 +#: cppfiles.c:411 #, c-format msgid "%s is too large" msgstr "" -#: cppfiles.c:426 +#: cppfiles.c:447 #, c-format msgid "%s is shorter than expected" msgstr "" -#: cppfiles.c:440 +#: cppfiles.c:461 #, c-format msgid "%s is a block device" msgstr "" -#: cppfiles.c:566 +#: cppfiles.c:594 #, c-format msgid "no include path in which to find %s" msgstr "" -#: cppfiles.c:640 +#: cppfiles.c:668 msgid "Multiple include guards may be useful for:\n" msgstr "" @@ -4064,723 +4269,593 @@ msgstr "" msgid "absolute file name in remap_filename" msgstr "" -#: cppinit.c:230 +#: cppinit.c:224 #, c-format msgid "ignoring nonexistent directory \"%s\"\n" msgstr "" -#: cppinit.c:237 +#: cppinit.c:231 #, c-format msgid "%s: Not a directory" msgstr "" -#: cppinit.c:284 +#: cppinit.c:287 #, c-format msgid "ignoring duplicate directory \"%s\"\n" msgstr "" -#: cppinit.c:312 -#, c-format -msgid "changing search order for system directory \"%s\"" +#: cppinit.c:325 +msgid " as it is a non-system directory that duplicates a system directory\n" +msgstr "" + +#: cppinit.c:891 +msgid "cppchar_t must be an unsigned type" msgstr "" -#: cppinit.c:316 +#: cppinit.c:895 #, c-format -msgid " as it is the same as non-system directory \"%s\"" +msgid "" +"preprocessor arithmetic has maximum precision of %lu bits; target requires %" +"lu bits" msgstr "" -#: cppinit.c:320 -msgid " as it has already been specified as a non-system directory" +#: cppinit.c:901 +msgid "CPP arithmetic must be at least as precise as a target int" msgstr "" -#: cppinit.c:940 +#: cppinit.c:904 +msgid "target char is less than 8 bits wide" +msgstr "" + +#: cppinit.c:908 +msgid "target wchar_t is narrower than target char" +msgstr "" + +#: cppinit.c:912 +msgid "target int is narrower than target char" +msgstr "" + +#: cppinit.c:916 +msgid "CPP half-integer narrower than CPP character" +msgstr "" + +#: cppinit.c:920 +#, c-format +msgid "" +"CPP on this host cannot handle wide character constants over %lu bits, but " +"the target requires %lu bits" +msgstr "" + +#: cppinit.c:972 msgid "#include \"...\" search starts here:\n" msgstr "" -#: cppinit.c:944 +#: cppinit.c:976 msgid "#include <...> search starts here:\n" msgstr "" -#: cppinit.c:947 +#: cppinit.c:979 msgid "End of search list.\n" msgstr "" -#: cppinit.c:1014 +#: cppinit.c:1055 msgid "<built-in>" msgstr "" -#: cppinit.c:1016 +#: cppinit.c:1057 msgid "<command line>" msgstr "" -#: cppinit.c:1091 tradcpp.c:983 tradcpp.c:993 tradcpp.c:1084 -msgid "I/O error on output" -msgstr "" - #. Irix6 "cc -n32" and OSF4 cc have problems with char foo[] = ("string"); #. I.e. a const string initializer with parens around it. That is #. what N_("string") resolves to, so we make no_* be macros instead. -#: cppinit.c:1139 -#, c-format -msgid "argument missing after %s" -msgstr "" - -#: cppinit.c:1140 +#: cppinit.c:1162 #, c-format msgid "assertion missing after %s" msgstr "" -#: cppinit.c:1141 +#: cppinit.c:1163 #, c-format msgid "directory name missing after %s" msgstr "" -#: cppinit.c:1142 +#: cppinit.c:1164 #, c-format msgid "file name missing after %s" msgstr "" -#: cppinit.c:1143 +#: cppinit.c:1165 #, c-format msgid "macro name missing after %s" msgstr "" -#: cppinit.c:1144 +#: cppinit.c:1166 #, c-format msgid "path name missing after %s" msgstr "" -#: cppinit.c:1145 -#, c-format -msgid "number missing after %s" -msgstr "" - -#: cppinit.c:1146 -#, c-format -msgid "target missing after %s" -msgstr "" - -#: cppinit.c:1336 -#, c-format -msgid "too many filenames. Type %s --help for usage info" -msgstr "" - -#: cppinit.c:1532 tradcpp.c:610 -msgid "output filename specified twice" -msgstr "" - -#: cppinit.c:1644 +#: cppinit.c:1368 msgid "-I- specified twice" msgstr "" -#: cppinit.c:1789 -#, c-format -msgid "GNU CPP version %s (cpplib)" -msgstr "" - -#: cppinit.c:1831 tradcpp.c:807 -msgid "you must additionally specify either -M or -MM" -msgstr "" - -#. To keep the lines from getting too long for some compilers, limit -#. to about 500 characters (6 lines) per chunk. -#: cppinit.c:1892 -msgid "" -"Switches:\n" -" -include <file> Include the contents of <file> before other " -"files\n" -" -imacros <file> Accept definition of macros in <file>\n" -" -iprefix <path> Specify <path> as a prefix for next two options\n" -" -iwithprefix <dir> Add <dir> to the end of the system include path\n" -" -iwithprefixbefore <dir> Add <dir> to the end of the main include path\n" -" -isystem <dir> Add <dir> to the start of the system include " -"path\n" -msgstr "" - -#: cppinit.c:1901 -msgid "" -" -idirafter <dir> Add <dir> to the end of the system include path\n" -" -I <dir> Add <dir> to the end of the main include path\n" -" -I- Fine-grained include path control; see info " -"docs\n" -" -nostdinc Do not search system include directories\n" -" (dirs specified with -isystem will still be " -"used)\n" -" -nostdinc++ Do not search system include directories for C+" -"+\n" -" -o <file> Put output into <file>\n" -msgstr "" - -#: cppinit.c:1910 -msgid "" -" -pedantic Issue all warnings demanded by strict ISO C\n" -" -pedantic-errors Issue -pedantic warnings as errors instead\n" -" -trigraphs Support ISO C trigraphs\n" -" -lang-c Assume that the input sources are in C\n" -" -lang-c89 Assume that the input sources are in C89\n" -msgstr "" - -#: cppinit.c:1917 -msgid "" -" -lang-c++ Assume that the input sources are in C++\n" -" -lang-objc Assume that the input sources are in ObjectiveC\n" -" -lang-objc++ Assume that the input sources are in ObjectiveC+" -"+\n" -" -lang-asm Assume that the input sources are in assembler\n" -msgstr "" - -#: cppinit.c:1923 -msgid "" -" -std=<std name> Specify the conformance standard; one of:\n" -" gnu89, gnu99, c89, c99, iso9899:1990,\n" -" iso9899:199409, iso9899:1999\n" -" -+ Allow parsing of C++ style features\n" -" -w Inhibit warning messages\n" -" -Wtrigraphs Warn if trigraphs are encountered\n" -" -Wno-trigraphs Do not warn about trigraphs\n" -" -Wcomment{s} Warn if one comment starts inside another\n" -msgstr "" - -#: cppinit.c:1933 -msgid "" -" -Wno-comment{s} Do not warn about comments\n" -" -Wtraditional Warn about features not present in traditional " -"C\n" -" -Wno-traditional Do not warn about traditional C\n" -" -Wundef Warn if an undefined macro is used by #if\n" -" -Wno-undef Do not warn about testing undefined macros\n" -" -Wimport Warn about the use of the #import directive\n" -msgstr "" - -#: cppinit.c:1941 -msgid "" -" -Wno-import Do not warn about the use of #import\n" -" -Werror Treat all warnings as errors\n" -" -Wno-error Do not treat warnings as errors\n" -" -Wsystem-headers Do not suppress warnings from system headers\n" -" -Wno-system-headers Suppress warnings from system headers\n" -" -Wall Enable all preprocessor warnings\n" -msgstr "" - -#: cppinit.c:1949 -msgid "" -" -M Generate make dependencies\n" -" -MM As -M, but ignore system header files\n" -" -MD Generate make dependencies and compile\n" -" -MMD As -MD, but ignore system header files\n" -" -MF <file> Write dependency output to the given file\n" -" -MG Treat missing header file as generated files\n" -msgstr "" - -#: cppinit.c:1957 -msgid "" -" -MP\t\t\t Generate phony targets for all headers\n" -" -MQ <target> Add a MAKE-quoted target\n" -" -MT <target> Add an unquoted target\n" -msgstr "" - -#: cppinit.c:1962 -msgid "" -" -D<macro> Define a <macro> with string '1' as its value\n" -" -D<macro>=<val> Define a <macro> with <val> as its value\n" -" -A<question>=<answer> Assert the <answer> to <question>\n" -" -A-<question>=<answer> Disable the <answer> to <question>\n" -" -U<macro> Undefine <macro> \n" -" -v Display the version number\n" -msgstr "" - -#: cppinit.c:1970 -msgid "" -" -H Print the name of header files as they are used\n" -" -C Do not discard comments\n" -" -dM Display a list of macro definitions active at " -"end\n" -" -dD Preserve macro definitions in output\n" -" -dN As -dD except that only the names are preserved\n" -" -dI Include #include directives in the output\n" -msgstr "" - -#: cppinit.c:1978 -msgid "" -" -fpreprocessed Treat the input file as already preprocessed\n" -" -ftabstop=<number> Distance between tab stops for column reporting\n" -" -P Do not generate #line directives\n" -" -$ Do not allow '$' in identifiers\n" -" -remap Remap file names when including files\n" -" --version Display version information\n" -" -h or --help Display this information\n" -msgstr "" - -#: cpplex.c:155 +#: cpplex.c:149 #, c-format msgid "trigraph ??%c converted to %c" msgstr "" -#: cpplex.c:163 +#: cpplex.c:157 #, c-format msgid "trigraph ??%c ignored" msgstr "" -#: cpplex.c:220 +#: cpplex.c:214 msgid "backslash and newline separated by space" msgstr "" -#: cpplex.c:227 +#: cpplex.c:221 cpptrad.c:158 msgid "backslash-newline at end of file" msgstr "" -#: cpplex.c:293 +#: cpplex.c:287 cpptrad.c:199 msgid "\"/*\" within comment" msgstr "" -#: cpplex.c:376 +#: cpplex.c:395 msgid "null character(s) ignored" msgstr "" -#: cpplex.c:383 +#: cpplex.c:402 #, c-format msgid "%s in preprocessing directive" msgstr "" -#: cpplex.c:456 +#: cpplex.c:475 #, c-format msgid "attempt to use poisoned \"%s\"" msgstr "" -#: cpplex.c:464 +#: cpplex.c:483 msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro" msgstr "" -#: cpplex.c:536 +#: cpplex.c:555 msgid "'$' character(s) in identifier or number" msgstr "" -#: cpplex.c:653 +#: cpplex.c:698 #, c-format msgid "missing terminating %c character" msgstr "" -#: cpplex.c:666 +#: cpplex.c:711 msgid "null character(s) preserved in literal" msgstr "" -#: cpplex.c:889 +#: cpplex.c:915 cpptrad.c:487 msgid "no newline at end of file" msgstr "" -#: cpplex.c:1009 tradcpp.c:1471 +#: cpplex.c:1092 cpptrad.c:213 msgid "unterminated comment" msgstr "" -#: cpplex.c:1020 -msgid "C++ style comments are not allowed in ISO C89" +#: cpplex.c:1103 +msgid "C++ style comments are not allowed in ISO C90" msgstr "" -#: cpplex.c:1022 +#: cpplex.c:1105 msgid "(this will be reported only once per input file)" msgstr "" -#: cpplex.c:1027 +#: cpplex.c:1110 msgid "multi-line comment" msgstr "" -#: cpplex.c:1342 +#: cpplex.c:1425 #, c-format msgid "unknown string token %s\n" msgstr "" -#: cpplex.c:1355 +#: cpplex.c:1438 #, c-format msgid "unspellable token %s" msgstr "" -#: cpplex.c:1612 +#: cpplex.c:1695 #, c-format msgid "the meaning of '\\%c' is different in traditional C" msgstr "" -#: cpplex.c:1618 +#: cpplex.c:1701 msgid "incomplete universal-character-name" msgstr "" -#: cpplex.c:1632 +#: cpplex.c:1715 #, c-format msgid "non-hex digit '%c' in universal-character-name" msgstr "" -#: cpplex.c:1640 +#: cpplex.c:1723 msgid "universal-character-name on EBCDIC target" msgstr "" -#: cpplex.c:1654 +#: cpplex.c:1737 msgid "universal-character-name out of range" msgstr "" -#: cpplex.c:1698 +#: cpplex.c:1791 msgid "the meaning of '\\a' is different in traditional C" msgstr "" -#: cpplex.c:1705 +#: cpplex.c:1798 #, c-format msgid "non-ISO-standard escape sequence, '\\%c'" msgstr "" -#: cpplex.c:1716 +#: cpplex.c:1809 msgid "the meaning of '\\x' is different in traditional C" msgstr "" -#: cpplex.c:1735 f/lex.c:585 +#: cpplex.c:1828 f/lex.c:585 msgid "\\x used with no following hex digits" msgstr "" -#: cpplex.c:1740 +#: cpplex.c:1833 msgid "hex escape sequence out of range" msgstr "" -#: cpplex.c:1765 +#: cpplex.c:1858 msgid "octal escape sequence out of range" msgstr "" -#: cpplex.c:1780 +#: cpplex.c:1874 #, c-format msgid "unknown escape sequence '\\%c'" msgstr "" -#: cpplex.c:1782 +#: cpplex.c:1877 #, c-format msgid "unknown escape sequence: '\\%03o'" msgstr "" -#: cpplex.c:1786 -msgid "escape sequence out of range for type" +#: cpplex.c:1882 +msgid "escape sequence out of range for its type" msgstr "" -#: cpplex.c:1881 +#: cpplex.c:1973 msgid "empty character constant" msgstr "" -#: cpplex.c:1885 -msgid "character constant too long" +#: cpplex.c:1983 +msgid "character constant too long for its type" msgstr "" -#: cpplex.c:1888 +#: cpplex.c:1986 msgid "multi-character character constant" msgstr "" -#: cpplib.c:228 +#: cpplib.c:225 #, c-format msgid "extra tokens at end of #%s directive" msgstr "" -#: cpplib.c:281 +#: cpplib.c:315 #, c-format msgid "#%s is a GCC extension" msgstr "" -#: cpplib.c:293 +#: cpplib.c:327 msgid "suggest not using #elif in traditional C" msgstr "" -#: cpplib.c:296 +#: cpplib.c:330 #, c-format msgid "traditional C ignores #%s with the # indented" msgstr "" -#: cpplib.c:300 +#: cpplib.c:334 #, c-format msgid "suggest hiding #%s from traditional C with an indented #" msgstr "" -#: cpplib.c:324 +#: cpplib.c:358 msgid "embedding a directive within macro arguments is not portable" msgstr "" -#: cpplib.c:344 +#: cpplib.c:378 msgid "style of line directive is a GCC extension" msgstr "" -#: cpplib.c:393 +#: cpplib.c:427 #, c-format msgid "invalid preprocessing directive #%s" msgstr "" -#: cpplib.c:471 -#, c-format -msgid "no macro name given in #%s directive" +#: cpplib.c:499 +msgid "\"defined\" cannot be used as a macro name" msgstr "" -#: cpplib.c:475 +#: cpplib.c:505 #, c-format msgid "\"%s\" cannot be used as a macro name as it is an operator in C++" msgstr "" -#: cpplib.c:478 -msgid "macro names must be identifiers" +#: cpplib.c:508 +#, c-format +msgid "no macro name given in #%s directive" msgstr "" -#: cpplib.c:489 -#, c-format -msgid "\"%s\" cannot be used as a macro name" +#: cpplib.c:511 +msgid "macro names must be identifiers" msgstr "" -#: cpplib.c:527 +#: cpplib.c:551 #, c-format msgid "undefining \"%s\"" msgstr "" -#: cpplib.c:570 +#: cpplib.c:597 msgid "missing terminating > character" msgstr "" -#: cpplib.c:609 +#: cpplib.c:636 #, c-format msgid "#%s expects \"FILENAME\" or <FILENAME>" msgstr "" -#: cpplib.c:620 +#: cpplib.c:647 #, c-format msgid "empty file name in #%s" msgstr "" -#: cpplib.c:639 +#: cpplib.c:666 msgid "#include_next in primary source file" msgstr "" -#: cpplib.c:646 +#: cpplib.c:673 msgid "#import is obsolete, use an #ifndef wrapper in the header file" msgstr "" -#: cpplib.c:654 +#: cpplib.c:681 msgid "#include nested too deeply" msgstr "" -#: cpplib.c:712 +#: cpplib.c:738 #, c-format msgid "invalid flag \"%s\" in line directive" msgstr "" -#: cpplib.c:795 +#: cpplib.c:813 #, c-format msgid "\"%s\" after #line is not a positive integer" msgstr "" -#: cpplib.c:801 +#: cpplib.c:819 msgid "line number out of range" msgstr "" -#: cpplib.c:812 cpplib.c:883 +#: cpplib.c:830 cpplib.c:901 #, c-format msgid "\"%s\" is not a valid filename" msgstr "" -#: cpplib.c:847 +#: cpplib.c:865 #, c-format msgid "\"%s\" after # is not a positive integer" msgstr "" -#: cpplib.c:954 +#: cpplib.c:972 msgid "invalid #ident directive" msgstr "" -#: cpplib.c:1042 +#: cpplib.c:1060 #, c-format msgid "registering \"%s\" as both a pragma and a pragma namespace" msgstr "" -#: cpplib.c:1045 +#: cpplib.c:1063 #, c-format msgid "#pragma %s %s is already registered" msgstr "" -#: cpplib.c:1048 +#: cpplib.c:1066 #, c-format msgid "#pragma %s is already registered" msgstr "" -#: cpplib.c:1123 +#: cpplib.c:1140 msgid "#pragma once is obsolete" msgstr "" -#: cpplib.c:1126 +#: cpplib.c:1143 msgid "#pragma once in main file" msgstr "" -#: cpplib.c:1150 +#: cpplib.c:1167 msgid "invalid #pragma GCC poison directive" msgstr "" -#: cpplib.c:1159 +#: cpplib.c:1176 #, c-format msgid "poisoning existing macro \"%s\"" msgstr "" -#: cpplib.c:1181 +#: cpplib.c:1198 msgid "#pragma system_header ignored outside include file" msgstr "" -#: cpplib.c:1206 +#: cpplib.c:1223 #, c-format msgid "cannot find source %s" msgstr "" -#: cpplib.c:1210 +#: cpplib.c:1227 #, c-format msgid "current file is older than %s" msgstr "" -#: cpplib.c:1286 +#: cpplib.c:1343 msgid "_Pragma takes a parenthesized string literal" msgstr "" -#: cpplib.c:1385 +#: cpplib.c:1426 msgid "#else without #if" msgstr "" -#: cpplib.c:1390 tradcpp.c:3875 +#: cpplib.c:1431 msgid "#else after #else" msgstr "" -#: cpplib.c:1392 cpplib.c:1426 +#: cpplib.c:1433 cpplib.c:1467 msgid "the conditional began here" msgstr "" -#: cpplib.c:1419 +#: cpplib.c:1460 msgid "#elif without #if" msgstr "" -#: cpplib.c:1424 tradcpp.c:3570 +#: cpplib.c:1465 msgid "#elif after #else" msgstr "" -#: cpplib.c:1455 +#: cpplib.c:1496 msgid "#endif without #if" msgstr "" -#: cpplib.c:1538 tradcpp.c:3267 +#: cpplib.c:1579 msgid "missing '(' after predicate" msgstr "" -#: cpplib.c:1553 tradcpp.c:3281 +#: cpplib.c:1594 msgid "missing ')' to complete answer" msgstr "" -#: cpplib.c:1573 tradcpp.c:3287 +#: cpplib.c:1614 msgid "predicate's answer is empty" msgstr "" -#: cpplib.c:1603 tradcpp.c:3335 +#: cpplib.c:1644 msgid "assertion without predicate" msgstr "" -#: cpplib.c:1605 tradcpp.c:3337 +#: cpplib.c:1646 msgid "predicate must be an identifier" msgstr "" -#: cpplib.c:1687 tradcpp.c:3434 +#: cpplib.c:1735 #, c-format msgid "\"%s\" re-asserted" msgstr "" -#: cpplib.c:1917 +#: cpplib.c:1965 #, c-format msgid "unterminated #%s" msgstr "" -#: cppmacro.c:146 +#: cppmacro.c:94 +#, c-format +msgid "macro \"%s\" is not used" +msgstr "" + +#: cppmacro.c:139 cppmacro.c:294 #, c-format msgid "invalid built-in macro \"%s\"" msgstr "" -#: cppmacro.c:349 -msgid "invalid string literal, ignoring final '\\'" +#: cppmacro.c:234 +msgid "could not determine date and time" msgstr "" -#: cppmacro.c:441 -#, c-format -msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token" +#: cppmacro.c:407 +msgid "invalid string literal, ignoring final '\\'" msgstr "" -#: cppmacro.c:561 +#: cppmacro.c:504 #, c-format -msgid "unterminated argument list invoking macro \"%s\"" +msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token" msgstr "" -#: cppmacro.c:579 +#: cppmacro.c:546 msgid "ISO C99 requires rest arguments to be used" msgstr "" -#: cppmacro.c:584 +#: cppmacro.c:551 #, c-format msgid "macro \"%s\" requires %u arguments, but only %u given" msgstr "" -#: cppmacro.c:595 +#: cppmacro.c:556 #, c-format msgid "macro \"%s\" passed %u arguments, but takes just %u" msgstr "" -#: cppmacro.c:683 +#: cppmacro.c:669 cpptrad.c:774 +#, c-format +msgid "unterminated argument list invoking macro \"%s\"" +msgstr "" + +#: cppmacro.c:776 #, c-format msgid "function-like macro \"%s\" must be used with arguments in traditional C" msgstr "" -#: cppmacro.c:1185 +#: cppmacro.c:1312 #, c-format msgid "duplicate macro parameter \"%s\"" msgstr "" -#: cppmacro.c:1221 +#: cppmacro.c:1349 #, c-format msgid "\"%s\" may not appear in macro parameter list" msgstr "" -#: cppmacro.c:1229 +#: cppmacro.c:1357 msgid "macro parameters must be comma-separated" msgstr "" -#: cppmacro.c:1246 +#: cppmacro.c:1374 msgid "parameter name missing" msgstr "" -#: cppmacro.c:1260 +#: cppmacro.c:1389 msgid "anonymous variadic macros were introduced in C99" msgstr "" -#: cppmacro.c:1264 +#: cppmacro.c:1393 msgid "ISO C does not permit named variadic macros" msgstr "" -#: cppmacro.c:1273 +#: cppmacro.c:1402 msgid "missing ')' in macro parameter list" msgstr "" -#: cppmacro.c:1352 +#: cppmacro.c:1470 msgid "ISO C requires whitespace after the macro name" msgstr "" -#: cppmacro.c:1383 +#: cppmacro.c:1498 msgid "'#' is not followed by a macro parameter" msgstr "" -#: cppmacro.c:1403 +#: cppmacro.c:1517 msgid "'##' cannot appear at either end of a macro expansion" msgstr "" -#: cppmacro.c:1439 +#: cppmacro.c:1599 #, c-format msgid "\"%s\" redefined" msgstr "" -#: cppmacro.c:1443 +#: cppmacro.c:1604 msgid "this is the location of the previous definition" msgstr "" -#: cppmacro.c:1507 +#: cppmacro.c:1655 #, c-format msgid "macro argument \"%s\" would be stringified in traditional C" msgstr "" -#: cppmacro.c:1532 +#: cppmacro.c:1680 #, c-format msgid "invalid hash type %d in cpp_macro_definition" msgstr "" @@ -4794,73 +4869,64 @@ msgstr "" msgid "too many input files" msgstr "" -#: cse.c:7113 +#: cpptrad.c:841 #, c-format -msgid ";; Processing block from %d to %d, %d sets.\n" +msgid "detected recursion whilst expanding macro \"%s\"" msgstr "" -#: diagnostic.c:777 +#: cse.c:7187 #, c-format -msgid "%s:%d: warning: " -msgstr "" - -#: diagnostic.c:784 -#, c-format -msgid "%s: warning: " +msgid ";; Processing block from %d to %d, %d sets.\n" msgstr "" -#: diagnostic.c:864 +#: diagnostic.c:700 msgid "((anonymous))" msgstr "" -#: diagnostic.c:934 +#: diagnostic.c:914 #, c-format msgid "%s: warnings being treated as errors\n" msgstr "" -#: diagnostic.c:971 +#: diagnostic.c:949 #, c-format msgid "%s: %s: " msgstr "" -#: diagnostic.c:1050 -msgid "sorry, not implemented: " -msgstr "" - -#: diagnostic.c:1069 +#: diagnostic.c:1040 #, c-format msgid "%s " msgstr "" -#: diagnostic.c:1071 +#: diagnostic.c:1042 #, c-format msgid " %s" msgstr "" -#: diagnostic.c:1095 +#: diagnostic.c:1064 msgid "At top level:" msgstr "" -#: diagnostic.c:1100 +#: diagnostic.c:1069 #, c-format msgid "In member function `%s':" msgstr "" -#: diagnostic.c:1104 +#: diagnostic.c:1073 #, c-format msgid "In function `%s':" msgstr "" -#: diagnostic.c:1188 +#: diagnostic.c:1161 msgid "compilation terminated.\n" msgstr "" -#: diagnostic.c:1220 +#: diagnostic.c:1179 #, c-format msgid "%s:%d: confused by earlier errors, bailing out\n" msgstr "" -#: diagnostic.c:1235 diagnostic.c:1385 +#: diagnostic.c:1194 diagnostic.c:1302 #, c-format msgid "" "Please submit a full bug report,\n" @@ -4868,73 +4934,82 @@ msgid "" "See %s for instructions.\n" msgstr "" -#: diagnostic.c:1383 +#: diagnostic.c:1300 msgid "Internal compiler error: Error reporting routines re-entered.\n" msgstr "" -#: diagnostic.c:1445 +#: diagnostic.c:1362 #, c-format -msgid "Internal compiler error in %s, at %s:%d" +msgid "in %s, at %s:%d" msgstr "" -#: diagnostic.c:1490 +#: diagnostic.c:1383 #, c-format msgid "In file included from %s:%d" msgstr "" -#: diagnostic.c:1493 +#: diagnostic.c:1386 #, c-format msgid "" ",\n" " from %s:%d" msgstr "" -#: diagnostic.c:1494 +#: diagnostic.c:1387 msgid ":\n" msgstr "" -#: diagnostic.c:1527 diagnostic.c:1544 +#: diagnostic.c:1431 diagnostic.c:1448 #, c-format msgid "`%s' is deprecated (declared at %s:%d)" msgstr "" -#: diagnostic.c:1547 +#: diagnostic.c:1451 #, c-format msgid "`%s' is deprecated" msgstr "" -#: diagnostic.c:1550 +#: diagnostic.c:1454 #, c-format msgid "type is deprecated (declared at %s:%d)" msgstr "" -#: diagnostic.c:1553 +#: diagnostic.c:1457 msgid "type is deprecated" msgstr "" -#: dwarf2out.c:3075 +#: dominance.c:728 +#, c-format +msgid "dominator of %d should be %d, not %d" +msgstr "" + +#: dwarf2out.c:3124 #, c-format msgid "DW_LOC_OP %s not implemented\n" msgstr "" -#: dwarfout.c:2087 +#: dwarfout.c:2066 #, c-format -msgid "internal regno botch: regno = %d\n" +msgid "internal regno botch: `%s' has regno = %d\n" msgstr "" -#: dwarfout.c:6287 +#: dwarfout.c:6181 +msgid "support for the DWARF1 debugging format is deprecated" +msgstr "" + +#: dwarfout.c:6278 msgid "can't get current directory" msgstr "" -#: emit-rtl.c:1018 +#: emit-rtl.c:1151 msgid "can't access real part of complex value in hard register" msgstr "" -#: emit-rtl.c:1040 +#: emit-rtl.c:1173 msgid "can't access imaginary part of complex value in hard register" msgstr "" -#: emit-rtl.c:3145 +#: emit-rtl.c:3418 msgid "ICE: emit_insn used where emit_jump_insn needed:\n" msgstr "" @@ -4943,251 +5018,251 @@ msgstr "" msgid "abort in %s, at %s:%d" msgstr "" -#: except.c:377 +#: except.c:371 msgid "exception handling disabled, use -fexceptions to enable" msgstr "" -#: except.c:3183 +#: except.c:2969 msgid "argument of `__builtin_eh_return_regno' must be constant" msgstr "" -#: except.c:3294 except.c:3316 +#: except.c:3090 except.c:3112 msgid "__builtin_eh_return not supported on this target" msgstr "" -#: explow.c:1369 +#: explow.c:1398 msgid "stack limits not supported on this target" msgstr "" -#: expr.c:2948 +#: expr.c:3323 msgid "function using short complex types cannot be inline" msgstr "" -#: expr.c:5815 expr.c:5824 expr.c:5833 expr.c:5838 expr.c:6125 expr.c:6141 +#: expr.c:6197 expr.c:6206 expr.c:6215 expr.c:6220 expr.c:6522 expr.c:6538 msgid "unsupported wide integer operation" msgstr "" -#: expr.c:6190 +#: expr.c:6587 #, c-format msgid "prior parameter's size depends on `%s'" msgstr "" -#: expr.c:6537 +#: expr.c:6932 msgid "returned value in block_exit_expr" msgstr "" -#: final.c:1205 +#: final.c:1342 msgid "negative insn length" msgstr "" -#: final.c:2622 +#: final.c:2793 msgid "could not split insn" msgstr "" -#: final.c:2970 +#: final.c:3141 msgid "invalid `asm': " msgstr "" -#: final.c:3154 +#: final.c:3328 msgid "nested assembly dialect alternatives" msgstr "" -#: final.c:3171 final.c:3183 +#: final.c:3345 final.c:3357 msgid "unterminated assembly dialect alternative" msgstr "" -#: final.c:3227 +#: final.c:3401 #, c-format msgid "operand number missing after %%-letter" msgstr "" -#: final.c:3230 final.c:3269 +#: final.c:3404 final.c:3443 msgid "operand number out of range" msgstr "" -#: final.c:3288 +#: final.c:3462 #, c-format msgid "invalid %%-code" msgstr "" -#: final.c:3319 +#: final.c:3493 #, c-format msgid "`%%l' operand isn't a label" msgstr "" #. We can't handle floating point constants; #. PRINT_OPERAND must handle them. -#: final.c:3426 vmsdbgout.c:475 config/i386/i386.c:5337 -#: config/pdp11/pdp11.c:1570 +#: final.c:3600 vmsdbgout.c:466 config/i386/i386.c:6104 +#: config/pdp11/pdp11.c:1573 msgid "floating constant misused" msgstr "" -#: final.c:3482 vmsdbgout.c:532 config/i386/i386.c:5391 -#: config/pdp11/pdp11.c:1617 +#: final.c:3656 vmsdbgout.c:523 config/i386/i386.c:6182 +#: config/pdp11/pdp11.c:1620 msgid "invalid expression as operand" msgstr "" -#: flow.c:356 +#: flow.c:352 msgid "function might be possible candidate for attribute `noreturn'" msgstr "" -#: flow.c:361 +#: flow.c:357 msgid "`noreturn' function does return" msgstr "" -#: flow.c:380 +#: flow.c:378 msgid "control reaches end of non-void function" msgstr "" -#: flow.c:1655 +#: flow.c:1641 msgid "Attempt to delete prologue/epilogue insn:" msgstr "" -#: fold-const.c:2476 fold-const.c:2489 +#: fold-const.c:2545 fold-const.c:2558 #, c-format msgid "comparison is always %d due to width of bit-field" msgstr "" -#: fold-const.c:3532 fold-const.c:3549 +#: fold-const.c:3752 fold-const.c:3769 #, c-format msgid "comparison is always %d" msgstr "" -#: fold-const.c:3680 +#: fold-const.c:3900 msgid "`or' of unmatched not-equal tests is always 1" msgstr "" -#: fold-const.c:3685 +#: fold-const.c:3905 msgid "`and' of mutually exclusive equal-tests is always 0" msgstr "" -#: function.c:901 varasm.c:1531 +#: function.c:881 varasm.c:1503 #, c-format msgid "size of variable `%s' is too large" msgstr "" -#: function.c:5492 +#: function.c:5470 #, c-format msgid "`%s' might be used uninitialized in this function" msgstr "" -#: function.c:5499 +#: function.c:5477 #, c-format msgid "variable `%s' might be clobbered by `longjmp' or `vfork'" msgstr "" -#: function.c:5518 +#: function.c:5496 #, c-format msgid "argument `%s' might be clobbered by `longjmp' or `vfork'" msgstr "" -#: function.c:6383 +#: function.c:6363 msgid "function returns an aggregate" msgstr "" -#: function.c:6905 +#: function.c:6868 #, c-format msgid "unused parameter `%s'" msgstr "" -#: gcc.c:1101 +#: gcc.c:1126 #, c-format msgid "ambiguous abbreviation %s" msgstr "" -#: gcc.c:1128 +#: gcc.c:1153 #, c-format msgid "incomplete `%s' option" msgstr "" -#: gcc.c:1139 +#: gcc.c:1164 #, c-format msgid "missing argument to `%s' option" msgstr "" -#: gcc.c:1152 +#: gcc.c:1177 #, c-format msgid "extraneous argument to `%s' option" msgstr "" -#: gcc.c:1459 +#: gcc.c:1505 msgid "Using built-in specs.\n" msgstr "" -#: gcc.c:1633 +#: gcc.c:1683 #, c-format msgid "" "Setting spec %s to '%s'\n" "\n" msgstr "" -#: gcc.c:1731 +#: gcc.c:1790 #, c-format msgid "Reading specs from %s\n" msgstr "" -#: gcc.c:1829 gcc.c:1848 +#: gcc.c:1888 gcc.c:1907 #, c-format msgid "specs %%include syntax malformed after %ld characters" msgstr "" -#: gcc.c:1856 +#: gcc.c:1915 #, c-format msgid "could not find specs file %s\n" msgstr "" -#: gcc.c:1873 gcc.c:1881 gcc.c:1890 gcc.c:1899 +#: gcc.c:1932 gcc.c:1940 gcc.c:1949 gcc.c:1958 #, c-format msgid "specs %%rename syntax malformed after %ld characters" msgstr "" -#: gcc.c:1908 +#: gcc.c:1967 #, c-format msgid "specs %s spec was not found to be renamed" msgstr "" -#: gcc.c:1915 +#: gcc.c:1974 #, c-format msgid "%s: attempt to rename spec '%s' to already defined spec '%s'" msgstr "" -#: gcc.c:1920 +#: gcc.c:1979 #, c-format msgid "rename spec %s to %s\n" msgstr "" -#: gcc.c:1922 +#: gcc.c:1981 #, c-format msgid "" "spec is '%s'\n" "\n" msgstr "" -#: gcc.c:1935 +#: gcc.c:1994 #, c-format msgid "specs unknown %% command after %ld characters" msgstr "" -#: gcc.c:1946 gcc.c:1959 +#: gcc.c:2005 gcc.c:2018 #, c-format msgid "specs file malformed after %ld characters" msgstr "" -#: gcc.c:2013 +#: gcc.c:2072 msgid "spec file has no spec for linking" msgstr "" -#: gcc.c:2725 +#: gcc.c:2570 msgid "-pipe not supported" msgstr "" -#: gcc.c:2779 +#: gcc.c:2625 msgid "" "\n" "Go ahead? (y or n) " msgstr "" -#: gcc.c:2878 +#: gcc.c:2751 #, c-format msgid "" "Internal error: %s (program %s)\n" @@ -5195,172 +5270,176 @@ msgid "" "See %s for instructions." msgstr "" -#: gcc.c:2896 +#: gcc.c:2769 #, c-format msgid "# %s %.2f %.2f\n" msgstr "" -#: gcc.c:3029 +#: gcc.c:2899 #, c-format msgid "Usage: %s [options] file...\n" msgstr "" -#: gcc.c:3030 +#: gcc.c:2900 msgid "Options:\n" msgstr "" -#: gcc.c:3032 +#: gcc.c:2902 msgid " -pass-exit-codes Exit with highest error code from a phase\n" msgstr "" -#: gcc.c:3033 +#: gcc.c:2903 msgid " --help Display this information\n" msgstr "" -#: gcc.c:3034 +#: gcc.c:2904 msgid "" " --target-help Display target specific command line options\n" msgstr "" -#: gcc.c:3036 +#: gcc.c:2906 msgid " (Use '-v --help' to display command line options of sub-processes)\n" msgstr "" -#: gcc.c:3037 +#: gcc.c:2907 msgid " -dumpspecs Display all of the built in spec strings\n" msgstr "" -#: gcc.c:3038 +#: gcc.c:2908 msgid " -dumpversion Display the version of the compiler\n" msgstr "" -#: gcc.c:3039 +#: gcc.c:2909 msgid " -dumpmachine Display the compiler's target processor\n" msgstr "" -#: gcc.c:3040 +#: gcc.c:2910 msgid "" " -print-search-dirs Display the directories in the compiler's search " "path\n" msgstr "" -#: gcc.c:3041 +#: gcc.c:2911 msgid "" " -print-libgcc-file-name Display the name of the compiler's companion " "library\n" msgstr "" -#: gcc.c:3042 +#: gcc.c:2912 msgid " -print-file-name=<lib> Display the full path to library <lib>\n" msgstr "" -#: gcc.c:3043 +#: gcc.c:2913 msgid "" " -print-prog-name=<prog> Display the full path to compiler component " "<prog>\n" msgstr "" -#: gcc.c:3044 +#: gcc.c:2914 msgid "" " -print-multi-directory Display the root directory for versions of " "libgcc\n" msgstr "" -#: gcc.c:3045 +#: gcc.c:2915 msgid "" " -print-multi-lib Display the mapping between command line options " "and\n" " multiple library search directories\n" msgstr "" -#: gcc.c:3048 +#: gcc.c:2918 +msgid " -print-multi-os-directory Display the relative path to OS libraries\n" +msgstr "" + +#: gcc.c:2919 msgid "" " -Wa,<options> Pass comma-separated <options> on to the " "assembler\n" msgstr "" -#: gcc.c:3049 +#: gcc.c:2920 msgid "" " -Wp,<options> Pass comma-separated <options> on to the " "preprocessor\n" msgstr "" -#: gcc.c:3050 +#: gcc.c:2921 msgid "" " -Wl,<options> Pass comma-separated <options> on to the linker\n" msgstr "" -#: gcc.c:3051 +#: gcc.c:2922 msgid " -Xlinker <arg> Pass <arg> on to the linker\n" msgstr "" -#: gcc.c:3052 +#: gcc.c:2923 msgid " -save-temps Do not delete intermediate files\n" msgstr "" -#: gcc.c:3053 +#: gcc.c:2924 msgid " -pipe Use pipes rather than intermediate files\n" msgstr "" -#: gcc.c:3054 +#: gcc.c:2925 msgid " -time Time the execution of each subprocess\n" msgstr "" -#: gcc.c:3055 +#: gcc.c:2926 msgid "" " -specs=<file> Override built-in specs with the contents of " "<file>\n" msgstr "" -#: gcc.c:3056 +#: gcc.c:2927 msgid "" " -std=<standard> Assume that the input sources are for <standard>\n" msgstr "" -#: gcc.c:3057 +#: gcc.c:2928 msgid "" " -B <directory> Add <directory> to the compiler's search paths\n" msgstr "" -#: gcc.c:3058 +#: gcc.c:2929 msgid " -b <machine> Run gcc for target <machine>, if installed\n" msgstr "" -#: gcc.c:3059 +#: gcc.c:2930 msgid "" " -V <version> Run gcc version number <version>, if installed\n" msgstr "" -#: gcc.c:3060 +#: gcc.c:2931 msgid "" " -v Display the programs invoked by the compiler\n" msgstr "" -#: gcc.c:3061 +#: gcc.c:2932 msgid "" " -### Like -v but options quoted and commands not " "executed\n" msgstr "" -#: gcc.c:3062 +#: gcc.c:2933 msgid "" " -E Preprocess only; do not compile, assemble or " "link\n" msgstr "" -#: gcc.c:3063 +#: gcc.c:2934 msgid " -S Compile only; do not assemble or link\n" msgstr "" -#: gcc.c:3064 +#: gcc.c:2935 msgid " -c Compile and assemble, but do not link\n" msgstr "" -#: gcc.c:3065 +#: gcc.c:2936 msgid " -o <file> Place the output into <file>\n" msgstr "" -#: gcc.c:3066 +#: gcc.c:2937 msgid "" " -x <language> Specify the language of the following input " "files\n" @@ -5371,7 +5450,7 @@ msgid "" "extension\n" msgstr "" -#: gcc.c:3073 +#: gcc.c:2944 #, c-format msgid "" "\n" @@ -5380,86 +5459,89 @@ msgid "" " other options on to these processes the -W<letter> options must be used.\n" msgstr "" +#: gcc.c:3079 +#, c-format +msgid "`-%c' option must have argument" +msgstr "" + +#: gcc.c:3101 +#, c-format +msgid "couldn't run `%s': %s" +msgstr "" + #. translate_options () has turned --version into -fversion. -#: gcc.c:3353 +#: gcc.c:3278 #, c-format msgid "%s (GCC) %s\n" msgstr "" -#: gcc.c:3354 +#: gcc.c:3279 msgid "Copyright (C) 2002 Free Software Foundation, Inc.\n" msgstr "" -#: gcc.c:3356 gcov.c:320 +#: gcc.c:3281 gcov.c:364 msgid "" "This is free software; see the source for copying conditions. There is NO\n" "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" "\n" msgstr "" -#: gcc.c:3455 +#: gcc.c:3382 msgid "argument to `-Xlinker' is missing" msgstr "" -#: gcc.c:3463 +#: gcc.c:3390 msgid "argument to `-l' is missing" msgstr "" -#: gcc.c:3480 +#: gcc.c:3407 msgid "argument to `-specs' is missing" msgstr "" -#: gcc.c:3495 +#: gcc.c:3422 msgid "argument to `-specs=' is missing" msgstr "" -#: gcc.c:3526 -msgid "argument to `-b' is missing" +#: gcc.c:3452 +#, c-format +msgid "`-%c' must come at the start of the command line" msgstr "" -#: gcc.c:3541 +#: gcc.c:3461 msgid "argument to `-B' is missing" msgstr "" -#: gcc.c:3611 -msgid "argument to `-V' is missing" -msgstr "" - -#: gcc.c:3632 gcc.c:3639 gcc.c:3646 -msgid "invalid version number format" -msgstr "" - -#: gcc.c:3756 +#: gcc.c:3634 msgid "cannot specify -o with -c or -S and multiple compilations" msgstr "" -#: gcc.c:3927 +#: gcc.c:3807 msgid "warning: -pipe ignored because -save-temps specified" msgstr "" -#: gcc.c:3931 +#: gcc.c:3811 msgid "warning: -pipe ignored because -time specified" msgstr "" -#: gcc.c:3943 +#: gcc.c:3823 msgid "argument to `-x' is missing" msgstr "" -#: gcc.c:3971 +#: gcc.c:3851 #, c-format msgid "argument to `-%s' is missing" msgstr "" -#: gcc.c:4032 +#: gcc.c:3912 #, c-format msgid "warning: `-x %s' after last input file has no effect" msgstr "" -#: gcc.c:4331 +#: gcc.c:4257 msgid "invalid specification! Bug in cc" msgstr "" -#: gcc.c:4480 +#: gcc.c:4411 #, c-format msgid "%s\n" msgstr "" @@ -5467,153 +5549,182 @@ msgstr "" #. Catch the case where a spec string contains something like #. '%{foo:%*}'. ie there is no * in the pattern on the left #. hand side of the :. -#: gcc.c:5033 +#: gcc.c:4971 #, c-format msgid "spec failure: '%%*' has not been initialized by pattern match" msgstr "" -#: gcc.c:5042 +#: gcc.c:4980 #, c-format msgid "warning: use of obsolete %%[ operator in specs" msgstr "" -#: gcc.c:5060 +#: gcc.c:4998 #, c-format msgid "Processing spec %c%s%c, which is '%s'\n" msgstr "" -#: gcc.c:5185 +#: gcc.c:5123 #, c-format msgid "spec failure: unrecognized spec option '%c'" msgstr "" -#: gcc.c:5295 +#: gcc.c:5204 +#, c-format +msgid "unknown spec function `%s'" +msgstr "" + +#: gcc.c:5223 +#, c-format +msgid "error in args to spec function `%s'" +msgstr "" + +#: gcc.c:5272 +msgid "malformed spec function name" +msgstr "" + +#. ) +#: gcc.c:5275 +msgid "no arguments for spec function" +msgstr "" + +#: gcc.c:5294 +msgid "malformed spec function arguments" +msgstr "" + +#: gcc.c:5402 msgid "mismatched braces in specs" msgstr "" -#: gcc.c:5973 +#: gcc.c:6097 #, c-format msgid "unrecognized option `-%s'" msgstr "" -#: gcc.c:5979 +#: gcc.c:6103 #, c-format msgid "install: %s%s\n" msgstr "" -#: gcc.c:5980 +#: gcc.c:6104 #, c-format msgid "programs: %s\n" msgstr "" -#: gcc.c:5981 +#: gcc.c:6105 #, c-format msgid "libraries: %s\n" msgstr "" -#: gcc.c:6029 +#: gcc.c:6162 msgid "" "\n" "For bug reporting instructions, please see:\n" msgstr "" -#: gcc.c:6045 +#: gcc.c:6178 #, c-format msgid "Configured with: %s\n" msgstr "" -#: gcc.c:6059 +#: gcc.c:6192 #, c-format msgid "Thread model: %s\n" msgstr "" -#: gcc.c:6070 +#: gcc.c:6203 #, c-format msgid "gcc version %s\n" msgstr "" -#: gcc.c:6072 +#: gcc.c:6205 #, c-format msgid "gcc driver version %s executing gcc version %s\n" msgstr "" -#: gcc.c:6080 +#: gcc.c:6213 msgid "no input files" msgstr "" -#: gcc.c:6118 +#: gcc.c:6251 #, c-format msgid "%s: %s compiler not installed on this system" msgstr "" -#: gcc.c:6193 +#: gcc.c:6326 #, c-format msgid "%s: linker input file unused because linking not done" msgstr "" -#: gcc.c:6236 +#: gcc.c:6369 #, c-format msgid "language %s not recognized" msgstr "" -#: gcc.c:6339 +#: gcc.c:6472 msgid "internal gcc abort" msgstr "" -#: gcov.c:282 +#: gcov.c:325 msgid "Internal gcov abort.\n" msgstr "" -#: gcov.c:295 +#: gcov.c:338 msgid "" "Usage: gcov [OPTION]... SOURCEFILE\n" "\n" msgstr "" -#: gcov.c:296 +#: gcov.c:339 msgid "" "Print code coverage information.\n" "\n" msgstr "" -#: gcov.c:297 +#: gcov.c:340 msgid " -h, --help Print this help, then exit\n" msgstr "" -#: gcov.c:298 +#: gcov.c:341 msgid " -v, --version Print version number, then exit\n" msgstr "" -#: gcov.c:299 +#: gcov.c:342 msgid "" " -b, --branch-probabilities Include branch probabilities in output\n" msgstr "" -#: gcov.c:300 +#: gcov.c:343 msgid "" " -c, --branch-counts Given counts of branches taken\n" " rather than percentages\n" msgstr "" -#: gcov.c:302 +#: gcov.c:345 msgid " -n, --no-output Do not create an output file\n" msgstr "" -#: gcov.c:303 +#: gcov.c:346 msgid "" " -l, --long-file-names Use long output file names for included\n" " source files\n" msgstr "" -#: gcov.c:305 +#: gcov.c:348 msgid " -f, --function-summaries Output summaries for each function\n" msgstr "" -#: gcov.c:306 -msgid " -o, --object-directory OBJDIR Search for object files in OBJDIR\n" +#: gcov.c:349 +msgid "" +" -o, --object-directory DIR|FILE Search for object files in DIR or called " +"FILE\n" msgstr "" -#: gcov.c:307 +#: gcov.c:350 +msgid " -p, --preserve-paths Preserve all pathname components\n" +msgstr "" + +#: gcov.c:351 #, c-format msgid "" "\n" @@ -5621,265 +5732,463 @@ msgid "" "%s.\n" msgstr "" -#: gcov.c:317 +#: gcov.c:361 #, c-format msgid "gcov (GCC) %s\n" msgstr "" -#: gcov.c:318 +#: gcov.c:362 msgid "Copyright (C) 2001 Free Software Foundation, Inc.\n" msgstr "" -#: gcov.c:462 +#: gcov.c:500 #, c-format msgid "Could not open basic block file %s.\n" msgstr "" -#: gcov.c:471 +#: gcov.c:507 +#, c-format +msgid "Could not open program flow graph file %s.\n" +msgstr "" + +#: gcov.c:524 #, c-format msgid "Could not open data file %s.\n" msgstr "" -#: gcov.c:472 +#: gcov.c:525 msgid "Assuming that all execution counts are zero.\n" msgstr "" -#: gcov.c:478 +#: gcov.c:534 #, c-format -msgid "Could not open program flow graph file %s.\n" +msgid "No executable code associated with file %s.\n" msgstr "" -#: gcov.c:489 +#: gcov.c:1186 #, c-format -msgid "No executable code associated with file %s.\n" +msgid "%s of %d lines executed in %s %s\n" msgstr "" -#: gcov.c:789 -msgid ".da file contents exhausted too early\n" +#: gcov.c:1191 +#, c-format +msgid "No executable lines in %s %s\n" msgstr "" -#: gcov.c:792 -msgid ".da file contents not exhausted\n" +#: gcov.c:1198 +#, c-format +msgid "%s of %d branches executed in %s %s\n" msgstr "" -#: gcov.c:973 +#: gcov.c:1203 #, c-format -msgid "%6.2f%% of %d source lines executed in function %s\n" +msgid "%s of %d branches taken at least once in %s %s\n" msgstr "" -#: gcov.c:977 +#: gcov.c:1209 #, c-format -msgid "No executable source lines in function %s\n" +msgid "No branches in %s %s\n" msgstr "" -#: gcov.c:984 +#: gcov.c:1211 #, c-format -msgid "%6.2f%% of %d branches executed in function %s\n" +msgid "%s of %d calls executed in %s %s\n" msgstr "" -#: gcov.c:988 +#: gcov.c:1216 #, c-format -msgid "%6.2f%% of %d branches taken at least once in function %s\n" +msgid "No calls in %s %s\n" msgstr "" -#: gcov.c:993 +#: gcov.c:1351 #, c-format -msgid "No branches in function %s\n" +msgid "didn't use all bb entries of graph, function %s\n" msgstr "" -#: gcov.c:995 +#: gcov.c:1353 #, c-format -msgid "%6.2f%% of %d calls executed in function %s\n" +msgid "block_num = %ld, num_blocks = %d\n" msgstr "" -#: gcov.c:999 +#: gcov.c:1367 #, c-format -msgid "No calls in function %s\n" +msgid "ERROR: unexpected line number %ld\n" msgstr "" -#: gcov.c:1126 +#: gcov.c:1383 #, c-format -msgid "didn't use all bb entries of graph, function %s\n" +msgid "ERROR: too many basic blocks in function %s\n" msgstr "" -#: gcov.c:1128 +#: gcov.c:1398 #, c-format -msgid "block_num = %ld, num_blocks = %d\n" +msgid "ERROR: out of range line number in function %s\n" msgstr "" -#: gcov.c:1166 +#: gcov.c:1470 #, c-format -msgid "ERROR: too many basic blocks in .bb file %s\n" +msgid "Could not open source file %s.\n" msgstr "" -#: gcov.c:1243 +#: gcov.c:1480 #, c-format -msgid "%6.2f%% of %d source lines executed in file %s\n" +msgid "Warning: source file %s is newer than %s\n" msgstr "" -#: gcov.c:1247 +#: gcov.c:1510 #, c-format -msgid "No executable source lines in file %s\n" +msgid "Unexpected EOF while reading source file %s.\n" msgstr "" -#: gcov.c:1254 +#: gcov.c:1532 #, c-format -msgid "%6.2f%% of %d branches executed in file %s\n" +msgid "call %2d never executed\n" msgstr "" -#: gcov.c:1258 +#: gcov.c:1535 #, c-format -msgid "%6.2f%% of %d branches taken at least once in file %s\n" +msgid "call %2d returns %s\n" msgstr "" -#: gcov.c:1263 +#: gcov.c:1543 #, c-format -msgid "No branches in file %s\n" +msgid "branch %2d never executed\n" msgstr "" -#: gcov.c:1265 +#: gcov.c:1546 #, c-format -msgid "%6.2f%% of %d calls executed in file %s\n" +msgid "branch %2d taken %s\n" msgstr "" -#: gcov.c:1269 +#: gcov.c:1610 #, c-format -msgid "No calls in file %s\n" +msgid "Creating %s.\n" msgstr "" -#: gcov.c:1281 +#: gcov.c:1613 #, c-format -msgid "Could not open source file %s.\n" +msgid "Error writing output file %s.\n" msgstr "" -#: gcov.c:1331 +#: gcov.c:1618 #, c-format msgid "Could not open output file %s.\n" msgstr "" -#: gcov.c:1339 +#: gcse.c:761 #, c-format -msgid "Creating %s.\n" +msgid "GCSE disabled: %d > 1000 basic blocks and %d >= 20 edges/basic block" +msgstr "" + +#: gcse.c:773 +#, c-format +msgid "GCSE disabled: %d basic blocks and %d registers" msgstr "" -#: gcov.c:1387 +#: genautomata.c:1490 #, c-format -msgid "call %d never executed\n" +msgid "Name `%s' contains quotes" msgstr "" -#: gcov.c:1396 +#: genautomata.c:1621 #, c-format -msgid "call %d returns = %s\n" +msgid "invalid string `%s' in define_cpu_unit" msgstr "" -#: gcov.c:1406 +#: genautomata.c:1650 #, c-format -msgid "call %d returns = %s%%\n" +msgid "invalid string `%s' in define_query_cpu_unit" msgstr "" -#: gcov.c:1413 +#: genautomata.c:1682 genautomata.c:1685 #, c-format -msgid "branch %d never executed\n" +msgid "invalid string `%s' in define_bypass" msgstr "" -#: gcov.c:1423 +#: genautomata.c:1720 #, c-format -msgid "branch %d taken = %s\n" +msgid "invalid first string `%s' in exclusion_set" msgstr "" -#: gcov.c:1433 +#: genautomata.c:1724 #, c-format -msgid "branch %d taken = %s%%\n" +msgid "invalid second string `%s' in exclusion_set" msgstr "" -#: gcov.c:1444 +#: genautomata.c:1760 #, c-format -msgid "Unexpected EOF while reading source file %s.\n" +msgid "invalid first string `%s' in presence_set" msgstr "" -#: gcse.c:759 +#: genautomata.c:1764 #, c-format -msgid "GCSE disabled: %d > 1000 basic blocks and %d >= 20 edges/basic block" +msgid "invalid second string `%s' in presence_set" msgstr "" -#: gcse.c:771 +#: genautomata.c:1800 #, c-format -msgid "GCSE disabled: %d basic blocks and %d registers" +msgid "invalid first string `%s' in absence_set" +msgstr "" + +#: genautomata.c:1804 +#, c-format +msgid "invalid second string `%s' in absence_set" msgstr "" -#: graph.c:421 profile.c:951 profile.c:959 toplev.c:1751 toplev.c:4884 -#: f/com.c:14293 java/jcf-parse.c:935 java/jcf-parse.c:1081 java/lex.c:1771 -#: objc/objc-act.c:490 +#: genautomata.c:1837 +#, c-format +msgid "invalid string `%s' in define_automaton" +msgstr "" + +#: genautomata.c:1868 +#, c-format +msgid "invalid option `%s' in automata_option" +msgstr "" + +#: genautomata.c:1890 +#, c-format +msgid "garbage after ) in reservation `%s'" +msgstr "" + +#: genautomata.c:1921 genautomata.c:1954 genautomata.c:1981 +#, c-format +msgid "invalid `%s' in reservation `%s'" +msgstr "" + +#: genautomata.c:1932 +#, c-format +msgid "repetition `%s' <= 1 in reservation `%s'" +msgstr "" + +#: genautomata.c:2425 +#, c-format +msgid "unit `%s' in exclusion is not declared" +msgstr "" + +#: genautomata.c:2427 +#, c-format +msgid "`%s' in exclusion is not unit" +msgstr "" + +#: genautomata.c:2465 +#, c-format +msgid "unit `%s' excludes itself" +msgstr "" + +#: genautomata.c:2473 +#, c-format +msgid "units `%s' and `%s' in exclusion set belong to different automata" +msgstr "" + +#: genautomata.c:2603 genautomata.c:2609 +#, c-format +msgid "unit `%s' excludes and requires presence of `%s'" +msgstr "" + +#: genautomata.c:2623 genautomata.c:2629 +#, c-format +msgid "unit `%s' requires absence and presence of `%s'" +msgstr "" + +#: genautomata.c:2692 genautomata.c:2695 +#, c-format +msgid "repeated declaration of automaton `%s'" +msgstr "" + +#: genautomata.c:2711 +#, c-format +msgid "define_insn_reservation `%s' has negative latency time" +msgstr "" + +#: genautomata.c:2717 +#, c-format +msgid "`%s' is already used as insn reservation name" +msgstr "" + +#: genautomata.c:2723 +#, c-format +msgid "define_bypass `%s - %s' has negative latency time" +msgstr "" + +#: genautomata.c:2737 +#, c-format +msgid "automaton `%s' is not declared" +msgstr "" + +#: genautomata.c:2747 +#, c-format +msgid "define_unit `%s' without automaton when one defined" +msgstr "" + +#: genautomata.c:2753 +#, c-format +msgid "`%s' is declared as cpu unit" +msgstr "" + +#: genautomata.c:2762 +#, c-format +msgid "`%s' is declared as cpu reservation" +msgstr "" + +#: genautomata.c:2772 +#, c-format +msgid "repeated declaration of unit `%s'" +msgstr "" + +#: genautomata.c:2775 +#, c-format +msgid "repeated declaration of reservation `%s'" +msgstr "" + +#: genautomata.c:2790 genautomata.c:2793 +#, c-format +msgid "there is no insn reservation `%s'" +msgstr "" + +#: genautomata.c:2810 genautomata.c:2815 +#, c-format +msgid "the same bypass `%s - %s' is already defined" +msgstr "" + +#: genautomata.c:2820 +#, c-format +msgid "bypass `%s - %s' is already defined" +msgstr "" + +#: genautomata.c:2925 genautomata.c:2927 +#, c-format +msgid "automaton `%s' is not used" +msgstr "" + +#: genautomata.c:2950 +#, c-format +msgid "undeclared unit or reservation `%s'" +msgstr "" + +#: genautomata.c:3028 genautomata.c:3030 +#, c-format +msgid "unit `%s' is not used" +msgstr "" + +#: genautomata.c:3035 genautomata.c:3037 +#, c-format +msgid "reservation `%s' is not used" +msgstr "" + +#: genautomata.c:3134 +#, c-format +msgid "cycle in definition of reservation `%s'" +msgstr "" + +#: genautomata.c:5333 +#, c-format +msgid "Units `%s' and `%s' should be in the same automaton" +msgstr "" + +#: genautomata.c:9441 +msgid "-split has no argument." +msgstr "" + +#: genautomata.c:9442 +msgid "option `-split' has not been implemented yet\n" +msgstr "" + +#: genautomata.c:9486 genautomata.c:9491 +#, c-format +msgid "Automaton `%s': Insn `%s' will never be issued" +msgstr "" + +#: genautomata.c:9498 genautomata.c:9501 +#, c-format +msgid "Insn `%s' will never be issued" +msgstr "" + +#: genautomata.c:9649 +msgid "Errors in DFA description" +msgstr "" + +#: genautomata.c:9732 +#, c-format +msgid "Error in writing DFA description file %s" +msgstr "" + +#: genconditions.c:196 +msgid "No input file name." +msgstr "" + +#: graph.c:420 profile.c:1204 profile.c:1211 toplev.c:1836 toplev.c:5121 +#: f/com.c:14138 java/jcf-parse.c:913 java/jcf-parse.c:1059 java/lex.c:1767 +#: objc/objc-act.c:449 #, c-format msgid "can't open %s" msgstr "" -#: haifa-sched.c:190 +#: haifa-sched.c:196 #, c-format msgid "fix_sched_param: unknown param: %s" msgstr "" -#: integrate.c:186 +#: integrate.c:172 msgid "function cannot be inline" msgstr "" -#: integrate.c:191 +#: integrate.c:176 msgid "varargs function cannot be inline" msgstr "" -#: integrate.c:194 +#: integrate.c:179 msgid "function using alloca cannot be inline" msgstr "" -#: integrate.c:197 +#: integrate.c:182 msgid "function using setjmp cannot be inline" msgstr "" -#: integrate.c:200 +#: integrate.c:185 msgid "function uses __builtin_eh_return" msgstr "" -#: integrate.c:203 +#: integrate.c:188 msgid "function with nested functions cannot be inline" msgstr "" -#: integrate.c:207 +#: integrate.c:192 msgid "function with label addresses used in initializers cannot inline" msgstr "" -#: integrate.c:214 integrate.c:258 +#: integrate.c:199 integrate.c:243 msgid "function too large to be inline" msgstr "" -#: integrate.c:224 +#: integrate.c:209 msgid "no prototype, and parameter address used; cannot be inline" msgstr "" -#: integrate.c:231 integrate.c:276 +#: integrate.c:216 integrate.c:261 msgid "inline functions not supported for this return value type" msgstr "" -#: integrate.c:236 +#: integrate.c:221 msgid "function with varying-size return value cannot be inline" msgstr "" -#: integrate.c:243 +#: integrate.c:228 msgid "function with varying-size parameter cannot be inline" msgstr "" -#: integrate.c:246 +#: integrate.c:231 msgid "function with transparent unit parameter cannot be inline" msgstr "" -#: integrate.c:265 +#: integrate.c:250 msgid "function with computed jump cannot inline" msgstr "" -#: integrate.c:269 +#: integrate.c:254 msgid "function with nonlocal goto cannot be inline" msgstr "" -#: integrate.c:283 +#: integrate.c:268 msgid "function with target specific attribute(s) cannot be inlined" msgstr "" @@ -5913,55 +6222,56 @@ msgstr "" msgid "invalid parameter `%s'" msgstr "" -#: profile.c:430 +#: profile.c:397 #, c-format -msgid "corrupted profile info: prob for %d-%d thought to be %d" +msgid "Profile does not match flowgraph of function %s (out of date?)" msgstr "" -#: profile.c:976 -#, c-format -msgid "file %s not found, execution counts assumed to be zero" +#: profile.c:400 +msgid ".da file corrupted" msgstr "" -#: profile.c:1023 -msgid ".da file contents exhausted too early" +#: profile.c:634 +#, c-format +msgid "corrupted profile info: prob for %d-%d thought to be %d" msgstr "" -#: profile.c:1026 -msgid ".da file contents not exhausted" +#: profile.c:1226 +#, c-format +msgid "file %s not found, execution counts assumed to be zero" msgstr "" -#: protoize.c:546 +#: protoize.c:542 #, c-format msgid "%s: internal abort\n" msgstr "" -#: protoize.c:637 +#: protoize.c:633 #, c-format msgid "%s: error writing file `%s': %s\n" msgstr "" -#: protoize.c:682 +#: protoize.c:678 #, c-format msgid "%s: usage '%s [ -VqfnkN ] [ -i <istring> ] [ filename ... ]'\n" msgstr "" -#: protoize.c:685 +#: protoize.c:681 #, c-format msgid "%s: usage '%s [ -VqfnkNlgC ] [ -B <dirname> ] [ filename ... ]'\n" msgstr "" -#: protoize.c:792 +#: protoize.c:788 #, c-format msgid "%s: warning: no read access for file `%s'\n" msgstr "" -#: protoize.c:800 +#: protoize.c:796 #, c-format msgid "%s: warning: no write access for file `%s'\n" msgstr "" -#: protoize.c:808 +#: protoize.c:804 #, c-format msgid "%s: warning: no write access for dir containing `%s'\n" msgstr "" @@ -5969,568 +6279,517 @@ msgstr "" #. Catch cases like /.. where we try to backup to a #. point above the absolute root of the logical file #. system. -#: protoize.c:1226 +#: protoize.c:1222 #, c-format msgid "%s: invalid file name: %s\n" msgstr "" -#: protoize.c:1378 +#: protoize.c:1374 #, c-format msgid "%s: %s: can't get status: %s\n" msgstr "" -#: protoize.c:1399 +#: protoize.c:1395 #, c-format msgid "" "\n" "%s: fatal error: aux info file corrupted at line %d\n" msgstr "" -#: protoize.c:1735 +#: protoize.c:1731 #, c-format msgid "%s:%d: declaration of function `%s' takes different forms\n" msgstr "" -#: protoize.c:1993 +#: protoize.c:1989 #, c-format msgid "%s: compiling `%s'\n" msgstr "" -#: protoize.c:2016 +#: protoize.c:2012 #, c-format msgid "%s: wait: %s\n" msgstr "" -#: protoize.c:2021 +#: protoize.c:2017 #, c-format msgid "%s: subprocess got fatal signal %d\n" msgstr "" -#: protoize.c:2029 +#: protoize.c:2025 #, c-format msgid "%s: %s exited with status %d\n" msgstr "" -#: protoize.c:2081 +#: protoize.c:2077 #, c-format msgid "%s: warning: missing SYSCALLS file `%s'\n" msgstr "" -#: protoize.c:2090 protoize.c:2119 +#: protoize.c:2086 protoize.c:2115 #, c-format msgid "%s: can't read aux info file `%s': %s\n" msgstr "" -#: protoize.c:2135 protoize.c:2163 +#: protoize.c:2131 protoize.c:2159 #, c-format msgid "%s: can't get status of aux info file `%s': %s\n" msgstr "" -#: protoize.c:2191 +#: protoize.c:2187 #, c-format msgid "%s: can't open aux info file `%s' for reading: %s\n" msgstr "" -#: protoize.c:2209 +#: protoize.c:2205 #, c-format msgid "%s: error reading aux info file `%s': %s\n" msgstr "" -#: protoize.c:2222 +#: protoize.c:2218 #, c-format msgid "%s: error closing aux info file `%s': %s\n" msgstr "" -#: protoize.c:2238 +#: protoize.c:2234 #, c-format msgid "%s: can't delete aux info file `%s': %s\n" msgstr "" -#: protoize.c:2320 protoize.c:4322 +#: protoize.c:2316 protoize.c:4318 #, c-format msgid "%s: can't delete file `%s': %s\n" msgstr "" -#: protoize.c:2399 +#: protoize.c:2395 #, c-format msgid "%s: warning: can't rename file `%s' to `%s': %s\n" msgstr "" -#: protoize.c:2524 +#: protoize.c:2520 #, c-format msgid "%s: conflicting extern definitions of '%s'\n" msgstr "" -#: protoize.c:2528 +#: protoize.c:2524 #, c-format msgid "%s: declarations of '%s' will not be converted\n" msgstr "" -#: protoize.c:2530 +#: protoize.c:2526 #, c-format msgid "%s: conflict list for '%s' follows:\n" msgstr "" -#: protoize.c:2563 +#: protoize.c:2559 #, c-format msgid "%s: warning: using formals list from %s(%d) for function `%s'\n" msgstr "" -#: protoize.c:2603 +#: protoize.c:2599 #, c-format msgid "%s: %d: `%s' used but missing from SYSCALLS\n" msgstr "" -#: protoize.c:2609 +#: protoize.c:2605 #, c-format msgid "%s: %d: warning: no extern definition for `%s'\n" msgstr "" -#: protoize.c:2640 +#: protoize.c:2636 #, c-format msgid "%s: warning: no static definition for `%s' in file `%s'\n" msgstr "" -#: protoize.c:2646 +#: protoize.c:2642 #, c-format msgid "%s: multiple static defs of `%s' in file `%s'\n" msgstr "" -#: protoize.c:2819 protoize.c:2822 +#: protoize.c:2815 protoize.c:2818 #, c-format msgid "%s: %d: warning: source too confusing\n" msgstr "" -#: protoize.c:3028 +#: protoize.c:3024 #, c-format msgid "%s: %d: warning: varargs function declaration not converted\n" msgstr "" -#: protoize.c:3043 +#: protoize.c:3039 #, c-format msgid "%s: declaration of function `%s' not converted\n" msgstr "" -#: protoize.c:3166 +#: protoize.c:3162 #, c-format msgid "%s: warning: too many parameter lists in declaration of `%s'\n" msgstr "" -#: protoize.c:3187 +#: protoize.c:3183 #, c-format msgid "" "\n" "%s: warning: too few parameter lists in declaration of `%s'\n" msgstr "" -#: protoize.c:3285 +#: protoize.c:3281 #, c-format msgid "%s: %d: warning: found `%s' but expected `%s'\n" msgstr "" -#: protoize.c:3463 +#: protoize.c:3459 #, c-format msgid "%s: local declaration for function `%s' not inserted\n" msgstr "" -#: protoize.c:3490 +#: protoize.c:3486 #, c-format msgid "" "\n" "%s: %d: warning: can't add declaration of `%s' into macro call\n" msgstr "" -#: protoize.c:3564 +#: protoize.c:3560 #, c-format msgid "%s: global declarations for file `%s' not inserted\n" msgstr "" -#: protoize.c:3655 protoize.c:3685 +#: protoize.c:3651 protoize.c:3681 #, c-format msgid "%s: definition of function `%s' not converted\n" msgstr "" -#: protoize.c:3674 +#: protoize.c:3670 #, c-format msgid "%s: %d: warning: definition of %s not converted\n" msgstr "" -#: protoize.c:4004 +#: protoize.c:4000 #, c-format msgid "%s: found definition of `%s' at %s(%d)\n" msgstr "" #. If we make it here, then we did not know about this #. function definition. -#: protoize.c:4020 +#: protoize.c:4016 #, c-format msgid "%s: %d: warning: `%s' excluded by preprocessing\n" msgstr "" -#: protoize.c:4023 +#: protoize.c:4019 #, c-format msgid "%s: function definition not converted\n" msgstr "" -#: protoize.c:4082 +#: protoize.c:4078 #, c-format msgid "%s: `%s' not converted\n" msgstr "" -#: protoize.c:4090 +#: protoize.c:4086 #, c-format msgid "%s: would convert file `%s'\n" msgstr "" -#: protoize.c:4093 +#: protoize.c:4089 #, c-format msgid "%s: converting file `%s'\n" msgstr "" -#: protoize.c:4103 +#: protoize.c:4099 #, c-format msgid "%s: can't get status for file `%s': %s\n" msgstr "" -#: protoize.c:4145 +#: protoize.c:4141 #, c-format msgid "%s: can't open file `%s' for reading: %s\n" msgstr "" -#: protoize.c:4160 +#: protoize.c:4156 #, c-format msgid "" "\n" "%s: error reading input file `%s': %s\n" msgstr "" -#: protoize.c:4194 +#: protoize.c:4190 #, c-format msgid "%s: can't create/open clean file `%s': %s\n" msgstr "" -#: protoize.c:4299 +#: protoize.c:4295 #, c-format msgid "%s: warning: file `%s' already saved in `%s'\n" msgstr "" -#: protoize.c:4307 +#: protoize.c:4303 #, c-format msgid "%s: can't link file `%s' to `%s': %s\n" msgstr "" -#: protoize.c:4337 +#: protoize.c:4333 #, c-format msgid "%s: can't create/open output file `%s': %s\n" msgstr "" -#: protoize.c:4370 +#: protoize.c:4366 #, c-format msgid "%s: can't change mode of file `%s': %s\n" msgstr "" -#: protoize.c:4545 +#: protoize.c:4541 #, c-format msgid "%s: cannot get working directory: %s\n" msgstr "" -#: protoize.c:4643 +#: protoize.c:4639 #, c-format msgid "%s: input file names must have .c suffixes: %s\n" msgstr "" -#: real.c:731 real.c:908 -msgid "conversion from NaN to int" -msgstr "" - -#: real.c:754 -msgid "conversion from NaN to unsigned int" -msgstr "" - -#: real.c:2628 -msgid "floating point overflow" -msgstr "" - -#: real.c:4303 real.c:6619 real.c:6700 -msgid "overflow on truncation to integer" +#: ra.c:750 +msgid "Didn't find a coloring.\n" msgstr "" -#: real.c:4375 -msgid "overflow on truncation to unsigned integer" -msgstr "" - -#: real.c:5720 -#, c-format -msgid "%s: argument domain error" -msgstr "" - -#: real.c:5721 -#, c-format -msgid "%s: function singularity" -msgstr "" - -#: real.c:5722 -#, c-format -msgid "%s: overflow range error" -msgstr "" - -#: real.c:5723 -#, c-format -msgid "%s: underflow range error" -msgstr "" - -#: real.c:5724 -#, c-format -msgid "%s: total loss of precision" -msgstr "" - -#: real.c:5725 -#, c-format -msgid "%s: partial loss of precision" -msgstr "" - -#: real.c:5726 -#, c-format -msgid "%s: NaN - producing operation" -msgstr "" - -#: real.c:6270 -#, c-format -msgid "%d-bit floats cannot hold NaNs" -msgstr "" - -#: real.c:6344 -#, c-format -msgid "value exceeds the range of a %d-bit float" -msgstr "" - -#: reg-stack.c:677 +#: reg-stack.c:673 #, c-format msgid "output constraint %d must specify a single register" msgstr "" -#: reg-stack.c:687 +#: reg-stack.c:683 #, c-format msgid "output constraint %d cannot be specified together with \"%s\" clobber" msgstr "" -#: reg-stack.c:710 +#: reg-stack.c:706 msgid "output regs must be grouped at top of stack" msgstr "" -#: reg-stack.c:747 +#: reg-stack.c:743 msgid "implicitly popped regs must be grouped at top of stack" msgstr "" -#: reg-stack.c:766 +#: reg-stack.c:762 #, c-format msgid "output operand %d must use `&' constraint" msgstr "" -#: regclass.c:778 +#: regclass.c:753 #, c-format msgid "can't use '%s' as a %s register" msgstr "" -#: regclass.c:793 config/ia64/ia64.c:3875 config/ia64/ia64.c:3882 +#: regclass.c:768 config/ia64/ia64.c:4169 config/ia64/ia64.c:4176 #, c-format msgid "unknown register name: %s" msgstr "" -#: regclass.c:804 +#: regclass.c:779 msgid "global register variable follows a function definition" msgstr "" -#: regclass.c:808 +#: regclass.c:783 msgid "register used for two global register variables" msgstr "" -#: regclass.c:813 +#: regclass.c:788 msgid "call-clobbered register used for global register variable" msgstr "" -#: regrename.c:1845 +#: regrename.c:1899 #, c-format msgid "validate_value_data: [%u] Bad next_regno for empty chain (%u)" msgstr "" -#: regrename.c:1857 +#: regrename.c:1911 #, c-format msgid "validate_value_data: Loop in regno chain (%u)" msgstr "" -#: regrename.c:1860 +#: regrename.c:1914 #, c-format msgid "validate_value_data: [%u] Bad oldest_regno (%u)" msgstr "" -#: regrename.c:1872 +#: regrename.c:1926 #, c-format msgid "validate_value_data: [%u] Non-empty reg in chain (%s %u %i)" msgstr "" -#: reload.c:1208 +#: reload.c:1225 msgid "cannot reload integer constant operand in `asm'" msgstr "" -#: reload.c:1230 +#: reload.c:1247 msgid "impossible register constraint in `asm'" msgstr "" -#: reload.c:3377 +#: reload.c:3467 msgid "`&' constraint used with no register class" msgstr "" -#: reload.c:3545 +#: reload.c:3635 msgid "unable to generate reloads for:" msgstr "" -#: reload.c:3546 reload.c:3760 +#: reload.c:3636 reload.c:3850 msgid "inconsistent operand constraints in an `asm'" msgstr "" -#: reload1.c:1247 +#: reload1.c:1255 msgid "frame size too large for reliable stack checking" msgstr "" -#: reload1.c:1250 +#: reload1.c:1258 msgid "try reducing the number of local variables" msgstr "" -#: reload1.c:1902 +#: reload1.c:1914 #, c-format msgid "can't find a register in class `%s' while reloading `asm'" msgstr "" -#: reload1.c:1906 +#: reload1.c:1918 #, c-format msgid "unable to find a register to spill in class `%s'" msgstr "" -#: reload1.c:1908 +#: reload1.c:1920 msgid "this is the insn:" msgstr "" -#: reload1.c:3924 +#: reload1.c:3941 msgid "`asm' operand requires impossible reload" msgstr "" #. It's the compiler's fault. -#: reload1.c:5040 +#: reload1.c:5055 msgid "could not find a spill register" msgstr "" -#: reload1.c:5045 +#: reload1.c:5060 msgid "`asm' operand constraint incompatible with operand size" msgstr "" #. It's the compiler's fault. -#: reload1.c:6639 +#: reload1.c:6680 msgid "VOIDmode on an output" msgstr "" -#: reload1.c:6640 +#: reload1.c:6681 msgid "output operand is constant in `asm'" msgstr "" -#: rtl-error.c:139 +#: rtl-error.c:140 msgid "unrecognizable insn:" msgstr "" -#: rtl-error.c:141 +#: rtl-error.c:142 msgid "insn does not satisfy its constraints:" msgstr "" -#: rtl.c:563 +#: rtl.c:558 #, c-format msgid "RTL check: access of elt %d of `%s' with last elt %d in %s, at %s:%d" msgstr "" -#: rtl.c:578 +#: rtl.c:573 #, c-format msgid "" "RTL check: expected elt %d type '%c', have '%c' (rtx %s) in %s, at %s:%d" msgstr "" -#: rtl.c:594 +#: rtl.c:589 #, c-format msgid "" "RTL check: expected elt %d type '%c' or '%c', have '%c' (rtx %s) in %s, at %" "s:%d" msgstr "" -#: rtl.c:607 +#: rtl.c:602 #, c-format msgid "RTL check: expected code `%s', have `%s' in %s, at %s:%d" msgstr "" -#: rtl.c:621 +#: rtl.c:616 #, c-format msgid "RTL check: expected code `%s' or `%s', have `%s' in %s, at %s:%d" msgstr "" -#: rtl.c:636 +#: rtl.c:631 #, c-format msgid "RTL check: access of elt %d of vector with last elt %d in %s, at %s:%d" msgstr "" -#: stmt.c:928 +#: rtl.c:646 +#, c-format +msgid "RTL flag check: %s used with unexpected rtx code `%s' in %s, at %s:%d" +msgstr "" + +#: stmt.c:753 #, c-format msgid "jump to `%s' invalidly jumps into binding contour" msgstr "" -#: stmt.c:1164 stmt.c:3763 +#: stmt.c:989 stmt.c:3731 #, c-format msgid "label `%s' used before containing binding contour" msgstr "" -#: stmt.c:1344 +#: stmt.c:1169 msgid "output operand constraint lacks `='" msgstr "" -#: stmt.c:1359 +#: stmt.c:1184 #, c-format msgid "output constraint `%c' for operand %d is not at the beginning" msgstr "" -#: stmt.c:1381 +#: stmt.c:1206 msgid "operand constraint contains incorrectly positioned '+' or '='" msgstr "" -#: stmt.c:1387 stmt.c:1487 +#: stmt.c:1212 stmt.c:1316 #, c-format msgid "`%%' constraint used with last operand" msgstr "" -#: stmt.c:1406 +#: stmt.c:1231 msgid "matching constraint not valid in output operand" msgstr "" -#: stmt.c:1478 +#: stmt.c:1307 #, c-format msgid "input operand constraint contains `%c'" msgstr "" -#: stmt.c:1518 +#: stmt.c:1347 msgid "matching constraint references invalid operand number" msgstr "" -#: stmt.c:1550 +#: stmt.c:1379 #, c-format msgid "invalid punctuation `%c' in constraint" msgstr "" -#: stmt.c:1646 +#: stmt.c:1429 +#, c-format +msgid "asm-specifier for variable `%s' conflicts with asm clobber list" +msgstr "" + +#: stmt.c:1519 #, c-format msgid "unknown register name `%s' in `asm'" msgstr "" -#: stmt.c:1690 +#: stmt.c:1567 #, c-format msgid "more than %d operands in `asm'" msgstr "" -#: stmt.c:1749 +#: stmt.c:1626 #, c-format msgid "output number %d not directly addressable" msgstr "" @@ -6538,99 +6797,107 @@ msgstr "" #. ??? Leave this only until we have experience with what #. happens in combine and elsewhere when constraints are #. not satisfied. -#: stmt.c:1818 stmt.c:1847 +#: stmt.c:1698 stmt.c:1727 #, c-format msgid "asm operand %d probably doesn't match constraints" msgstr "" -#: stmt.c:1993 +#: stmt.c:1858 +msgid "asm clobber conflict with output operand" +msgstr "" + +#: stmt.c:1863 +msgid "asm clobber conflict with input operand" +msgstr "" + +#: stmt.c:1898 msgid "too many alternatives in `asm'" msgstr "" -#: stmt.c:2005 +#: stmt.c:1910 msgid "operand constraints for `asm' differ in number of alternatives" msgstr "" -#: stmt.c:2058 +#: stmt.c:1963 #, c-format msgid "duplicate asm operand name '%s'" msgstr "" -#: stmt.c:2145 +#: stmt.c:2050 msgid "missing close brace for named operand" msgstr "" -#: stmt.c:2173 +#: stmt.c:2078 #, c-format msgid "undefined named operand '%s'" msgstr "" -#: stmt.c:3700 +#: stmt.c:3668 #, c-format msgid "unused variable `%s'" msgstr "" -#: stmt.c:5180 +#: stmt.c:5149 #, c-format msgid "enumeration value `%s' not handled in switch" msgstr "" -#: stmt.c:5205 stmt.c:5225 +#: stmt.c:5174 stmt.c:5194 #, c-format msgid "case value `%ld' not in enumerated type" msgstr "" -#: stmt.c:5208 stmt.c:5228 +#: stmt.c:5177 stmt.c:5197 #, c-format msgid "case value `%ld' not in enumerated type `%s'" msgstr "" -#: stmt.c:5315 +#: stmt.c:5270 msgid "switch missing default case" msgstr "" -#: stor-layout.c:175 +#: stor-layout.c:178 msgid "type size can't be explicitly evaluated" msgstr "" -#: stor-layout.c:177 +#: stor-layout.c:180 msgid "variable-size type declared outside of any function" msgstr "" -#: stor-layout.c:458 +#: stor-layout.c:461 #, c-format msgid "size of `%s' is %d bytes" msgstr "" -#: stor-layout.c:460 +#: stor-layout.c:463 #, c-format msgid "size of `%s' is larger than %d bytes" msgstr "" -#: stor-layout.c:858 stor-layout.c:1159 +#: stor-layout.c:869 stor-layout.c:1285 #, c-format msgid "packed attribute causes inefficient alignment for `%s'" msgstr "" -#: stor-layout.c:860 stor-layout.c:1161 +#: stor-layout.c:871 stor-layout.c:1287 #, c-format msgid "packed attribute is unnecessary for `%s'" msgstr "" -#: stor-layout.c:875 +#: stor-layout.c:886 #, c-format msgid "padding struct to align `%s'" msgstr "" -#: stor-layout.c:1123 +#: stor-layout.c:1249 msgid "padding struct size to alignment boundary" msgstr "" -#: stor-layout.c:1166 +#: stor-layout.c:1292 msgid "packed attribute causes inefficient alignment" msgstr "" -#: stor-layout.c:1168 +#: stor-layout.c:1294 msgid "packed attribute is unnecessary" msgstr "" @@ -6650,1008 +6917,1038 @@ msgstr "" msgid "time in %s: %ld.%06ld (%ld%%)\n" msgstr "" -#: tlink.c:428 +#: tlink.c:399 #, c-format msgid "collect: reading %s\n" msgstr "" -#: tlink.c:532 +#: tlink.c:502 #, c-format msgid "collect: recompiling %s\n" msgstr "" -#: tlink.c:698 +#: tlink.c:668 #, c-format msgid "collect: tweaking %s in %s\n" msgstr "" -#: tlink.c:745 +#: tlink.c:715 msgid "collect: relinking\n" msgstr "" -#: tlink.c:754 +#: tlink.c:724 #, c-format msgid "ld returned %d exit status" msgstr "" -#: toplev.c:875 +#: toplev.c:920 msgid "Generate debugging info in default format" msgstr "" -#: toplev.c:876 +#: toplev.c:921 msgid "Generate debugging info in default extended format" msgstr "" -#: toplev.c:878 +#: toplev.c:923 msgid "Generate STABS format debug info" msgstr "" -#: toplev.c:879 +#: toplev.c:924 msgid "Generate extended STABS format debug info" msgstr "" -#: toplev.c:882 +#: toplev.c:927 msgid "Generate DWARF-1 format debug info" msgstr "" -#: toplev.c:884 +#: toplev.c:929 msgid "Generate extended DWARF-1 format debug info" msgstr "" -#: toplev.c:887 +#: toplev.c:932 msgid "Generate DWARF-2 debug info" msgstr "" -#: toplev.c:890 +#: toplev.c:935 msgid "Generate XCOFF format debug info" msgstr "" -#: toplev.c:891 +#: toplev.c:936 msgid "Generate extended XCOFF format debug info" msgstr "" -#: toplev.c:894 +#: toplev.c:939 msgid "Generate COFF format debug info" msgstr "" -#: toplev.c:897 +#: toplev.c:942 msgid "Generate VMS format debug info" msgstr "" -#: toplev.c:941 +#: toplev.c:981 msgid "Perform DWARF2 duplicate elimination" msgstr "" -#: toplev.c:943 +#: toplev.c:983 msgid "Do not store floats in registers" msgstr "" -#: toplev.c:945 +#: toplev.c:985 msgid "Consider all mem refs through pointers as volatile" msgstr "" -#: toplev.c:947 +#: toplev.c:987 msgid "Consider all mem refs to global data to be volatile" msgstr "" -#: toplev.c:949 +#: toplev.c:989 msgid "Consider all mem refs to static data to be volatile" msgstr "" -#: toplev.c:951 +#: toplev.c:991 msgid "Defer popping functions args from stack until later" msgstr "" -#: toplev.c:953 +#: toplev.c:993 msgid "When possible do not generate stack frames" msgstr "" -#: toplev.c:955 +#: toplev.c:995 msgid "Optimize sibling and tail recursive calls" msgstr "" -#: toplev.c:957 +#: toplev.c:997 +msgid "Perform superblock formation via tail duplication" +msgstr "" + +#: toplev.c:999 msgid "When running CSE, follow jumps to their targets" msgstr "" -#: toplev.c:959 +#: toplev.c:1001 msgid "When running CSE, follow conditional jumps" msgstr "" -#: toplev.c:961 +#: toplev.c:1003 msgid "Perform a number of minor, expensive optimizations" msgstr "" -#: toplev.c:963 +#: toplev.c:1005 msgid "Perform jump threading optimizations" msgstr "" -#: toplev.c:965 +#: toplev.c:1007 msgid "Perform strength reduction optimizations" msgstr "" -#: toplev.c:967 +#: toplev.c:1009 msgid "Perform loop unrolling when iteration count is known" msgstr "" -#: toplev.c:969 +#: toplev.c:1011 msgid "Perform loop unrolling for all loops" msgstr "" -#: toplev.c:971 +#: toplev.c:1013 msgid "Generate prefetch instructions, if available, for arrays in loops" msgstr "" -#: toplev.c:973 +#: toplev.c:1015 msgid "Force all loop invariant computations out of loops" msgstr "" -#: toplev.c:975 +#: toplev.c:1017 msgid "Strength reduce all loop general induction variables" msgstr "" -#: toplev.c:977 +#: toplev.c:1019 msgid "Store strings in writable data section" msgstr "" -#: toplev.c:979 +#: toplev.c:1021 msgid "Enable machine specific peephole optimizations" msgstr "" -#: toplev.c:981 +#: toplev.c:1023 msgid "Copy memory operands into registers before using" msgstr "" -#: toplev.c:983 +#: toplev.c:1025 msgid "Copy memory address constants into regs before using" msgstr "" -#: toplev.c:985 +#: toplev.c:1027 msgid "Allow function addresses to be held in registers" msgstr "" -#: toplev.c:987 +#: toplev.c:1029 msgid "Integrate simple functions into their callers" msgstr "" -#: toplev.c:989 +#: toplev.c:1031 msgid "Generate code for funcs even if they are fully inlined" msgstr "" -#: toplev.c:991 +#: toplev.c:1033 msgid "Pay attention to the 'inline' keyword" msgstr "" -#: toplev.c:993 +#: toplev.c:1035 msgid "Emit static const variables even if they are not used" msgstr "" -#: toplev.c:995 +#: toplev.c:1037 msgid "Check for syntax errors, then stop" msgstr "" -#: toplev.c:997 +#: toplev.c:1039 msgid "Mark data as shared rather than private" msgstr "" -#: toplev.c:999 +#: toplev.c:1041 msgid "Enable saving registers around function calls" msgstr "" -#: toplev.c:1001 +#: toplev.c:1043 msgid "Return 'short' aggregates in memory, not registers" msgstr "" -#: toplev.c:1003 +#: toplev.c:1045 msgid "Return 'short' aggregates in registers" msgstr "" -#: toplev.c:1005 +#: toplev.c:1047 msgid "Attempt to fill delay slots of branch instructions" msgstr "" -#: toplev.c:1007 +#: toplev.c:1049 msgid "Perform the global common subexpression elimination" msgstr "" -#: toplev.c:1009 +#: toplev.c:1051 msgid "Perform enhanced load motion during global subexpression elimination" msgstr "" -#: toplev.c:1011 +#: toplev.c:1053 msgid "Perform store motion after global subexpression elimination" msgstr "" -#: toplev.c:1013 +#: toplev.c:1055 msgid "Perform the loop optimizations" msgstr "" -#: toplev.c:1015 +#: toplev.c:1057 msgid "Perform cross-jumping optimization" msgstr "" -#: toplev.c:1017 +#: toplev.c:1059 +msgid "Perform conversion of conditional jumps to branchless equivalents" +msgstr "" + +#: toplev.c:1061 +msgid "Perform conversion of conditional jumps to conditional execution" +msgstr "" + +#: toplev.c:1063 msgid "Run CSE pass after loop optimizations" msgstr "" -#: toplev.c:1019 +#: toplev.c:1065 msgid "Run the loop optimizer twice" msgstr "" -#: toplev.c:1021 +#: toplev.c:1067 msgid "Delete useless null pointer checks" msgstr "" -#: toplev.c:1023 +#: toplev.c:1069 msgid "Reschedule instructions before register allocation" msgstr "" -#: toplev.c:1025 +#: toplev.c:1071 msgid "Reschedule instructions after register allocation" msgstr "" -#: toplev.c:1027 +#: toplev.c:1073 msgid "Enable scheduling across basic blocks" msgstr "" -#: toplev.c:1029 +#: toplev.c:1075 msgid "Allow speculative motion of non-loads" msgstr "" -#: toplev.c:1031 +#: toplev.c:1077 msgid "Allow speculative motion of some loads" msgstr "" -#: toplev.c:1033 +#: toplev.c:1079 msgid "Allow speculative motion of more loads" msgstr "" -#: toplev.c:1035 +#: toplev.c:1081 msgid "Replace add,compare,branch with branch on count reg" msgstr "" -#: toplev.c:1037 +#: toplev.c:1083 msgid "Generate position independent code, if possible" msgstr "" -#: toplev.c:1040 +#: toplev.c:1086 msgid "Enable exception handling" msgstr "" -#: toplev.c:1042 +#: toplev.c:1088 msgid "Just generate unwind tables for exception handling" msgstr "" -#: toplev.c:1044 +#: toplev.c:1090 msgid "Generate unwind tables exact at each instruction boundary" msgstr "" -#: toplev.c:1046 +#: toplev.c:1092 msgid "Support synchronous non-call exceptions" msgstr "" -#: toplev.c:1048 +#: toplev.c:1094 msgid "Insert arc based program profiling code" msgstr "" -#: toplev.c:1050 +#: toplev.c:1096 msgid "Create data files needed by gcov" msgstr "" -#: toplev.c:1052 +#: toplev.c:1098 msgid "Use profiling information for branch probabilities" msgstr "" -#: toplev.c:1054 +#: toplev.c:1100 +msgid "Enable basic program profiling code" +msgstr "" + +#: toplev.c:1102 msgid "Reorder basic blocks to improve code placement" msgstr "" -#: toplev.c:1056 +#: toplev.c:1104 +msgid "Reorder functions to improve code placement" +msgstr "" + +#: toplev.c:1106 msgid "Do the register renaming optimization pass" msgstr "" -#: toplev.c:1058 +#: toplev.c:1108 msgid "Do the register copy-propagation optimization pass" msgstr "" -#: toplev.c:1060 +#: toplev.c:1110 msgid "Do not put uninitialized globals in the common section" msgstr "" -#: toplev.c:1062 +#: toplev.c:1112 msgid "Do not generate .size directives" msgstr "" -#: toplev.c:1064 +#: toplev.c:1114 msgid "place each function into its own section" msgstr "" -#: toplev.c:1066 +#: toplev.c:1116 msgid "place data items into their own section" msgstr "" -#: toplev.c:1068 +#: toplev.c:1118 msgid "Add extra commentry to assembler output" msgstr "" -#: toplev.c:1070 +#: toplev.c:1120 msgid "Output GNU ld formatted global initializers" msgstr "" -#: toplev.c:1072 +#: toplev.c:1122 msgid "Enables a register move optimization" msgstr "" -#: toplev.c:1074 +#: toplev.c:1124 msgid "Do the full regmove optimization pass" msgstr "" -#: toplev.c:1076 +#: toplev.c:1126 msgid "Pack structure members together without holes" msgstr "" -#: toplev.c:1078 +#: toplev.c:1128 msgid "Insert stack checking code into the program" msgstr "" -#: toplev.c:1080 +#: toplev.c:1130 msgid "Specify that arguments may alias each other & globals" msgstr "" -#: toplev.c:1082 +#: toplev.c:1132 msgid "Assume arguments may alias globals but not each other" msgstr "" -#: toplev.c:1084 +#: toplev.c:1134 msgid "Assume arguments do not alias each other or globals" msgstr "" -#: toplev.c:1086 +#: toplev.c:1136 msgid "Assume strict aliasing rules apply" msgstr "" -#: toplev.c:1088 +#: toplev.c:1138 msgid "Align the start of loops" msgstr "" -#: toplev.c:1090 +#: toplev.c:1140 msgid "Align labels which are only reached by jumping" msgstr "" -#: toplev.c:1092 +#: toplev.c:1142 msgid "Align all labels" msgstr "" -#: toplev.c:1094 +#: toplev.c:1144 msgid "Align the start of functions" msgstr "" -#: toplev.c:1096 +#: toplev.c:1146 msgid "Attempt to merge identical constants accross compilation units" msgstr "" -#: toplev.c:1098 +#: toplev.c:1148 msgid "Attempt to merge identical constants and constant variables" msgstr "" -#: toplev.c:1100 +#: toplev.c:1150 msgid "" "Suppress output of instruction numbers and line number notes in debugging " "dumps" msgstr "" -#: toplev.c:1102 +#: toplev.c:1152 msgid "Instrument function entry/exit with profiling calls" msgstr "" -#: toplev.c:1104 +#: toplev.c:1154 msgid "Put zero initialized data in the bss section" msgstr "" -#: toplev.c:1106 +#: toplev.c:1156 msgid "Enable SSA optimizations" msgstr "" -#: toplev.c:1108 +#: toplev.c:1158 msgid "Enable SSA conditional constant propagation" msgstr "" -#: toplev.c:1110 +#: toplev.c:1160 msgid "Enable aggressive SSA dead code elimination" msgstr "" -#: toplev.c:1112 +#: toplev.c:1162 msgid "External symbols have a leading underscore" msgstr "" -#: toplev.c:1114 +#: toplev.c:1164 msgid "Process #ident directives" msgstr "" -#: toplev.c:1116 +#: toplev.c:1166 msgid "Enables an rtl peephole pass run before sched2" msgstr "" -#: toplev.c:1118 +#: toplev.c:1168 +msgid "Assume no NaNs or +-Infs are generated" +msgstr "" + +#: toplev.c:1170 msgid "Enables guessing of branch probabilities" msgstr "" -#: toplev.c:1120 +#: toplev.c:1172 msgid "Set errno after built-in math functions" msgstr "" -#: toplev.c:1122 +#: toplev.c:1174 msgid "Floating-point operations can trap" msgstr "" -#: toplev.c:1124 +#: toplev.c:1176 msgid "Allow math optimizations that may violate IEEE or ANSI standards" msgstr "" -#: toplev.c:1126 -msgid "Compile pointers as triples: value, base & end" +#: toplev.c:1178 +msgid "Disable optimizations observable by IEEE signaling NaNs" msgstr "" -#: toplev.c:1128 -msgid "Generate code to check bounds before dereferencing pointers and arrays" +#: toplev.c:1180 +msgid "Generate code to check bounds before indexing arrays" msgstr "" -#: toplev.c:1130 +#: toplev.c:1182 msgid "Convert floating point constant to single precision constant" msgstr "" -#: toplev.c:1132 +#: toplev.c:1184 msgid "Report time taken by each compiler pass at end of run" msgstr "" -#: toplev.c:1134 +#: toplev.c:1186 msgid "Report on permanent memory allocation at end of run" msgstr "" -#: toplev.c:1136 +#: toplev.c:1188 msgid "Trap for signed overflow in addition / subtraction / multiplication" msgstr "" -#: toplev.c:1153 -msgid "Compile just for ISO C89" +#: toplev.c:1190 +msgid "Use graph coloring register allocation." msgstr "" -#: toplev.c:1155 +#: toplev.c:1207 +msgid "Compile just for ISO C90" +msgstr "" + +#: toplev.c:1209 msgid "Determine language standard" msgstr "" -#: toplev.c:1159 +#: toplev.c:1213 msgid "Make bit-fields by unsigned by default" msgstr "" -#: toplev.c:1163 +#: toplev.c:1217 msgid "Make 'char' be signed by default" msgstr "" -#: toplev.c:1165 +#: toplev.c:1219 msgid "Make 'char' be unsigned by default" msgstr "" -#: toplev.c:1171 +#: toplev.c:1225 msgid "Do not recognize the 'asm' keyword" msgstr "" -#: toplev.c:1174 +#: toplev.c:1228 msgid "Do not recognize any built in functions" msgstr "" -#: toplev.c:1176 +#: toplev.c:1230 msgid "Assume normal C execution environment" msgstr "" -#: toplev.c:1179 +#: toplev.c:1233 msgid "Assume that standard libraries & main might not exist" msgstr "" -#: toplev.c:1182 +#: toplev.c:1236 msgid "Allow different types as args of ? operator" msgstr "" -#: toplev.c:1185 +#: toplev.c:1239 msgid "Allow the use of $ inside identifiers" msgstr "" -#: toplev.c:1190 +#: toplev.c:1244 msgid "Use the same size for double as for float" msgstr "" -#: toplev.c:1193 +#: toplev.c:1247 msgid "Use the smallest fitting integer to hold enums" msgstr "" -#: toplev.c:1196 +#: toplev.c:1250 msgid "Override the underlying type for wchar_t to `unsigned short'" msgstr "" -#: toplev.c:1200 +#: toplev.c:1254 msgid "Enable most warning messages" msgstr "" -#: toplev.c:1202 +#: toplev.c:1256 msgid "Warn about casting functions to incompatible types" msgstr "" -#: toplev.c:1205 +#: toplev.c:1259 msgid "Warn about functions which might be candidates for format attributes" msgstr "" -#: toplev.c:1208 +#: toplev.c:1262 msgid "Warn about casts which discard qualifiers" msgstr "" -#: toplev.c:1211 +#: toplev.c:1265 msgid "Warn about subscripts whose type is 'char'" msgstr "" -#: toplev.c:1214 toplev.c:1217 +#: toplev.c:1268 toplev.c:1271 msgid "Warn if nested comments are detected" msgstr "" -#: toplev.c:1220 +#: toplev.c:1274 msgid "Warn about possibly confusing type conversions" msgstr "" -#: toplev.c:1224 +#: toplev.c:1278 msgid "Do not warn about compile-time integer division by zero" msgstr "" -#: toplev.c:1226 +#: toplev.c:1280 msgid "Warn about testing equality of floating point numbers" msgstr "" -#: toplev.c:1229 +#: toplev.c:1283 msgid "Warn about printf/scanf/strftime/strfmon format anomalies" msgstr "" -#: toplev.c:1233 +#: toplev.c:1287 msgid "Don't warn about too many arguments to format functions" msgstr "" -#: toplev.c:1235 +#: toplev.c:1289 msgid "Warn about non-string-literal format strings" msgstr "" -#: toplev.c:1238 +#: toplev.c:1292 msgid "Warn about possible security problems with format functions" msgstr "" -#: toplev.c:1242 +#: toplev.c:1296 msgid "Don't warn about strftime formats yielding 2 digit years" msgstr "" -#: toplev.c:1244 +#: toplev.c:1298 msgid "Warn about implicit function declarations" msgstr "" -#: toplev.c:1248 +#: toplev.c:1302 msgid "Warn when a declaration does not specify a type" msgstr "" -#: toplev.c:1253 +#: toplev.c:1307 msgid "Warn about the use of the #import directive" msgstr "" -#: toplev.c:1257 +#: toplev.c:1311 msgid "Do not warn about using 'long long' when -pedantic" msgstr "" -#: toplev.c:1259 +#: toplev.c:1313 msgid "Warn about suspicious declarations of main" msgstr "" -#: toplev.c:1262 +#: toplev.c:1316 msgid "Warn about possibly missing braces around initializers" msgstr "" -#: toplev.c:1265 +#: toplev.c:1319 msgid "Warn about global funcs without previous declarations" msgstr "" -#: toplev.c:1268 +#: toplev.c:1322 msgid "Warn about global funcs without prototypes" msgstr "" -#: toplev.c:1271 +#: toplev.c:1325 msgid "Warn about use of multicharacter literals" msgstr "" -#: toplev.c:1274 +#: toplev.c:1328 msgid "Warn about externs not at file scope level" msgstr "" -#: toplev.c:1277 +#: toplev.c:1331 msgid "Warn about possible missing parentheses" msgstr "" -#: toplev.c:1280 +#: toplev.c:1334 msgid "Warn about function pointer arithmetic" msgstr "" -#: toplev.c:1283 +#: toplev.c:1337 msgid "Warn about multiple declarations of the same object" msgstr "" -#: toplev.c:1286 +#: toplev.c:1340 msgid "Warn whenever a function's return-type defaults to int" msgstr "" -#: toplev.c:1289 +#: toplev.c:1343 msgid "Warn about possible violations of sequence point rules" msgstr "" -#: toplev.c:1292 +#: toplev.c:1346 msgid "Warn about signed/unsigned comparisons" msgstr "" -#: toplev.c:1295 +#: toplev.c:1349 msgid "Warn about non-prototyped function decls" msgstr "" -#: toplev.c:1298 +#: toplev.c:1352 msgid "Warn about constructs whose meanings change in ISO C" msgstr "" -#: toplev.c:1301 +#: toplev.c:1355 msgid "Warn when trigraphs are encountered" msgstr "" -#: toplev.c:1306 +#: toplev.c:1360 msgid "Warn about unrecognized pragmas" msgstr "" -#: toplev.c:1309 +#: toplev.c:1363 msgid "Mark strings as 'const char *'" msgstr "" -#: toplev.c:1449 +#: toplev.c:1508 msgid "Warn when a function is unused" msgstr "" -#: toplev.c:1451 +#: toplev.c:1510 msgid "Warn when a label is unused" msgstr "" -#: toplev.c:1453 +#: toplev.c:1512 msgid "Warn when a function parameter is unused" msgstr "" -#: toplev.c:1455 +#: toplev.c:1514 msgid "Warn when a variable is unused" msgstr "" -#: toplev.c:1457 +#: toplev.c:1516 msgid "Warn when an expression value is unused" msgstr "" -#: toplev.c:1459 +#: toplev.c:1518 msgid "Do not suppress warnings from system headers" msgstr "" -#: toplev.c:1461 +#: toplev.c:1520 msgid "Treat all warnings as errors" msgstr "" -#: toplev.c:1463 +#: toplev.c:1522 msgid "Warn when one local variable shadows another" msgstr "" -#: toplev.c:1465 +#: toplev.c:1524 msgid "Warn about enumerated switches, with no default, missing a case" msgstr "" -#: toplev.c:1467 +#: toplev.c:1526 msgid "Warn about enumerated switches missing a default case" msgstr "" -#: toplev.c:1469 +#: toplev.c:1528 msgid "Warn about all enumerated switches missing a specific case" msgstr "" -#: toplev.c:1471 +#: toplev.c:1530 msgid "Warn about returning structures, unions or arrays" msgstr "" -#: toplev.c:1473 +#: toplev.c:1532 msgid "Warn about pointer casts which increase alignment" msgstr "" -#: toplev.c:1475 +#: toplev.c:1534 msgid "Warn about code that will never be executed" msgstr "" -#: toplev.c:1477 +#: toplev.c:1536 msgid "Warn about uninitialized automatic variables" msgstr "" -#: toplev.c:1479 +#: toplev.c:1538 msgid "Warn when an inlined function cannot be inlined" msgstr "" -#: toplev.c:1481 +#: toplev.c:1540 msgid "Warn when the packed attribute has no effect on struct layout" msgstr "" -#: toplev.c:1483 +#: toplev.c:1542 msgid "Warn when padding is required to align struct members" msgstr "" -#: toplev.c:1485 +#: toplev.c:1544 msgid "Warn when an optimization pass is disabled" msgstr "" -#: toplev.c:1487 +#: toplev.c:1546 msgid "Warn about uses of __attribute__((deprecated)) declarations" msgstr "" -#: toplev.c:1489 +#: toplev.c:1548 msgid "Warn about functions which might be candidates for attribute noreturn" msgstr "" -#: toplev.c:1560 toplev.c:4284 tradcpp.c:796 -#, c-format -msgid "invalid option `%s'" +#: toplev.c:1550 +msgid "Warn about code which might break the strict aliasing rules" msgstr "" -#: toplev.c:1627 +#: toplev.c:1627 toplev.c:4513 config/rs6000/rs6000.c:676 #, c-format -msgid "internal error: %s" +msgid "invalid option `%s'" msgstr "" -#: toplev.c:1939 +#: toplev.c:2029 #, c-format msgid "`%s' used but never defined" msgstr "" -#: toplev.c:1942 +#: toplev.c:2032 #, c-format msgid "`%s' declared `static' but never defined" msgstr "" -#: toplev.c:1961 +#: toplev.c:2051 #, c-format msgid "`%s' defined but not used" msgstr "" -#: toplev.c:2206 +#: toplev.c:2300 #, c-format msgid "invalid register name `%s' for register variable" msgstr "" -#: toplev.c:3495 +#: toplev.c:3683 msgid "" " -ffixed-<register> Mark <register> as being unavailable to the " "compiler\n" msgstr "" -#: toplev.c:3496 +#: toplev.c:3684 msgid "" " -fcall-used-<register> Mark <register> as being corrupted by function " "calls\n" msgstr "" -#: toplev.c:3497 +#: toplev.c:3685 msgid "" " -fcall-saved-<register> Mark <register> as being preserved across " "functions\n" msgstr "" -#: toplev.c:3498 +#: toplev.c:3686 msgid "" " -finline-limit=<number> Limits the size of inlined functions to <number>\n" msgstr "" -#: toplev.c:3499 +#: toplev.c:3687 msgid "" " -fmessage-length=<number> Limits diagnostics messages lengths to <number> " "characters per line. 0 suppresses line-wrapping\n" msgstr "" -#: toplev.c:3500 +#: toplev.c:3688 msgid "" " -fdiagnostics-show-location=[once | every-line] Indicates how often source " "location information should be emitted, as prefix, at the beginning of " "diagnostics when line-wrapping\n" msgstr "" -#: toplev.c:3511 +#: toplev.c:3689 +msgid "" +" -ftls-model=[global-dynamic | local-dynamic | initial-exec | local-exec] " +"Indicates the default thread-local storage code generation model\n" +msgstr "" + +#: toplev.c:3700 msgid " -O[number] Set optimization level to [number]\n" msgstr "" -#: toplev.c:3512 +#: toplev.c:3701 msgid " -Os Optimize for space rather than speed\n" msgstr "" -#: toplev.c:3524 +#: toplev.c:3713 msgid "" " -pedantic Issue warnings needed by strict compliance to ISO " "C\n" msgstr "" -#: toplev.c:3525 +#: toplev.c:3714 msgid "" " -pedantic-errors Like -pedantic except that errors are produced\n" msgstr "" -#: toplev.c:3526 +#: toplev.c:3715 msgid " -w Suppress warnings\n" msgstr "" -#: toplev.c:3527 +#: toplev.c:3716 msgid " -W Enable extra warnings\n" msgstr "" -#: toplev.c:3538 +#: toplev.c:3727 msgid " -Wunused Enable unused warnings\n" msgstr "" -#: toplev.c:3539 +#: toplev.c:3728 msgid "" " -Wlarger-than-<number> Warn if an object is larger than <number> bytes\n" msgstr "" -#: toplev.c:3540 +#: toplev.c:3729 msgid " -p Enable function profiling\n" msgstr "" -#: toplev.c:3542 -msgid " -a Enable block profiling \n" -msgstr "" - -#: toplev.c:3545 -msgid " -ax Enable jump profiling \n" -msgstr "" - -#: toplev.c:3547 +#: toplev.c:3730 msgid " -o <file> Place output into <file> \n" msgstr "" -#: toplev.c:3548 +#: toplev.c:3731 msgid "" " -G <number> Put global and static data smaller than <number>\n" " bytes into a special section (on some targets)\n" msgstr "" -#: toplev.c:3559 +#: toplev.c:3742 msgid " -aux-info <file> Emit declaration info into <file>\n" msgstr "" -#: toplev.c:3560 +#: toplev.c:3743 msgid "" " -quiet Do not display functions compiled or elapsed time\n" msgstr "" -#: toplev.c:3561 +#: toplev.c:3744 msgid " -version Display the compiler's version\n" msgstr "" -#: toplev.c:3562 +#: toplev.c:3745 msgid "" " -d[letters] Enable dumps from specific passes of the compiler\n" msgstr "" -#: toplev.c:3563 +#: toplev.c:3746 msgid "" " -dumpbase <file> Base name to be used for dumps from specific " "passes\n" msgstr "" -#: toplev.c:3565 +#: toplev.c:3748 msgid " -fsched-verbose=<number> Set the verbosity level of the scheduler\n" msgstr "" -#: toplev.c:3567 +#: toplev.c:3750 msgid " --help Display this information\n" msgstr "" -#: toplev.c:3582 +#: toplev.c:3765 msgid "" "\n" "Language specific options:\n" msgstr "" -#: toplev.c:3594 +#: toplev.c:3777 #, c-format msgid " %-23.23s [undocumented]\n" msgstr "" -#: toplev.c:3602 toplev.c:3616 +#: toplev.c:3785 toplev.c:3799 #, c-format msgid "" "\n" "There are undocumented %s specific options as well.\n" msgstr "" -#: toplev.c:3606 +#: toplev.c:3789 #, c-format msgid "" "\n" " Options for %s:\n" msgstr "" -#: toplev.c:3643 +#: toplev.c:3826 msgid "" "\n" "Target specific options:\n" msgstr "" -#: toplev.c:3657 toplev.c:3676 +#: toplev.c:3840 toplev.c:3859 #, c-format msgid " -m%-23.23s [undocumented]\n" msgstr "" -#: toplev.c:3685 +#: toplev.c:3868 msgid "" "\n" "There are undocumented target specific options as well.\n" msgstr "" -#: toplev.c:3687 +#: toplev.c:3870 msgid " They exist, but they are not documented.\n" msgstr "" -#: toplev.c:3740 +#: toplev.c:3923 #, c-format msgid "unrecognized gcc debugging option: %c" msgstr "" -#: toplev.c:3810 +#: toplev.c:3979 +#, c-format +msgid "`%s': unknown tls-model option" +msgstr "" + +#: toplev.c:4006 #, c-format msgid "unrecognized register name `%s'" msgstr "" -#: toplev.c:3835 toplev.c:4714 +#: toplev.c:4031 toplev.c:4965 #, c-format msgid "unrecognized option `%s'" msgstr "" -#: toplev.c:3879 +#: toplev.c:4075 msgid "-Wid-clash-LEN is no longer supported" msgstr "" -#: toplev.c:3956 +#: toplev.c:4152 #, c-format msgid "use -gdwarf -g%d for DWARF v1, level %d" msgstr "" -#: toplev.c:3959 +#: toplev.c:4155 msgid "use -gdwarf-2 for DWARF v2" msgstr "" -#: toplev.c:3964 +#: toplev.c:4160 #, c-format msgid "ignoring option `%s' due to invalid debug level specification" msgstr "" -#: toplev.c:3987 toplev.c:4712 +#: toplev.c:4183 toplev.c:4963 #, c-format msgid "`%s': unknown or unsupported -g option" msgstr "" -#: toplev.c:3994 +#: toplev.c:4190 #, c-format msgid "`%s' ignored, conflicts with `-g%s'" msgstr "" -#: toplev.c:4073 +#: toplev.c:4269 msgid "-param option missing argument" msgstr "" -#: toplev.c:4082 +#: toplev.c:4278 #, c-format msgid "invalid --param option: %s" msgstr "" -#: toplev.c:4094 +#: toplev.c:4290 #, c-format msgid "invalid parameter value `%s'" msgstr "" -#: toplev.c:4301 +#: toplev.c:4530 #, c-format msgid "" "%s%s%s version %s (%s)\n" @@ -7659,1164 +7956,923 @@ msgid "" "%s%s%s version %s (%s) compiled by CC.\n" msgstr "" -#: toplev.c:4357 +#: toplev.c:4586 msgid "options passed: " msgstr "" -#: toplev.c:4386 +#: toplev.c:4615 msgid "options enabled: " msgstr "" -#: toplev.c:4445 java/jcf-write.c:3379 +#: toplev.c:4674 java/jcf-write.c:3421 #, c-format msgid "can't open %s for writing" msgstr "" -#: toplev.c:4704 +#: toplev.c:4955 #, c-format msgid "ignoring command line option '%s'" msgstr "" -#: toplev.c:4707 +#: toplev.c:4958 #, c-format msgid "(it is valid for %s but not the selected language)" msgstr "" -#: toplev.c:4741 +#: toplev.c:4992 msgid "-Wuninitialized is not supported without -O" msgstr "" -#: toplev.c:4800 +#: toplev.c:5047 msgid "instruction scheduling not supported on this target machine" msgstr "" -#: toplev.c:4804 +#: toplev.c:5051 msgid "this target machine does not have delayed branches" msgstr "" -#: toplev.c:4813 -msgid "profiling does not work without a frame pointer" -msgstr "" - -#: toplev.c:4828 +#: toplev.c:5065 #, c-format msgid "-f%sleading-underscore not supported on this target machine" msgstr "" -#: toplev.c:4891 +#: toplev.c:5128 msgid "-ffunction-sections not supported for this target" msgstr "" -#: toplev.c:4896 +#: toplev.c:5133 msgid "-fdata-sections not supported for this target" msgstr "" -#: toplev.c:4903 +#: toplev.c:5140 msgid "-ffunction-sections disabled; it makes profiling impossible" msgstr "" -#: toplev.c:4910 +#: toplev.c:5147 msgid "-fprefetch-loop-arrays not supported for this target" msgstr "" -#: toplev.c:4916 +#: toplev.c:5153 msgid "" "-fprefetch-loop-arrays not supported for this target (try -march switches)" msgstr "" -#: toplev.c:4925 +#: toplev.c:5162 msgid "-fprefetch-loop-arrays is not supported with -Os" msgstr "" -#: toplev.c:4931 +#: toplev.c:5168 msgid "-ffunction-sections may affect debugging on some targets" msgstr "" -#: toplev.c:5044 +#: toplev.c:5280 #, c-format msgid "error writing to %s" msgstr "" -#: toplev.c:5046 java/jcf-parse.c:954 java/jcf-write.c:3386 +#: toplev.c:5282 java/jcf-parse.c:932 java/jcf-write.c:3428 #, c-format msgid "error closing %s" msgstr "" -#: /usr/share/bison.simple:650 -msgid "parse error; also virtual memory exceeded" -msgstr "" - -#. It's a float since it contains a point. -#: tradcif.y:231 -msgid "floating point numbers not allowed in #if expressions" -msgstr "" - -#: tradcif.y:277 -msgid "invalid number in #if expression" -msgstr "" - -#: tradcif.y:357 -msgid "invalid character constant in #if" -msgstr "" - -#: tradcif.y:394 -msgid "double quoted strings not allowed in #if expressions" -msgstr "" - -#: tradcif.y:407 -msgid "invalid token in expression" -msgstr "" - -#: tradcif.y:498 -msgid "octal character constant does not fit in a byte" -msgstr "" - -#: tradcif.y:519 -msgid "hex character constant does not fit in a byte" -msgstr "" - -#: tradcif.y:550 -msgid "empty #if expression" -msgstr "" - -#: tradcif.y:564 -msgid "Junk after end of expression." -msgstr "" - -#: tradcpp.c:145 -msgid "macro or #include recursion too deep" -msgstr "" - -#: tradcpp.c:562 -#, c-format -msgid "usage: %s [switches] input output" -msgstr "" - -#: tradcpp.c:578 -msgid "-traditional is not supported in C++" -msgstr "" - -#: tradcpp.c:580 -msgid "-traditional and -ansi are mutually exclusive" -msgstr "" - -#: tradcpp.c:594 -msgid "filename missing after -i option" -msgstr "" - -#: tradcpp.c:612 -msgid "filename missing after -o option" -msgstr "" - -#: tradcpp.c:675 -#, c-format -msgid "target missing after %s option" -msgstr "" - -#: tradcpp.c:689 -#, c-format -msgid "filename missing after %s option" -msgstr "" - -#: tradcpp.c:714 -#, c-format -msgid "macro name missing after -%c option" -msgstr "" - -#: tradcpp.c:734 -msgid "-pedantic and -traditional are mutually exclusive" -msgstr "" - -#: tradcpp.c:739 -msgid "-trigraphs and -traditional are mutually exclusive" -msgstr "" - -#: tradcpp.c:765 -msgid "directory name missing after -I option" -msgstr "" - -#: tradcpp.c:1449 tradcpp.c:3941 -msgid "`/*' within comment" -msgstr "" - -#: tradcpp.c:1825 -#, c-format -msgid "unterminated #%s conditional" -msgstr "" - -#: tradcpp.c:2184 -msgid "not in any file?!" -msgstr "" - -#: tradcpp.c:2290 -msgid "`defined' must be followed by ident or (ident)" -msgstr "" - -#: tradcpp.c:2294 -msgid "cccp error: invalid special hash type" -msgstr "" - -#: tradcpp.c:2392 tradcpp.c:2462 -msgid "#include expects \"fname\" or <fname>" -msgstr "" - -#: tradcpp.c:2547 -#, c-format -msgid "no include path in which to find %.*s" -msgstr "" - -#: tradcpp.c:2725 -msgid "invalid macro name" -msgstr "" - -#: tradcpp.c:2733 -#, c-format -msgid "invalid macro name `%s'" -msgstr "" - -#: tradcpp.c:2738 -msgid "\"defined\" cannot be used as a macro name" -msgstr "" - -#: tradcpp.c:2765 -msgid "parameter name starts with a digit in #define" -msgstr "" - -#: tradcpp.c:2775 -msgid "badly punctuated parameter list in #define" -msgstr "" - -#: tradcpp.c:2783 -msgid "unterminated parameter list in #define" -msgstr "" - -#: tradcpp.c:2831 -#, c-format -msgid "\"%.*s\" redefined" -msgstr "" - -#: tradcpp.c:3088 -msgid "# operator should be followed by a macro argument name" -msgstr "" - -#: tradcpp.c:3135 tradcpp.c:3161 tradcpp.c:3175 tradcpp.c:3182 tradcpp.c:3207 -msgid "invalid format #line command" -msgstr "" - -#: tradcpp.c:3233 -msgid "undefining `defined'" -msgstr "" - -#: tradcpp.c:3237 -#, c-format -msgid "undefining `%s'" -msgstr "" - -#: tradcpp.c:3293 -msgid "extra text at end of directive" -msgstr "" - -#: tradcpp.c:3400 -#, c-format -msgid "#error%.*s" -msgstr "" - -#: tradcpp.c:3410 -#, c-format -msgid "#warning%.*s" -msgstr "" - -#: tradcpp.c:3566 -msgid "#elif not within a conditional" -msgstr "" - -#: tradcpp.c:3823 -#, c-format -msgid "#%s not within a conditional" -msgstr "" - -#: tradcpp.c:3831 -msgid "#else or #elif after #else" -msgstr "" - -#: tradcpp.c:3871 -msgid "#else not within a conditional" -msgstr "" - -#: tradcpp.c:3902 -msgid "unbalanced #endif" -msgstr "" - -#: tradcpp.c:3996 -msgid "unterminated string or character constant" -msgstr "" - -#: tradcpp.c:4154 -#, c-format -msgid "arguments given to macro `%s'" -msgstr "" - -#: tradcpp.c:4160 -#, c-format -msgid "no args to macro `%s'" -msgstr "" - -#: tradcpp.c:4162 -#, c-format -msgid "only 1 arg to macro `%s'" -msgstr "" - -#: tradcpp.c:4164 -#, c-format -msgid "only %d args to macro `%s'" -msgstr "" - -#: tradcpp.c:4166 -#, c-format -msgid "too many (%d) args to macro `%s'" -msgstr "" - -#: tradcpp.c:4763 -#, c-format -msgid "" -"internal error in %s, at tradcpp.c:%d\n" -"Please submit a full bug report.\n" -"See %s for instructions." -msgstr "" - -#: tree-dump.c:848 +#: tree-dump.c:702 #, c-format msgid "could not open dump file `%s'" msgstr "" -#: tree-dump.c:924 +#: tree-dump.c:778 #, c-format msgid "ignoring unknown option `%.*s' in `-f%s'" msgstr "" -#: tree.c:3709 +#: tree.c:3645 msgid "arrays of functions are not meaningful" msgstr "" -#: tree.c:3766 +#: tree.c:3702 msgid "function return type cannot be function" msgstr "" -#: tree.c:4520 +#: tree.c:4544 msgid "invalid initializer for bit string" msgstr "" -#: tree.c:4579 +#: tree.c:4603 #, c-format msgid "tree check: expected %s, have %s in %s, at %s:%d" msgstr "" -#: tree.c:4596 +#: tree.c:4620 #, c-format msgid "tree check: expected class '%c', have '%c' (%s) in %s, at %s:%d" msgstr "" -#: varasm.c:456 config/i386/winnt.c:526 +#: tree.c:4637 +#, c-format +msgid "tree check: accessed elt %d of tree_vec with %d elts in %s, at %s:%d" +msgstr "" + +#: varasm.c:455 config/i386/winnt.c:546 #, c-format msgid "%s causes a section type conflict" msgstr "" -#: varasm.c:878 +#: varasm.c:841 #, c-format msgid "register name not specified for `%s'" msgstr "" -#: varasm.c:880 +#: varasm.c:843 #, c-format msgid "invalid register name for `%s'" msgstr "" -#: varasm.c:883 +#: varasm.c:846 #, c-format msgid "data type of `%s' isn't suitable for a register" msgstr "" -#: varasm.c:886 +#: varasm.c:849 #, c-format msgid "register specified for `%s' isn't suitable for data type" msgstr "" -#: varasm.c:895 +#: varasm.c:858 msgid "global register variable has initial value" msgstr "" -#: varasm.c:898 +#: varasm.c:861 msgid "volatile register variables don't work as you might wish" msgstr "" -#: varasm.c:931 +#: varasm.c:894 #, c-format msgid "register name given for non-register variable `%s'" msgstr "" -#: varasm.c:1571 +#: varasm.c:1542 #, c-format msgid "" "alignment of `%s' is greater than maximum object file alignment. Using %d" msgstr "" -#: varasm.c:1637 +#: varasm.c:1584 +msgid "thread-local COMMON data not implemented" +msgstr "" + +#: varasm.c:1608 #, c-format msgid "requested alignment for %s is greater than implemented alignment of %d" msgstr "" -#: varasm.c:4569 +#: varasm.c:4020 msgid "initializer for integer value is too complicated" msgstr "" -#: varasm.c:4574 +#: varasm.c:4025 msgid "initializer for floating value is not a floating constant" msgstr "" -#: varasm.c:4624 +#: varasm.c:4075 msgid "unknown set constructor type" msgstr "" -#: varasm.c:4838 +#: varasm.c:4289 #, c-format msgid "invalid initial value for member `%s'" msgstr "" -#: varasm.c:4999 +#: varasm.c:4480 varasm.c:4523 #, c-format -msgid "weak declaration of `%s' must be public" +msgid "weak declaration of `%s' must precede definition" msgstr "" -#: varasm.c:5001 +#: varasm.c:4487 #, c-format -msgid "weak declaration of `%s' must precede definition" +msgid "" +"weak declaration of `%s' after first use results in unspecified behavior" +msgstr "" + +#: varasm.c:4521 +#, c-format +msgid "weak declaration of `%s' must be public" msgstr "" -#: varasm.c:5008 +#: varasm.c:4530 #, c-format msgid "weak declaration of `%s' not supported" msgstr "" -#: varasm.c:5035 varasm.c:5110 +#: varasm.c:4557 varasm.c:4632 msgid "only weak aliases are supported in this configuration" msgstr "" -#: varasm.c:5119 +#: varasm.c:4640 msgid "alias definitions not supported in this configuration; ignored" msgstr "" -#: varasm.c:5139 +#: varasm.c:4670 msgid "visibility attribute not supported in this configuration; ignored" msgstr "" -#: varray.c:88 +#: varray.c:134 #, c-format msgid "virtual array %s[%lu]: element %lu out of bounds in %s, at %s:%d" msgstr "" #. Print an error message for unrecognized stab codes. -#: xcoffout.c:174 +#: xcoffout.c:175 #, c-format msgid "no sclass for %s stab (0x%x)\n" msgstr "" -#: params.def:46 +#: pretty-print.h:97 +#, c-format +msgid "#`%s' not supported by %s#" +msgstr "" + +#: params.def:53 msgid "" -"The maximum number of instructions in a function that is eligible for " +"The maximum number of instructions in a single function eliglible for " "inlining" msgstr "" -#: params.def:57 +#: params.def:74 +msgid "" +"The maximuem number of instructions by repeated inlining before gcc starts " +"to throttle inlining" +msgstr "" + +#: params.def:87 +msgid "" +"The slope of the linear funtion throttling inlining after the recursive " +"inlining limit has been reached is given by the negative reciprocal value of " +"this parameter" +msgstr "" + +#: params.def:100 +msgid "" +"The number of instructions in a single functions still eligible to inlining " +"after a lot recursive inlining" +msgstr "" + +#: params.def:111 msgid "The maximum number of instructions to consider to fill a delay slot" msgstr "" -#: params.def:68 +#: params.def:122 msgid "" "The maximum number of instructions to consider to find accurate live " "register information" msgstr "" -#: params.def:78 +#: params.def:132 msgid "The maximum length of scheduling's pending operations list" msgstr "" -#: params.def:85 +#: params.def:139 msgid "The maximum amount of memory to be allocated by GCSE" msgstr "" -#: params.def:90 +#: params.def:144 msgid "The maximum number of passes to make when doing GCSE" msgstr "" -#: params.def:97 +#: params.def:151 msgid "The maximum number of instructions to consider to unroll in a loop" msgstr "" -#: config/darwin-c.c:76 -msgid "too many #pragma options align=reset" -msgstr "" - -#: config/darwin-c.c:98 config/darwin-c.c:101 config/darwin-c.c:103 -#: config/darwin-c.c:105 -msgid "malformed '#pragma options', ignoring" -msgstr "" - -#: config/darwin-c.c:108 -msgid "junk at end of '#pragma options'" -msgstr "" - -#: config/darwin-c.c:118 -msgid "malformed '#pragma options align={mac68k|power|reset}', ignoring" -msgstr "" - -#: config/darwin-c.c:131 -msgid "missing '(' after '#pragma unused', ignoring" -msgstr "" - -#: config/darwin-c.c:149 -msgid "missing ')' after '#pragma unused', ignoring" -msgstr "" - -#: config/darwin-c.c:152 -msgid "junk at end of '#pragma unused'" -msgstr "" - -#: config/nextstep.c:68 -msgid "optimization turned on" -msgstr "" - -#: config/nextstep.c:74 -msgid "optimization turned off" -msgstr "" - -#: config/nextstep.c:83 -msgid "optimization level restored" -msgstr "" - -#: config/lynx-ng.h:97 config/lynx.h:120 config/rs6000/lynx.h:85 -msgid "-msystem-v and -p are incompatible" -msgstr "" - -#: config/lynx-ng.h:99 config/lynx.h:122 config/rs6000/lynx.h:87 -msgid "-msystem-v and -mthreads are incompatible" -msgstr "" - -#. Run-time compilation parameters selecting different hardware subsets. -#: config/1750a/1750a.h:39 -msgid "Use VAX-C alignment" -msgstr "" - -#: config/a29k/a29k.c:1028 config/m88k/m88k.c:2966 -#, c-format -msgid "invalid %%Q value" -msgstr "" - -#: config/a29k/a29k.c:1034 config/alpha/alpha.c:5410 config/m88k/m88k.c:3062 -#, c-format -msgid "invalid %%C value" -msgstr "" - -#: config/a29k/a29k.c:1040 config/alpha/alpha.c:5255 -#: config/rs6000/rs6000.c:6459 -#, c-format -msgid "invalid %%N value" -msgstr "" - -#: config/a29k/a29k.c:1046 config/alpha/alpha.c:5326 -#: config/rs6000/rs6000.c:6421 -#, c-format -msgid "invalid %%M value" -msgstr "" - -#: config/a29k/a29k.c:1052 config/alpha/alpha.c:5318 -#: config/rs6000/rs6000.c:6386 -#, c-format -msgid "invalid %%m value" -msgstr "" - -#: config/a29k/a29k.c:1157 config/alpha/alpha.c:5279 config/romp/romp.c:690 -#, c-format -msgid "invalid %%L value" -msgstr "" - -#: config/a29k/a29k.c:1162 config/rs6000/rs6000.c:6467 -#, c-format -msgid "invalid %%O value" -msgstr "" - -#: config/a29k/a29k.c:1168 config/alpha/alpha.c:5263 -#: config/rs6000/rs6000.c:6487 -#, c-format -msgid "invalid %%P value" -msgstr "" - -#: config/a29k/a29k.c:1178 -#, c-format -msgid "invalid %%V value" -msgstr "" - -#: config/a29k/a29k.h:101 -msgid "Generate code assuming DW bit is set" +#: params.def:156 +msgid "" +"Select fraction of the maximal count of repetitions of basic block in " +"program given basic block needs to have to be considered hot" msgstr "" -#: config/a29k/a29k.h:102 -msgid "Generate code assuming DW bit is not set" +#: params.def:161 +msgid "" +"Select fraction of the maximal frequency of executions of basic block in " +"function given basic block needs to have to be considered hot" msgstr "" -#: config/a29k/a29k.h:103 -msgid "Generate code using byte writes" +#: params.def:166 +msgid "" +"The percentage of function, weighted by execution frequency, that must be " +"covered by trace formation. Used when profile feedback is available" msgstr "" -#: config/a29k/a29k.h:104 -msgid "Do not generate byte writes" +#: params.def:171 +msgid "" +"The percentage of function, weighted by execution frequency, that must be " +"covered by trace formation. Used when profile feedback is not available" msgstr "" -#: config/a29k/a29k.h:105 -msgid "Use small memory model" +#: params.def:176 +msgid "Maximal code growth caused by tail duplication (in percents)" msgstr "" -#: config/a29k/a29k.h:106 -msgid "Use normal memory model" +#: params.def:180 +msgid "" +"Stop reverse growth if the reverse probability of best edge is less than " +"this threshold (in percents)" msgstr "" -#: config/a29k/a29k.h:107 -msgid "Use large memory model" +#: params.def:185 +msgid "" +"Stop forward growth if the probability of best edge is less than this " +"threshold (in percents). Used when profile feedback is available" msgstr "" -#: config/a29k/a29k.h:108 -msgid "Generate 29050 code" +#: params.def:190 +msgid "" +"Stop forward growth if the probability of best edge is less than this " +"threshold (in percents). Used when profile feedback is not available" msgstr "" -#: config/a29k/a29k.h:109 -msgid "Generate 29000 code" +#: params.def:204 +msgid "" +"Minimum heap expansion to trigger garbage collection, as a percentage of the " +"total size of the heap." msgstr "" -#: config/a29k/a29k.h:110 -msgid "Use kernel global registers" +#: params.def:210 +msgid "Minimum heap size before we start collecting garbage, in kilobytes." msgstr "" -#: config/a29k/a29k.h:111 -msgid "Use user global registers" +#: config/darwin-c.c:75 +msgid "too many #pragma options align=reset" msgstr "" -#: config/a29k/a29k.h:112 -msgid "Emit stack checking code" +#: config/darwin-c.c:97 config/darwin-c.c:100 config/darwin-c.c:102 +#: config/darwin-c.c:104 +msgid "malformed '#pragma options', ignoring" msgstr "" -#: config/a29k/a29k.h:113 -msgid "Do not emit stack checking code" +#: config/darwin-c.c:107 +msgid "junk at end of '#pragma options'" msgstr "" -#: config/a29k/a29k.h:114 -msgid "Work around storem hardware bug" +#: config/darwin-c.c:117 +msgid "malformed '#pragma options align={mac68k|power|reset}', ignoring" msgstr "" -#: config/a29k/a29k.h:115 -msgid "Do not work around storem hardware bug" +#: config/darwin-c.c:130 +msgid "missing '(' after '#pragma unused', ignoring" msgstr "" -#: config/a29k/a29k.h:116 -msgid "Store locals in argument registers" +#: config/darwin-c.c:148 +msgid "missing ')' after '#pragma unused', ignoring" msgstr "" -#: config/a29k/a29k.h:117 -msgid "Do not store locals in arg registers" +#: config/darwin-c.c:151 +msgid "junk at end of '#pragma unused'" msgstr "" -#: config/a29k/a29k.h:118 config/i960/i960.h:283 config/mips/mips.h:406 -msgid "Use software floating point" +#: config/lynx-ng.h:97 config/lynx.h:121 config/rs6000/lynx.h:100 +msgid "-msystem-v and -p are incompatible" msgstr "" -#: config/a29k/a29k.h:119 -msgid "Do not generate multm instructions" +#: config/lynx-ng.h:99 config/lynx.h:123 config/rs6000/lynx.h:102 +msgid "-msystem-v and -mthreads are incompatible" msgstr "" -#: config/alpha/alpha.c:272 +#: config/alpha/alpha.c:342 #, c-format msgid "-f%s ignored for Unicos/Mk (not supported)" msgstr "" -#: config/alpha/alpha.c:296 +#: config/alpha/alpha.c:366 msgid "-mieee not supported on Unicos/Mk" msgstr "" -#: config/alpha/alpha.c:307 +#: config/alpha/alpha.c:377 msgid "-mieee-with-inexact not supported on Unicos/Mk" msgstr "" -#: config/alpha/alpha.c:324 +#: config/alpha/alpha.c:394 #, c-format msgid "bad value `%s' for -mtrap-precision switch" msgstr "" -#: config/alpha/alpha.c:338 +#: config/alpha/alpha.c:408 #, c-format msgid "bad value `%s' for -mfp-rounding-mode switch" msgstr "" -#: config/alpha/alpha.c:353 +#: config/alpha/alpha.c:423 #, c-format msgid "bad value `%s' for -mfp-trap-mode switch" msgstr "" -#: config/alpha/alpha.c:372 config/alpha/alpha.c:384 +#: config/alpha/alpha.c:435 +#, c-format +msgid "bad value `%s' for -mtls-size switch" +msgstr "" + +#: config/alpha/alpha.c:454 config/alpha/alpha.c:466 #, c-format msgid "bad value `%s' for -mcpu switch" msgstr "" -#: config/alpha/alpha.c:391 +#: config/alpha/alpha.c:473 msgid "trap mode not supported on Unicos/Mk" msgstr "" -#: config/alpha/alpha.c:398 +#: config/alpha/alpha.c:480 msgid "fp software completion requires -mtrap-precision=i" msgstr "" -#: config/alpha/alpha.c:414 +#: config/alpha/alpha.c:496 msgid "rounding mode not supported for VAX floats" msgstr "" -#: config/alpha/alpha.c:419 +#: config/alpha/alpha.c:501 msgid "trap mode not supported for VAX floats" msgstr "" -#: config/alpha/alpha.c:448 +#: config/alpha/alpha.c:530 #, c-format msgid "L%d cache latency unknown for %s" msgstr "" -#: config/alpha/alpha.c:463 +#: config/alpha/alpha.c:545 #, c-format msgid "bad value `%s' for -mmemory-latency" msgstr "" -#: config/alpha/alpha.c:5219 config/m88k/m88k.c:2954 config/romp/romp.c:746 -#: config/romp/romp.c:753 +#: config/alpha/alpha.c:5604 config/m88k/m88k.c:2889 config/romp/romp.c:754 +#: config/romp/romp.c:761 #, c-format msgid "invalid %%H value" msgstr "" -#: config/alpha/alpha.c:5229 +#: config/alpha/alpha.c:5625 #, c-format msgid "invalid %%J value" msgstr "" -#: config/alpha/alpha.c:5239 config/ia64/ia64.c:3544 config/m88k/m88k.c:3099 +#: config/alpha/alpha.c:5641 config/ia64/ia64.c:3834 config/m88k/m88k.c:3034 #, c-format msgid "invalid %%r value" msgstr "" -#: config/alpha/alpha.c:5249 config/rs6000/rs6000.c:6533 +#: config/alpha/alpha.c:5651 config/rs6000/rs6000.c:7700 #, c-format msgid "invalid %%R value" msgstr "" -#: config/alpha/alpha.c:5271 config/m88k/m88k.c:2960 config/romp/romp.c:732 -#: config/romp/romp.c:739 +#: config/alpha/alpha.c:5657 config/rs6000/rs6000.c:7626 +#, c-format +msgid "invalid %%N value" +msgstr "" + +#: config/alpha/alpha.c:5665 config/rs6000/rs6000.c:7654 +#, c-format +msgid "invalid %%P value" +msgstr "" + +#: config/alpha/alpha.c:5673 config/m88k/m88k.c:2895 config/romp/romp.c:740 +#: config/romp/romp.c:747 #, c-format msgid "invalid %%h value" msgstr "" -#: config/alpha/alpha.c:5361 +#: config/alpha/alpha.c:5681 config/romp/romp.c:698 +#, c-format +msgid "invalid %%L value" +msgstr "" + +#: config/alpha/alpha.c:5720 config/rs6000/rs6000.c:7608 +#, c-format +msgid "invalid %%m value" +msgstr "" + +#: config/alpha/alpha.c:5728 config/rs6000/rs6000.c:7616 +#, c-format +msgid "invalid %%M value" +msgstr "" + +#: config/alpha/alpha.c:5772 #, c-format msgid "invalid %%U value" msgstr "" -#: config/alpha/alpha.c:5373 config/alpha/alpha.c:5387 config/romp/romp.c:698 -#: config/rs6000/rs6000.c:6541 +#: config/alpha/alpha.c:5784 config/alpha/alpha.c:5798 config/romp/romp.c:706 +#: config/rs6000/rs6000.c:7708 #, c-format msgid "invalid %%s value" msgstr "" -#: config/alpha/alpha.c:5447 config/m88k/m88k.c:3083 -#: config/rs6000/rs6000.c:6248 +#: config/alpha/alpha.c:5821 config/m88k/m88k.c:2997 +#, c-format +msgid "invalid %%C value" +msgstr "" + +#: config/alpha/alpha.c:5858 config/m88k/m88k.c:3018 +#: config/rs6000/rs6000.c:7465 #, c-format msgid "invalid %%E value" msgstr "" -#: config/alpha/alpha.c:5468 config/romp/romp.c:973 -#: config/rs6000/rs6000.c:6849 +#: config/alpha/alpha.c:5883 config/alpha/alpha.c:5933 +msgid "unknown relocation unspec" +msgstr "" + +#: config/alpha/alpha.c:5892 config/romp/romp.c:981 +#: config/rs6000/rs6000.c:8015 #, c-format msgid "invalid %%xn code" msgstr "" +#: config/alpha/alpha.c:6615 config/alpha/alpha.c:6618 +msgid "bad builtin fcode" +msgstr "" + #. Macro to define tables used to set the flags. #. This is a list in braces of pairs in braces, #. each pair being { "NAME", VALUE } #. where VALUE is the bits to set or minus the bits to clear. #. An empty string NAME is used to identify the default VALUE. -#: config/alpha/alpha.h:214 config/i386/i386.h:291 config/i386/i386.h:293 -#: config/i386/i386.h:295 config/ns32k/ns32k.h:103 config/rs6000/rs6000.h:329 -#: config/s390/s390.h:56 config/sparc/sparc.h:529 config/sparc/sparc.h:534 +#: config/alpha/alpha.h:279 config/i386/i386.h:294 config/i386/i386.h:296 +#: config/i386/i386.h:298 config/ns32k/ns32k.h:140 config/rs6000/rs6000.h:292 +#: config/s390/s390.h:68 config/sparc/sparc.h:522 config/sparc/sparc.h:527 msgid "Use hardware fp" msgstr "" -#: config/alpha/alpha.h:215 config/i386/i386.h:292 config/i386/i386.h:294 -#: config/rs6000/rs6000.h:331 config/sparc/sparc.h:531 -#: config/sparc/sparc.h:536 +#: config/alpha/alpha.h:280 config/i386/i386.h:295 config/i386/i386.h:297 +#: config/rs6000/rs6000.h:294 config/sparc/sparc.h:524 +#: config/sparc/sparc.h:529 msgid "Do not use hardware fp" msgstr "" -#: config/alpha/alpha.h:216 +#: config/alpha/alpha.h:281 msgid "Use fp registers" msgstr "" -#: config/alpha/alpha.h:218 +#: config/alpha/alpha.h:283 msgid "Do not use fp registers" msgstr "" -#: config/alpha/alpha.h:219 +#: config/alpha/alpha.h:284 msgid "Do not assume GAS" msgstr "" -#: config/alpha/alpha.h:220 +#: config/alpha/alpha.h:285 msgid "Assume GAS" msgstr "" -#: config/alpha/alpha.h:222 +#: config/alpha/alpha.h:287 msgid "Request IEEE-conformant math library routines (OSF/1)" msgstr "" -#: config/alpha/alpha.h:224 +#: config/alpha/alpha.h:289 msgid "Emit IEEE-conformant code, without inexact exceptions" msgstr "" -#: config/alpha/alpha.h:226 +#: config/alpha/alpha.h:291 msgid "Emit IEEE-conformant code, with inexact exceptions" msgstr "" -#: config/alpha/alpha.h:228 +#: config/alpha/alpha.h:293 msgid "Do not emit complex integer constants to read-only memory" msgstr "" -#: config/alpha/alpha.h:229 +#: config/alpha/alpha.h:294 msgid "Use VAX fp" msgstr "" -#: config/alpha/alpha.h:230 +#: config/alpha/alpha.h:295 msgid "Do not use VAX fp" msgstr "" -#: config/alpha/alpha.h:231 +#: config/alpha/alpha.h:296 msgid "Emit code for the byte/word ISA extension" msgstr "" -#: config/alpha/alpha.h:234 +#: config/alpha/alpha.h:299 msgid "Emit code for the motion video ISA extension" msgstr "" -#: config/alpha/alpha.h:237 +#: config/alpha/alpha.h:302 msgid "Emit code for the fp move and sqrt ISA extension" msgstr "" -#: config/alpha/alpha.h:239 +#: config/alpha/alpha.h:304 msgid "Emit code for the counting ISA extension" msgstr "" -#: config/alpha/alpha.h:242 +#: config/alpha/alpha.h:307 msgid "Emit code using explicit relocation directives" msgstr "" -#: config/alpha/alpha.h:245 +#: config/alpha/alpha.h:310 msgid "Emit 16-bit relocations to the small data areas" msgstr "" -#: config/alpha/alpha.h:247 +#: config/alpha/alpha.h:312 msgid "Emit 32-bit relocations to the small data areas" msgstr "" +#: config/alpha/alpha.h:314 +msgid "Emit rdval instead of rduniq for thread pointer" +msgstr "" + #. For -mcpu= #. For -mtune= #. For -mfp-rounding-mode=[n|m|c|d] #. For -mfp-trap-mode=[n|u|su|sui] #. For -mtrap-precision=[p|f|i] #. For -mmemory-latency= -#: config/alpha/alpha.h:275 +#. For -mtls-size= +#: config/alpha/alpha.h:343 msgid "Use features of and schedule given CPU" msgstr "" -#: config/alpha/alpha.h:277 +#: config/alpha/alpha.h:345 msgid "Schedule given CPU" msgstr "" -#: config/alpha/alpha.h:279 +#: config/alpha/alpha.h:347 msgid "Control the generated fp rounding mode" msgstr "" -#: config/alpha/alpha.h:281 +#: config/alpha/alpha.h:349 msgid "Control the IEEE trap mode" msgstr "" -#: config/alpha/alpha.h:283 +#: config/alpha/alpha.h:351 msgid "Control the precision given to fp exceptions" msgstr "" -#: config/alpha/alpha.h:285 +#: config/alpha/alpha.h:353 msgid "Tune expected memory latency" msgstr "" -#: config/arc/arc.c:132 +#: config/alpha/alpha.h:355 config/ia64/ia64.h:221 +msgid "Specify bit size of immediate TLS offsets" +msgstr "" + +#: config/arc/arc.c:135 #, c-format msgid "bad value (%s) for -mcpu switch" msgstr "" -#: config/arc/arc.c:359 +#: config/arc/arc.c:362 #, c-format msgid "argument of `%s' attribute is not a string constant" msgstr "" -#: config/arc/arc.c:366 +#: config/arc/arc.c:369 #, c-format msgid "argument of `%s' attribute is not \"ilink1\" or \"ilink2\"" msgstr "" -#: config/arc/arc.c:1709 config/m32r/m32r.c:2282 +#: config/arc/arc.c:1708 config/m32r/m32r.c:2286 #, c-format msgid "invalid operand to %%R code" msgstr "" -#: config/arc/arc.c:1741 config/m32r/m32r.c:2305 +#: config/arc/arc.c:1740 config/m32r/m32r.c:2309 #, c-format msgid "invalid operand to %%H/%%L code" msgstr "" -#: config/arc/arc.c:1765 config/m32r/m32r.c:2382 +#: config/arc/arc.c:1763 config/m32r/m32r.c:2385 #, c-format msgid "invalid operand to %%U code" msgstr "" -#: config/arc/arc.c:1776 +#: config/arc/arc.c:1774 #, c-format msgid "invalid operand to %%V code" msgstr "" #. Unknown flag. -#: config/arc/arc.c:1783 config/m32r/m32r.c:2421 config/sparc/sparc.c:6159 +#: config/arc/arc.c:1781 config/m32r/m32r.c:2424 config/sparc/sparc.c:6473 msgid "invalid operand output code" msgstr "" -#: config/arm/arm.c:436 +#: config/arm/arm.c:459 #, c-format msgid "switch -mcpu=%s conflicts with -march= switch" msgstr "" -#: config/arm/arm.c:446 config/rs6000/rs6000.c:444 config/sparc/sparc.c:381 +#: config/arm/arm.c:469 config/rs6000/rs6000.c:554 config/sparc/sparc.c:393 #, c-format msgid "bad value (%s) for %s switch" msgstr "" -#: config/arm/arm.c:582 +#: config/arm/arm.c:605 msgid "target CPU does not support APCS-32" msgstr "" -#: config/arm/arm.c:587 +#: config/arm/arm.c:610 msgid "target CPU does not support APCS-26" msgstr "" -#: config/arm/arm.c:593 +#: config/arm/arm.c:616 msgid "target CPU does not support interworking" msgstr "" -#: config/arm/arm.c:599 +#: config/arm/arm.c:622 msgid "target CPU does not support THUMB instructions" msgstr "" -#: config/arm/arm.c:613 +#: config/arm/arm.c:636 msgid "" "enabling backtrace support is only meaningful when compiling for the Thumb" msgstr "" -#: config/arm/arm.c:616 +#: config/arm/arm.c:639 msgid "" "enabling callee interworking support is only meaningful when compiling for " "the Thumb" msgstr "" -#: config/arm/arm.c:619 +#: config/arm/arm.c:642 msgid "" "enabling caller interworking support is only meaningful when compiling for " "the Thumb" msgstr "" -#: config/arm/arm.c:625 +#: config/arm/arm.c:648 msgid "interworking forces APCS-32 to be used" msgstr "" -#: config/arm/arm.c:631 +#: config/arm/arm.c:654 msgid "-mapcs-stack-check incompatible with -mno-apcs-frame" msgstr "" -#: config/arm/arm.c:639 +#: config/arm/arm.c:662 msgid "-fpic and -mapcs-reent are incompatible" msgstr "" -#: config/arm/arm.c:642 +#: config/arm/arm.c:665 msgid "APCS reentrant code not supported. Ignored" msgstr "" -#: config/arm/arm.c:650 +#: config/arm/arm.c:673 msgid "-g with -mno-apcs-frame may not give sensible debugging" msgstr "" -#: config/arm/arm.c:658 +#: config/arm/arm.c:681 msgid "passing floating point arguments in fp regs not yet supported" msgstr "" -#: config/arm/arm.c:687 +#: config/arm/arm.c:710 #, c-format msgid "invalid floating point emulation option: -mfpe-%s" msgstr "" -#: config/arm/arm.c:711 +#: config/arm/arm.c:734 msgid "structure size boundary can only be set to 8 or 32" msgstr "" -#: config/arm/arm.c:719 +#: config/arm/arm.c:742 msgid "-mpic-register= is useless without -fpic" msgstr "" -#: config/arm/arm.c:726 +#: config/arm/arm.c:749 #, c-format msgid "unable to use '%s' for PIC register" msgstr "" -#: config/arm/arm.c:1970 config/arm/arm.c:1993 config/avr/avr.c:4703 -#: config/c4x/c4x.c:4674 config/h8300/h8300.c:3381 config/i386/i386.c:1261 -#: config/i386/i386.c:1290 config/m68hc11/m68hc11.c:1220 -#: config/mcore/mcore.c:3506 config/ns32k/ns32k.c:1044 -#: config/rs6000/rs6000.c:10789 config/sh/sh.c:5592 config/sh/sh.c:5612 -#: config/sh/sh.c:5651 config/stormy16/stormy16.c:2012 config/v850/v850.c:2047 +#: config/arm/arm.c:2061 config/arm/arm.c:2084 config/avr/avr.c:4794 +#: config/c4x/c4x.c:4644 config/h8300/h8300.c:3623 config/i386/i386.c:1389 +#: config/i386/i386.c:1418 config/m68hc11/m68hc11.c:1216 +#: config/mcore/mcore.c:3510 config/ns32k/ns32k.c:1047 +#: config/rs6000/rs6000.c:12476 config/sh/sh.c:5678 config/sh/sh.c:5703 +#: config/sh/sh.c:5742 config/stormy16/stormy16.c:2026 config/v850/v850.c:2180 #, c-format msgid "`%s' attribute only applies to functions" msgstr "" -#: config/arm/arm.c:9290 +#: config/arm/arm.c:9474 msgid "unable to compute real location of stacked parameter" msgstr "" -#: config/arm/arm.c:9970 +#: config/arm/arm.c:10153 msgid "no low registers available for popping high registers" msgstr "" -#: config/arm/arm.c:10162 +#: config/arm/arm.c:10404 msgid "interrupt Service Routines cannot be coded in Thumb mode" msgstr "" -#: config/arm/pe.c:168 config/i386/winnt.c:290 config/mcore/mcore.c:3365 +#: config/arm/pe.c:168 config/i386/winnt.c:303 config/mcore/mcore.c:3358 #, c-format msgid "initialized variable `%s' is marked dllimport" msgstr "" -#: config/arm/pe.c:177 config/i386/winnt.c:299 +#: config/arm/pe.c:177 config/i386/winnt.c:312 #, c-format msgid "static variable `%s' is marked dllimport" msgstr "" -#: config/arm/arm.h:422 +#: config/arm/arm.h:416 msgid "Generate APCS conformant stack frames" msgstr "" -#: config/arm/arm.h:425 +#: config/arm/arm.h:419 msgid "Store function names in object code" msgstr "" -#: config/arm/arm.h:429 +#: config/arm/arm.h:423 msgid "Use the 32-bit version of the APCS" msgstr "" -#: config/arm/arm.h:431 +#: config/arm/arm.h:425 msgid "Use the 26-bit version of the APCS" msgstr "" -#: config/arm/arm.h:435 +#: config/arm/arm.h:429 msgid "Pass FP arguments in FP registers" msgstr "" -#: config/arm/arm.h:438 +#: config/arm/arm.h:432 msgid "Generate re-entrant, PIC code" msgstr "" -#: config/arm/arm.h:441 +#: config/arm/arm.h:435 msgid "The MMU will trap on unaligned accesses" msgstr "" -#: config/arm/arm.h:448 +#: config/arm/arm.h:442 msgid "Use library calls to perform FP operations" msgstr "" -#: config/arm/arm.h:450 config/i960/i960.h:281 +#: config/arm/arm.h:444 config/i960/i960.h:281 msgid "Use hardware floating point instructions" msgstr "" -#: config/arm/arm.h:452 +#: config/arm/arm.h:446 msgid "Assume target CPU is configured as big endian" msgstr "" -#: config/arm/arm.h:454 +#: config/arm/arm.h:448 msgid "Assume target CPU is configured as little endian" msgstr "" -#: config/arm/arm.h:456 +#: config/arm/arm.h:450 msgid "Assume big endian bytes, little endian words" msgstr "" -#: config/arm/arm.h:458 +#: config/arm/arm.h:452 msgid "Support calls between Thumb and ARM instruction sets" msgstr "" -#: config/arm/arm.h:461 +#: config/arm/arm.h:455 msgid "Generate a call to abort if a noreturn function returns" msgstr "" -#: config/arm/arm.h:464 +#: config/arm/arm.h:458 msgid "Do not move instructions into a function's prologue" msgstr "" -#: config/arm/arm.h:467 +#: config/arm/arm.h:461 msgid "Do not load the PIC register in function prologues" msgstr "" -#: config/arm/arm.h:470 +#: config/arm/arm.h:464 msgid "Generate call insns as indirect calls, if necessary" msgstr "" -#: config/arm/arm.h:473 +#: config/arm/arm.h:467 msgid "Compile for the Thumb not the ARM" msgstr "" -#: config/arm/arm.h:477 +#: config/arm/arm.h:471 msgid "Thumb: Generate (non-leaf) stack frames even if not needed" msgstr "" -#: config/arm/arm.h:480 +#: config/arm/arm.h:474 msgid "Thumb: Generate (leaf) stack frames even if not needed" msgstr "" -#: config/arm/arm.h:483 +#: config/arm/arm.h:477 msgid "Thumb: Assume non-static functions may be called from ARM code" msgstr "" -#: config/arm/arm.h:487 +#: config/arm/arm.h:481 msgid "Thumb: Assume function pointers may go to non-Thumb aware code" msgstr "" -#: config/arm/arm.h:497 +#: config/arm/arm.h:491 msgid "Specify the name of the target CPU" msgstr "" -#: config/arm/arm.h:499 +#: config/arm/arm.h:493 msgid "Specify the name of the target architecture" msgstr "" -#: config/arm/arm.h:503 +#: config/arm/arm.h:497 msgid "Specify the version of the floating point emulator" msgstr "" -#: config/arm/arm.h:505 +#: config/arm/arm.h:499 msgid "Specify the minimum bit alignment of structures" msgstr "" -#: config/arm/arm.h:507 +#: config/arm/arm.h:501 msgid "Specify the register to be used for PIC addressing" msgstr "" @@ -8824,99 +8880,92 @@ msgstr "" msgid "Ignore dllimport attribute for functions" msgstr "" -#. None of these is actually used in cc1. If we don't define them in target -#. switches cc1 complains about them. For the sake of argument lets allocate -#. bit 31 of target flags for such options. -#: config/arm/riscix.h:84 -msgid "Do symbol renaming for BSD" -msgstr "" - -#: config/arm/riscix.h:85 -msgid "Do symbol renaming for X/OPEN" -msgstr "" - -#: config/arm/riscix.h:86 -msgid "Don't do symbol renaming" -msgstr "" - -#: config/avr/avr.c:221 -#, c-format -msgid "MCU `%s' not supported" -msgstr "" - -#: config/avr/avr.c:461 +#: config/avr/avr.c:528 #, c-format msgid "large frame pointer change (%d) with -mtiny-stack" msgstr "" -#: config/avr/avr.c:1056 +#: config/avr/avr.c:1135 msgid "bad address, not (reg+disp):" msgstr "" -#: config/avr/avr.c:1064 +#: config/avr/avr.c:1143 msgid "internal compiler error. Bad address:" msgstr "" -#: config/avr/avr.c:1077 +#: config/avr/avr.c:1156 msgid "internal compiler error. Unknown mode:" msgstr "" -#: config/avr/avr.c:1785 config/avr/avr.c:2497 +#: config/avr/avr.c:1864 config/avr/avr.c:2576 msgid "invalid insn:" msgstr "" -#: config/avr/avr.c:1822 config/avr/avr.c:1908 config/avr/avr.c:1957 -#: config/avr/avr.c:1966 config/avr/avr.c:2064 config/avr/avr.c:2236 -#: config/avr/avr.c:2534 config/avr/avr.c:2645 +#: config/avr/avr.c:1901 config/avr/avr.c:1987 config/avr/avr.c:2036 +#: config/avr/avr.c:2045 config/avr/avr.c:2143 config/avr/avr.c:2315 +#: config/avr/avr.c:2613 config/avr/avr.c:2724 msgid "incorrect insn:" msgstr "" -#: config/avr/avr.c:1985 config/avr/avr.c:2149 config/avr/avr.c:2307 -#: config/avr/avr.c:2689 +#: config/avr/avr.c:2064 config/avr/avr.c:2228 config/avr/avr.c:2386 +#: config/avr/avr.c:2768 msgid "unknown move insn:" msgstr "" -#: config/avr/avr.c:2925 +#: config/avr/avr.c:3003 msgid "bad shift insn:" msgstr "" -#: config/avr/avr.c:3041 config/avr/avr.c:3471 config/avr/avr.c:3851 +#: config/avr/avr.c:3119 config/avr/avr.c:3549 config/avr/avr.c:3929 msgid "internal compiler error. Incorrect shift:" msgstr "" -#: config/avr/avr.c:4676 +#: config/avr/avr.c:4767 msgid "only initialized variables can be placed into program memory area" msgstr "" -#: config/avr/avr.h:63 +#: config/avr/avr.c:4866 +msgid "only uninitialized variables can be placed in the .noinit section" +msgstr "" + +#: config/avr/avr.c:4881 +#, c-format +msgid "MCU `%s' supported for assembler only" +msgstr "" + +#: config/avr/avr.h:78 msgid "Assume int to be 8 bit integer" msgstr "" -#: config/avr/avr.h:65 +#: config/avr/avr.h:80 msgid "Change the stack pointer without disabling interrupts" msgstr "" -#: config/avr/avr.h:67 +#: config/avr/avr.h:82 msgid "Use subroutines for function prologue/epilogue" msgstr "" -#: config/avr/avr.h:69 +#: config/avr/avr.h:84 msgid "Change only the low 8 bits of the stack pointer" msgstr "" -#: config/avr/avr.h:71 +#: config/avr/avr.h:86 msgid "Do not generate tablejump insns" msgstr "" -#: config/avr/avr.h:74 +#: config/avr/avr.h:88 +msgid "Use rjmp/rcall (limited range) on >8K devices" +msgstr "" + +#: config/avr/avr.h:91 msgid "Output instruction sizes to the asm file" msgstr "" -#: config/avr/avr.h:87 +#: config/avr/avr.h:108 msgid "Specify the initial stack address" msgstr "" -#: config/avr/avr.h:88 +#: config/avr/avr.h:109 msgid "Specify the MCU name" msgstr "" @@ -8928,132 +8977,132 @@ msgstr "" #. For instance, the SH target has only positive offsets in #. addresses. Thus sorting to put the smallest address first allows #. the most combinations to be found. -#: config/avr/avr.h:2553 +#: config/avr/avr.h:2450 msgid "trampolines not supported" msgstr "" -#: config/c4x/c4x-c.c:70 +#: config/c4x/c4x-c.c:69 #, c-format msgid "missing '(' after '#pragma %s' - ignored" msgstr "" -#: config/c4x/c4x-c.c:73 +#: config/c4x/c4x-c.c:72 #, c-format msgid "missing function name in '#pragma %s' - ignored" msgstr "" -#: config/c4x/c4x-c.c:78 +#: config/c4x/c4x-c.c:77 #, c-format msgid "malformed '#pragma %s' - ignored" msgstr "" -#: config/c4x/c4x-c.c:80 +#: config/c4x/c4x-c.c:79 #, c-format msgid "missing section name in '#pragma %s' - ignored" msgstr "" -#: config/c4x/c4x-c.c:85 +#: config/c4x/c4x-c.c:84 #, c-format msgid "missing ')' for '#pragma %s' - ignored" msgstr "" -#: config/c4x/c4x-c.c:88 +#: config/c4x/c4x-c.c:87 #, c-format msgid "junk at end of '#pragma %s'" msgstr "" -#: config/c4x/c4x.c:299 +#: config/c4x/c4x.c:280 #, c-format msgid "unknown CPU version %d, using 40.\n" msgstr "" -#: config/c4x/c4x.c:883 +#: config/c4x/c4x.c:853 #, c-format msgid "ISR %s requires %d words of local vars, max is 32767" msgstr "" -#: config/c4x/c4x.c:1631 +#: config/c4x/c4x.c:1602 msgid "using CONST_DOUBLE for address" msgstr "" -#: config/c4x/c4x.c:1771 +#: config/c4x/c4x.c:1742 msgid "c4x_address_cost: Invalid addressing mode" msgstr "" -#: config/c4x/c4x.c:1913 +#: config/c4x/c4x.c:1884 #, c-format msgid "c4x_print_operand: %%L inconsistency" msgstr "" -#: config/c4x/c4x.c:1919 +#: config/c4x/c4x.c:1890 #, c-format msgid "c4x_print_operand: %%N inconsistency" msgstr "" -#: config/c4x/c4x.c:1960 +#: config/c4x/c4x.c:1931 #, c-format msgid "c4x_print_operand: %%O inconsistency" msgstr "" -#: config/c4x/c4x.c:2056 +#: config/c4x/c4x.c:2026 msgid "c4x_print_operand: Bad operand case" msgstr "" -#: config/c4x/c4x.c:2099 +#: config/c4x/c4x.c:2069 msgid "c4x_print_operand_address: Bad post_modify" msgstr "" -#: config/c4x/c4x.c:2121 +#: config/c4x/c4x.c:2091 msgid "c4x_print_operand_address: Bad pre_modify" msgstr "" -#: config/c4x/c4x.c:2169 config/c4x/c4x.c:2181 config/c4x/c4x.c:2196 +#: config/c4x/c4x.c:2139 config/c4x/c4x.c:2151 config/c4x/c4x.c:2166 msgid "c4x_print_operand_address: Bad operand case" msgstr "" -#: config/c4x/c4x.c:2452 +#: config/c4x/c4x.c:2422 msgid "c4x_rptb_insert: Cannot find start label" msgstr "" -#: config/c4x/c4x.c:3439 config/c4x/c4x.c:3459 +#: config/c4x/c4x.c:3409 config/c4x/c4x.c:3429 msgid "mode not QImode" msgstr "" -#: config/c4x/c4x.c:3544 +#: config/c4x/c4x.c:3514 msgid "invalid indirect memory address" msgstr "" -#: config/c4x/c4x.c:3633 +#: config/c4x/c4x.c:3603 msgid "invalid indirect (S) memory address" msgstr "" -#: config/c4x/c4x.c:3974 +#: config/c4x/c4x.c:3944 msgid "c4x_valid_operands: Internal error" msgstr "" -#: config/c4x/c4x.c:4454 +#: config/c4x/c4x.c:4424 msgid "c4x_operand_subword: invalid mode" msgstr "" -#: config/c4x/c4x.c:4457 +#: config/c4x/c4x.c:4427 msgid "c4x_operand_subword: invalid operand" msgstr "" #. We could handle these with some difficulty. #. e.g., *p-- => *(p-=2); *(p+1). -#: config/c4x/c4x.c:4483 +#: config/c4x/c4x.c:4453 msgid "c4x_operand_subword: invalid autoincrement" msgstr "" -#: config/c4x/c4x.c:4489 +#: config/c4x/c4x.c:4459 msgid "c4x_operand_subword: invalid address" msgstr "" -#: config/c4x/c4x.c:4500 +#: config/c4x/c4x.c:4470 msgid "c4x_operand_subword: address not offsettable" msgstr "" -#: config/c4x/c4x.c:4700 +#: config/c4x/c4x.c:4670 msgid "c4x_rptb_rpts_p: Repeat block top label moved\n" msgstr "" @@ -9061,7 +9110,6 @@ msgstr "" #. Name of the c4x linker. #. Define assembler options. #. Define linker options. -#. Define C preprocessor options. #. Specify the end file to link with. #. Target compilation option flags. #. Small memory model. @@ -9097,405 +9145,343 @@ msgstr "" #. each pair being { "NAME", VALUE, "DESCRIPTION" } #. where VALUE is the bits to set or minus the bits to clear. #. An empty string NAME is used to identify the default VALUE. -#: config/c4x/c4x.h:141 +#: config/c4x/c4x.h:170 msgid "Small memory model" msgstr "" -#: config/c4x/c4x.h:143 +#: config/c4x/c4x.h:172 msgid "Big memory model" msgstr "" -#: config/c4x/c4x.h:145 +#: config/c4x/c4x.h:174 msgid "Use MPYI instruction for C3x" msgstr "" -#: config/c4x/c4x.h:147 +#: config/c4x/c4x.h:176 msgid "Do not use MPYI instruction for C3x" msgstr "" -#: config/c4x/c4x.h:149 +#: config/c4x/c4x.h:178 msgid "Use fast but approximate float to integer conversion" msgstr "" -#: config/c4x/c4x.h:151 +#: config/c4x/c4x.h:180 msgid "Use slow but accurate float to integer conversion" msgstr "" -#: config/c4x/c4x.h:153 +#: config/c4x/c4x.h:182 msgid "Enable use of RTPS instruction" msgstr "" -#: config/c4x/c4x.h:155 +#: config/c4x/c4x.h:184 msgid "Disable use of RTPS instruction" msgstr "" -#: config/c4x/c4x.h:157 +#: config/c4x/c4x.h:186 msgid "Enable use of RTPB instruction" msgstr "" -#: config/c4x/c4x.h:159 +#: config/c4x/c4x.h:188 msgid "Disable use of RTPB instruction" msgstr "" -#: config/c4x/c4x.h:161 +#: config/c4x/c4x.h:190 msgid "Generate code for C30 CPU" msgstr "" -#: config/c4x/c4x.h:163 +#: config/c4x/c4x.h:192 msgid "Generate code for C31 CPU" msgstr "" -#: config/c4x/c4x.h:165 +#: config/c4x/c4x.h:194 msgid "Generate code for C32 CPU" msgstr "" -#: config/c4x/c4x.h:167 +#: config/c4x/c4x.h:196 msgid "Generate code for C33 CPU" msgstr "" -#: config/c4x/c4x.h:169 +#: config/c4x/c4x.h:198 msgid "Generate code for C40 CPU" msgstr "" -#: config/c4x/c4x.h:171 +#: config/c4x/c4x.h:200 msgid "Generate code for C44 CPU" msgstr "" -#: config/c4x/c4x.h:173 +#: config/c4x/c4x.h:202 msgid "Emit code compatible with TI tools" msgstr "" -#: config/c4x/c4x.h:175 +#: config/c4x/c4x.h:204 msgid "Emit code to use GAS extensions" msgstr "" -#: config/c4x/c4x.h:177 config/c4x/c4x.h:181 +#: config/c4x/c4x.h:206 config/c4x/c4x.h:210 msgid "Save DP across ISR in small memory model" msgstr "" -#: config/c4x/c4x.h:179 config/c4x/c4x.h:183 +#: config/c4x/c4x.h:208 config/c4x/c4x.h:212 msgid "Don't save DP across ISR in small memory model" msgstr "" -#: config/c4x/c4x.h:185 +#: config/c4x/c4x.h:214 msgid "Pass arguments on the stack" msgstr "" -#: config/c4x/c4x.h:187 +#: config/c4x/c4x.h:216 msgid "Pass arguments in registers" msgstr "" -#: config/c4x/c4x.h:189 +#: config/c4x/c4x.h:218 msgid "Enable new features under development" msgstr "" -#: config/c4x/c4x.h:191 +#: config/c4x/c4x.h:220 msgid "Disable new features under development" msgstr "" -#: config/c4x/c4x.h:193 +#: config/c4x/c4x.h:222 msgid "Use the BK register as a general purpose register" msgstr "" -#: config/c4x/c4x.h:195 +#: config/c4x/c4x.h:224 msgid "Do not allocate BK register" msgstr "" -#: config/c4x/c4x.h:197 +#: config/c4x/c4x.h:226 msgid "Enable use of DB instruction" msgstr "" -#: config/c4x/c4x.h:199 +#: config/c4x/c4x.h:228 msgid "Disable use of DB instruction" msgstr "" -#: config/c4x/c4x.h:201 +#: config/c4x/c4x.h:230 msgid "Enable debugging" msgstr "" -#: config/c4x/c4x.h:203 +#: config/c4x/c4x.h:232 msgid "Disable debugging" msgstr "" -#: config/c4x/c4x.h:205 +#: config/c4x/c4x.h:234 msgid "Force constants into registers to improve hoisting" msgstr "" -#: config/c4x/c4x.h:207 +#: config/c4x/c4x.h:236 msgid "Don't force constants into registers" msgstr "" -#: config/c4x/c4x.h:209 +#: config/c4x/c4x.h:238 msgid "Force RTL generation to emit valid 3 operand insns" msgstr "" -#: config/c4x/c4x.h:211 +#: config/c4x/c4x.h:240 msgid "Allow RTL generation to emit invalid 3 operand insns" msgstr "" -#: config/c4x/c4x.h:213 +#: config/c4x/c4x.h:242 msgid "Allow unsigned interation counts for RPTB/DB" msgstr "" -#: config/c4x/c4x.h:215 +#: config/c4x/c4x.h:244 msgid "Disallow unsigned iteration counts for RPTB/DB" msgstr "" -#: config/c4x/c4x.h:217 +#: config/c4x/c4x.h:246 msgid "Preserve all 40 bits of FP reg across call" msgstr "" -#: config/c4x/c4x.h:219 +#: config/c4x/c4x.h:248 msgid "Only preserve 32 bits of FP reg across call" msgstr "" -#: config/c4x/c4x.h:221 +#: config/c4x/c4x.h:250 msgid "Enable parallel instructions" msgstr "" -#: config/c4x/c4x.h:223 +#: config/c4x/c4x.h:252 msgid "Disable parallel instructions" msgstr "" -#: config/c4x/c4x.h:225 +#: config/c4x/c4x.h:254 msgid "Enable MPY||ADD and MPY||SUB instructions" msgstr "" -#: config/c4x/c4x.h:227 +#: config/c4x/c4x.h:256 msgid "Disable MPY||ADD and MPY||SUB instructions" msgstr "" -#: config/c4x/c4x.h:229 +#: config/c4x/c4x.h:258 msgid "Assume that pointers may be aliased" msgstr "" -#: config/c4x/c4x.h:231 +#: config/c4x/c4x.h:260 msgid "Assume that pointers not aliased" msgstr "" -#: config/c4x/c4x.h:304 +#: config/c4x/c4x.h:333 msgid "Specify maximum number of iterations for RPTS" msgstr "" -#: config/c4x/c4x.h:306 +#: config/c4x/c4x.h:335 msgid "Select CPU to generate code for" msgstr "" -#. Macros used in the machine description to test the flags. -#. Macro to define tables used to set the flags. -#. This is a list in braces of pairs in braces, -#. each pair being { "NAME", VALUE } -#. where VALUE is the bits to set or minus the bits to clear. -#. An empty string NAME is used to identify the default VALUE. -#: config/clipper/clipper.h:40 -msgid "Generate code for the C400" -msgstr "" - -#: config/clipper/clipper.h:41 -msgid "Generate code for the C300" -msgstr "" - -#: config/convex/convex.h:53 -msgid "Generate code for c1" -msgstr "" - -#: config/convex/convex.h:54 -msgid "Generate code for c2" -msgstr "" - -#: config/convex/convex.h:55 -msgid "Generate code for c32" -msgstr "" - -#: config/convex/convex.h:56 config/convex/convex.h:57 -msgid "Generate code for c34" -msgstr "" - -#: config/convex/convex.h:59 -msgid "Use standard calling sequence, with arg count word" -msgstr "" - -#: config/convex/convex.h:61 -msgid "Place arg count in a nop instruction (faster than push)" -msgstr "" - -#: config/convex/convex.h:63 -msgid "Don't push arg count, depend on symbol table" -msgstr "" - -#: config/convex/convex.h:65 -msgid "Use data cache for volatile mem refs (default)" -msgstr "" - -#: config/convex/convex.h:67 -msgid "Don't use data cache for volatile mem refs" -msgstr "" - -#: config/convex/convex.h:69 -msgid "Bypass data cache for volatile mem refs" -msgstr "" - -#: config/convex/convex.h:70 -msgid "Use 64-bit longs" -msgstr "" - -#: config/convex/convex.h:71 -msgid "Use cc- and libc-compatible 32-bit longs" -msgstr "" - -#: config/cris/cris.c:569 +#: config/cris/cris.c:583 msgid "unexpected index-type in cris_print_index" msgstr "" -#: config/cris/cris.c:585 +#: config/cris/cris.c:599 msgid "unexpected base-type in cris_print_base" msgstr "" -#: config/cris/cris.c:878 +#: config/cris/cris.c:892 #, c-format msgid "stackframe too big: %d bytes" msgstr "" -#: config/cris/cris.c:1193 +#: config/cris/cris.c:1207 msgid "allocated but unused delay list in epilogue" msgstr "" -#: config/cris/cris.c:1203 +#: config/cris/cris.c:1217 msgid "" "unexpected function type needing stack adjustment for __builtin_eh_return" msgstr "" -#: config/cris/cris.c:1282 +#: config/cris/cris.c:1296 msgid "invalid operand for 'b' modifier" msgstr "" -#: config/cris/cris.c:1294 +#: config/cris/cris.c:1308 msgid "invalid operand for 'v' modifier" msgstr "" -#: config/cris/cris.c:1304 +#: config/cris/cris.c:1318 msgid "invalid operand for 'P' modifier" msgstr "" -#: config/cris/cris.c:1311 +#: config/cris/cris.c:1325 msgid "invalid operand for 'p' modifier" msgstr "" -#: config/cris/cris.c:1350 +#: config/cris/cris.c:1364 msgid "invalid operand for 'z' modifier" msgstr "" -#: config/cris/cris.c:1381 config/cris/cris.c:1411 +#: config/cris/cris.c:1395 config/cris/cris.c:1425 msgid "invalid operand for 'H' modifier" msgstr "" -#: config/cris/cris.c:1387 +#: config/cris/cris.c:1401 msgid "bad register" msgstr "" -#: config/cris/cris.c:1425 +#: config/cris/cris.c:1439 msgid "invalid operand for 'e' modifier" msgstr "" -#: config/cris/cris.c:1442 +#: config/cris/cris.c:1456 msgid "invalid operand for 'm' modifier" msgstr "" -#: config/cris/cris.c:1467 +#: config/cris/cris.c:1481 msgid "invalid operand for 'A' modifier" msgstr "" -#: config/cris/cris.c:1475 +#: config/cris/cris.c:1489 msgid "invalid operand for 'D' modifier" msgstr "" -#: config/cris/cris.c:1489 +#: config/cris/cris.c:1503 msgid "invalid operand for 'T' modifier" msgstr "" -#: config/cris/cris.c:1498 +#: config/cris/cris.c:1512 msgid "invalid operand modifier letter" msgstr "" -#: config/cris/cris.c:1506 +#: config/cris/cris.c:1520 #, c-format msgid "internal error: bad register: %d" msgstr "" -#: config/cris/cris.c:1554 +#: config/cris/cris.c:1568 msgid "unexpected multiplicative operand" msgstr "" -#: config/cris/cris.c:1574 +#: config/cris/cris.c:1588 msgid "unexpected operand" msgstr "" -#: config/cris/cris.c:1609 config/cris/cris.c:1619 +#: config/cris/cris.c:1623 config/cris/cris.c:1633 msgid "unrecognized address" msgstr "" -#: config/cris/cris.c:1975 +#: config/cris/cris.c:1989 msgid "internal error: sideeffect-insn affecting main effect" msgstr "" #. If we get here, the caller got its initial tests wrong. -#: config/cris/cris.c:2262 +#: config/cris/cris.c:2276 msgid "internal error: cris_side_effect_mode_ok with bad operands" msgstr "" -#: config/cris/cris.c:2344 config/cris/cris.c:2402 +#: config/cris/cris.c:2358 config/cris/cris.c:2416 msgid "unrecognized supposed constant" msgstr "" -#: config/cris/cris.c:2443 +#: config/cris/cris.c:2457 msgid "unrecognized supposed constant in cris_global_pic_symbol" msgstr "" -#: config/cris/cris.c:2462 +#: config/cris/cris.c:2476 #, c-format msgid "-max-stackframe=%d is not usable, not between 0 and %d" msgstr "" -#: config/cris/cris.c:2490 +#: config/cris/cris.c:2504 #, c-format msgid "unknown CRIS version specification in -march= or -mcpu= : %s" msgstr "" -#: config/cris/cris.c:2526 +#: config/cris/cris.c:2540 #, c-format msgid "unknown CRIS cpu version specification in -mtune= : %s" msgstr "" -#: config/cris/cris.c:2544 +#: config/cris/cris.c:2558 msgid "-fPIC and -fpic are not supported in this configuration" msgstr "" -#: config/cris/cris.c:2560 +#: config/cris/cris.c:2574 msgid "that particular -g option is invalid with -maout and -melinux" msgstr "" -#: config/cris/cris.c:2790 config/cris/cris.c:2835 +#: config/cris/cris.c:2808 config/cris/cris.c:2853 msgid "unexpected side-effects in address" msgstr "" #. Labels are never marked as global symbols. -#: config/cris/cris.c:2932 config/cris/cris.c:2963 +#: config/cris/cris.c:2950 config/cris/cris.c:2981 msgid "unexpected PIC symbol" msgstr "" -#: config/cris/cris.c:2936 +#: config/cris/cris.c:2954 msgid "PIC register isn't set up" msgstr "" -#: config/cris/cris.c:2949 config/cris/cris.c:3032 +#: config/cris/cris.c:2967 config/cris/cris.c:3050 msgid "unexpected address expression" msgstr "" -#: config/cris/cris.c:2967 +#: config/cris/cris.c:2985 msgid "emitting PIC operand, but PIC register isn't set up" msgstr "" -#: config/cris/cris.c:2976 +#: config/cris/cris.c:2994 msgid "unexpected NOTE as addr_const:" msgstr "" @@ -9575,7 +9561,7 @@ msgid "Warn when a stackframe is larger than the specified size" msgstr "" #. Node: Profiling -#: config/cris/cris.h:1023 +#: config/cris/cris.h:1019 msgid "no FUNCTION_PROFILER for CRIS" msgstr "" @@ -9583,105 +9569,105 @@ msgstr "" msgid "Together with -fpic and -fPIC, do not use GOTPLT references" msgstr "" -#: config/d30v/d30v.c:210 +#: config/d30v/d30v.c:207 #, c-format msgid "bad modes_tieable_p for register %s, mode1 %s, mode2 %s" msgstr "" -#: config/d30v/d30v.c:2677 +#: config/d30v/d30v.c:2666 msgid "bad insn to d30v_print_operand_address:" msgstr "" -#: config/d30v/d30v.c:2694 config/d30v/d30v.c:2755 config/d30v/d30v.c:2776 -#: config/d30v/d30v.c:2794 +#: config/d30v/d30v.c:2683 config/d30v/d30v.c:2744 config/d30v/d30v.c:2765 +#: config/d30v/d30v.c:2783 msgid "bad insn to d30v_print_operand_memory_reference:" msgstr "" -#: config/d30v/d30v.c:2862 +#: config/d30v/d30v.c:2851 msgid "bad insn to d30v_print_operand, 'f' modifier:" msgstr "" -#: config/d30v/d30v.c:2871 +#: config/d30v/d30v.c:2860 msgid "bad insn to d30v_print_operand, 'A' modifier:" msgstr "" -#: config/d30v/d30v.c:2878 +#: config/d30v/d30v.c:2867 msgid "bad insn to d30v_print_operand, 'M' modifier:" msgstr "" -#: config/d30v/d30v.c:2932 +#: config/d30v/d30v.c:2921 msgid "bad insn to print_operand, 'F' or 'T' modifier:" msgstr "" -#: config/d30v/d30v.c:2943 +#: config/d30v/d30v.c:2932 msgid "bad insn to print_operand, 'B' modifier:" msgstr "" -#: config/d30v/d30v.c:2950 +#: config/d30v/d30v.c:2939 msgid "bad insn to print_operand, 'E' modifier:" msgstr "" -#: config/d30v/d30v.c:2968 +#: config/d30v/d30v.c:2957 msgid "bad insn to print_operand, 'R' modifier:" msgstr "" -#: config/d30v/d30v.c:2977 config/d30v/d30v.c:2985 +#: config/d30v/d30v.c:2966 config/d30v/d30v.c:2974 msgid "bad insn to print_operand, 's' modifier:" msgstr "" -#: config/d30v/d30v.c:3014 +#: config/d30v/d30v.c:3003 msgid "bad insn in d30v_print_operand, 0 case" msgstr "" -#: config/d30v/d30v.c:3369 +#: config/d30v/d30v.c:3301 msgid "d30v_emit_comparison" msgstr "" -#: config/d30v/d30v.c:3413 +#: config/d30v/d30v.c:3345 msgid "bad call to d30v_move_2words" msgstr "" -#: config/d30v/d30v.h:108 +#: config/d30v/d30v.h:114 msgid "Enable use of conditional move instructions" msgstr "" -#: config/d30v/d30v.h:111 +#: config/d30v/d30v.h:117 msgid "Disable use of conditional move instructions" msgstr "" -#: config/d30v/d30v.h:114 +#: config/d30v/d30v.h:120 msgid "Debug argument support in compiler" msgstr "" -#: config/d30v/d30v.h:117 +#: config/d30v/d30v.h:123 msgid "Debug stack support in compiler" msgstr "" -#: config/d30v/d30v.h:120 +#: config/d30v/d30v.h:126 msgid "Debug memory address support in compiler" msgstr "" -#: config/d30v/d30v.h:123 +#: config/d30v/d30v.h:129 msgid "Make adjacent short instructions parallel if possible" msgstr "" -#: config/d30v/d30v.h:126 +#: config/d30v/d30v.h:132 msgid "Do not make adjacent short instructions parallel" msgstr "" -#: config/d30v/d30v.h:129 config/d30v/d30v.h:132 +#: config/d30v/d30v.h:135 config/d30v/d30v.h:138 msgid "Link programs/data to be in external memory by default" msgstr "" -#: config/d30v/d30v.h:135 +#: config/d30v/d30v.h:141 msgid "Link programs/data to be in onchip memory by default" msgstr "" -#: config/d30v/d30v.h:143 +#: config/d30v/d30v.h:149 msgid "Change the branch costs within the compiler" msgstr "" -#: config/d30v/d30v.h:146 +#: config/d30v/d30v.h:152 msgid "Change the threshold for conversion to conditional execution" msgstr "" @@ -9693,27 +9679,27 @@ msgstr "" msgid "invalid addressing mode" msgstr "" -#: config/dsp16xx/dsp16xx.c:1857 +#: config/dsp16xx/dsp16xx.c:1821 msgid "bad register extension code" msgstr "" -#: config/dsp16xx/dsp16xx.c:1957 +#: config/dsp16xx/dsp16xx.c:1921 msgid "invalid offset in ybase addressing" msgstr "" -#: config/dsp16xx/dsp16xx.c:1960 +#: config/dsp16xx/dsp16xx.c:1924 msgid "invalid register in ybase addressing" msgstr "" -#: config/dsp16xx/dsp16xx.c:2135 +#: config/dsp16xx/dsp16xx.c:2099 msgid "invalid shift operator in emit_1600_core_shift" msgstr "" -#: config/dsp16xx/dsp16xx.c:2464 +#: config/dsp16xx/dsp16xx.c:2428 msgid "invalid mode for gen_tst_reg" msgstr "" -#: config/dsp16xx/dsp16xx.c:2536 +#: config/dsp16xx/dsp16xx.c:2500 msgid "invalid mode for integer comparison in gen_compare_reg" msgstr "" @@ -9722,239 +9708,379 @@ msgstr "" #. each pair being { "NAME", VALUE } #. where VALUE is the bits to set or minus the bits to clear. #. An empty string NAME is used to identify the default VALUE. -#: config/dsp16xx/dsp16xx.h:215 +#: config/dsp16xx/dsp16xx.h:230 msgid "Pass parameters in registers (default)" msgstr "" -#: config/dsp16xx/dsp16xx.h:217 +#: config/dsp16xx/dsp16xx.h:232 msgid "Don't pass parameters in registers" msgstr "" -#: config/dsp16xx/dsp16xx.h:219 +#: config/dsp16xx/dsp16xx.h:234 msgid "Generate code for near calls" msgstr "" -#: config/dsp16xx/dsp16xx.h:221 +#: config/dsp16xx/dsp16xx.h:236 msgid "Don't generate code for near calls" msgstr "" -#: config/dsp16xx/dsp16xx.h:223 +#: config/dsp16xx/dsp16xx.h:238 msgid "Generate code for near jumps" msgstr "" -#: config/dsp16xx/dsp16xx.h:225 +#: config/dsp16xx/dsp16xx.h:240 msgid "Don't generate code for near jumps" msgstr "" -#: config/dsp16xx/dsp16xx.h:227 +#: config/dsp16xx/dsp16xx.h:242 msgid "Generate code for a bit-manipulation unit" msgstr "" -#: config/dsp16xx/dsp16xx.h:229 +#: config/dsp16xx/dsp16xx.h:244 msgid "Don't generate code for a bit-manipulation unit" msgstr "" -#: config/dsp16xx/dsp16xx.h:231 +#: config/dsp16xx/dsp16xx.h:246 msgid "Generate code for memory map1" msgstr "" -#: config/dsp16xx/dsp16xx.h:233 +#: config/dsp16xx/dsp16xx.h:248 msgid "Generate code for memory map2" msgstr "" -#: config/dsp16xx/dsp16xx.h:235 +#: config/dsp16xx/dsp16xx.h:250 msgid "Generate code for memory map3" msgstr "" -#: config/dsp16xx/dsp16xx.h:237 +#: config/dsp16xx/dsp16xx.h:252 msgid "Generate code for memory map4" msgstr "" -#: config/dsp16xx/dsp16xx.h:239 +#: config/dsp16xx/dsp16xx.h:254 msgid "Ouput extra code for initialized data" msgstr "" -#: config/dsp16xx/dsp16xx.h:241 +#: config/dsp16xx/dsp16xx.h:256 msgid "Don't let reg. allocator use ybase registers" msgstr "" -#: config/dsp16xx/dsp16xx.h:243 +#: config/dsp16xx/dsp16xx.h:258 msgid "Output extra debug info in Luxworks environment" msgstr "" -#: config/dsp16xx/dsp16xx.h:245 +#: config/dsp16xx/dsp16xx.h:260 msgid "Save temp. files in Luxworks environment" msgstr "" -#: config/dsp16xx/dsp16xx.h:257 +#: config/dsp16xx/dsp16xx.h:272 msgid "Specify alternate name for text section" msgstr "" -#: config/dsp16xx/dsp16xx.h:259 +#: config/dsp16xx/dsp16xx.h:274 msgid "Specify alternate name for data section" msgstr "" -#: config/dsp16xx/dsp16xx.h:261 +#: config/dsp16xx/dsp16xx.h:276 msgid "Specify alternate name for bss section" msgstr "" -#: config/dsp16xx/dsp16xx.h:263 +#: config/dsp16xx/dsp16xx.h:278 msgid "Specify alternate name for constant section" msgstr "" -#: config/dsp16xx/dsp16xx.h:265 +#: config/dsp16xx/dsp16xx.h:280 msgid "Specify alternate name for dsp16xx chip" msgstr "" #. Output assembler code to FILE to increment profiler label # LABELNO #. for profiling a function entry. -#: config/dsp16xx/dsp16xx.h:1203 config/dsp16xx/dsp16xx.h:1208 -#: config/dsp16xx/dsp16xx.h:1213 config/dsp16xx/dsp16xx.h:1793 -#: config/dsp16xx/dsp16xx.h:1798 +#: config/dsp16xx/dsp16xx.h:1218 config/dsp16xx/dsp16xx.h:1772 +#: config/dsp16xx/dsp16xx.h:1777 msgid "profiling not implemented yet" msgstr "" #. Emit RTL insns to initialize the variable parts of a trampoline. #. FNADDR is an RTX for the address of the function's pure code. #. CXT is an RTX for the static chain value for the function. -#: config/dsp16xx/dsp16xx.h:1224 config/dsp16xx/dsp16xx.h:1236 +#: config/dsp16xx/dsp16xx.h:1228 config/dsp16xx/dsp16xx.h:1240 msgid "trampolines not yet implemented" msgstr "" -#. Macro to define tables used to set the flags. -#. This is a list in braces of pairs in braces, -#. each pair being { "NAME", VALUE } -#. where VALUE is the bits to set or minus the bits to clear. -#. An empty string NAME is used to identify the default VALUE. -#: config/elxsi/elxsi.h:51 -msgid "Generate code the unix assembler can handle" -msgstr "" - -#: config/elxsi/elxsi.h:52 -msgid "Generate code an embedded assembler can handle" -msgstr "" - -#: config/fr30/fr30.c:456 +#: config/fr30/fr30.c:453 msgid "fr30_print_operand_address: unhandled address" msgstr "" -#: config/fr30/fr30.c:483 +#: config/fr30/fr30.c:480 #, c-format msgid "fr30_print_operand: unrecognized %%p code" msgstr "" -#: config/fr30/fr30.c:503 +#: config/fr30/fr30.c:500 #, c-format msgid "fr30_print_operand: unrecognized %%b code" msgstr "" -#: config/fr30/fr30.c:524 +#: config/fr30/fr30.c:521 #, c-format msgid "fr30_print_operand: unrecognized %%B code" msgstr "" -#: config/fr30/fr30.c:532 +#: config/fr30/fr30.c:529 #, c-format msgid "fr30_print_operand: invalid operand to %%A code" msgstr "" -#: config/fr30/fr30.c:549 +#: config/fr30/fr30.c:546 #, c-format msgid "fr30_print_operand: invalid %%x code" msgstr "" -#: config/fr30/fr30.c:556 +#: config/fr30/fr30.c:553 #, c-format msgid "fr30_print_operand: invalid %%F code" msgstr "" -#: config/fr30/fr30.c:572 +#: config/fr30/fr30.c:570 msgid "fr30_print_operand: unknown code" msgstr "" -#: config/fr30/fr30.c:601 config/fr30/fr30.c:610 config/fr30/fr30.c:621 -#: config/fr30/fr30.c:634 +#: config/fr30/fr30.c:599 config/fr30/fr30.c:608 config/fr30/fr30.c:619 +#: config/fr30/fr30.c:632 msgid "fr30_print_operand: unhandled MEM" msgstr "" -#: config/fr30/fr30.h:57 +#: config/fr30/fr30.h:63 msgid "Assume small address space" msgstr "" -#: config/h8300/h8300.c:143 +#: config/frv/frv.c:410 config/frv/frv.c:428 +#, c-format +msgid "Unknown cpu: -mcpu=%s" +msgstr "" + +#: config/frv/frv.c:451 +msgid "-fpic and -gdwarf are incompatible (-fpic and -g/-gdwarf-2 are fine)" +msgstr "" + +#: config/frv/frv.c:2520 +msgid "Bad insn to frv_print_operand_address:" +msgstr "" + +#: config/frv/frv.c:2533 +msgid "Bad register to frv_print_operand_memory_reference_reg:" +msgstr "" + +#: config/frv/frv.c:2574 config/frv/frv.c:2584 config/frv/frv.c:2593 +#: config/frv/frv.c:2621 config/frv/frv.c:2633 config/frv/frv.c:2637 +msgid "Bad insn to frv_print_operand_memory_reference:" +msgstr "" + +#: config/frv/frv.c:2779 +msgid "Bad insn in frv_print_operand, bad const_double" +msgstr "" + +#: config/frv/frv.c:2824 +msgid "Bad insn to frv_print_operand, 'C' modifier:" +msgstr "" + +#: config/frv/frv.c:2847 +msgid "Bad insn to frv_print_operand, 'c' modifier:" +msgstr "" + +#: config/frv/frv.c:2872 +msgid "Bad insn to frv_print_operand, 'e' modifier:" +msgstr "" + +#: config/frv/frv.c:2880 +msgid "Bad insn to frv_print_operand, 'F' modifier:" +msgstr "" + +#: config/frv/frv.c:2896 +msgid "Bad insn to frv_print_operand, 'f' modifier:" +msgstr "" + +#: config/frv/frv.c:2949 +msgid "Bad insn to frv_print_operand, 'L' modifier:" +msgstr "" + +#: config/frv/frv.c:2962 +msgid "Bad insn to frv_print_operand, 'M/N' modifier:" +msgstr "" + +#: config/frv/frv.c:2983 +msgid "Bad insn to frv_print_operand, 'O' modifier:" +msgstr "" + +#: config/frv/frv.c:3001 +msgid "Bad insn to frv_print_operand, P modifier:" +msgstr "" + +#: config/frv/frv.c:3021 +msgid "Bad insn in frv_print_operand, z case" +msgstr "" + +#: config/frv/frv.c:3049 +msgid "Bad insn in frv_print_operand, 0 case" +msgstr "" + +#: config/frv/frv.c:3054 +msgid "frv_print_operand: unknown code" +msgstr "" + +#: config/frv/frv.c:5737 +msgid "Bad output_move_single operand" +msgstr "" + +#: config/frv/frv.c:5866 +msgid "Bad output_move_double operand" +msgstr "" + +#: config/frv/frv.c:6010 +msgid "Bad output_condmove_single operand" +msgstr "" + +#: config/frv/frv.c:8315 +msgid "frv_registers_update" +msgstr "" + +#: config/frv/frv.c:8475 +msgid "frv_registers_used_p" +msgstr "" + +#: config/frv/frv.c:8604 +msgid "frv_registers_set_p" +msgstr "" + +#: config/frv/frv.c:9171 +msgid "accumulator is not a constant integer" +msgstr "" + +#: config/frv/frv.c:9176 +msgid "accumulator number is out of bounds" +msgstr "" + +#: config/frv/frv.c:9187 +#, c-format +msgid "inappropriate accumulator for `%s'" +msgstr "" + +#: config/frv/frv.c:9253 +#, c-format +msgid "`%s' expects a constant argument" +msgstr "" + +#: config/frv/frv.c:9258 +#, c-format +msgid "constant argument out of range for `%s'" +msgstr "" + +#: config/frv/frv.c:9638 +msgid "media functions are not available unless -mmedia is used" +msgstr "" + +#: config/frv/frv.c:9650 +msgid "this media function is only available on the fr500" +msgstr "" + +#: config/frv/frv.c:9678 +msgid "this media function is only available on the fr400" +msgstr "" + +#. This macro is a C statement to print on `stderr' a string describing the +#. particular machine description choice. Every machine description should +#. define `TARGET_VERSION'. For example: +#. +#. #ifdef MOTOROLA +#. #define TARGET_VERSION fprintf (stderr, " (68k, Motorola syntax)"); +#. #else +#. #define TARGET_VERSION fprintf (stderr, " (68k, MIT syntax)"); +#. #endif +#: config/frv/frv.h:512 +msgid " (frv)" +msgstr "" + +#: config/h8300/h8300.c:314 msgid "-ms2600 is used without -ms" msgstr "" +#: config/h8300/h8300.c:320 +msgid "-mn is used without -mh or -ms" +msgstr "" + #. Macro to define tables used to set the flags. #. This is a list in braces of pairs in braces, #. each pair being { "NAME", VALUE } #. where VALUE is the bits to set or minus the bits to clear. #. An empty string NAME is used to identify the default VALUE. -#: config/h8300/h8300.h:117 -msgid "Generate H8/S code" +#: config/h8300/h8300.h:150 +msgid "Generate H8S code" msgstr "" -#: config/h8300/h8300.h:118 -msgid "Do not generate H8/S code" +#: config/h8300/h8300.h:151 +msgid "Do not generate H8S code" msgstr "" -#: config/h8300/h8300.h:119 -msgid "Generate H8/S2600 code" +#: config/h8300/h8300.h:152 +msgid "Generate H8S/2600 code" msgstr "" -#: config/h8300/h8300.h:120 -msgid "Do not generate H8/S2600 code" +#: config/h8300/h8300.h:153 +msgid "Do not generate H8S/2600 code" msgstr "" -#: config/h8300/h8300.h:121 +#: config/h8300/h8300.h:154 msgid "Make integers 32 bits wide" msgstr "" -#: config/h8300/h8300.h:124 +#: config/h8300/h8300.h:157 msgid "Use registers for argument passing" msgstr "" -#: config/h8300/h8300.h:126 +#: config/h8300/h8300.h:159 msgid "Do not use registers for argument passing" msgstr "" -#: config/h8300/h8300.h:128 +#: config/h8300/h8300.h:161 msgid "Consider access to byte sized memory slow" msgstr "" -#: config/h8300/h8300.h:129 +#: config/h8300/h8300.h:162 msgid "Enable linker relaxing" msgstr "" -#: config/h8300/h8300.h:131 +#: config/h8300/h8300.h:164 msgid "Generate H8/300H code" msgstr "" -#: config/h8300/h8300.h:132 +#: config/h8300/h8300.h:165 +msgid "Enable the normal mode" +msgstr "" + +#: config/h8300/h8300.h:166 msgid "Do not generate H8/300H code" msgstr "" -#: config/h8300/h8300.h:133 +#: config/h8300/h8300.h:167 msgid "Use H8/300 alignment rules" msgstr "" -#: config/i370/i370-c.c:54 +#: config/i370/i370-c.c:53 msgid "junk at end of #pragma map" msgstr "" -#: config/i370/i370-c.c:60 +#: config/i370/i370-c.c:59 msgid "malformed #pragma map, ignored" msgstr "" -#: config/i370/i370.c:897 +#: config/i370/i370.c:915 msgid "real name is too long - alias ignored" msgstr "" -#: config/i370/i370.c:902 +#: config/i370/i370.c:920 msgid "alias name is too long - alias ignored" msgstr "" -#: config/i370/i370.c:1173 +#: config/i370/i370.c:1191 msgid "internal error--no jump follows compare:" msgstr "" @@ -9962,162 +10088,171 @@ msgstr "" #. of pairs in braces, each pair being { "NAME", VALUE } #. where VALUE is the bits to set or minus the bits to clear. #. An empty string NAME is used to identify the default VALUE. -#: config/i370/i370.h:63 +#: config/i370/i370.h:75 msgid "Generate char instructions" msgstr "" -#: config/i370/i370.h:64 +#: config/i370/i370.h:76 msgid "Do not generate char instructions" msgstr "" -#: config/i386/i386.c:926 +#: config/i386/i386.c:1043 #, c-format msgid "code model %s not supported in PIC mode" msgstr "" -#: config/i386/i386.c:936 config/sparc/sparc.c:344 +#: config/i386/i386.c:1053 config/sparc/sparc.c:356 #, c-format msgid "bad value (%s) for -mcmodel= switch" msgstr "" -#: config/i386/i386.c:951 +#: config/i386/i386.c:1068 #, c-format msgid "bad value (%s) for -masm= switch" msgstr "" -#: config/i386/i386.c:954 +#: config/i386/i386.c:1071 #, c-format msgid "code model `%s' not supported in the %s bit mode" msgstr "" -#: config/i386/i386.c:957 +#: config/i386/i386.c:1074 msgid "code model `large' not supported yet" msgstr "" -#: config/i386/i386.c:959 +#: config/i386/i386.c:1076 #, c-format msgid "%i-bit mode not compiled in" msgstr "" -#: config/i386/i386.c:989 config/mips/mips.c:4969 +#: config/i386/i386.c:1106 #, c-format msgid "bad value (%s) for -march= switch" msgstr "" -#: config/i386/i386.c:1000 config/mips/mips.c:4925 +#: config/i386/i386.c:1117 #, c-format msgid "bad value (%s) for -mcpu= switch" msgstr "" -#: config/i386/i386.c:1019 +#: config/i386/i386.c:1134 #, c-format msgid "-mregparm=%d is not between 0 and %d" msgstr "" -#: config/i386/i386.c:1032 +#: config/i386/i386.c:1147 msgid "-malign-loops is obsolete, use -falign-loops" msgstr "" -#: config/i386/i386.c:1037 config/i386/i386.c:1050 config/i386/i386.c:1063 +#: config/i386/i386.c:1152 config/i386/i386.c:1165 config/i386/i386.c:1178 #, c-format msgid "-malign-loops=%d is not between 0 and %d" msgstr "" -#: config/i386/i386.c:1045 +#: config/i386/i386.c:1160 msgid "-malign-jumps is obsolete, use -falign-jumps" msgstr "" -#: config/i386/i386.c:1058 +#: config/i386/i386.c:1173 msgid "-malign-functions is obsolete, use -falign-functions" msgstr "" -#: config/i386/i386.c:1096 +#: config/i386/i386.c:1211 #, c-format msgid "-mpreferred-stack-boundary=%d is not between %d and 12" msgstr "" -#: config/i386/i386.c:1108 +#: config/i386/i386.c:1223 #, c-format msgid "-mbranch-cost=%d is not between 0 and 5" msgstr "" -#: config/i386/i386.c:1130 +#: config/i386/i386.c:1235 +#, c-format +msgid "bad value (%s) for -mtls-dialect= switch" +msgstr "" + +#: config/i386/i386.c:1256 msgid "-malign-double makes no sense in the 64bit mode" msgstr "" -#: config/i386/i386.c:1132 +#: config/i386/i386.c:1258 msgid "-mrtd calling convention not supported in the 64bit mode" msgstr "" -#: config/i386/i386.c:1148 config/i386/i386.c:1159 +#: config/i386/i386.c:1274 config/i386/i386.c:1285 msgid "SSE instruction set disabled, using 387 arithmetics" msgstr "" -#: config/i386/i386.c:1164 +#: config/i386/i386.c:1290 msgid "387 instruction set disabled, using SSE arithmetics" msgstr "" -#: config/i386/i386.c:1171 +#: config/i386/i386.c:1297 #, c-format msgid "bad value (%s) for -mfpmath= switch" msgstr "" -#: config/i386/i386.c:1301 +#: config/i386/i386.c:1429 #, c-format msgid "`%s' attribute requires an integer constant argument" msgstr "" -#: config/i386/i386.c:1307 +#: config/i386/i386.c:1435 #, c-format msgid "argument to `%s' attribute larger than %d" msgstr "" -#: config/i386/i386.c:5385 +#: config/i386/i386.c:6176 msgid "invalid UNSPEC as operand" msgstr "" -#: config/i386/i386.c:5622 +#: config/i386/i386.c:6438 msgid "extended registers have no high halves" msgstr "" -#: config/i386/i386.c:5637 +#: config/i386/i386.c:6453 msgid "unsupported operand size for extended register" msgstr "" -#: config/i386/i386.c:5910 +#: config/i386/i386.c:6768 msgid "" "operand is neither a constant nor a condition code, invalid operand code 'c'" msgstr "" -#: config/i386/i386.c:5956 +#: config/i386/i386.c:6814 #, c-format msgid "invalid operand code `%c'" msgstr "" -#: config/i386/i386.c:6003 +#: config/i386/i386.c:6861 msgid "invalid constraints for operand" msgstr "" -#: config/i386/i386.c:9978 +#: config/i386/i386.c:11027 msgid "unknown insn mode" msgstr "" #. @@@ better error message -#: config/i386/i386.c:11841 config/i386/i386.c:11874 +#: config/i386/i386.c:13083 config/i386/i386.c:13119 msgid "selector must be an immediate" msgstr "" #. @@@ better error message -#: config/i386/i386.c:12032 config/i386/i386.c:12060 +#: config/i386/i386.c:13280 config/i386/i386.c:13314 msgid "mask must be an immediate" msgstr "" -#: config/i386/winnt.c:94 +#: config/i386/i386.c:13346 +msgid "shift must be an immediate" +msgstr "" + +#: config/i386/winnt.c:105 #, c-format msgid "`%s' attribute only applies to variables" msgstr "" -#: config/i386/winnt.c:262 +#: config/i386/winnt.c:275 #, c-format msgid "`%s' declared as both exported to and imported from a DLL" msgstr "" @@ -10158,140 +10293,113 @@ msgstr "" msgid "Use Mingw-specific thread support" msgstr "" -#: config/i386/cygwin.h:236 +#: config/i386/cygwin.h:244 #, c-format msgid "-f%s ignored for target (all code is position independent)" msgstr "" -#: config/i386/dgux.h:60 -msgid "Retain standard MXDB information" -msgstr "" - -#: config/i386/dgux.h:62 -msgid "Retain legend information" -msgstr "" - -#: config/i386/dgux.h:65 -msgid "Generate external legend information" -msgstr "" - -#: config/i386/dgux.h:67 -msgid "Emit identifying info in .s file" -msgstr "" - -#: config/i386/dgux.h:69 -msgid "Warn when a function arg is a structure" -msgstr "" - -#: config/i386/dgux.h:249 -msgid "argument is a structure" -msgstr "" - -#: config/i386/djgpp.h:202 +#: config/i386/djgpp.h:204 msgid "-mbnu210 is ignored (option is obsolete)" msgstr "" -#: config/i386/i386.h:45 config/mips/mips.h:184 -msgid "half-pic init called on systems that don't support it" -msgstr "" - #. Deprecated. #. Deprecated. #. Deprecated. #. Deprecated. #. Deprecated. #. Deprecated. -#: config/i386/i386.h:303 +#: config/i386/i386.h:306 msgid "Alternate calling convention" msgstr "" -#: config/i386/i386.h:305 config/m68k/m68k.h:180 config/ns32k/ns32k.h:106 +#: config/i386/i386.h:308 config/m68k/m68k.h:180 config/ns32k/ns32k.h:144 msgid "Use normal calling convention" msgstr "" -#: config/i386/i386.h:307 +#: config/i386/i386.h:310 msgid "Align some doubles on dword boundary" msgstr "" -#: config/i386/i386.h:309 +#: config/i386/i386.h:312 msgid "Align doubles on word boundary" msgstr "" -#: config/i386/i386.h:311 +#: config/i386/i386.h:314 msgid "Uninitialized locals in .bss" msgstr "" -#: config/i386/i386.h:313 +#: config/i386/i386.h:316 msgid "Uninitialized locals in .data" msgstr "" -#: config/i386/i386.h:315 config/m68k/linux-aout.h:45 config/m68k/linux.h:50 +#: config/i386/i386.h:318 config/m68k/linux-aout.h:45 config/m68k/linux.h:50 +#: config/ns32k/ns32k.h:167 msgid "Use IEEE math for fp comparisons" msgstr "" -#: config/i386/i386.h:317 +#: config/i386/i386.h:320 config/ns32k/ns32k.h:169 msgid "Do not use IEEE math for fp comparisons" msgstr "" -#: config/i386/i386.h:319 +#: config/i386/i386.h:322 msgid "Return values of functions in FPU registers" msgstr "" -#: config/i386/i386.h:321 +#: config/i386/i386.h:324 msgid "Do not return values of functions in FPU registers" msgstr "" -#: config/i386/i386.h:323 +#: config/i386/i386.h:326 msgid "Do not generate sin, cos, sqrt for FPU" msgstr "" -#: config/i386/i386.h:325 +#: config/i386/i386.h:328 msgid "Generate sin, cos, sqrt for FPU" msgstr "" -#: config/i386/i386.h:327 +#: config/i386/i386.h:330 msgid "Omit the frame pointer in leaf functions" msgstr "" -#: config/i386/i386.h:330 +#: config/i386/i386.h:333 msgid "Enable stack probing" msgstr "" #. undocumented #. undocumented -#: config/i386/i386.h:335 +#: config/i386/i386.h:338 msgid "Align destination of the string operations" msgstr "" -#: config/i386/i386.h:337 +#: config/i386/i386.h:340 msgid "Do not align destination of the string operations" msgstr "" -#: config/i386/i386.h:339 +#: config/i386/i386.h:342 msgid "Inline all known string operations" msgstr "" -#: config/i386/i386.h:341 +#: config/i386/i386.h:344 msgid "Do not inline all known string operations" msgstr "" -#: config/i386/i386.h:343 config/i386/i386.h:348 +#: config/i386/i386.h:346 config/i386/i386.h:350 msgid "Use push instructions to save outgoing arguments" msgstr "" -#: config/i386/i386.h:345 config/i386/i386.h:350 +#: config/i386/i386.h:348 config/i386/i386.h:352 msgid "Do not use push instructions to save outgoing arguments" msgstr "" -#: config/i386/i386.h:352 +#: config/i386/i386.h:354 msgid "Support MMX built-in functions" msgstr "" -#: config/i386/i386.h:354 +#: config/i386/i386.h:356 msgid "Do not support MMX built-in functions" msgstr "" -#: config/i386/i386.h:357 +#: config/i386/i386.h:358 msgid "Support 3DNow! built-in functions" msgstr "" @@ -10303,39 +10411,39 @@ msgstr "" msgid "Support MMX and SSE built-in functions and code generation" msgstr "" -#: config/i386/i386.h:365 +#: config/i386/i386.h:364 msgid "Do not support MMX and SSE built-in functions and code generation" msgstr "" -#: config/i386/i386.h:367 +#: config/i386/i386.h:366 msgid "Support MMX, SSE and SSE2 built-in functions and code generation" msgstr "" -#: config/i386/i386.h:370 +#: config/i386/i386.h:368 msgid "Do not support MMX, SSE and SSE2 built-in functions and code generation" msgstr "" -#: config/i386/i386.h:372 +#: config/i386/i386.h:370 msgid "sizeof(long double) is 16" msgstr "" -#: config/i386/i386.h:374 +#: config/i386/i386.h:372 msgid "sizeof(long double) is 12" msgstr "" -#: config/i386/i386.h:376 +#: config/i386/i386.h:374 msgid "Generate 64bit x86-64 code" msgstr "" -#: config/i386/i386.h:378 +#: config/i386/i386.h:376 msgid "Generate 32bit i386 code" msgstr "" -#: config/i386/i386.h:380 +#: config/i386/i386.h:378 msgid "Use red-zone in the x86-64 code" msgstr "" -#: config/i386/i386.h:382 +#: config/i386/i386.h:380 msgid "Do not use red-zone in the x86-64 code" msgstr "" @@ -10348,19 +10456,19 @@ msgstr "" #. variable, type `char *', is set to the variable part of the given #. option if the fixed part matches. The actual option name is made #. by appending `-m' to the specified name. -#: config/i386/i386.h:428 config/rs6000/rs6000.h:428 config/sparc/sparc.h:641 +#: config/i386/i386.h:409 config/rs6000/rs6000.h:393 config/sparc/sparc.h:635 msgid "Schedule code for given CPU" msgstr "" -#: config/i386/i386.h:430 +#: config/i386/i386.h:411 msgid "Generate floating point mathematics using given instruction set" msgstr "" -#: config/i386/i386.h:432 +#: config/i386/i386.h:413 msgid "Generate code for given CPU" msgstr "" -#: config/i386/i386.h:434 +#: config/i386/i386.h:415 msgid "Number of registers used to pass integer arguments" msgstr "" @@ -10374,71 +10482,41 @@ msgstr "" #. variable, type `char *', is set to the variable part of the given #. option if the fixed part matches. The actual option name is made #. by appending `-m' to the specified name. -#: config/i386/i386.h:436 config/m68k/m68k.h:263 +#: config/i386/i386.h:417 config/m68k/m68k.h:263 msgid "Loop code aligned to this power of 2" msgstr "" -#: config/i386/i386.h:438 config/m68k/m68k.h:265 +#: config/i386/i386.h:419 config/m68k/m68k.h:265 msgid "Jump targets are aligned to this power of 2" msgstr "" -#: config/i386/i386.h:440 config/m68k/m68k.h:267 +#: config/i386/i386.h:421 config/m68k/m68k.h:267 msgid "Function starts are aligned to this power of 2" msgstr "" -#: config/i386/i386.h:443 +#: config/i386/i386.h:424 msgid "Attempt to keep stack aligned to this power of 2" msgstr "" -#: config/i386/i386.h:445 +#: config/i386/i386.h:426 msgid "Branches are this expensive (1-5, arbitrary units)" msgstr "" -#: config/i386/i386.h:447 +#: config/i386/i386.h:428 msgid "Use given x86-64 code model" msgstr "" #. Undocumented. #. Undocumented. -#: config/i386/i386.h:453 +#: config/i386/i386.h:434 msgid "Use given assembler dialect" msgstr "" -#: config/i386/osf1elf.h:112 -msgid "Profiling uses mcount" +#: config/i386/i386.h:436 +msgid "Use given thread-local storage dialect" msgstr "" -#: config/i386/osfrose.h:57 -msgid "Emit half-PIC code" -msgstr "" - -#. intentionally undoc -#. intentionally undoc -#: config/i386/osfrose.h:64 -msgid "Emit ELF object code" -msgstr "" - -#: config/i386/osfrose.h:66 -msgid "Emit ROSE object code" -msgstr "" - -#: config/i386/osfrose.h:68 -msgid "Symbols have a leading underscore" -msgstr "" - -#: config/i386/osfrose.h:71 -msgid "Align to >word boundaries" -msgstr "" - -#: config/i386/osfrose.h:74 -msgid "Use mcount for profiling" -msgstr "" - -#: config/i386/osfrose.h:76 -msgid "Use mcount_ptr for profiling" -msgstr "" - -#: config/i386/sco5.h:763 +#: config/i386/sco5.h:700 msgid "Generate ELF output" msgstr "" @@ -10470,33 +10548,31 @@ msgstr "" msgid "environment variable DJGPP points to corrupt file '%s'" msgstr "" -#. Macro to define tables used to set the flags. -#. This is a list in braces of pairs in braces, -#. each pair being { "NAME", VALUE } -#. where VALUE is the bits to set or minus the bits to clear. -#. An empty string NAME is used to identify the default VALUE. -#: config/i860/i860.h:56 config/i860/paragon.h:28 -msgid "Generate code which uses the FPU" +#: config/i960/i960-c.c:66 +msgid "sorry, not implemented: #pragma align NAME=SIZE" msgstr "" -#: config/i860/i860.h:57 config/i860/i860.h:58 config/i860/paragon.h:29 -#: config/i860/paragon.h:30 config/i860/paragon.h:31 -msgid "Do not generate code which uses the FPU" +#: config/i960/i960-c.c:71 +msgid "malformed #pragma align - ignored" msgstr "" -#: config/i960/i960-c.c:67 -msgid "sorry, not implemented: #pragma align NAME=SIZE" +#: config/i960/i960-c.c:109 +msgid "sorry, not implemented: #pragma noalign NAME" msgstr "" -#: config/i960/i960-c.c:72 -msgid "malformed #pragma align - ignored" +#: config/i960/i960.c:121 config/i960/i960.c:131 +msgid "conflicting architectures defined - using C series" msgstr "" -#: config/i960/i960-c.c:110 -msgid "sorry, not implemented: #pragma noalign NAME" +#: config/i960/i960.c:126 +msgid "conflicting architectures defined - using K series" msgstr "" -#: config/i960/i960.c:1405 config/m68k/m68k.c:665 config/rs6000/rs6000.c:8446 +#: config/i960/i960.c:141 +msgid "iC2.0 and iC3.0 are incompatible - using iC3.0" +msgstr "" + +#: config/i960/i960.c:1448 config/m68k/m68k.c:559 config/rs6000/rs6000.c:9931 msgid "stack limit expression is not supported" msgstr "" @@ -10554,6 +10630,10 @@ msgstr "" msgid "Generate CF code" msgstr "" +#: config/i960/i960.h:283 config/mips/mips.h:568 config/pa/pa.h:252 +msgid "Use software floating point" +msgstr "" + #: config/i960/i960.h:285 msgid "Use alternate leaf function entries" msgstr "" @@ -10615,8 +10695,8 @@ msgstr "" msgid "Do not layout types like Intel's v1.3 gcc" msgstr "" -#: config/i960/i960.h:323 config/sparc/freebsd.h:80 config/sparc/linux.h:88 -#: config/sparc/linux64.h:145 config/sparc/netbsd-elf.h:240 +#: config/i960/i960.h:323 config/sparc/freebsd.h:79 config/sparc/linux.h:86 +#: config/sparc/linux64.h:88 config/sparc/netbsd-elf.h:238 msgid "Use 64 bit long doubles" msgstr "" @@ -10628,187 +10708,196 @@ msgstr "" msgid "Do not enable linker relaxation" msgstr "" -#. Override conflicting target switch options. -#. Doesn't actually detect if more than one -mARCH option is given, but -#. does handle the case of two blatantly conflicting -mARCH options. -#: config/i960/i960.h:342 config/i960/i960.h:352 -msgid "conflicting architectures defined - using C series" +#: config/ia64/ia64-c.c:50 +msgid "malformed #pragma builtin" msgstr "" -#: config/i960/i960.h:347 -msgid "conflicting architectures defined - using K series" +#: config/ia64/ia64.c:3879 +msgid "ia64_print_operand: unknown code" msgstr "" -#: config/i960/i960.h:362 -msgid "iC2.0 and iC3.0 are incompatible - using iC3.0" +#: config/ia64/ia64.c:4157 +msgid "value of -mfixed-range must have form REG1-REG2" msgstr "" -#. ??? See the LONG_DOUBLE_TYPE_SIZE definition below. -#: config/i960/i960.h:373 -msgid "the -mlong-double-64 option does not work yet" +#: config/ia64/ia64.c:4184 +#, c-format +msgid "%s-%s is an empty range" msgstr "" -#: config/ia64/ia64.c:3589 -msgid "ia64_print_operand: unknown code" +#: config/ia64/ia64.c:4215 +msgid "cannot optimize floating point division for both latency and throughput" msgstr "" -#: config/ia64/ia64.c:3863 -msgid "value of -mfixed-range must have form REG1-REG2" +#: config/ia64/ia64.c:4221 +msgid "cannot optimize integer division for both latency and throughput" msgstr "" -#: config/ia64/ia64.c:3890 +#: config/ia64/ia64.c:4233 #, c-format -msgid "%s-%s is an empty range" -msgstr "" - -#: config/ia64/ia64.c:3955 -msgid "cannot optimize division for both latency and throughput" +msgid "bad value (%s) for -mtls-size= switch" msgstr "" #. This macro defines names of command options to set and clear bits in #. `target_flags'. Its definition is an initializer with a subgrouping for #. each command option. -#: config/ia64/ia64.h:119 +#: config/ia64/ia64.h:150 msgid "Generate big endian code" msgstr "" -#: config/ia64/ia64.h:121 config/mcore/mcore.h:159 +#: config/ia64/ia64.h:152 config/mcore/mcore.h:159 msgid "Generate little endian code" msgstr "" -#: config/ia64/ia64.h:123 +#: config/ia64/ia64.h:154 msgid "Generate code for GNU as" msgstr "" -#: config/ia64/ia64.h:125 +#: config/ia64/ia64.h:156 msgid "Generate code for Intel as" msgstr "" -#: config/ia64/ia64.h:127 +#: config/ia64/ia64.h:158 msgid "Generate code for GNU ld" msgstr "" -#: config/ia64/ia64.h:129 +#: config/ia64/ia64.h:160 msgid "Generate code for Intel ld" msgstr "" -#: config/ia64/ia64.h:131 +#: config/ia64/ia64.h:162 msgid "Generate code without GP reg" msgstr "" -#: config/ia64/ia64.h:133 +#: config/ia64/ia64.h:164 msgid "Emit stop bits before and after volatile extended asms" msgstr "" -#: config/ia64/ia64.h:135 +#: config/ia64/ia64.h:166 msgid "Don't emit stop bits before and after volatile extended asms" msgstr "" -#: config/ia64/ia64.h:137 +#: config/ia64/ia64.h:168 msgid "Emit code for Itanium (TM) processor B step" msgstr "" -#: config/ia64/ia64.h:139 +#: config/ia64/ia64.h:170 msgid "Use in/loc/out register names" msgstr "" -#: config/ia64/ia64.h:141 +#: config/ia64/ia64.h:172 msgid "Disable use of sdata/scommon/sbss" msgstr "" -#: config/ia64/ia64.h:143 +#: config/ia64/ia64.h:174 msgid "Enable use of sdata/scommon/sbss" msgstr "" -#: config/ia64/ia64.h:145 +#: config/ia64/ia64.h:176 msgid "gp is constant (but save/restore gp on indirect calls)" msgstr "" -#: config/ia64/ia64.h:147 +#: config/ia64/ia64.h:178 msgid "Generate self-relocatable code" msgstr "" -#: config/ia64/ia64.h:149 -msgid "Generate inline division, optimize for latency" +#: config/ia64/ia64.h:180 +msgid "Generate inline floating point division, optimize for latency" +msgstr "" + +#: config/ia64/ia64.h:182 +msgid "Generate inline floating point division, optimize for throughput" +msgstr "" + +#: config/ia64/ia64.h:184 +msgid "Generate inline integer division, optimize for latency" msgstr "" -#: config/ia64/ia64.h:151 -msgid "Generate inline division, optimize for throughput" +#: config/ia64/ia64.h:186 +msgid "Generate inline integer division, optimize for throughput" msgstr "" -#: config/ia64/ia64.h:153 +#: config/ia64/ia64.h:188 msgid "Enable Dwarf 2 line debug info via GNU as" msgstr "" -#: config/ia64/ia64.h:155 +#: config/ia64/ia64.h:190 msgid "Disable Dwarf 2 line debug info via GNU as" msgstr "" -#: config/ia64/ia64.h:183 +#: config/ia64/ia64.h:219 msgid "Specify range of registers to make fixed" msgstr "" -#: config/m32r/m32r.c:130 +#: config/ip2k/ip2k.c:1082 +msgid "bad operand" +msgstr "" + +#: config/ip2k/ip2k.c:3184 +msgid "Only initialized variables can be placed into program memory area." +msgstr "" + +#: config/m32r/m32r.c:139 #, c-format msgid "bad value (%s) for -mmodel switch" msgstr "" -#: config/m32r/m32r.c:139 +#: config/m32r/m32r.c:148 #, c-format msgid "bad value (%s) for -msdata switch" msgstr "" -#: config/m32r/m32r.c:310 +#: config/m32r/m32r.c:319 #, c-format msgid "invalid argument of `%s' attribute" msgstr "" -#: config/m32r/m32r.c:412 +#: config/m32r/m32r.c:422 msgid "const objects cannot go in .sdata/.sbss" msgstr "" -#: config/m32r/m32r.c:2252 +#: config/m32r/m32r.c:2256 #, c-format msgid "invalid operand to %%s code" msgstr "" -#: config/m32r/m32r.c:2259 +#: config/m32r/m32r.c:2263 #, c-format msgid "invalid operand to %%p code" msgstr "" -#: config/m32r/m32r.c:2315 +#: config/m32r/m32r.c:2318 msgid "bad insn for 'A'" msgstr "" -#: config/m32r/m32r.c:2367 +#: config/m32r/m32r.c:2370 #, c-format msgid "invalid operand to %%T/%%B code" msgstr "" -#: config/m32r/m32r.c:2390 +#: config/m32r/m32r.c:2393 #, c-format msgid "invalid operand to %%N code" msgstr "" -#: config/m32r/m32r.c:2435 +#: config/m32r/m32r.c:2438 msgid "pre-increment address is not a register" msgstr "" -#: config/m32r/m32r.c:2442 +#: config/m32r/m32r.c:2445 msgid "pre-decrement address is not a register" msgstr "" -#: config/m32r/m32r.c:2449 +#: config/m32r/m32r.c:2452 msgid "post-increment address is not a register" msgstr "" -#: config/m32r/m32r.c:2527 config/m32r/m32r.c:2543 -#: config/rs6000/rs6000.c:11098 +#: config/m32r/m32r.c:2530 config/m32r/m32r.c:2546 +#: config/rs6000/rs6000.c:12737 msgid "bad address" msgstr "" -#: config/m32r/m32r.c:2548 +#: config/m32r/m32r.c:2551 msgid "lo_sum not of register" msgstr "" @@ -10837,46 +10926,46 @@ msgstr "" msgid "Small data area: none, sdata, use" msgstr "" -#: config/m68hc11/m68hc11.c:236 +#: config/m68hc11/m68hc11.c:242 #, c-format msgid "-f%s ignored for 68HC11/68HC12 (not supported)" msgstr "" #. !!!! SCz wrong here. -#: config/m68hc11/m68hc11.c:3170 config/m68hc11/m68hc11.c:3544 +#: config/m68hc11/m68hc11.c:3252 config/m68hc11/m68hc11.c:3626 msgid "move insn not handled" msgstr "" -#: config/m68hc11/m68hc11.c:3390 config/m68hc11/m68hc11.c:3474 -#: config/m68hc11/m68hc11.c:3747 +#: config/m68hc11/m68hc11.c:3472 config/m68hc11/m68hc11.c:3556 +#: config/m68hc11/m68hc11.c:3829 msgid "invalid register in the move instruction" msgstr "" -#: config/m68hc11/m68hc11.c:3424 +#: config/m68hc11/m68hc11.c:3506 msgid "invalid operand in the instruction" msgstr "" -#: config/m68hc11/m68hc11.c:3721 +#: config/m68hc11/m68hc11.c:3803 msgid "invalid register in the instruction" msgstr "" -#: config/m68hc11/m68hc11.c:3754 +#: config/m68hc11/m68hc11.c:3836 msgid "operand 1 must be a hard register" msgstr "" -#: config/m68hc11/m68hc11.c:3771 +#: config/m68hc11/m68hc11.c:3853 msgid "invalid rotate insn" msgstr "" -#: config/m68hc11/m68hc11.c:4196 +#: config/m68hc11/m68hc11.c:4278 msgid "registers IX, IY and Z used in the same INSN" msgstr "" -#: config/m68hc11/m68hc11.c:4521 config/m68hc11/m68hc11.c:4823 +#: config/m68hc11/m68hc11.c:4603 config/m68hc11/m68hc11.c:4906 msgid "cannot do z-register replacement" msgstr "" -#: config/m68hc11/m68hc11.c:4886 +#: config/m68hc11/m68hc11.c:4969 msgid "invalid Z register replacement for insn" msgstr "" @@ -10884,31 +10973,47 @@ msgstr "" #. pairs in braces, each pair being { "NAME", VALUE } where VALUE is the bits #. to set or minus the bits to clear. An empty string NAME is used to #. identify the default VALUE. -#: config/m68hc11/m68hc11.h:155 +#: config/m68hc11/m68hc11.h:160 msgid "Compile with 16-bit integer mode" msgstr "" -#: config/m68hc11/m68hc11.h:157 +#: config/m68hc11/m68hc11.h:162 msgid "Compile with 32-bit integer mode" msgstr "" -#: config/m68hc11/m68hc11.h:159 +#: config/m68hc11/m68hc11.h:164 msgid "Auto pre/post decrement increment allowed" msgstr "" -#: config/m68hc11/m68hc11.h:161 +#: config/m68hc11/m68hc11.h:166 msgid "Auto pre/post decrement increment not allowed" msgstr "" -#: config/m68hc11/m68hc11.h:163 +#: config/m68hc11/m68hc11.h:168 +msgid "Min/max instructions allowed" +msgstr "" + +#: config/m68hc11/m68hc11.h:170 +msgid "Min/max instructions not allowed" +msgstr "" + +#: config/m68hc11/m68hc11.h:172 +msgid "Use call and rtc for function calls and returns" +msgstr "" + +#: config/m68hc11/m68hc11.h:174 +msgid "Use jsr and rts for function calls and returns" +msgstr "" + +#: config/m68hc11/m68hc11.h:176 msgid "Do not use direct addressing mode for soft registers" msgstr "" -#: config/m68hc11/m68hc11.h:165 config/m68hc11/m68hc11.h:169 +#: config/m68hc11/m68hc11.h:178 config/m68hc11/m68hc11.h:182 msgid "Compile for a 68HC11" msgstr "" -#: config/m68hc11/m68hc11.h:167 config/m68hc11/m68hc11.h:171 +#: config/m68hc11/m68hc11.h:180 config/m68hc11/m68hc11.h:184 msgid "Compile for a 68HC12" msgstr "" @@ -10921,29 +11026,33 @@ msgstr "" #. variable, type `char *', is set to the variable part of the given #. option if the fixed part matches. The actual option name is made #. by appending `-m' to the specified name. -#: config/m68hc11/m68hc11.h:185 +#: config/m68hc11/m68hc11.h:198 msgid "Specify the register allocation order" msgstr "" -#: config/m68hc11/m68hc11.h:187 +#: config/m68hc11/m68hc11.h:200 msgid "Indicate the number of soft registers available" msgstr "" -#: config/m68k/m68k.c:150 +#: config/m68k/m68k.c:158 #, c-format msgid "-malign-loops=%d is not between 1 and %d" msgstr "" -#: config/m68k/m68k.c:161 +#: config/m68k/m68k.c:169 #, c-format msgid "-malign-jumps=%d is not between 1 and %d" msgstr "" -#: config/m68k/m68k.c:172 +#: config/m68k/m68k.c:180 #, c-format msgid "-malign-functions=%d is not between 1 and %d" msgstr "" +#: config/m68k/m68k.c:189 +msgid "-fPIC is not currently supported on the 68000 or 68010\n" +msgstr "" + #. Macro to define tables used to set the flags. #. This is a list in braces of pairs in braces, #. each pair being { "NAME", VALUE } @@ -11065,91 +11174,84 @@ msgstr "" msgid "Use unaligned memory references" msgstr "" -#. Sometimes certain combinations of command options do not make -#. sense on a particular target machine. You can define a macro -#. `OVERRIDE_OPTIONS' to take account of this. This macro, if -#. defined, is executed once just after all the command options have -#. been parsed. -#. -#. Don't use this macro to turn on various extra optimizations for -#. `-O'. That is what `OPTIMIZATION_OPTIONS' is for. -#: config/m68k/m68k.h:284 config/m68k/m68kelf.h:267 config/m68k/m68kv4.h:299 -msgid "-fPIC is not currently supported on the 68000 or 68010\n" -msgstr "" - -#: config/m88k/m88k.c:899 +#: config/m88k/m88k.c:903 #, c-format msgid "internal gcc monitor: short-branch(%x)" msgstr "" -#: config/m88k/m88k.c:2299 +#: config/m88k/m88k.c:2302 msgid "internal gcc error: Can't express symbolic location" msgstr "" -#: config/m88k/m88k.c:2581 +#: config/m88k/m88k.c:2517 #, c-format msgid "argument #%d is a structure" msgstr "" -#: config/m88k/m88k.c:2881 +#: config/m88k/m88k.c:2816 #, c-format msgid "%%R not followed by %%B/C/D/E" msgstr "" -#: config/m88k/m88k.c:2949 +#: config/m88k/m88k.c:2884 #, c-format msgid "invalid %%x/X value" msgstr "" -#: config/m88k/m88k.c:2972 config/rs6000/rs6000.c:6514 +#: config/m88k/m88k.c:2901 +#, c-format +msgid "invalid %%Q value" +msgstr "" + +#: config/m88k/m88k.c:2907 config/rs6000/rs6000.c:7681 #, c-format msgid "invalid %%q value" msgstr "" -#: config/m88k/m88k.c:2978 +#: config/m88k/m88k.c:2913 #, c-format msgid "invalid %%o value" msgstr "" -#: config/m88k/m88k.c:2985 config/rs6000/rs6000.c:6477 +#: config/m88k/m88k.c:2920 config/rs6000/rs6000.c:7644 #, c-format msgid "invalid %%p value" msgstr "" -#: config/m88k/m88k.c:2998 config/m88k/m88k.c:3003 +#: config/m88k/m88k.c:2933 config/m88k/m88k.c:2938 #, c-format msgid "invalid %%s/S value" msgstr "" -#: config/m88k/m88k.c:3014 +#: config/m88k/m88k.c:2949 #, c-format msgid "invalid %%P operand" msgstr "" -#: config/m88k/m88k.c:3045 config/romp/romp.c:682 +#: config/m88k/m88k.c:2980 config/romp/romp.c:690 #, c-format msgid "invalid %%B value" msgstr "" -#: config/m88k/m88k.c:3075 +#: config/m88k/m88k.c:3010 #, c-format msgid "invalid %%D value" msgstr "" -#: config/m88k/m88k.c:3088 +#: config/m88k/m88k.c:3023 #, c-format msgid "`%%d' operand isn't a register" msgstr "" -#: config/m88k/m88k.c:3106 +#: config/m88k/m88k.c:3041 msgid "operand is r0" msgstr "" -#: config/m88k/m88k.c:3120 +#: config/m88k/m88k.c:3055 msgid "operand is const_double" msgstr "" -#: config/m88k/m88k.c:3139 +#: config/m88k/m88k.c:3074 msgid "invalid code" msgstr "" @@ -11173,7 +11275,7 @@ msgstr "" msgid "-mshort-data-%s and PIC are incompatible" msgstr "" -#: config/mcore/mcore.c:3083 +#: config/mcore/mcore.c:3078 #, c-format msgid "invalid option `-mstack-increment=%s'" msgstr "" @@ -11230,219 +11332,235 @@ msgstr "" msgid "Maximum amount for a single stack increment operation" msgstr "" -#: config/mips/mips.c:4795 -msgid "The -march option is incompatible to -mipsN and therefore ignored." +#: config/mips/mips.c:5112 +#, c-format +msgid "bad value (%s) for -mabi= switch" msgstr "" -#: config/mips/mips.c:4821 +#: config/mips/mips.c:5142 #, c-format -msgid "-mips%d not supported" +msgid "" +"-mips%d conflicts with the other architecture options, which specify a MIPS%" +"d processor" msgstr "" -#: config/mips/mips.c:4828 +#: config/mips/mips.c:5149 #, c-format msgid "bad value (%s) for -mips switch" msgstr "" -#: config/mips/mips.c:4849 +#: config/mips/mips.c:5164 #, c-format -msgid "bad value (%s) for -mabi= switch" +msgid "-march=%s is not compatible with the selected ABI" msgstr "" -#: config/mips/mips.c:4887 -#, c-format -msgid "-mabi=%s does not support -mips%d" +#: config/mips/mips.c:5176 +msgid "-mgp64 used with a 32-bit processor" msgstr "" -#: config/mips/mips.c:4904 -msgid "this target does not support the -mabi switch" +#: config/mips/mips.c:5178 +msgid "-mgp32 used with a 64-bit ABI" msgstr "" -#: config/mips/mips.c:5014 -#, c-format -msgid "bad value (%s) for -mtune= switch" +#: config/mips/mips.c:5180 +msgid "-mgp64 used with a 32-bit ABI" msgstr "" -#: config/mips/mips.c:5024 +#: config/mips/mips.c:5198 config/mips/mips.c:5200 config/mips/mips.c:5202 #, c-format -msgid "-mips%d does not support 64 bit fp registers" +msgid "unsupported combination: %s" msgstr "" -#: config/mips/mips.c:5030 -#, c-format -msgid "-mips%d does not support 64 bit gp registers" +#: config/mips/mips.c:5272 +msgid "" +"generation of Branch Likely instructions enabled, but not supported by " +"architecture" msgstr "" -#: config/mips/mips.c:5051 +#: config/mips/mips.c:5283 msgid "-G is incompatible with PIC code which is the default" msgstr "" -#: config/mips/mips.c:5067 +#: config/mips/mips.c:5299 msgid "-membedded-pic and -mabicalls are incompatible" msgstr "" -#: config/mips/mips.c:5070 +#: config/mips/mips.c:5302 msgid "-G and -membedded-pic are incompatible" msgstr "" -#: config/mips/mips.c:5121 +#: config/mips/mips.c:5353 #, c-format msgid "invalid option `entry%s'" msgstr "" -#: config/mips/mips.c:5124 +#: config/mips/mips.c:5356 msgid "-mentry is only meaningful with -mips-16" msgstr "" -#: config/mips/mips.c:5500 +#: config/mips/mips.c:5761 #, c-format msgid "internal error: %%) found without a %%( in assembler pattern" msgstr "" -#: config/mips/mips.c:5514 +#: config/mips/mips.c:5775 #, c-format msgid "internal error: %%] found without a %%[ in assembler pattern" msgstr "" -#: config/mips/mips.c:5527 +#: config/mips/mips.c:5788 #, c-format msgid "internal error: %%> found without a %%< in assembler pattern" msgstr "" -#: config/mips/mips.c:5540 +#: config/mips/mips.c:5801 #, c-format msgid "internal error: %%} found without a %%{ in assembler pattern" msgstr "" -#: config/mips/mips.c:5554 +#: config/mips/mips.c:5815 #, c-format msgid "PRINT_OPERAND: unknown punctuation '%c'" msgstr "" -#: config/mips/mips.c:5563 config/xtensa/xtensa.c:1913 +#: config/mips/mips.c:5824 config/xtensa/xtensa.c:1939 msgid "PRINT_OPERAND null pointer" msgstr "" -#: config/mips/mips.c:5696 +#: config/mips/mips.c:5955 #, c-format msgid "invalid use of %%d, %%x, or %%X" msgstr "" -#: config/mips/mips.c:5739 config/xtensa/xtensa.c:2012 +#: config/mips/mips.c:5993 config/xtensa/xtensa.c:2033 msgid "PRINT_OPERAND_ADDRESS, null pointer" msgstr "" -#: config/mips/mips.c:5963 +#: config/mips/mips.c:6222 msgid "" "MIPS ECOFF format does not allow changing filenames within functions with " "#line" msgstr "" -#: config/mips/mips.c:6277 +#: config/mips/mips.c:6532 msgid "can't rewind temp file" msgstr "" -#: config/mips/mips.c:6281 +#: config/mips/mips.c:6536 msgid "can't write to output file" msgstr "" -#: config/mips/mips.c:6284 +#: config/mips/mips.c:6539 msgid "can't read from temp file" msgstr "" -#: config/mips/mips.c:6287 +#: config/mips/mips.c:6542 msgid "can't close temp file" msgstr "" -#: config/mips/mips.c:6705 +#: config/mips/mips.c:6983 #, c-format msgid "gp_offset (%ld) or end_offset (%ld) is less than zero" msgstr "" -#: config/mips/mips.c:6865 +#: config/mips/mips.c:7092 #, c-format msgid "fp_offset (%ld) or end_offset (%ld) is less than zero" msgstr "" -#: config/mips/mips.c:8906 +#: config/mips/mips.c:9312 #, c-format msgid "can not handle inconsistent calls to `%s'" msgstr "" +#: config/mips/mips.c:10444 +msgid "the cpu name must be lower case" +msgstr "" + +#: config/mips/mips.c:10466 +#, c-format +msgid "bad value (%s) for %s" +msgstr "" + +#. Target CPU builtins. +#. We do this here because __mips is defined below and so we can't use builtin_define_std. +#. Treat _R3000 and _R4000 like register-size defines, which is how they've historically been used. +#. Macros dependent on the C dialect. +#. Bizzare, but needed at least for Irix. #. Macro to define tables used to set the flags. #. This is a list in braces of pairs in braces, #. each pair being { "NAME", VALUE } #. where VALUE is the bits to set or minus the bits to clear. #. An empty string NAME is used to identify the default VALUE. -#: config/mips/mips.h:366 config/mn10300/mn10300.h:64 +#: config/mips/mips.h:528 config/mn10300/mn10300.h:64 msgid "No default crt0.o" msgstr "" -#: config/mips/mips.h:368 +#: config/mips/mips.h:530 msgid "Use 64-bit int type" msgstr "" -#: config/mips/mips.h:370 +#: config/mips/mips.h:532 msgid "Use 64-bit long type" msgstr "" -#: config/mips/mips.h:372 +#: config/mips/mips.h:534 msgid "Use 32-bit long type" msgstr "" -#: config/mips/mips.h:374 +#: config/mips/mips.h:536 msgid "Optimize lui/addiu address loads" msgstr "" -#: config/mips/mips.h:376 +#: config/mips/mips.h:538 msgid "Don't optimize lui/addiu address loads" msgstr "" -#: config/mips/mips.h:378 +#: config/mips/mips.h:540 msgid "Use MIPS as" msgstr "" -#: config/mips/mips.h:380 +#: config/mips/mips.h:542 msgid "Use GNU as" msgstr "" -#: config/mips/mips.h:382 +#: config/mips/mips.h:544 msgid "Use symbolic register names" msgstr "" -#: config/mips/mips.h:384 +#: config/mips/mips.h:546 msgid "Don't use symbolic register names" msgstr "" -#: config/mips/mips.h:386 config/mips/mips.h:388 +#: config/mips/mips.h:548 config/mips/mips.h:550 msgid "Use GP relative sdata/sbss sections" msgstr "" -#: config/mips/mips.h:390 config/mips/mips.h:392 +#: config/mips/mips.h:552 config/mips/mips.h:554 msgid "Don't use GP relative sdata/sbss sections" msgstr "" -#: config/mips/mips.h:394 +#: config/mips/mips.h:556 msgid "Output compiler statistics" msgstr "" -#: config/mips/mips.h:396 +#: config/mips/mips.h:558 msgid "Don't output compiler statistics" msgstr "" -#: config/mips/mips.h:398 +#: config/mips/mips.h:560 msgid "Don't optimize block moves" msgstr "" -#: config/mips/mips.h:400 +#: config/mips/mips.h:562 msgid "Optimize block moves" msgstr "" -#: config/mips/mips.h:402 +#: config/mips/mips.h:564 msgid "Use mips-tfile asm postpass" msgstr "" -#: config/mips/mips.h:404 +#: config/mips/mips.h:566 msgid "Don't use mips-tfile asm postpass" msgstr "" @@ -11452,270 +11570,253 @@ msgstr "" #. where VALUE is the bits to set or minus the bits to clear and DOC #. is the documentation for --help (NULL if intentionally undocumented). #. An empty string NAME is used to identify the default VALUE. -#: config/mips/mips.h:408 config/pdp11/pdp11.h:55 +#: config/mips/mips.h:570 config/pdp11/pdp11.h:56 msgid "Use hardware floating point" msgstr "" -#: config/mips/mips.h:410 +#: config/mips/mips.h:572 msgid "Use 64-bit FP registers" msgstr "" -#: config/mips/mips.h:412 +#: config/mips/mips.h:574 msgid "Use 32-bit FP registers" msgstr "" -#: config/mips/mips.h:414 +#: config/mips/mips.h:576 msgid "Use 64-bit general registers" msgstr "" -#: config/mips/mips.h:416 +#: config/mips/mips.h:578 msgid "Use 32-bit general registers" msgstr "" -#: config/mips/mips.h:418 +#: config/mips/mips.h:580 msgid "Use Irix PIC" msgstr "" -#: config/mips/mips.h:420 +#: config/mips/mips.h:582 msgid "Don't use Irix PIC" msgstr "" -#: config/mips/mips.h:422 -msgid "Use OSF PIC" -msgstr "" - -#: config/mips/mips.h:424 -msgid "Don't use OSF PIC" -msgstr "" - -#: config/mips/mips.h:426 +#: config/mips/mips.h:584 msgid "Use indirect calls" msgstr "" -#: config/mips/mips.h:428 +#: config/mips/mips.h:586 msgid "Don't use indirect calls" msgstr "" -#: config/mips/mips.h:430 +#: config/mips/mips.h:588 msgid "Use embedded PIC" msgstr "" -#: config/mips/mips.h:432 +#: config/mips/mips.h:590 msgid "Don't use embedded PIC" msgstr "" -#: config/mips/mips.h:434 +#: config/mips/mips.h:592 msgid "Use ROM instead of RAM" msgstr "" -#: config/mips/mips.h:436 +#: config/mips/mips.h:594 msgid "Don't use ROM instead of RAM" msgstr "" -#: config/mips/mips.h:438 +#: config/mips/mips.h:596 msgid "Put uninitialized constants in ROM (needs -membedded-data)" msgstr "" -#: config/mips/mips.h:440 +#: config/mips/mips.h:598 msgid "Don't put uninitialized constants in ROM" msgstr "" #. Macro to define tables used to set the flags. -#: config/mips/mips.h:442 config/xtensa/xtensa.h:110 +#: config/mips/mips.h:600 config/xtensa/xtensa.h:110 msgid "Use big-endian byte order" msgstr "" -#: config/mips/mips.h:444 config/xtensa/xtensa.h:112 +#: config/mips/mips.h:602 config/xtensa/xtensa.h:112 msgid "Use little-endian byte order" msgstr "" -#: config/mips/mips.h:446 +#: config/mips/mips.h:604 msgid "Use single (32-bit) FP only" msgstr "" -#: config/mips/mips.h:448 +#: config/mips/mips.h:606 msgid "Don't use single (32-bit) FP only" msgstr "" -#: config/mips/mips.h:450 +#: config/mips/mips.h:608 msgid "Use multiply accumulate" msgstr "" -#: config/mips/mips.h:452 +#: config/mips/mips.h:610 msgid "Don't use multiply accumulate" msgstr "" -#: config/mips/mips.h:454 config/rs6000/rs6000.h:351 +#: config/mips/mips.h:612 config/rs6000/rs6000.h:314 msgid "Don't generate fused multiply/add instructions" msgstr "" -#: config/mips/mips.h:456 config/rs6000/rs6000.h:349 +#: config/mips/mips.h:614 config/rs6000/rs6000.h:312 msgid "Generate fused multiply/add instructions" msgstr "" -#: config/mips/mips.h:458 +#: config/mips/mips.h:616 msgid "Work around early 4300 hardware bug" msgstr "" -#: config/mips/mips.h:460 +#: config/mips/mips.h:618 msgid "Don't work around early 4300 hardware bug" msgstr "" -#: config/mips/mips.h:462 -msgid "Optimize for 3900" -msgstr "" - -#: config/mips/mips.h:464 -msgid "Optimize for 4650" -msgstr "" - -#: config/mips/mips.h:466 +#: config/mips/mips.h:620 msgid "Trap on integer divide by zero" msgstr "" -#: config/mips/mips.h:468 +#: config/mips/mips.h:622 msgid "Don't trap on integer divide by zero" msgstr "" -#: config/mips/mips.h:470 +#: config/mips/mips.h:624 msgid "Trap on integer divide overflow" msgstr "" -#: config/mips/mips.h:472 +#: config/mips/mips.h:626 msgid "Don't trap on integer divide overflow" msgstr "" -#: config/mips/mips.h:588 config/mips/mips.h:590 +#: config/mips/mips.h:628 +msgid "Use Branch Likely instructions, overriding default for arch" +msgstr "" + +#: config/mips/mips.h:630 +msgid "Don't use Branch Likely instructions, overriding default for arch" +msgstr "" + +#: config/mips/mips.h:744 config/pa/pa.h:296 msgid "Specify CPU for scheduling purposes" msgstr "" -#: config/mips/mips.h:592 +#: config/mips/mips.h:746 msgid "Specify CPU for code generation purposes" msgstr "" -#: config/mips/mips.h:594 +#: config/mips/mips.h:748 +msgid "Specify an ABI" +msgstr "" + +#: config/mips/mips.h:750 msgid "Specify a Standard MIPS ISA" msgstr "" -#: config/mips/mips.h:596 +#: config/mips/mips.h:752 msgid "Use mips16 entry/exit psuedo ops" msgstr "" -#: config/mips/mips.h:598 +#: config/mips/mips.h:754 msgid "Don't use MIPS16 instructions" msgstr "" -#: config/mips/mips.h:602 +#: config/mips/mips.h:756 msgid "Don't call any cache flush functions" msgstr "" -#: config/mips/mips.h:604 +#: config/mips/mips.h:758 msgid "Specify cache flush function" msgstr "" #. Output assembler code to FILE to increment profiler label # LABELNO #. for profiling a function entry. -#: config/mips/mips.h:2923 +#: config/mips/mips.h:2868 msgid "mips16 function profiling" msgstr "" -#: config/mmix/mmix.c:138 +#: config/mmix/mmix.c:189 #, c-format msgid "-f%s not supported: ignored" msgstr "" -#: config/mmix/mmix.c:596 +#: config/mmix/mmix.c:644 #, c-format msgid "" "too large function value type, needs %d registers, have only %d registers " "for this" msgstr "" -#: config/mmix/mmix.c:677 -msgid "stack frame too big" -msgstr "" - -#: config/mmix/mmix.c:705 -#, c-format -msgid "stack frame not a multiple of 8 bytes: %d" -msgstr "" - -#: config/mmix/mmix.c:1044 -#, c-format -msgid "stack frame not a multiple of octabyte: %d" -msgstr "" - -#: config/mmix/mmix.c:1203 +#: config/mmix/mmix.c:826 msgid "function_profiler support for MMIX" msgstr "" -#: config/mmix/mmix.c:1240 -msgid "neither varargs or stdarg in mmix_setup_incoming_varargs" -msgstr "" - -#: config/mmix/mmix.c:1246 +#: config/mmix/mmix.c:848 msgid "MMIX Internal: Last named vararg would not fit in a register" msgstr "" -#. FIXME: Remove when I know this trigs. -#: config/mmix/mmix.c:1608 -msgid "oops, not debugged; fixing up value:" -msgstr "" - -#: config/mmix/mmix.c:2185 config/mmix/mmix.c:2319 +#: config/mmix/mmix.c:1639 config/mmix/mmix.c:1769 msgid "MMIX Internal: Expected a CONST_INT, not this" msgstr "" -#: config/mmix/mmix.c:2193 config/mmix/mmix.c:2217 config/mmix/mmix.c:2336 +#: config/mmix/mmix.c:1647 config/mmix/mmix.c:1671 config/mmix/mmix.c:1787 #, c-format msgid "MMIX Internal: Bad register: %d" msgstr "" -#: config/mmix/mmix.c:2264 +#: config/mmix/mmix.c:1718 msgid "MMIX Internal: Bad value for 'm', not a CONST_INT" msgstr "" -#: config/mmix/mmix.c:2287 +#: config/mmix/mmix.c:1737 msgid "MMIX Internal: Expected a register, not this" msgstr "" -#: config/mmix/mmix.c:2297 +#: config/mmix/mmix.c:1747 msgid "MMIX Internal: Expected a constant, not this" msgstr "" #. Presumably there's a missing case above if we get here. -#: config/mmix/mmix.c:2329 +#: config/mmix/mmix.c:1779 #, c-format msgid "MMIX Internal: Missing `%c' case in mmix_print_operand" msgstr "" #. We need the original here. -#: config/mmix/mmix.c:2380 +#: config/mmix/mmix.c:1831 msgid "MMIX Internal: Cannot decode this operand" msgstr "" -#: config/mmix/mmix.c:2445 +#: config/mmix/mmix.c:1891 msgid "MMIX Internal: This is not a recognized address" msgstr "" -#: config/mmix/mmix.c:2941 config/mmix/mmix.c:3010 +#: config/mmix/mmix.c:2082 +#, c-format +msgid "stack frame not a multiple of 8 bytes: %d" +msgstr "" + +#: config/mmix/mmix.c:2321 +#, c-format +msgid "stack frame not a multiple of octabyte: %d" +msgstr "" + +#: config/mmix/mmix.c:2818 config/mmix/mmix.c:2887 #, c-format msgid "MMIX Internal: %s is not a shiftable int" msgstr "" -#: config/mmix/mmix.c:3129 +#: config/mmix/mmix.c:3006 msgid "MMIX Internal: Trying to output invalidly reversed condition:" msgstr "" -#: config/mmix/mmix.c:3136 +#: config/mmix/mmix.c:3013 msgid "MMIX Internal: What's the CC of this?" msgstr "" -#: config/mmix/mmix.c:3140 +#: config/mmix/mmix.c:3017 msgid "MMIX Internal: What is the CC of this?" msgstr "" -#: config/mmix/mmix.c:3211 +#: config/mmix/mmix.c:3088 msgid "MMIX Internal: This is not a constant:" msgstr "" @@ -11728,8 +11829,6 @@ msgstr "" #. the opposite, since we don't have to care about old littering and #. soon outdated generic comments. #. Node: Driver -#. When both ABI:s work, this is how we tell them apart in code. The -#. GNU abi is implied the default. Also implied in TARGET_DEFAULT. #. User symbols are in the same name-space as built-in symbols, but we #. don't need the built-in symbols, so remove those and instead apply #. stricter operand checking. Don't warn when expanding insns. @@ -11738,69 +11837,77 @@ msgstr "" #. Don't do this if linking relocatably, with -r. For a final link, #. produce mmo, unless ELF is requested or when linking relocatably. #. Put unused option values here. -#: config/mmix/mmix.h:137 +#: config/mmix/mmix.h:132 msgid "Set start-address of the program" msgstr "" -#: config/mmix/mmix.h:139 +#: config/mmix/mmix.h:134 msgid "Set start-address of data" msgstr "" #. FIXME: Provide a way to *load* the epsilon register. -#: config/mmix/mmix.h:188 +#: config/mmix/mmix.h:198 msgid "For intrinsics library: pass all parameters in registers" msgstr "" -#: config/mmix/mmix.h:191 +#: config/mmix/mmix.h:201 msgid "Use register stack for parameters and return value" msgstr "" -#: config/mmix/mmix.h:193 +#: config/mmix/mmix.h:203 msgid "Use call-clobbered registers for parameters and return value" msgstr "" -#: config/mmix/mmix.h:195 +#: config/mmix/mmix.h:205 msgid "Use epsilon-respecting floating point compare instructions" msgstr "" -#: config/mmix/mmix.h:198 +#: config/mmix/mmix.h:208 msgid "Use zero-extending memory loads, not sign-extending ones" msgstr "" -#: config/mmix/mmix.h:201 +#: config/mmix/mmix.h:211 msgid "" "Generate divide results with reminder having the same sign as the divisor " "(not the dividend)" msgstr "" -#: config/mmix/mmix.h:205 +#: config/mmix/mmix.h:215 msgid "Prepend global symbols with \":\" (for use with PREFIX)" msgstr "" -#: config/mmix/mmix.h:207 +#: config/mmix/mmix.h:217 msgid "Do not provide a default start-address 0x100 of the program" msgstr "" -#: config/mmix/mmix.h:209 +#: config/mmix/mmix.h:219 msgid "Link to emit program in ELF format (rather than mmo)" msgstr "" -#: config/mmix/mmix.h:211 +#: config/mmix/mmix.h:221 msgid "Use P-mnemonics for branches statically predicted as taken" msgstr "" -#: config/mmix/mmix.h:213 +#: config/mmix/mmix.h:223 msgid "Don't use P-mnemonics for branches" msgstr "" -#: config/mmix/mmix.h:215 +#: config/mmix/mmix.h:225 msgid "Use addresses that allocate global registers" msgstr "" -#: config/mmix/mmix.h:217 +#: config/mmix/mmix.h:227 msgid "Do not use addresses that allocate global registers" msgstr "" +#: config/mmix/mmix.h:229 +msgid "Generate a single exit point for each function" +msgstr "" + +#: config/mmix/mmix.h:231 +msgid "Do not generate a single exit point for each function" +msgstr "" + #: config/mn10300/mn10300.h:59 msgid "Work around hardware multiply bug" msgstr "" @@ -11817,152 +11924,282 @@ msgstr "" msgid "Enable linker relaxations" msgstr "" -#: config/ns32k/ns32k.h:104 config/s390/s390.h:57 +#: config/ns32k/ns32k.h:142 config/s390/s390.h:69 msgid "Don't use hardware fp" msgstr "" -#: config/ns32k/ns32k.h:105 +#: config/ns32k/ns32k.h:143 msgid "Alternative calling convention" msgstr "" -#: config/ns32k/ns32k.h:107 +#: config/ns32k/ns32k.h:145 msgid "Pass some arguments in registers" msgstr "" -#: config/ns32k/ns32k.h:108 +#: config/ns32k/ns32k.h:146 msgid "Pass all arguments on stack" msgstr "" -#: config/ns32k/ns32k.h:109 +#: config/ns32k/ns32k.h:147 msgid "Optimize for 32532 cpu" msgstr "" -#: config/ns32k/ns32k.h:110 +#: config/ns32k/ns32k.h:148 msgid "Optimize for 32332 cpu" msgstr "" -#: config/ns32k/ns32k.h:112 +#: config/ns32k/ns32k.h:150 msgid "Optimize for 32032" msgstr "" -#: config/ns32k/ns32k.h:114 +#: config/ns32k/ns32k.h:152 msgid "Register sb is zero. Use for absolute addressing" msgstr "" -#: config/ns32k/ns32k.h:115 +#: config/ns32k/ns32k.h:153 msgid "Do not use register sb" msgstr "" -#: config/ns32k/ns32k.h:116 -msgid "Do not use bit-field instructions" +#: config/ns32k/ns32k.h:155 +msgid "Use bit-field instructions" msgstr "" -#: config/ns32k/ns32k.h:117 -msgid "Use bit-field instructions" +#: config/ns32k/ns32k.h:157 +msgid "Do not use bit-field instructions" msgstr "" -#: config/ns32k/ns32k.h:118 +#: config/ns32k/ns32k.h:158 msgid "Generate code for high memory" msgstr "" -#: config/ns32k/ns32k.h:119 +#: config/ns32k/ns32k.h:159 msgid "Generate code for low memory" msgstr "" -#: config/ns32k/ns32k.h:120 +#: config/ns32k/ns32k.h:160 msgid "32381 fpu" msgstr "" -#: config/ns32k/ns32k.h:121 +#: config/ns32k/ns32k.h:162 msgid "Use multiply-accumulate fp instructions" msgstr "" -#: config/ns32k/ns32k.h:123 +#: config/ns32k/ns32k.h:164 msgid "Do not use multiply-accumulate fp instructions" msgstr "" -#: config/ns32k/ns32k.h:124 +#: config/ns32k/ns32k.h:165 msgid "\"Small register classes\" kludge" msgstr "" -#: config/ns32k/ns32k.h:125 +#: config/ns32k/ns32k.h:166 msgid "No \"Small register classes\" kludge" msgstr "" -#: config/pa/pa.c:182 +#: config/pa/pa.c:246 #, c-format msgid "" "unknown -mschedule= option (%s).\n" -"Valid options are 700, 7100, 7100LC, 7200, and 8000\n" +"Valid options are 700, 7100, 7100LC, 7200, 7300, and 8000\n" msgstr "" -#: config/pa/pa.c:207 +#: config/pa/pa.c:271 #, c-format msgid "" "unknown -march= option (%s).\n" "Valid options are 1.0, 1.1, and 2.0\n" msgstr "" -#: config/pa/pa.c:212 +#: config/pa/pa.c:284 msgid "PIC code generation is not supported in the portable runtime model\n" msgstr "" -#: config/pa/pa.c:217 +#: config/pa/pa.c:289 msgid "PIC code generation is not compatible with fast indirect calls\n" msgstr "" -#: config/pa/pa.c:222 +#: config/pa/pa.c:294 msgid "-g is only supported when using GAS on this processor," msgstr "" -#: config/pa/pa.c:223 +#: config/pa/pa.c:295 msgid "-g option disabled" msgstr "" -#: config/pdp11/pdp11.h:56 +#: config/pa/pa-hiux.h:75 config/pa/pa-hpux.h:80 config/pa/pa-hpux7.h:81 +#: config/pa/pa64-hpux.h:25 +msgid "Generate cpp defines for server IO" +msgstr "" + +#: config/pa/pa-hiux.h:76 config/pa/pa-hpux.h:81 config/pa/pa-hpux7.h:82 +#: config/pa/pa64-hpux.h:27 +msgid "Generate cpp defines for workstation IO" +msgstr "" + +#. Macro to define tables used to set the flags. This is a +#. list in braces of target switches with each switch being +#. { "NAME", VALUE, "HELP_STRING" }. VALUE is the bits to set, +#. or minus the bits to clear. An empty string NAME is used to +#. identify the default VALUE. Do not mark empty strings for +#. translation. +#: config/pa/pa.h:218 config/pa/pa.h:224 +msgid "Generate PA1.1 code" +msgstr "" + +#: config/pa/pa.h:220 config/pa/pa.h:222 +msgid "Generate PA1.0 code" +msgstr "" + +#: config/pa/pa.h:226 +msgid "Generate PA2.0 code (requires binutils 2.10 or later)" +msgstr "" + +#: config/pa/pa.h:228 +msgid "Disable FP regs" +msgstr "" + +#: config/pa/pa.h:230 +msgid "Do not disable FP regs" +msgstr "" + +#: config/pa/pa.h:232 +msgid "Disable space regs" +msgstr "" + +#: config/pa/pa.h:234 +msgid "Do not disable space regs" +msgstr "" + +#: config/pa/pa.h:236 +msgid "Put jumps in call delay slots" +msgstr "" + +#: config/pa/pa.h:238 +msgid "Do not put jumps in call delay slots" +msgstr "" + +#: config/pa/pa.h:240 +msgid "Disable indexed addressing" +msgstr "" + +#: config/pa/pa.h:242 +msgid "Do not disable indexed addressing" +msgstr "" + +#: config/pa/pa.h:244 +msgid "Use portable calling conventions" +msgstr "" + +#: config/pa/pa.h:246 +msgid "Do not use portable calling conventions" +msgstr "" + +#: config/pa/pa.h:248 +msgid "Assume code will be assembled by GAS" +msgstr "" + +#: config/pa/pa.h:250 +msgid "Do not assume code will be assembled by GAS" +msgstr "" + +#: config/pa/pa.h:254 +msgid "Do not use software floating point" +msgstr "" + +#: config/pa/pa.h:256 +msgid "Emit long load/store sequences" +msgstr "" + +#: config/pa/pa.h:258 +msgid "Do not emit long load/store sequences" +msgstr "" + +#: config/pa/pa.h:260 +msgid "Generate fast indirect calls" +msgstr "" + +#: config/pa/pa.h:262 +msgid "Do not generate fast indirect calls" +msgstr "" + +#: config/pa/pa.h:264 +msgid "Generate code for huge switch statements" +msgstr "" + +#: config/pa/pa.h:266 +msgid "Do not generate code for huge switch statements" +msgstr "" + +#: config/pa/pa.h:268 +msgid "Always generate long calls" +msgstr "" + +#: config/pa/pa.h:270 +msgid "Generate long calls only when needed" +msgstr "" + +#: config/pa/pa.h:272 +msgid "Enable linker optimizations" +msgstr "" + +#: config/pa/pa.h:298 +msgid "" +"Specify architecture for code generation. Values are 1.0, 1.1, and 2.0. " +"2.0 requires gas snapshot 19990413 or later." +msgstr "" + +#: config/pa/pa64-hpux.h:29 +msgid "Assume code will be linked by GNU ld" +msgstr "" + +#: config/pa/pa64-hpux.h:31 +msgid "Assume code will be linked by HP ld" +msgstr "" + +#: config/pdp11/pdp11.h:57 msgid "Do not use hardware floating point" msgstr "" #. return float result in ac0 -#: config/pdp11/pdp11.h:58 +#: config/pdp11/pdp11.h:59 msgid "Return floating point results in ac0" msgstr "" -#: config/pdp11/pdp11.h:59 +#: config/pdp11/pdp11.h:60 msgid "Return floating point results in memory" msgstr "" #. is 11/40 -#: config/pdp11/pdp11.h:61 +#: config/pdp11/pdp11.h:62 msgid "Generate code for an 11/40" msgstr "" #. is 11/45 -#: config/pdp11/pdp11.h:64 +#: config/pdp11/pdp11.h:65 msgid "Generate code for an 11/45" msgstr "" #. is 11/10 -#: config/pdp11/pdp11.h:67 +#: config/pdp11/pdp11.h:68 msgid "Generate code for an 11/10" msgstr "" #. use movstrhi for bcopy #. use 32 bit for int -#: config/pdp11/pdp11.h:72 config/pdp11/pdp11.h:73 +#: config/pdp11/pdp11.h:73 config/pdp11/pdp11.h:74 msgid "Use 32 bit int" msgstr "" -#: config/pdp11/pdp11.h:74 config/pdp11/pdp11.h:75 +#: config/pdp11/pdp11.h:75 config/pdp11/pdp11.h:76 msgid "Use 16 bit int" msgstr "" #. use 32 bit for float -#: config/pdp11/pdp11.h:77 config/pdp11/pdp11.h:78 +#: config/pdp11/pdp11.h:78 config/pdp11/pdp11.h:79 msgid "Use 32 bit float" msgstr "" -#: config/pdp11/pdp11.h:79 config/pdp11/pdp11.h:80 +#: config/pdp11/pdp11.h:80 config/pdp11/pdp11.h:81 msgid "Use 64 bit float" msgstr "" @@ -11970,74 +12207,50 @@ msgstr "" #. is branching expensive - on a PDP, it's actually really cheap #. this is just to play around and check what code gcc generates #. split instruction and data memory? -#: config/pdp11/pdp11.h:89 +#: config/pdp11/pdp11.h:90 msgid "Target has split I&D" msgstr "" -#: config/pdp11/pdp11.h:90 +#: config/pdp11/pdp11.h:91 msgid "Target does not have split I&D" msgstr "" #. UNIX assembler syntax? -#: config/pdp11/pdp11.h:92 +#: config/pdp11/pdp11.h:93 msgid "Use UNIX assembler syntax" msgstr "" -#: config/pdp11/pdp11.h:93 +#: config/pdp11/pdp11.h:94 msgid "Use DEC assembler syntax" msgstr "" -#: config/pj/pj.h:73 -msgid "Generate little endian data" -msgstr "" - -#: config/pj/pj.h:75 -msgid "Generate big endian data" -msgstr "" - -#: config/pj/pj.h:77 -msgid "Turn on maintainer testing code" -msgstr "" - -#: config/pj/pj.h:79 -msgid "Enable Transmeta picoJava extensions" -msgstr "" - -#: config/pj/pj.h:81 -msgid "Disable Transmeta picoJava extensions" -msgstr "" - -#: config/pj/pj.h:83 -msgid "Disable reorganization pass" -msgstr "" - -#: config/romp/romp.c:709 config/rs6000/rs6000.c:6551 +#: config/romp/romp.c:717 config/rs6000/rs6000.c:7718 #, c-format msgid "invalid %%S value" msgstr "" -#: config/romp/romp.c:718 config/romp/romp.c:725 +#: config/romp/romp.c:726 config/romp/romp.c:733 #, c-format msgid "invalid %%b value" msgstr "" -#: config/romp/romp.c:765 config/romp/romp.c:776 +#: config/romp/romp.c:773 config/romp/romp.c:784 #, c-format msgid "invalid %%z value" msgstr "" -#: config/romp/romp.c:784 config/romp/romp.c:792 +#: config/romp/romp.c:792 config/romp/romp.c:800 #, c-format msgid "invalid %%Z value" msgstr "" -#: config/romp/romp.c:799 config/romp/romp.c:808 config/romp/romp.c:815 -#: config/rs6000/rs6000.c:6330 +#: config/romp/romp.c:807 config/romp/romp.c:816 config/romp/romp.c:823 +#: config/rs6000/rs6000.c:7547 #, c-format msgid "invalid %%k value" msgstr "" -#: config/romp/romp.c:900 config/romp/romp.c:943 +#: config/romp/romp.c:908 config/romp/romp.c:951 #, c-format msgid "invalid %%j value" msgstr "" @@ -12059,139 +12272,198 @@ msgstr "" msgid "can't have varargs with -mfp-arg-in-fp-regs" msgstr "" -#: config/rs6000/rs6000.c:475 +#. Handle the machine specific pragma longcall. Its syntax is +#. +#. # pragma longcall ( TOGGLE ) +#. +#. where TOGGLE is either 0 or 1. +#. +#. rs6000_default_long_calls is set to the value of TOGGLE, changing +#. whether or not new function declarations receive a longcall +#. attribute by default. +#: config/rs6000/rs6000-c.c:44 +msgid "ignoring malformed #pragma longcall" +msgstr "" + +#: config/rs6000/rs6000-c.c:58 +msgid "missing open paren" +msgstr "" + +#: config/rs6000/rs6000-c.c:60 +msgid "missing number" +msgstr "" + +#: config/rs6000/rs6000-c.c:62 +msgid "missing close paren" +msgstr "" + +#: config/rs6000/rs6000-c.c:65 +msgid "number must be 0 or 1" +msgstr "" + +#: config/rs6000/rs6000-c.c:68 +msgid "junk at end of #pragma longcall" +msgstr "" + +#: config/rs6000/rs6000.c:588 msgid "-mmultiple is not supported on little endian systems" msgstr "" -#: config/rs6000/rs6000.c:482 +#: config/rs6000/rs6000.c:595 msgid "-mstring is not supported on little endian systems" msgstr "" -#: config/rs6000/rs6000.c:491 config/xtensa/xtensa.c:1846 +#: config/rs6000/rs6000.c:619 #, c-format -msgid "-f%s ignored (all code is position independent)" +msgid "unknown -mdebug-%s switch" msgstr "" -#: config/rs6000/rs6000.c:499 -msgid "-ffunction-sections disabled on AIX when debugging" +#: config/rs6000/rs6000.c:631 +#, c-format +msgid "unknown -mtraceback arg `%s'; expecting `full', `partial' or `none'" msgstr "" -#: config/rs6000/rs6000.c:505 -msgid "-fdata-sections not supported on AIX" +#: config/rs6000/rs6000.c:642 +#, c-format +msgid "Unknown switch -mlong-double-%s" msgstr "" -#: config/rs6000/rs6000.c:520 +#: config/rs6000/rs6000.c:734 #, c-format -msgid "unknown -mdebug-%s switch" +msgid "unknown -misel= option specified: '%s'" msgstr "" -#: config/rs6000/rs6000.c:530 +#: config/rs6000/rs6000.c:749 #, c-format -msgid "Unknown switch -mlong-double-%s" +msgid "unknown -mvrsave= option specified: '%s'" msgstr "" -#: config/rs6000/rs6000.c:597 +#: config/rs6000/rs6000.c:768 #, c-format msgid "unknown ABI specified: '%s'" msgstr "" -#: config/rs6000/rs6000.c:3636 +#: config/rs6000/rs6000.c:4169 +msgid "argument 1 must be a 5-bit signed literal" +msgstr "" + +#: config/rs6000/rs6000.c:4276 config/rs6000/rs6000.c:4866 +msgid "argument 2 must be a 5-bit unsigned literal" +msgstr "" + +#: config/rs6000/rs6000.c:4319 msgid "argument 1 of __builtin_altivec_predicate must be a constant" msgstr "" -#: config/rs6000/rs6000.c:3690 +#: config/rs6000/rs6000.c:4373 msgid "argument 1 of __builtin_altivec_predicate is out of range" msgstr "" -#: config/rs6000/rs6000.c:4046 +#: config/rs6000/rs6000.c:4452 +msgid "argument 3 must be a 4-bit unsigned literal" +msgstr "" + +#: config/rs6000/rs6000.c:4629 #, c-format -msgid "argument 3 of `%s' must be a 2-bit literal" +msgid "argument to `%s' must be a 2-bit unsigned literal" +msgstr "" + +#: config/rs6000/rs6000.c:4745 +msgid "argument to dss must be a 2-bit unsigned literal" +msgstr "" + +#: config/rs6000/rs6000.c:4976 +msgid "argument 1 of __builtin_spe_predicate must be a constant" msgstr "" -#: config/rs6000/rs6000.c:6257 +#: config/rs6000/rs6000.c:5049 +msgid "argument 1 of __builtin_spe_predicate is out of range" +msgstr "" + +#: config/rs6000/rs6000.c:7474 #, c-format msgid "invalid %%f value" msgstr "" -#: config/rs6000/rs6000.c:6266 +#: config/rs6000/rs6000.c:7483 #, c-format msgid "invalid %%F value" msgstr "" -#: config/rs6000/rs6000.c:6275 +#: config/rs6000/rs6000.c:7492 #, c-format msgid "invalid %%G value" msgstr "" -#: config/rs6000/rs6000.c:6310 +#: config/rs6000/rs6000.c:7527 #, c-format msgid "invalid %%j code" msgstr "" -#: config/rs6000/rs6000.c:6320 +#: config/rs6000/rs6000.c:7537 #, c-format msgid "invalid %%J code" msgstr "" -#: config/rs6000/rs6000.c:6350 +#: config/rs6000/rs6000.c:7567 #, c-format msgid "invalid %%K value" msgstr "" -#: config/rs6000/rs6000.c:6577 -#, c-format -msgid "%%S computed all 1's mask" -msgstr "" - -#: config/rs6000/rs6000.c:6604 +#: config/rs6000/rs6000.c:7634 #, c-format -msgid "%%S computed all 0's mask" +msgid "invalid %%O value" msgstr "" -#: config/rs6000/rs6000.c:6614 +#: config/rs6000/rs6000.c:7756 #, c-format msgid "invalid %%T value" msgstr "" -#: config/rs6000/rs6000.c:6624 +#: config/rs6000/rs6000.c:7766 #, c-format msgid "invalid %%u value" msgstr "" -#: config/rs6000/rs6000.c:6633 +#: config/rs6000/rs6000.c:7775 #, c-format msgid "invalid %%v value" msgstr "" -#: config/rs6000/aix.h:137 config/rs6000/beos.h:32 +#: config/rs6000/rs6000.c:12180 +msgid "no profiling of 64-bit code for this ABI" +msgstr "" + +#: config/rs6000/aix.h:160 config/rs6000/beos.h:32 msgid "Always pass floating-point arguments in memory" msgstr "" -#: config/rs6000/aix.h:139 config/rs6000/beos.h:34 +#: config/rs6000/aix.h:162 config/rs6000/beos.h:34 msgid "Don't always pass floating-point arguments in memory" msgstr "" #: config/rs6000/aix41.h:28 config/rs6000/aix43.h:32 config/rs6000/aix51.h:32 +#: config/rs6000/aix52.h:32 msgid "Support message passing with the Parallel Environment" msgstr "" -#: config/rs6000/aix43.h:28 config/rs6000/aix51.h:28 +#: config/rs6000/aix43.h:28 config/rs6000/aix51.h:28 config/rs6000/aix52.h:28 msgid "Compile for 64-bit pointers" msgstr "" -#: config/rs6000/aix43.h:30 config/rs6000/aix51.h:30 +#: config/rs6000/aix43.h:30 config/rs6000/aix51.h:30 config/rs6000/aix52.h:30 msgid "Compile for 32-bit pointers" msgstr "" -#: config/rs6000/aix43.h:49 config/rs6000/aix51.h:49 +#: config/rs6000/aix43.h:49 config/rs6000/aix51.h:49 config/rs6000/aix52.h:49 msgid "-maix64 and POWER architecture are incompatible" msgstr "" -#: config/rs6000/aix43.h:54 config/rs6000/aix51.h:54 +#: config/rs6000/aix43.h:54 config/rs6000/aix51.h:54 config/rs6000/aix52.h:54 msgid "-maix64 requires PowerPC64 architecture remain enabled" msgstr "" -#: config/rs6000/aix43.h:58 config/rs6000/aix51.h:58 +#: config/rs6000/aix43.h:58 config/rs6000/aix51.h:58 config/rs6000/aix52.h:58 msgid "" "-maix64 required: 64-bit computation with 32-bit addressing not yet supported" msgstr "" @@ -12203,146 +12475,162 @@ msgstr "" #. each pair being { "NAME", VALUE } #. where VALUE is the bits to set or minus the bits to clear. #. An empty string NAME is used to identify the default VALUE. -#: config/rs6000/rs6000.h:277 +#: config/rs6000/rs6000.h:240 msgid "Use POWER instruction set" msgstr "" -#: config/rs6000/rs6000.h:280 +#: config/rs6000/rs6000.h:243 msgid "Use POWER2 instruction set" msgstr "" -#: config/rs6000/rs6000.h:282 +#: config/rs6000/rs6000.h:245 msgid "Do not use POWER2 instruction set" msgstr "" -#: config/rs6000/rs6000.h:285 +#: config/rs6000/rs6000.h:248 msgid "Do not use POWER instruction set" msgstr "" -#: config/rs6000/rs6000.h:287 +#: config/rs6000/rs6000.h:250 msgid "Use PowerPC instruction set" msgstr "" -#: config/rs6000/rs6000.h:290 +#: config/rs6000/rs6000.h:253 msgid "Do not use PowerPC instruction set" msgstr "" -#: config/rs6000/rs6000.h:292 +#: config/rs6000/rs6000.h:255 msgid "Use PowerPC General Purpose group optional instructions" msgstr "" -#: config/rs6000/rs6000.h:294 +#: config/rs6000/rs6000.h:257 msgid "Don't use PowerPC General Purpose group optional instructions" msgstr "" -#: config/rs6000/rs6000.h:296 +#: config/rs6000/rs6000.h:259 msgid "Use PowerPC Graphics group optional instructions" msgstr "" -#: config/rs6000/rs6000.h:298 +#: config/rs6000/rs6000.h:261 msgid "Don't use PowerPC Graphics group optional instructions" msgstr "" -#: config/rs6000/rs6000.h:300 +#: config/rs6000/rs6000.h:263 msgid "Use PowerPC-64 instruction set" msgstr "" -#: config/rs6000/rs6000.h:302 +#: config/rs6000/rs6000.h:265 msgid "Don't use PowerPC-64 instruction set" msgstr "" -#: config/rs6000/rs6000.h:304 +#: config/rs6000/rs6000.h:267 msgid "Use AltiVec instructions" msgstr "" -#: config/rs6000/rs6000.h:306 +#: config/rs6000/rs6000.h:269 msgid "Don't use AltiVec instructions" msgstr "" -#: config/rs6000/rs6000.h:308 +#: config/rs6000/rs6000.h:271 msgid "Use new mnemonics for PowerPC architecture" msgstr "" -#: config/rs6000/rs6000.h:310 +#: config/rs6000/rs6000.h:273 msgid "Use old mnemonics for PowerPC architecture" msgstr "" -#: config/rs6000/rs6000.h:313 +#: config/rs6000/rs6000.h:276 msgid "Put everything in the regular TOC" msgstr "" -#: config/rs6000/rs6000.h:315 +#: config/rs6000/rs6000.h:278 msgid "Place floating point constants in TOC" msgstr "" -#: config/rs6000/rs6000.h:317 +#: config/rs6000/rs6000.h:280 msgid "Don't place floating point constants in TOC" msgstr "" -#: config/rs6000/rs6000.h:319 +#: config/rs6000/rs6000.h:282 msgid "Place symbol+offset constants in TOC" msgstr "" -#: config/rs6000/rs6000.h:321 +#: config/rs6000/rs6000.h:284 msgid "Don't place symbol+offset constants in TOC" msgstr "" -#: config/rs6000/rs6000.h:327 +#: config/rs6000/rs6000.h:290 msgid "Place variable addresses in the regular TOC" msgstr "" -#: config/rs6000/rs6000.h:333 +#: config/rs6000/rs6000.h:296 msgid "Generate load/store multiple instructions" msgstr "" -#: config/rs6000/rs6000.h:335 +#: config/rs6000/rs6000.h:298 msgid "Do not generate load/store multiple instructions" msgstr "" -#: config/rs6000/rs6000.h:339 +#: config/rs6000/rs6000.h:302 msgid "Generate string instructions for block moves" msgstr "" -#: config/rs6000/rs6000.h:341 +#: config/rs6000/rs6000.h:304 msgid "Do not generate string instructions for block moves" msgstr "" -#: config/rs6000/rs6000.h:345 +#: config/rs6000/rs6000.h:308 msgid "Generate load/store with update instructions" msgstr "" -#: config/rs6000/rs6000.h:347 +#: config/rs6000/rs6000.h:310 msgid "Do not generate load/store with update instructions" msgstr "" -#: config/rs6000/rs6000.h:355 +#: config/rs6000/rs6000.h:318 msgid "Don't schedule the start and end of the procedure" msgstr "" -#: config/rs6000/rs6000.h:361 +#: config/rs6000/rs6000.h:324 msgid "Return all structures in memory (AIX default)" msgstr "" -#: config/rs6000/rs6000.h:363 +#: config/rs6000/rs6000.h:326 msgid "Return small structures in registers (SVR4 default)" msgstr "" -#: config/rs6000/rs6000.h:426 config/sparc/sparc.h:639 +#: config/rs6000/rs6000.h:391 config/sparc/sparc.h:633 msgid "Use features of and schedule code for given CPU" msgstr "" -#: config/rs6000/rs6000.h:429 +#: config/rs6000/rs6000.h:394 msgid "Enable debug output" msgstr "" -#: config/rs6000/rs6000.h:430 +#: config/rs6000/rs6000.h:396 +msgid "Select full, part, or no traceback table" +msgstr "" + +#: config/rs6000/rs6000.h:397 msgid "Specify ABI to use" msgstr "" -#: config/rs6000/rs6000.h:432 +#: config/rs6000/rs6000.h:399 msgid "Specify size of long double (64 or 128 bits)" msgstr "" +#: config/rs6000/rs6000.h:401 +msgid "Specify yes/no if isel instructions should be generated" +msgstr "" + +#: config/rs6000/rs6000.h:403 +msgid "Specify yes/no if VRSAVE instructions should be generated for AltiVec" +msgstr "" + +#: config/rs6000/rs6000.h:405 +msgid "Avoid all range limits on call instructions" +msgstr "" + #. Definitions for __builtin_return_address and __builtin_frame_address. #. __builtin_return_address (0) should give link register (65), enable #. this. @@ -12355,99 +12643,103 @@ msgstr "" #. Number of bytes into the frame return addresses can be found. See #. rs6000_stack_info in rs6000.c for more information on how the different #. abi's store the return address. -#: config/rs6000/rs6000.h:1772 +#: config/rs6000/rs6000.h:1869 msgid "RETURN_ADDRESS_OFFSET not supported" msgstr "" -#: config/rs6000/sysv4.h:88 +#: config/rs6000/sysv4.h:87 msgid "Select ABI calling convention" msgstr "" -#: config/rs6000/sysv4.h:89 +#: config/rs6000/sysv4.h:88 msgid "Select method for sdata handling" msgstr "" -#: config/rs6000/sysv4.h:104 +#: config/rs6000/sysv4.h:103 msgid "Align to the base type of the bit-field" msgstr "" -#: config/rs6000/sysv4.h:106 +#: config/rs6000/sysv4.h:105 msgid "Don't align to the base type of the bit-field" msgstr "" -#: config/rs6000/sysv4.h:108 +#: config/rs6000/sysv4.h:107 msgid "Don't assume that unaligned accesses are handled by the system" msgstr "" -#: config/rs6000/sysv4.h:110 +#: config/rs6000/sysv4.h:109 msgid "Assume that unaligned accesses are handled by the system" msgstr "" -#: config/rs6000/sysv4.h:112 config/rs6000/sysv4.h:116 +#: config/rs6000/sysv4.h:111 config/rs6000/sysv4.h:115 msgid "Produce code relocatable at runtime" msgstr "" -#: config/rs6000/sysv4.h:114 config/rs6000/sysv4.h:118 +#: config/rs6000/sysv4.h:113 config/rs6000/sysv4.h:117 msgid "Don't produce code relocatable at runtime" msgstr "" -#: config/rs6000/sysv4.h:120 config/rs6000/sysv4.h:122 +#: config/rs6000/sysv4.h:119 config/rs6000/sysv4.h:121 msgid "Produce little endian code" msgstr "" -#: config/rs6000/sysv4.h:124 config/rs6000/sysv4.h:126 +#: config/rs6000/sysv4.h:123 config/rs6000/sysv4.h:125 msgid "Produce big endian code" msgstr "" -#: config/rs6000/sysv4.h:127 config/rs6000/sysv4.h:128 -#: config/rs6000/sysv4.h:129 config/rs6000/sysv4.h:130 -#: config/rs6000/sysv4.h:131 config/rs6000/sysv4.h:132 -#: config/rs6000/sysv4.h:142 config/rs6000/sysv4.h:143 -#: config/rs6000/sysv4.h:154 config/rs6000/sysv4.h:155 +#: config/rs6000/sysv4.h:126 config/rs6000/sysv4.h:127 +#: config/rs6000/sysv4.h:128 config/rs6000/sysv4.h:129 +#: config/rs6000/sysv4.h:130 config/rs6000/sysv4.h:131 +#: config/rs6000/sysv4.h:141 config/rs6000/sysv4.h:142 +#: config/rs6000/sysv4.h:153 config/rs6000/sysv4.h:155 #: config/rs6000/sysv4.h:157 msgid "no description yet" msgstr "" -#: config/rs6000/sysv4.h:133 +#: config/rs6000/sysv4.h:132 msgid "Use EABI" msgstr "" -#: config/rs6000/sysv4.h:134 +#: config/rs6000/sysv4.h:133 msgid "Don't use EABI" msgstr "" -#: config/rs6000/sysv4.h:137 +#: config/rs6000/sysv4.h:136 msgid "Do not allow bit-fields to cross word boundaries" msgstr "" -#: config/rs6000/sysv4.h:139 +#: config/rs6000/sysv4.h:138 msgid "Use alternate register names" msgstr "" -#: config/rs6000/sysv4.h:141 +#: config/rs6000/sysv4.h:140 msgid "Don't use alternate register names" msgstr "" -#: config/rs6000/sysv4.h:145 +#: config/rs6000/sysv4.h:144 msgid "Link with libsim.a, libc.a and sim-crt0.o" msgstr "" -#: config/rs6000/sysv4.h:147 +#: config/rs6000/sysv4.h:146 msgid "Link with libads.a, libc.a and crt0.o" msgstr "" -#: config/rs6000/sysv4.h:149 +#: config/rs6000/sysv4.h:148 msgid "Link with libyk.a, libc.a and crt0.o" msgstr "" -#: config/rs6000/sysv4.h:151 +#: config/rs6000/sysv4.h:150 msgid "Link with libmvme.a, libc.a and crt0.o" msgstr "" -#: config/rs6000/sysv4.h:153 +#: config/rs6000/sysv4.h:152 msgid "Set the PPC_EMB bit in the ELF flags header" msgstr "" +#: config/rs6000/sysv4.h:154 +msgid "Use the WindISS simulator" +msgstr "" + #. Sometimes certain combinations of command options do not make sense #. on a particular target machine. You can define a macro #. `OVERRIDE_OPTIONS' to take account of this. This macro, if @@ -12481,179 +12773,183 @@ msgstr "" msgid "-msdata=%s and -mcall-%s are incompatible" msgstr "" -#: config/rs6000/sysv4.h:270 +#: config/rs6000/sysv4.h:272 msgid "-mrelocatable and -mno-minimal-toc are incompatible" msgstr "" -#: config/rs6000/sysv4.h:276 +#: config/rs6000/sysv4.h:278 #, c-format msgid "-mrelocatable and -mcall-%s are incompatible" msgstr "" -#: config/rs6000/sysv4.h:283 +#: config/rs6000/sysv4.h:285 #, c-format msgid "-fPIC and -mcall-%s are incompatible" msgstr "" -#: config/rs6000/sysv4.h:290 +#: config/rs6000/sysv4.h:292 msgid "-mcall-aixdesc must be big endian" msgstr "" -#: config/s390/s390.c:1958 +#: config/s390/s390.c:2584 msgid "invalid UNSPEC as operand (1)" msgstr "" -#: config/s390/s390.c:1988 +#: config/s390/s390.c:2620 msgid "invalid UNSPEC as operand (2)" msgstr "" -#: config/s390/s390.c:1994 +#: config/s390/s390.c:2626 msgid "UNKNOWN in s390_output_symbolic_const !?" msgstr "" -#: config/s390/s390.c:2010 +#: config/s390/s390.c:2644 msgid "Cannot decompose address." msgstr "" -#: config/s390/s390.c:2158 +#: config/s390/s390.c:2784 msgid "UNKNOWN in print_operand !?" msgstr "" -#: config/s390/s390.c:2751 +#: config/s390/s390.c:4421 msgid "Total size of local variables exceeds architecture limit." msgstr "" -#: config/s390/s390.h:58 +#: config/s390/s390.h:70 msgid "Set backchain" msgstr "" -#: config/s390/s390.h:59 +#: config/s390/s390.h:71 msgid "Don't set backchain (faster, but debug harder" msgstr "" -#: config/s390/s390.h:60 +#: config/s390/s390.h:72 msgid "Use bras for execucable < 64k" msgstr "" -#: config/s390/s390.h:61 +#: config/s390/s390.h:73 msgid "Don't use bras" msgstr "" -#: config/s390/s390.h:62 +#: config/s390/s390.h:74 msgid "Additional debug prints" msgstr "" -#: config/s390/s390.h:63 +#: config/s390/s390.h:75 msgid "Don't print additional debug prints" msgstr "" -#: config/s390/s390.h:64 +#: config/s390/s390.h:76 msgid "64 bit mode" msgstr "" -#: config/s390/s390.h:65 +#: config/s390/s390.h:77 msgid "31 bit mode" msgstr "" -#: config/s390/s390.h:66 +#: config/s390/s390.h:78 msgid "mvcle use" msgstr "" -#: config/s390/s390.h:67 +#: config/s390/s390.h:79 msgid "mvc&ex" msgstr "" -#: config/sh/sh.c:5069 +#: config/sh/sh.c:5134 msgid "__builtin_saveregs not supported by this subtarget" msgstr "" +#: config/sh/sh.c:5684 +msgid "attribute interrupt_handler is not compatible with -m5-compact" +msgstr "" + #. The sp_switch attribute only has meaning for interrupt functions. -#: config/sh/sh.c:5619 config/sh/sh.c:5658 +#: config/sh/sh.c:5710 config/sh/sh.c:5749 #, c-format msgid "`%s' attribute only applies to interrupt functions" msgstr "" #. The argument must be a constant string. -#: config/sh/sh.c:5626 +#: config/sh/sh.c:5717 #, c-format msgid "`%s' attribute argument not a string constant" msgstr "" #. The argument must be a constant integer. -#: config/sh/sh.c:5665 +#: config/sh/sh.c:5756 #, c-format msgid "`%s' attribute argument not an integer constant" msgstr "" #. There are no delay slots on SHmedia. #. Relaxation isn't yet supported for SHmedia -#: config/sh/sh.h:367 +#: config/sh/sh.h:437 msgid "Profiling is not supported on this target." msgstr "" -#: config/sparc/sparc.c:317 +#: config/sparc/sparc.c:329 #, c-format msgid "%s is not supported by this configuration" msgstr "" -#: config/sparc/sparc.c:324 +#: config/sparc/sparc.c:336 msgid "-mlong-double-64 not allowed with -m64" msgstr "" -#: config/sparc/sparc.c:349 +#: config/sparc/sparc.c:361 msgid "-mcmodel= is not supported on 32 bit systems" msgstr "" -#: config/sparc/sparc.c:5985 config/sparc/sparc.c:5991 +#: config/sparc/sparc.c:6299 config/sparc/sparc.c:6305 #, c-format msgid "invalid %%Y operand" msgstr "" -#: config/sparc/sparc.c:6061 +#: config/sparc/sparc.c:6375 #, c-format msgid "invalid %%A operand" msgstr "" -#: config/sparc/sparc.c:6071 +#: config/sparc/sparc.c:6385 #, c-format msgid "invalid %%B operand" msgstr "" -#: config/sparc/sparc.c:6110 +#: config/sparc/sparc.c:6424 #, c-format msgid "invalid %%c operand" msgstr "" -#: config/sparc/sparc.c:6111 +#: config/sparc/sparc.c:6425 #, c-format msgid "invalid %%C operand" msgstr "" -#: config/sparc/sparc.c:6132 +#: config/sparc/sparc.c:6446 #, c-format msgid "invalid %%d operand" msgstr "" -#: config/sparc/sparc.c:6133 +#: config/sparc/sparc.c:6447 #, c-format msgid "invalid %%D operand" msgstr "" -#: config/sparc/sparc.c:6149 +#: config/sparc/sparc.c:6463 #, c-format msgid "invalid %%f operand" msgstr "" -#: config/sparc/sparc.c:6199 +#: config/sparc/sparc.c:6513 msgid "long long constant not a valid immediate operand" msgstr "" -#: config/sparc/sparc.c:6202 +#: config/sparc/sparc.c:6516 msgid "floating point constant not a valid immediate operand" msgstr "" -#: config/sparc/freebsd.h:81 config/sparc/linux.h:89 -#: config/sparc/linux64.h:146 config/sparc/netbsd-elf.h:241 +#: config/sparc/freebsd.h:80 config/sparc/linux.h:87 config/sparc/linux64.h:89 +#: config/sparc/netbsd-elf.h:239 msgid "Use 128 bit long doubles" msgstr "" @@ -12665,334 +12961,379 @@ msgstr "" msgid "Generate code for little endian" msgstr "" -#: config/sparc/sp86x-aout.h:51 config/sparc/sp86x-elf.h:67 +#: config/sparc/sp86x-aout.h:51 config/sparc/sp86x-elf.h:65 msgid "Use little-endian byte order for data" msgstr "" -#: config/sparc/sparc.h:539 +#: config/sparc/sparc.h:532 msgid "Assume possible double misalignment" msgstr "" -#: config/sparc/sparc.h:541 +#: config/sparc/sparc.h:534 msgid "Assume all doubles are aligned" msgstr "" -#: config/sparc/sparc.h:543 +#: config/sparc/sparc.h:536 msgid "Pass -assert pure-text to linker" msgstr "" -#: config/sparc/sparc.h:545 +#: config/sparc/sparc.h:538 msgid "Do not pass -assert pure-text to linker" msgstr "" -#: config/sparc/sparc.h:547 +#: config/sparc/sparc.h:540 msgid "Use flat register window model" msgstr "" -#: config/sparc/sparc.h:549 +#: config/sparc/sparc.h:542 msgid "Do not use flat register window model" msgstr "" -#: config/sparc/sparc.h:551 +#: config/sparc/sparc.h:544 msgid "Use ABI reserved registers" msgstr "" -#: config/sparc/sparc.h:553 +#: config/sparc/sparc.h:546 msgid "Do not use ABI reserved registers" msgstr "" -#: config/sparc/sparc.h:555 +#: config/sparc/sparc.h:548 msgid "Use hardware quad fp instructions" msgstr "" -#: config/sparc/sparc.h:557 +#: config/sparc/sparc.h:550 msgid "Do not use hardware quad fp instructions" msgstr "" -#: config/sparc/sparc.h:559 +#: config/sparc/sparc.h:552 msgid "Compile for v8plus ABI" msgstr "" -#: config/sparc/sparc.h:561 +#: config/sparc/sparc.h:554 msgid "Do not compile for v8plus ABI" msgstr "" -#: config/sparc/sparc.h:563 +#: config/sparc/sparc.h:556 msgid "Utilize Visual Instruction Set" msgstr "" -#: config/sparc/sparc.h:565 +#: config/sparc/sparc.h:558 msgid "Do not utilize Visual Instruction Set" msgstr "" #. ??? These are deprecated, coerced to -mcpu=. Delete in 2.9. -#: config/sparc/sparc.h:568 +#: config/sparc/sparc.h:561 msgid "Optimize for Cypress processors" msgstr "" -#: config/sparc/sparc.h:570 -msgid "Optimize for SparcLite processors" +#: config/sparc/sparc.h:563 +msgid "Optimize for SPARCLite processors" msgstr "" -#: config/sparc/sparc.h:572 +#: config/sparc/sparc.h:565 msgid "Optimize for F930 processors" msgstr "" -#: config/sparc/sparc.h:574 +#: config/sparc/sparc.h:567 msgid "Optimize for F934 processors" msgstr "" -#: config/sparc/sparc.h:576 -msgid "Use V8 Sparc ISA" +#: config/sparc/sparc.h:569 +msgid "Use V8 SPARC ISA" msgstr "" -#: config/sparc/sparc.h:578 -msgid "Optimize for SuperSparc processors" +#: config/sparc/sparc.h:571 +msgid "Optimize for SuperSPARC processors" msgstr "" #. End of deprecated options. -#: config/sparc/sparc.h:581 +#: config/sparc/sparc.h:574 msgid "Pointers are 64-bit" msgstr "" -#: config/sparc/sparc.h:583 +#: config/sparc/sparc.h:576 msgid "Pointers are 32-bit" msgstr "" -#: config/sparc/sparc.h:585 +#: config/sparc/sparc.h:578 msgid "Use 32-bit ABI" msgstr "" -#: config/sparc/sparc.h:587 +#: config/sparc/sparc.h:580 msgid "Use 64-bit ABI" msgstr "" -#: config/sparc/sparc.h:589 +#: config/sparc/sparc.h:582 msgid "Use stack bias" msgstr "" -#: config/sparc/sparc.h:591 +#: config/sparc/sparc.h:584 msgid "Do not use stack bias" msgstr "" -#: config/sparc/sparc.h:593 +#: config/sparc/sparc.h:586 msgid "Use structs on stronger alignment for double-word copies" msgstr "" -#: config/sparc/sparc.h:595 +#: config/sparc/sparc.h:588 msgid "Do not use structs on stronger alignment for double-word copies" msgstr "" -#: config/sparc/sparc.h:597 +#: config/sparc/sparc.h:590 msgid "Optimize tail call instructions in assembler and linker" msgstr "" -#: config/sparc/sparc.h:599 +#: config/sparc/sparc.h:592 msgid "Do not optimize tail call instructions in assembler or linker" msgstr "" -#: config/sparc/sparc.h:643 -msgid "Use given Sparc code model" +#: config/sparc/sparc.h:637 +msgid "Use given SPARC code model" msgstr "" -#: config/stormy16/stormy16.c:1180 +#: config/stormy16/stormy16.c:1192 msgid "cannot use va_start in interrupt function" msgstr "" -#: config/stormy16/stormy16.c:1538 +#: config/stormy16/stormy16.c:1552 msgid "`B' operand is not constant" msgstr "" -#: config/stormy16/stormy16.c:1544 +#: config/stormy16/stormy16.c:1558 msgid "`B' operand has multiple bits set" msgstr "" -#: config/stormy16/stormy16.c:1571 +#: config/stormy16/stormy16.c:1585 msgid "`o' operand is not constant" msgstr "" -#: config/stormy16/stormy16.c:1586 +#: config/stormy16/stormy16.c:1600 msgid "xstormy16_print_operand: unknown code" msgstr "" -#: config/stormy16/stormy16.c:1636 +#: config/stormy16/stormy16.c:1650 #, c-format msgid "switch statement of size %lu entries too large" msgstr "" -#: config/v850/v850-c.c:68 +#: config/v850/v850-c.c:67 msgid "#pragma GHS endXXXX found without previous startXXX" msgstr "" -#: config/v850/v850-c.c:70 +#: config/v850/v850-c.c:69 msgid "#pragma GHS endXXX does not match previous startXXX" msgstr "" -#: config/v850/v850-c.c:95 +#: config/v850/v850-c.c:94 msgid "cannot set interrupt attribute: no current function" msgstr "" -#: config/v850/v850-c.c:103 +#: config/v850/v850-c.c:102 msgid "cannot set interrupt attribute: no such identifier" msgstr "" -#: config/v850/v850-c.c:149 +#: config/v850/v850-c.c:148 msgid "junk at end of #pragma ghs section" msgstr "" -#: config/v850/v850-c.c:166 +#: config/v850/v850-c.c:165 #, c-format msgid "unrecognized section name \"%s\"" msgstr "" -#: config/v850/v850-c.c:181 +#: config/v850/v850-c.c:180 msgid "malformed #pragma ghs section" msgstr "" -#: config/v850/v850-c.c:201 +#: config/v850/v850-c.c:200 msgid "junk at end of #pragma ghs interrupt" msgstr "" -#: config/v850/v850-c.c:213 +#: config/v850/v850-c.c:212 msgid "junk at end of #pragma ghs starttda" msgstr "" -#: config/v850/v850-c.c:225 +#: config/v850/v850-c.c:224 msgid "junk at end of #pragma ghs startsda" msgstr "" -#: config/v850/v850-c.c:237 +#: config/v850/v850-c.c:236 msgid "junk at end of #pragma ghs startzda" msgstr "" -#: config/v850/v850-c.c:249 +#: config/v850/v850-c.c:248 msgid "junk at end of #pragma ghs endtda" msgstr "" -#: config/v850/v850-c.c:261 +#: config/v850/v850-c.c:260 msgid "junk at end of #pragma ghs endsda" msgstr "" -#: config/v850/v850-c.c:273 +#: config/v850/v850-c.c:272 msgid "junk at end of #pragma ghs endzda" msgstr "" -#: config/v850/v850.c:122 +#: config/v850/v850.c:129 #, c-format msgid "%s=%s is not numeric" msgstr "" -#: config/v850/v850.c:129 +#: config/v850/v850.c:136 #, c-format msgid "%s=%s is too large" msgstr "" -#: config/v850/v850.c:285 +#: config/v850/v850.c:302 msgid "const_double_split got a bad insn:" msgstr "" -#: config/v850/v850.c:777 +#: config/v850/v850.c:837 msgid "output_move_single:" msgstr "" -#: config/v850/v850.c:2084 +#: config/v850/v850.c:2217 msgid "a data area attribute cannot be specified for local variables" msgstr "" -#: config/v850/v850.c:2095 +#: config/v850/v850.c:2228 #, c-format msgid "data area of '%s' conflicts with previous declaration" msgstr "" -#: config/v850/v850.c:2298 +#: config/v850/v850.c:2447 #, c-format msgid "bogus JR construction: %d\n" msgstr "" -#: config/v850/v850.c:2319 config/v850/v850.c:2521 +#: config/v850/v850.c:2468 config/v850/v850.c:2670 #, c-format msgid "bad amount of stack space removal: %d" msgstr "" -#: config/v850/v850.c:2497 +#: config/v850/v850.c:2646 #, c-format msgid "bogus JARL construction: %d\n" msgstr "" +#: config/v850/v850.c:3026 +#, c-format +msgid "Bogus DISPOSE construction: %d\n" +msgstr "" + +#: config/v850/v850.c:3048 +#, c-format +msgid "Too much stack space to dispose of: %d" +msgstr "" + +#: config/v850/v850.c:3224 +#, c-format +msgid "Bogus PREPEARE construction: %d\n" +msgstr "" + +#: config/v850/v850.c:3246 +#, c-format +msgid "Too much stack space to prepare: %d" +msgstr "" + #. Macro to define tables used to set the flags. #. This is a list in braces of pairs in braces, #. each pair being { "NAME", VALUE } #. where VALUE is the bits to set or minus the bits to clear. #. An empty string NAME is used to identify the default VALUE. -#: config/v850/v850.h:120 +#: config/v850/v850.h:158 msgid "Support Green Hills ABI" msgstr "" -#: config/v850/v850.h:123 +#: config/v850/v850.h:161 msgid "Prohibit PC relative function calls" msgstr "" -#: config/v850/v850.h:126 +#: config/v850/v850.h:164 msgid "Reuse r30 on a per function basis" msgstr "" -#: config/v850/v850.h:129 +#: config/v850/v850.h:167 msgid "Use stubs for function prologues" msgstr "" -#: config/v850/v850.h:132 +#: config/v850/v850.h:170 msgid "Same as: -mep -mprolog-function" msgstr "" -#: config/v850/v850.h:133 +#: config/v850/v850.h:171 msgid "Enable backend debugging" msgstr "" -#: config/v850/v850.h:135 +#: config/v850/v850.h:173 msgid "Compile for the v850 processor" msgstr "" -#: config/v850/v850.h:138 +#: config/v850/v850.h:175 +msgid "Compile for v850e processor" +msgstr "" + +#. Make sure that the other bits are cleared. +#: config/v850/v850.h:177 +msgid "Enable the use of the short load instructions" +msgstr "" + +#: config/v850/v850.h:180 +msgid "Do not use the callt instruction" +msgstr "" + +#: config/v850/v850.h:187 +msgid "Do not use registers r2 and r5" +msgstr "" + +#: config/v850/v850.h:189 +msgid "Enfore strict alignment" +msgstr "" + +#: config/v850/v850.h:192 msgid "Use 4 byte entries in switch tables" msgstr "" -#: config/v850/v850.h:164 +#: config/v850/v850.h:218 msgid "Set the max size of data eligible for the TDA area" msgstr "" -#: config/v850/v850.h:167 +#: config/v850/v850.h:221 msgid "Set the max size of data eligible for the SDA area" msgstr "" -#: config/v850/v850.h:170 +#: config/v850/v850.h:224 msgid "Set the max size of data eligible for the ZDA area" msgstr "" -#: config/xtensa/xtensa.c:1048 config/xtensa/xtensa.c:1082 -#: config/xtensa/xtensa.c:1091 +#: config/xtensa/xtensa.c:1062 config/xtensa/xtensa.c:1096 +#: config/xtensa/xtensa.c:1105 msgid "bad test" msgstr "" -#: config/xtensa/xtensa.c:1790 +#: config/xtensa/xtensa.c:1824 msgid "boolean registers required for the floating-point option" msgstr "" -#: config/xtensa/xtensa.c:1965 +#: config/xtensa/xtensa.c:1991 msgid "invalid mask" msgstr "" -#: config/xtensa/xtensa.c:2017 +#: config/xtensa/xtensa.c:2038 msgid "invalid address" msgstr "" -#: config/xtensa/xtensa.c:2042 +#: config/xtensa/xtensa.c:2063 msgid "no register in address" msgstr "" -#: config/xtensa/xtensa.c:2050 +#: config/xtensa/xtensa.c:2071 msgid "address offset not a constant" msgstr "" +#: config/xtensa/xtensa.c:2809 +msgid "only uninitialized variables can be placed in a .bss section" +msgstr "" + #: config/xtensa/xtensa.h:114 msgid "Use the Xtensa code density option" msgstr "" @@ -13115,519 +13456,574 @@ msgstr "" msgid "Use direct CALLn instructions for fast calls" msgstr "" -#: ada/misc.c:234 +#: ada/misc.c:233 msgid "`-gnat' misspelled as `-gant'" msgstr "" -#: cp/call.c:270 cp/init.c:1633 +#: cp/call.c:258 cp/init.c:1587 msgid "qualified type `%T' does not match destructor name `~%T'" msgstr "" -#: cp/call.c:279 +#: cp/call.c:267 msgid "type of `%E' does not match destructor type `%T' (type was `%T')" msgstr "" -#: cp/call.c:288 +#: cp/call.c:276 msgid "`%D' is a namespace" msgstr "" -#: cp/call.c:296 +#: cp/call.c:284 msgid "base object `%E' of scoped method call is of non-aggregate type `%T'" msgstr "" -#: cp/call.c:377 +#: cp/call.c:366 msgid "unable to call pointer to member function here" msgstr "" -#: cp/call.c:513 +#: cp/call.c:515 msgid "destructors take no parameters" msgstr "" -#: cp/call.c:520 +#: cp/call.c:519 msgid "destructor name `~%T' does not match type `%T' of expression" msgstr "" -#: cp/call.c:2357 +#: cp/call.c:535 cp/call.c:4857 +msgid "request for member `%D' in `%E', which is of non-aggregate type `%T'" +msgstr "" + +#: cp/call.c:557 +msgid "request for member `%D' is ambiguous" +msgstr "" + +#: cp/call.c:2446 msgid "%s %D(%T, %T, %T) <built-in>" msgstr "" -#: cp/call.c:2362 +#: cp/call.c:2451 msgid "%s %D(%T, %T) <built-in>" msgstr "" -#: cp/call.c:2366 +#: cp/call.c:2455 msgid "%s %D(%T) <built-in>" msgstr "" -#: cp/call.c:2370 +#: cp/call.c:2459 msgid "%s %T <conversion>" msgstr "" -#: cp/call.c:2372 +#: cp/call.c:2461 msgid "%s %+#D%s" msgstr "" -#: cp/call.c:2517 -msgid "no viable candidates" +#: cp/call.c:2615 +msgid "conversion from `%T' to `%T' is ambiguous" msgstr "" -#: cp/call.c:2531 -msgid "conversion from `%T' to `%T' is ambiguous" +#: cp/call.c:2690 +msgid "incomplete type '%T' cannot be used to name a scope" +msgstr "" + +#: cp/call.c:2706 cp/typeck.c:2176 cp/typeck.c:2205 +msgid "'%D' has no member named '%E'" msgstr "" -#: cp/call.c:2648 +#: cp/call.c:2812 msgid "no matching function for call to `%D(%A)'" msgstr "" -#: cp/call.c:2659 cp/call.c:4655 +#: cp/call.c:2823 cp/call.c:4948 msgid "call of overloaded `%D(%A)' is ambiguous" msgstr "" #. It's no good looking for an overloaded operator() on a #. pointer-to-member-function. -#: cp/call.c:2686 +#: cp/call.c:2850 #, c-format msgid "" "pointer-to-member function %E cannot be called without an object; consider " "using .* or ->*" msgstr "" -#: cp/call.c:2755 +#: cp/call.c:2920 msgid "no match for call to `(%T) (%A)'" msgstr "" -#: cp/call.c:2765 +#: cp/call.c:2930 msgid "call of `(%T) (%A)' is ambiguous" msgstr "" -#: cp/call.c:2800 +#: cp/call.c:2965 msgid "%s for `%T ? %T : %T' operator" msgstr "" -#: cp/call.c:2805 +#: cp/call.c:2970 msgid "%s for `%T %s' operator" msgstr "" -#: cp/call.c:2808 +#: cp/call.c:2973 msgid "%s for `%T [%T]' operator" msgstr "" -#: cp/call.c:2813 +#: cp/call.c:2978 msgid "%s for `%T %s %T' operator" msgstr "" -#: cp/call.c:2816 +#: cp/call.c:2981 msgid "%s for `%s %T' operator" msgstr "" -#: cp/call.c:2908 +#: cp/call.c:3071 msgid "ISO C++ forbids omitting the middle term of a ?: expression" msgstr "" -#: cp/call.c:2967 +#: cp/call.c:3130 #, c-format msgid "`%E' has type `void' and is not a throw-expression" msgstr "" -#: cp/call.c:3000 cp/call.c:3200 +#: cp/call.c:3163 cp/call.c:3363 msgid "operands to ?: have different types" msgstr "" -#: cp/call.c:3153 +#: cp/call.c:3316 msgid "enumeral mismatch in conditional expression: `%T' vs `%T'" msgstr "" -#: cp/call.c:3160 +#: cp/call.c:3323 msgid "enumeral and non-enumeral type in conditional expression" msgstr "" -#: cp/call.c:3241 +#: cp/call.c:3405 msgid "`%D' must be declared before use" msgstr "" -#: cp/call.c:3404 +#: cp/call.c:3604 msgid "no `%D(int)' declared for postfix `%s', trying prefix operator instead" msgstr "" -#: cp/call.c:3451 +#: cp/call.c:3651 msgid "using synthesized `%#D' for copy assignment" msgstr "" -#: cp/call.c:3453 +#: cp/call.c:3653 msgid " where cfront would use `%#D'" msgstr "" -#: cp/call.c:3480 +#: cp/call.c:3680 msgid "comparison between `%#T' and `%#T'" msgstr "" -#: cp/call.c:3719 +#: cp/call.c:3919 msgid "no suitable `operator delete' for `%T'" msgstr "" -#: cp/call.c:3738 +#: cp/call.c:3938 msgid "`%+#D' is private" msgstr "" -#: cp/call.c:3740 +#: cp/call.c:3940 msgid "`%+#D' is protected" msgstr "" -#: cp/call.c:3742 +#: cp/call.c:3942 msgid "`%+#D' is inaccessible" msgstr "" -#: cp/call.c:3743 +#: cp/call.c:3943 msgid "within this context" msgstr "" -#: cp/call.c:3785 +#: cp/call.c:3985 msgid "invalid conversion from `%T' to `%T'" msgstr "" -#: cp/call.c:3787 cp/call.c:3926 cp/call.c:3928 +#: cp/call.c:3987 cp/call.c:4126 cp/call.c:4128 msgid " initializing argument %P of `%D'" msgstr "" -#: cp/call.c:3850 cp/call.c:3854 +#: cp/call.c:4050 cp/call.c:4054 msgid " initializing argument %P of `%D' from result of `%D'" msgstr "" -#: cp/call.c:3860 cp/call.c:3863 +#: cp/call.c:4060 cp/call.c:4063 msgid " initializing temporary from result of `%D'" msgstr "" -#. Undefined behaviour [expr.call] 5.2.2/7. -#: cp/call.c:3997 -msgid "cannot pass objects of non-POD type `%#T' through `...'" +#. Undefined behavior [expr.call] 5.2.2/7. We used to just warn +#. here and do a bitwise copy, but now cp_expr_size will abort if we +#. try to do that. +#: cp/call.c:4215 +msgid "" +"cannot pass objects of non-POD type `%#T' through `...'; call will abort at " +"runtime" msgstr "" -#. Undefined behaviour [expr.call] 5.2.2/7. -#: cp/call.c:4022 +#. Undefined behavior [expr.call] 5.2.2/7. +#: cp/call.c:4242 msgid "cannot receive objects of non-POD type `%#T' through `...'" msgstr "" -#: cp/call.c:4167 +#: cp/call.c:4422 msgid "passing `%T' as `this' argument of `%#D' discards qualifiers" msgstr "" -#: cp/call.c:4417 +#: cp/call.c:4656 msgid "could not find class$ field in java interface type `%T'" msgstr "" -#: cp/call.c:4518 cp/typeck.c:2019 -msgid "request for member `%D' in `%E', which is of non-aggregate type `%T'" +#: cp/call.c:4831 +msgid "call to non-function `%D'" msgstr "" -#: cp/call.c:4644 +#: cp/call.c:4937 msgid "no matching function for call to `%T::%D(%A)%#V'" msgstr "" -#: cp/call.c:4674 +#: cp/call.c:4967 msgid "cannot call member function `%D' without object" msgstr "" -#: cp/call.c:5287 +#: cp/call.c:5580 msgid "passing `%T' chooses `%T' over `%T'" msgstr "" -#: cp/call.c:5289 cp/decl2.c:4508 +#: cp/call.c:5582 cp/decl2.c:4081 msgid " in call to `%D'" msgstr "" -#: cp/call.c:5338 cp/call.c:5463 +#: cp/call.c:5631 cp/call.c:5756 msgid "choosing `%D' over `%D'" msgstr "" -#: cp/call.c:5339 +#: cp/call.c:5632 msgid " for conversion from `%T' to `%T'" msgstr "" -#: cp/call.c:5341 +#: cp/call.c:5634 msgid " because conversion sequence for the argument is better" msgstr "" -#: cp/call.c:5465 +#: cp/call.c:5758 msgid "" " because worst conversion for the former is better than worst conversion " "for the latter" msgstr "" -#: cp/call.c:5581 cp/call.c:5602 +#: cp/call.c:5874 cp/call.c:5895 msgid "could not convert `%E' to `%T'" msgstr "" -#: cp/class.c:287 +#: cp/class.c:286 msgid "" "cannot convert from base `%T' to derived type `%T' via virtual base `%T'" msgstr "" -#: cp/class.c:1049 +#: cp/class.c:943 msgid "`%#D' and `%#D' cannot be overloaded" msgstr "" -#. There has already been a declaration of this method -#. or member template. -#: cp/class.c:1060 -msgid "`%D' has already been declared in `%T'" -msgstr "" - -#: cp/class.c:1141 +#: cp/class.c:1027 msgid "duplicate enum value `%D'" msgstr "" -#: cp/class.c:1144 +#: cp/class.c:1030 msgid "duplicate field `%D' (as enum and non-enum)" msgstr "" -#: cp/class.c:1151 +#: cp/class.c:1037 msgid "duplicate nested type `%D'" msgstr "" -#: cp/class.c:1162 +#: cp/class.c:1048 msgid "duplicate field `%D' (as type and non-type)" msgstr "" -#: cp/class.c:1166 +#: cp/class.c:1052 msgid "duplicate member `%D'" msgstr "" -#: cp/class.c:1209 +#: cp/class.c:1095 msgid "conflicting access specifications for method `%D', ignored" msgstr "" -#: cp/class.c:1211 +#: cp/class.c:1097 #, c-format msgid "conflicting access specifications for field `%s', ignored" msgstr "" -#: cp/class.c:1254 +#: cp/class.c:1142 msgid "`%D' names constructor" msgstr "" -#: cp/class.c:1260 +#: cp/class.c:1147 msgid "`%D' invalid in `%T'" msgstr "" -#: cp/class.c:1268 +#: cp/class.c:1155 msgid "no members matching `%D' in `%#T'" msgstr "" -#: cp/class.c:1300 cp/class.c:1308 +#: cp/class.c:1187 cp/class.c:1195 msgid "`%D' invalid in `%#T'" msgstr "" -#: cp/class.c:1301 +#: cp/class.c:1188 msgid " because of local method `%#D' with same name" msgstr "" -#: cp/class.c:1309 +#: cp/class.c:1196 msgid " because of local member `%#D' with same name" msgstr "" -#: cp/class.c:1381 +#: cp/class.c:1268 msgid "base class `%#T' has a non-virtual destructor" msgstr "" -#: cp/class.c:1401 +#: cp/class.c:1288 msgid "" "base `%T' with only non-default constructor in class without a constructor" msgstr "" -#: cp/class.c:1988 +#: cp/class.c:1860 msgid "all member functions in class `%T' are private" msgstr "" -#: cp/class.c:2002 +#: cp/class.c:1874 msgid "`%#T' only defines a private destructor and has no friends" msgstr "" -#: cp/class.c:2045 +#: cp/class.c:1917 msgid "`%#T' only defines private constructors and has no friends" msgstr "" -#: cp/class.c:2166 cp/class.c:5093 +#: cp/class.c:2038 cp/class.c:5172 msgid "redefinition of `%#T'" msgstr "" -#: cp/class.c:2167 +#: cp/class.c:2039 msgid "previous definition of `%#T'" msgstr "" -#: cp/class.c:2497 +#: cp/class.c:2313 msgid "no unique final overrider for `%D' in `%T'" msgstr "" #. Here we know it is a hider, and no overrider exists. -#: cp/class.c:2879 +#: cp/class.c:2652 msgid "`%D' was hidden" msgstr "" -#: cp/class.c:2880 +#: cp/class.c:2653 msgid " by `%D'" msgstr "" -#: cp/class.c:2922 +#: cp/class.c:2695 msgid "ISO C++ forbids member `%D' with same name as enclosing class" msgstr "" -#: cp/class.c:2927 cp/decl2.c:1874 +#: cp/class.c:2700 cp/decl2.c:1327 msgid "`%#D' invalid; an anonymous union can only have non-static data members" msgstr "" -#: cp/class.c:2933 cp/decl2.c:1880 +#: cp/class.c:2706 cp/decl2.c:1333 msgid "private member `%#D' in anonymous union" msgstr "" -#: cp/class.c:2936 cp/decl2.c:1882 +#: cp/class.c:2709 cp/decl2.c:1335 msgid "protected member `%#D' in anonymous union" msgstr "" -#: cp/class.c:3088 +#: cp/class.c:2834 +msgid "" +"vtable layout for class `%T' may not be ABI-compliant and may change in a " +"future version of GCC due to implicit virtual destructor" +msgstr "" + +#: cp/class.c:2898 msgid "bit-field `%#D' with non-integral type" msgstr "" -#: cp/class.c:3108 +#: cp/class.c:2918 msgid "bit-field `%D' width not an integer constant" msgstr "" -#: cp/class.c:3114 +#: cp/class.c:2924 msgid "negative width in bit-field `%D'" msgstr "" -#: cp/class.c:3119 +#: cp/class.c:2929 msgid "zero width for bit-field `%D'" msgstr "" -#: cp/class.c:3125 +#: cp/class.c:2935 msgid "width of `%D' exceeds its type" msgstr "" -#: cp/class.c:3134 +#: cp/class.c:2944 msgid "`%D' is too small to hold all values of `%#T'" msgstr "" -#: cp/class.c:3218 +#: cp/class.c:3028 msgid "member `%#D' with constructor not allowed in union" msgstr "" -#: cp/class.c:3221 +#: cp/class.c:3031 msgid "member `%#D' with destructor not allowed in union" msgstr "" -#: cp/class.c:3224 +#: cp/class.c:3034 msgid "member `%#D' with copy assignment operator not allowed in union" msgstr "" -#: cp/class.c:3251 +#: cp/class.c:3061 msgid "multiple fields in union `%T' initialized" msgstr "" -#: cp/class.c:3370 +#: cp/class.c:3183 msgid "field `%D' in local class cannot be static" msgstr "" -#: cp/class.c:3376 +#: cp/class.c:3189 msgid "field `%D' invalidly declared function type" msgstr "" -#: cp/class.c:3383 +#: cp/class.c:3196 msgid "field `%D' invalidly declared method type" msgstr "" -#: cp/class.c:3389 +#: cp/class.c:3202 msgid "field `%D' invalidly declared offset type" msgstr "" #. Unions cannot have static members. -#: cp/class.c:3407 +#: cp/class.c:3220 msgid "field `%D' declared static in union" msgstr "" -#: cp/class.c:3433 +#: cp/class.c:3247 msgid "non-static reference `%#D' in class without a constructor" msgstr "" -#: cp/class.c:3464 +#: cp/class.c:3282 msgid "non-static const member `%#D' in class without a constructor" msgstr "" -#: cp/class.c:3479 +#: cp/class.c:3298 msgid "field `%#D' with same name as class" msgstr "" -#: cp/class.c:3497 +#: cp/class.c:3316 msgid "`%#T' has pointer data members" msgstr "" -#: cp/class.c:3501 +#: cp/class.c:3320 msgid " but does not override `%T(const %T&)'" msgstr "" -#: cp/class.c:3503 +#: cp/class.c:3322 msgid " or `operator=(const %T&)'" msgstr "" -#: cp/class.c:3506 +#: cp/class.c:3325 msgid " but does not override `operator=(const %T&)'" msgstr "" -#: cp/class.c:3972 +#: cp/class.c:3775 +msgid "" +"offset of empty base `%T' may not be ABI-compliant and maychange in a future " +"version of GCC" +msgstr "" + +#: cp/class.c:3883 +msgid "class `%T' will be considered nearly empty in a future version of GCC" +msgstr "" + +#: cp/class.c:3973 msgid "initializer specified for non-virtual method `%D'" msgstr "" -#: cp/class.c:4757 -msgid "virtual base `%T' inaccessible in `%T' due to ambiguity" +#: cp/class.c:4709 +msgid "" +"offset of virtual base `%T' is not ABI-compliant and may change in a future " +"version of GCC" msgstr "" -#: cp/class.c:4827 +#: cp/class.c:4809 msgid "direct base `%T' inaccessible in `%T' due to ambiguity" msgstr "" -#: cp/class.c:5254 +#: cp/class.c:4822 +msgid "virtual base `%T' inaccessible in `%T' due to ambiguity" +msgstr "" + +#: cp/class.c:4978 +msgid "" +"size assigned to `%T' may not be ABI-compliant and may change in a future " +"version of GCC" +msgstr "" + +#: cp/class.c:5011 +msgid "" +"offset of `%D' is not ABI-compliant and may change in a future version of GCC" +msgstr "" + +#: cp/class.c:5020 +msgid "" +"`%D' contains empty classes which may cause base classes to be placed at " +"different locations in a future version of GCC" +msgstr "" + +#: cp/class.c:5079 +msgid "" +"layout of classes derived from empty class `%T' may change in a future " +"version of GCC" +msgstr "" + +#: cp/class.c:5320 msgid "`%#T' has virtual functions but non-virtual destructor" msgstr "" -#: cp/class.c:5338 +#: cp/class.c:5405 msgid "trying to finish struct, but kicked out due to previous parse errors" msgstr "" -#: cp/class.c:5795 +#: cp/class.c:5861 #, c-format msgid "language string `\"%s\"' not recognized" msgstr "" -#: cp/class.c:5891 +#: cp/class.c:5957 msgid "" "cannot resolve overloaded function `%D' based on conversion to type `%T'" msgstr "" -#: cp/class.c:6012 +#: cp/class.c:6078 msgid "no matches converting function `%D' to type `%#T'" msgstr "" -#: cp/class.c:6035 +#: cp/class.c:6101 msgid "converting overloaded function `%D' to type `%#T' is ambiguous" msgstr "" -#: cp/class.c:6061 +#: cp/class.c:6127 msgid "assuming pointer to member `%D'" msgstr "" -#: cp/class.c:6064 +#: cp/class.c:6130 #, c-format msgid "(a pointer to member can only be formed with `&%E')" msgstr "" -#: cp/class.c:6108 cp/class.c:6276 cp/class.c:6283 +#: cp/class.c:6174 cp/class.c:6345 cp/class.c:6352 msgid "not enough type information" msgstr "" -#: cp/class.c:6117 +#: cp/class.c:6183 msgid "argument of type `%T' does not match `%T'" msgstr "" -#: cp/class.c:6260 +#: cp/class.c:6329 msgid "invalid operation on uninstantiated type" msgstr "" @@ -13636,11 +14032,11 @@ msgstr "" #. A name N used in a class S shall refer to the same declaration #. in its context and when re-evaluated in the completed scope of #. S. -#: cp/class.c:6512 cp/decl.c:1029 cp/decl.c:3169 cp/pt.c:1844 +#: cp/class.c:6612 cp/decl.c:1006 cp/decl.c:3102 cp/pt.c:1845 msgid "declaration of `%#D'" msgstr "" -#: cp/class.c:6513 +#: cp/class.c:6613 msgid "changes meaning of `%D' from `%+#D'" msgstr "" @@ -13656,206 +14052,210 @@ msgstr "" msgid "converting from `%T' to `%T'" msgstr "" -#: cp/cvt.c:198 cp/cvt.c:202 +#: cp/cvt.c:201 cp/cvt.c:205 msgid "pointer to member cast from `%T' to `%T' is via virtual base" msgstr "" -#: cp/cvt.c:220 cp/cvt.c:233 cp/cvt.c:272 +#: cp/cvt.c:223 cp/cvt.c:236 cp/cvt.c:283 msgid "cannot convert `%E' from type `%T' to type `%T'" msgstr "" -#: cp/cvt.c:525 +#: cp/cvt.c:262 +msgid "invalid conversion from '%T' to '%T'" +msgstr "" + +#: cp/cvt.c:537 msgid "conversion from `%T' to `%T' discards qualifiers" msgstr "" -#: cp/cvt.c:543 +#: cp/cvt.c:555 msgid "casting `%T' to `%T' does not dereference pointer" msgstr "" -#: cp/cvt.c:572 +#: cp/cvt.c:584 msgid "cannot convert type `%T' to type `%T'" msgstr "" -#: cp/cvt.c:689 +#: cp/cvt.c:701 msgid "conversion from `%#T' to `%#T'" msgstr "" -#: cp/cvt.c:701 +#: cp/cvt.c:713 msgid "`%#T' used where a `%T' was expected" msgstr "" -#: cp/cvt.c:718 +#: cp/cvt.c:730 msgid "the address of `%D', will always be `true'" msgstr "" -#: cp/cvt.c:738 +#: cp/cvt.c:750 msgid "`%#T' used where a floating point value was expected" msgstr "" -#: cp/cvt.c:793 +#: cp/cvt.c:797 msgid "conversion from `%T' to non-scalar type `%T' requested" msgstr "" -#: cp/cvt.c:879 +#: cp/cvt.c:883 msgid "object of incomplete type `%T' will not be accessed in %s" msgstr "" -#: cp/cvt.c:882 +#: cp/cvt.c:886 msgid "object of type `%T' will not be accessed in %s" msgstr "" -#: cp/cvt.c:898 +#: cp/cvt.c:902 msgid "object `%E' of incomplete type `%T' will not be accessed in %s" msgstr "" #. [over.over] enumerates the places where we can take the address #. of an overloaded function, and this is not one of them. -#: cp/cvt.c:918 +#: cp/cvt.c:922 #, c-format msgid "%s cannot resolve address of overloaded function" msgstr "" #. Only warn when there is no &. -#: cp/cvt.c:923 +#: cp/cvt.c:927 #, c-format msgid "%s is a reference, not call, to function `%E'" msgstr "" -#: cp/cvt.c:1061 +#: cp/cvt.c:1065 msgid "converting NULL to non-pointer type" msgstr "" -#: cp/cvt.c:1137 +#: cp/cvt.c:1141 msgid "ambiguous default type conversion from `%T'" msgstr "" -#: cp/cvt.c:1139 +#: cp/cvt.c:1143 msgid " candidate conversions include `%D' and `%D'" msgstr "" -#: cp/decl.c:1030 cp/decl.c:3272 +#: cp/decl.c:1007 cp/decl.c:3205 msgid "conflicts with previous declaration `%#D'" msgstr "" -#: cp/decl.c:1219 +#: cp/decl.c:1211 msgid "label `%D' used but not defined" msgstr "" -#: cp/decl.c:1224 +#: cp/decl.c:1216 msgid "label `%D' defined but not used" msgstr "" -#: cp/decl.c:2291 +#: cp/decl.c:2249 msgid "namespace alias `%D' not allowed here, assuming `%D'" msgstr "" -#: cp/decl.c:3075 cp/decl.c:3480 +#: cp/decl.c:3008 cp/decl.c:3413 msgid "previous declaration of `%D'" msgstr "" -#: cp/decl.c:3156 cp/decl.c:3194 +#: cp/decl.c:3089 cp/decl.c:3127 msgid "shadowing %s function `%#D'" msgstr "" -#: cp/decl.c:3165 +#: cp/decl.c:3098 msgid "library function `%#D' redeclared as non-function `%#D'" msgstr "" -#: cp/decl.c:3170 +#: cp/decl.c:3103 msgid "conflicts with built-in declaration `%#D'" msgstr "" -#: cp/decl.c:3189 cp/decl.c:3282 cp/decl.c:3298 +#: cp/decl.c:3122 cp/decl.c:3219 cp/decl.c:3235 msgid "new declaration `%#D'" msgstr "" -#: cp/decl.c:3190 +#: cp/decl.c:3123 msgid "ambiguates built-in declaration `%#D'" msgstr "" -#: cp/decl.c:3246 +#: cp/decl.c:3179 msgid "`%#D' redeclared as different kind of symbol" msgstr "" -#: cp/decl.c:3249 +#: cp/decl.c:3182 msgid "previous declaration of `%#D'" msgstr "" -#: cp/decl.c:3271 +#: cp/decl.c:3204 msgid "declaration of template `%#D'" msgstr "" -#: cp/decl.c:3283 cp/decl.c:3299 +#: cp/decl.c:3220 cp/decl.c:3236 msgid "ambiguates old declaration `%#D'" msgstr "" -#: cp/decl.c:3291 +#: cp/decl.c:3228 msgid "declaration of C function `%#D' conflicts with" msgstr "" -#: cp/decl.c:3293 +#: cp/decl.c:3230 msgid "previous declaration `%#D' here" msgstr "" -#: cp/decl.c:3309 +#: cp/decl.c:3246 msgid "conflicting types for `%#D'" msgstr "" -#: cp/decl.c:3310 +#: cp/decl.c:3247 msgid "previous declaration as `%#D'" msgstr "" -#: cp/decl.c:3353 +#: cp/decl.c:3290 msgid "`%#D' previously defined here" msgstr "" -#: cp/decl.c:3354 +#: cp/decl.c:3291 msgid "`%#D' previously declared here" msgstr "" #. Prototype decl follows defn w/o prototype. -#: cp/decl.c:3363 +#: cp/decl.c:3300 msgid "prototype for `%#D'" msgstr "" -#: cp/decl.c:3364 +#: cp/decl.c:3301 msgid "follows non-prototype definition here" msgstr "" -#: cp/decl.c:3376 +#: cp/decl.c:3313 msgid "previous declaration of `%#D' with %L linkage" msgstr "" -#: cp/decl.c:3378 +#: cp/decl.c:3315 msgid "conflicts with new declaration with %L linkage" msgstr "" -#: cp/decl.c:3401 cp/decl.c:3408 +#: cp/decl.c:3338 cp/decl.c:3345 msgid "default argument given for parameter %d of `%#D'" msgstr "" -#: cp/decl.c:3403 cp/decl.c:3410 +#: cp/decl.c:3340 cp/decl.c:3347 msgid "after previous specification in `%#D'" msgstr "" -#: cp/decl.c:3419 +#: cp/decl.c:3356 msgid "`%#D' was used before it was declared inline" msgstr "" -#: cp/decl.c:3421 +#: cp/decl.c:3358 msgid "previous non-inline declaration here" msgstr "" -#: cp/decl.c:3479 +#: cp/decl.c:3412 msgid "redundant redeclaration of `%D' in same scope" msgstr "" -#: cp/decl.c:3563 +#: cp/decl.c:3493 #, c-format msgid "declaration of `%F' throws different exceptions" msgstr "" -#: cp/decl.c:3565 +#: cp/decl.c:3495 #, c-format msgid "than previous declaration `%F'" msgstr "" @@ -13868,15 +14268,15 @@ msgstr "" #. that specialization that would cause an implicit #. instantiation to take place, in every translation unit in #. which such a use occurs. -#: cp/decl.c:3698 +#: cp/decl.c:3632 msgid "explicit specialization of %D after first use" msgstr "" -#: cp/decl.c:3943 +#: cp/decl.c:3886 msgid "`%#D' used prior to declaration" msgstr "" -#: cp/decl.c:3974 +#: cp/decl.c:3917 msgid "redeclaration of `wchar_t' as `%T'" msgstr "" @@ -13886,856 +14286,900 @@ msgstr "" #. [basic.start.main] #. #. This function shall not be overloaded. -#: cp/decl.c:4002 +#: cp/decl.c:3945 msgid "invalid redeclaration of `%D'" msgstr "" -#: cp/decl.c:4003 +#: cp/decl.c:3946 msgid "as `%D'" msgstr "" -#: cp/decl.c:4093 +#: cp/decl.c:4036 msgid "previous external decl of `%#D'" msgstr "" -#: cp/decl.c:4134 +#: cp/decl.c:4077 msgid "`%D' was previously implicitly declared to return `int'" msgstr "" -#: cp/decl.c:4194 +#: cp/decl.c:4137 msgid "extern declaration of `%#D' doesn't match" msgstr "" -#: cp/decl.c:4195 +#: cp/decl.c:4138 msgid "global declaration `%#D'" msgstr "" -#: cp/decl.c:4226 +#: cp/decl.c:4169 msgid "declaration of `%#D' shadows a parameter" msgstr "" -#: cp/decl.c:4246 +#: cp/decl.c:4189 #, c-format msgid "declaration of `%s' shadows a member of `this'" msgstr "" -#: cp/decl.c:4597 +#: cp/decl.c:4541 msgid "`%#D' hides constructor for `%#T'" msgstr "" -#: cp/decl.c:4612 +#: cp/decl.c:4556 msgid "`%#D' conflicts with previous using declaration `%#D'" msgstr "" -#: cp/decl.c:4624 +#: cp/decl.c:4568 msgid "previous non-function declaration `%#D'" msgstr "" -#: cp/decl.c:4625 +#: cp/decl.c:4569 msgid "conflicts with function declaration `%#D'" msgstr "" -#: cp/decl.c:4715 +#: cp/decl.c:4659 msgid "implicit declaration of function `%#D'" msgstr "" -#: cp/decl.c:4873 +#: cp/decl.c:4817 #, c-format msgid "label `%s' referenced outside of any function" msgstr "" -#: cp/decl.c:4976 cp/decl.c:5000 cp/decl.c:5093 +#: cp/decl.c:4920 cp/decl.c:4944 cp/decl.c:5037 msgid "jump to label `%D'" msgstr "" -#: cp/decl.c:4978 cp/decl.c:5002 +#: cp/decl.c:4922 cp/decl.c:4946 msgid "jump to case label" msgstr "" -#: cp/decl.c:4986 +#: cp/decl.c:4930 msgid " crosses initialization of `%#D'" msgstr "" -#: cp/decl.c:4989 cp/decl.c:5109 +#: cp/decl.c:4933 cp/decl.c:5053 msgid " enters scope of non-POD `%#D'" msgstr "" -#: cp/decl.c:5009 cp/decl.c:5113 +#: cp/decl.c:4953 cp/decl.c:5057 msgid " enters try block" msgstr "" #. Can't skip init of __exception_info. -#: cp/decl.c:5011 cp/decl.c:5105 cp/decl.c:5115 +#: cp/decl.c:4955 cp/decl.c:5049 cp/decl.c:5059 msgid " enters catch block" msgstr "" -#: cp/decl.c:5094 +#: cp/decl.c:5038 msgid " from here" msgstr "" -#: cp/decl.c:5107 +#: cp/decl.c:5051 msgid " skips initialization of `%#D'" msgstr "" -#: cp/decl.c:5142 +#: cp/decl.c:5086 msgid "label named wchar_t" msgstr "" -#: cp/decl.c:5146 +#: cp/decl.c:5090 msgid "duplicate label `%D'" msgstr "" -#: cp/decl.c:5231 +#: cp/decl.c:5175 #, c-format msgid "case label `%E' not within a switch statement" msgstr "" #. Definition isn't the kind we were looking for. -#: cp/decl.c:5408 cp/decl.c:5427 +#: cp/decl.c:5354 cp/decl.c:5373 msgid "`%#D' redeclared as %C" msgstr "" #. This happens for A::B where B is a template, and there are no #. template arguments. -#: cp/decl.c:5515 cp/typeck.c:1981 +#: cp/decl.c:5461 cp/typeck.c:2062 cp/typeck.c:2217 msgid "invalid use of `%D'" msgstr "" -#: cp/decl.c:5556 +#: cp/decl.c:5502 msgid "`%D::%D' is not a template" msgstr "" -#: cp/decl.c:5573 +#: cp/decl.c:5519 msgid "`%D' undeclared in namespace `%D'" msgstr "" -#: cp/decl.c:5710 +#: cp/decl.c:5652 msgid "`%D' used without template parameters" msgstr "" -#: cp/decl.c:5721 cp/decl.c:5737 cp/decl.c:5825 +#: cp/decl.c:5663 cp/decl.c:5679 cp/decl.c:5783 msgid "no class template named `%#T' in `%#T'" msgstr "" -#: cp/decl.c:5755 cp/decl.c:5785 +#: cp/decl.c:5702 cp/decl.c:5712 cp/decl.c:5744 msgid "no type named `%#T' in `%#T'" msgstr "" -#: cp/decl.c:6008 +#: cp/decl.c:5968 msgid "lookup of `%D' finds `%#D'" msgstr "" -#: cp/decl.c:6010 +#: cp/decl.c:5970 msgid " instead of `%D' from dependent base class" msgstr "" -#: cp/decl.c:6012 +#: cp/decl.c:5972 msgid " (use `typename %T::%D' if that's what you meant)" msgstr "" -#: cp/decl.c:6185 +#: cp/decl.c:6003 +msgid "name lookup of `%D' changed" +msgstr "" + +#: cp/decl.c:6005 +msgid " matches this `%D' under ISO standard rules" +msgstr "" + +#: cp/decl.c:6007 +msgid " matches this `%D' under old rules" +msgstr "" + +#: cp/decl.c:6021 cp/decl.c:6028 +msgid "name lookup of `%D' changed for new ISO `for' scoping" +msgstr "" + +#: cp/decl.c:6023 +msgid " cannot use obsolete binding at `%D' because it has a destructor" +msgstr "" + +#: cp/decl.c:6030 +msgid " using obsolete binding at `%D'" +msgstr "" + +#: cp/decl.c:6211 msgid "" "lookup of `%D' in the scope of `%#T' (`%#D') does not match lookup in the " "current scope (`%#D')" msgstr "" -#: cp/decl.c:7024 +#: cp/decl.c:7025 msgid "an anonymous union cannot have function members" msgstr "" -#: cp/decl.c:7041 +#: cp/decl.c:7042 msgid "member %#D' with constructor not allowed in anonymous aggregate" msgstr "" -#: cp/decl.c:7044 +#: cp/decl.c:7045 msgid "member %#D' with destructor not allowed in anonymous aggregate" msgstr "" -#: cp/decl.c:7047 +#: cp/decl.c:7048 msgid "" "member %#D' with copy assignment operator not allowed in anonymous aggregate" msgstr "" -#: cp/decl.c:7085 +#: cp/decl.c:7086 msgid "redeclaration of C++ built-in type `%T'" msgstr "" -#: cp/decl.c:7120 +#: cp/decl.c:7122 msgid "multiple types in one declaration" msgstr "" -#: cp/decl.c:7123 -msgid "declaration does not declare anything" -msgstr "" - -#: cp/decl.c:7147 +#: cp/decl.c:7149 msgid "missing type-name in typedef-declaration" msgstr "" -#: cp/decl.c:7154 +#: cp/decl.c:7156 msgid "ISO C++ prohibits anonymous structs" msgstr "" -#: cp/decl.c:7161 +#: cp/decl.c:7163 msgid "`%D' can only be specified for functions" msgstr "" -#: cp/decl.c:7163 +#: cp/decl.c:7165 msgid "`%D' can only be specified inside a class" msgstr "" -#: cp/decl.c:7165 +#: cp/decl.c:7167 msgid "`%D' can only be specified for constructors" msgstr "" -#: cp/decl.c:7168 +#: cp/decl.c:7170 msgid "`%D' can only be specified for objects and functions" msgstr "" -#: cp/decl.c:7317 -msgid "typedef `%D' is initialized" +#: cp/decl.c:7312 cp/decl2.c:927 +msgid "typedef `%D' is initialized (use __typeof__ instead)" msgstr "" -#: cp/decl.c:7323 +#: cp/decl.c:7317 msgid "function `%#D' is initialized like a variable" msgstr "" -#: cp/decl.c:7335 +#: cp/decl.c:7329 msgid "declaration of `%#D' has `extern' and is initialized" msgstr "" -#: cp/decl.c:7369 +#: cp/decl.c:7363 msgid "`%#D' is not a static member of `%#T'" msgstr "" -#: cp/decl.c:7374 +#: cp/decl.c:7368 msgid "ISO C++ does not permit `%T::%D' to be defined as `%T::%D'" msgstr "" -#: cp/decl.c:7385 +#: cp/decl.c:7379 msgid "duplicate initialization of %D" msgstr "" -#: cp/decl.c:7414 +#: cp/decl.c:7408 msgid "declaration of `%#D' outside of class is not definition" msgstr "" -#: cp/decl.c:7462 +#: cp/decl.c:7456 msgid "variable `%#D' has initializer but incomplete type" msgstr "" -#: cp/decl.c:7470 cp/decl.c:7821 +#: cp/decl.c:7464 cp/decl.c:8006 msgid "elements of array `%#D' have incomplete type" msgstr "" -#: cp/decl.c:7486 +#: cp/decl.c:7480 msgid "aggregate `%#D' has incomplete type and cannot be defined" msgstr "" -#: cp/decl.c:7525 +#: cp/decl.c:7519 msgid "`%D' declared as reference but not initialized" msgstr "" -#: cp/decl.c:7534 +#: cp/decl.c:7528 msgid "ISO C++ forbids use of initializer list to initialize reference `%D'" msgstr "" -#: cp/decl.c:7567 +#: cp/decl.c:7561 msgid "cannot initialize `%T' from `%T'" msgstr "" -#: cp/decl.c:7628 +#: cp/decl.c:7595 msgid "initializer fails to determine size of `%D'" msgstr "" -#: cp/decl.c:7633 +#: cp/decl.c:7600 msgid "array size missing in `%D'" msgstr "" -#: cp/decl.c:7645 +#: cp/decl.c:7612 msgid "zero-size array `%D'" msgstr "" #. An automatic variable with an incomplete type: that is an error. #. Don't talk about array types here, since we took care of that #. message in grokdeclarator. -#: cp/decl.c:7678 +#: cp/decl.c:7650 msgid "storage size of `%D' isn't known" msgstr "" -#: cp/decl.c:7700 +#: cp/decl.c:7672 msgid "storage size of `%D' isn't constant" msgstr "" -#: cp/decl.c:7751 +#: cp/decl.c:7723 msgid "" "sorry: semantics of inline function static data `%#D' are wrong (you'll wind " "up with multiple copies)" msgstr "" -#: cp/decl.c:7752 +#: cp/decl.c:7724 msgid " you can work around this by removing the initializer" msgstr "" -#: cp/decl.c:7780 +#: cp/decl.c:7752 msgid "uninitialized const `%D'" msgstr "" -#: cp/decl.c:7815 +#: cp/decl.c:7836 +msgid "brace-enclosed initializer used to initialize `%T'" +msgstr "" + +#: cp/decl.c:7900 +msgid "initializer for `%T' must be brace-enclosed" +msgstr "" + +#: cp/decl.c:7964 +msgid "too many initializers for `%T'" +msgstr "" + +#: cp/decl.c:8000 msgid "variable-sized object `%D' may not be initialized" msgstr "" -#: cp/decl.c:7826 cp/typeck2.c:201 +#: cp/decl.c:8011 msgid "`%D' has incomplete type" msgstr "" -#: cp/decl.c:7858 +#: cp/decl.c:8060 msgid "`%D' must be initialized by constructor, not by `{...}'" msgstr "" -#: cp/decl.c:7888 +#: cp/decl.c:8101 msgid "structure `%D' with uninitialized const members" msgstr "" -#: cp/decl.c:7890 +#: cp/decl.c:8103 msgid "structure `%D' with uninitialized reference members" msgstr "" -#: cp/decl.c:8157 +#: cp/decl.c:8346 msgid "assignment (not initialization) in declaration" msgstr "" -#: cp/decl.c:8169 +#: cp/decl.c:8358 msgid "cannot initialize `%D' to namespace `%D'" msgstr "" -#: cp/decl.c:8226 +#: cp/decl.c:8409 msgid "shadowing previous type declaration of `%#D'" msgstr "" -#: cp/decl.c:8624 +#: cp/decl.c:8455 +msgid "`%D' cannot be thread-local because it has non-POD type `%T'" +msgstr "" + +#: cp/decl.c:8470 +msgid "`%D' is thread-local and so cannot be dynamically initialized" +msgstr "" + +#: cp/decl.c:8864 cp/init.c:547 msgid "multiple initializations given for `%D'" msgstr "" -#: cp/decl.c:8724 +#: cp/decl.c:8956 msgid "invalid catch parameter" msgstr "" -#: cp/decl.c:8842 +#: cp/decl.c:9074 msgid "destructor for alien class `%T' cannot be a member" msgstr "" -#: cp/decl.c:8845 +#: cp/decl.c:9077 msgid "constructor for alien class `%T' cannot be a member" msgstr "" -#: cp/decl.c:8864 +#: cp/decl.c:9096 msgid "`%D' declared as a `virtual' %s" msgstr "" -#: cp/decl.c:8866 +#: cp/decl.c:9098 msgid "`%D' declared as an `inline' %s" msgstr "" -#: cp/decl.c:8868 +#: cp/decl.c:9100 msgid "" "`const' and `volatile' function specifiers on `%D' invalid in %s declaration" msgstr "" -#: cp/decl.c:8871 +#: cp/decl.c:9103 msgid "`%D' declared as a friend" msgstr "" -#: cp/decl.c:8877 +#: cp/decl.c:9109 msgid "`%D' declared with an exception specification" msgstr "" -#: cp/decl.c:8952 +#: cp/decl.c:9184 msgid "cannot declare `::main' to be a template" msgstr "" -#: cp/decl.c:8954 +#: cp/decl.c:9186 msgid "cannot declare `::main' to be inline" msgstr "" -#: cp/decl.c:8956 +#: cp/decl.c:9188 msgid "cannot declare `::main' to be static" msgstr "" -#: cp/decl.c:8959 +#: cp/decl.c:9191 msgid "`main' must return `int'" msgstr "" -#: cp/decl.c:8987 +#: cp/decl.c:9219 msgid "non-local function `%#D' uses anonymous type" msgstr "" -#: cp/decl.c:8990 +#: cp/decl.c:9222 msgid "" "`%#D' does not refer to the unqualified type, so it is not used for linkage" msgstr "" -#: cp/decl.c:8996 +#: cp/decl.c:9228 msgid "non-local function `%#D' uses local type `%T'" msgstr "" -#: cp/decl.c:9019 +#: cp/decl.c:9251 msgid "%smember function `%D' cannot have `%T' method qualifier" msgstr "" -#: cp/decl.c:9043 +#: cp/decl.c:9275 msgid "defining explicit specialization `%D' in friend declaration" msgstr "" #. Something like `template <class T> friend void f<T>()'. -#: cp/decl.c:9053 +#: cp/decl.c:9285 msgid "invalid use of template-id `%D' in declaration of primary template" msgstr "" -#: cp/decl.c:9081 +#: cp/decl.c:9313 msgid "" "default arguments are not allowed in declaration of friend template " "specialization `%D'" msgstr "" -#: cp/decl.c:9088 +#: cp/decl.c:9320 msgid "" "`inline' is not allowed in declaration of friend template specialization `%D'" msgstr "" -#: cp/decl.c:9150 +#: cp/decl.c:9382 msgid "definition of implicitly-declared `%D'" msgstr "" -#: cp/decl.c:9162 cp/decl2.c:1358 +#: cp/decl.c:9394 cp/decl2.c:776 msgid "no `%#D' member function declared in class `%T'" msgstr "" -#: cp/decl.c:9281 +#: cp/decl.c:9527 msgid "non-local variable `%#D' uses local type `%T'" msgstr "" -#: cp/decl.c:9371 +#: cp/decl.c:9625 msgid "" "invalid in-class initialization of static data member of non-integral type `%" "T'" msgstr "" -#: cp/decl.c:9380 +#: cp/decl.c:9634 msgid "ISO C++ forbids in-class initialization of non-const static member `%D'" msgstr "" -#: cp/decl.c:9383 +#: cp/decl.c:9637 msgid "" "ISO C++ forbids initialization of member constant `%D' of non-integral type `" "%T'" msgstr "" -#: cp/decl.c:9433 +#: cp/decl.c:9687 msgid "size of array `%D' has non-integer type" msgstr "" -#: cp/decl.c:9435 +#: cp/decl.c:9689 msgid "size of array has non-integer type" msgstr "" -#: cp/decl.c:9455 +#: cp/decl.c:9709 msgid "size of array `%D' is negative" msgstr "" -#: cp/decl.c:9457 +#: cp/decl.c:9711 msgid "size of array is negative" msgstr "" -#: cp/decl.c:9466 +#: cp/decl.c:9720 msgid "ISO C++ forbids zero-size array `%D'" msgstr "" -#: cp/decl.c:9468 +#: cp/decl.c:9722 msgid "ISO C++ forbids zero-size array" msgstr "" -#: cp/decl.c:9475 +#: cp/decl.c:9729 msgid "size of array `%D' is not an integral constant-expression" msgstr "" -#: cp/decl.c:9478 +#: cp/decl.c:9732 msgid "size of array is not an integral constant-expression" msgstr "" -#: cp/decl.c:9496 +#: cp/decl.c:9750 msgid "ISO C++ forbids variable-size array `%D'" msgstr "" -#: cp/decl.c:9499 +#: cp/decl.c:9753 msgid "ISO C++ forbids variable-size array" msgstr "" -#: cp/decl.c:9510 +#: cp/decl.c:9764 msgid "overflow in array dimension" msgstr "" -#: cp/decl.c:9569 +#: cp/decl.c:9823 msgid "declaration of `%D' as %s" msgstr "" -#: cp/decl.c:9571 +#: cp/decl.c:9825 #, c-format msgid "creating %s" msgstr "" -#: cp/decl.c:9583 +#: cp/decl.c:9837 msgid "" "declaration of `%D' as multidimensional array must have bounds for all " "dimensions except the first" msgstr "" -#: cp/decl.c:9586 +#: cp/decl.c:9840 msgid "" "multidimensional array must have bounds for all dimensions except the first" msgstr "" -#: cp/decl.c:9615 +#: cp/decl.c:9869 msgid "return type specification for constructor invalid" msgstr "" -#: cp/decl.c:9622 +#: cp/decl.c:9876 msgid "return type specification for destructor invalid" msgstr "" -#: cp/decl.c:9628 +#: cp/decl.c:9882 msgid "operator `%T' declared to return `%T'" msgstr "" -#: cp/decl.c:9630 +#: cp/decl.c:9884 msgid "return type specified for `operator %T'" msgstr "" -#: cp/decl.c:9798 +#: cp/decl.c:10052 msgid "destructors must be member functions" msgstr "" -#: cp/decl.c:9817 +#: cp/decl.c:10071 msgid "destructor `%T' must match class name `%T'" msgstr "" -#: cp/decl.c:9867 +#: cp/decl.c:10100 +msgid "variable declaration is not allowed here" +msgstr "" + +#: cp/decl.c:10127 msgid "invalid declarator" msgstr "" -#: cp/decl.c:9920 +#: cp/decl.c:10178 msgid "declarator-id missing; using reserved word `%D'" msgstr "" -#: cp/decl.c:9977 +#: cp/decl.c:10235 msgid "type `%T' is not derived from type `%T'" msgstr "" #. Parse error puts this typespec where #. a declarator should go. -#: cp/decl.c:10023 +#: cp/decl.c:10279 msgid "`%T' specified as declarator-id" msgstr "" -#: cp/decl.c:10025 +#: cp/decl.c:10281 msgid " perhaps you want `%T' for a constructor" msgstr "" -#: cp/decl.c:10039 -msgid "`%D' as declarator" +#. Sometimes, we see a template-name used as part of a +#. decl-specifier like in +#. std::allocator alloc; +#. Handle that gracefully. +#: cp/decl.c:10303 +#, c-format +msgid "invalid use of template-name '%E' in a declarator" msgstr "" -#: cp/decl.c:10054 +#: cp/decl.c:10323 msgid "declaration of `%D' as non-function" msgstr "" -#: cp/decl.c:10131 +#: cp/decl.c:10400 msgid "`bool' is now a keyword" msgstr "" -#: cp/decl.c:10133 +#: cp/decl.c:10402 msgid "extraneous `%T' ignored" msgstr "" -#: cp/decl.c:10149 cp/decl.c:10182 +#: cp/decl.c:10418 cp/decl.c:10463 msgid "multiple declarations `%T' and `%T'" msgstr "" -#: cp/decl.c:10162 +#: cp/decl.c:10431 msgid "ISO C++ does not support `long long'" msgstr "" -#: cp/decl.c:10255 cp/decl.c:10258 +#: cp/decl.c:10536 cp/decl.c:10539 #, c-format msgid "ISO C++ forbids declaration of `%s' with no type" msgstr "" #. The implicit typename extension is deprecated and will be #. removed. Warn about its use now. -#: cp/decl.c:10268 +#: cp/decl.c:10549 msgid "`%T' is implicitly a typename" msgstr "" -#: cp/decl.c:10304 +#: cp/decl.c:10585 #, c-format msgid "short, signed or unsigned invalid for `%s'" msgstr "" -#: cp/decl.c:10309 +#: cp/decl.c:10590 #, c-format msgid "long and short specified together for `%s'" msgstr "" -#: cp/decl.c:10320 +#: cp/decl.c:10601 #, c-format msgid "signed and unsigned given together for `%s'" msgstr "" -#: cp/decl.c:10429 +#: cp/decl.c:10710 msgid "qualifiers are not allowed on declaration of `operator %T'" msgstr "" -#: cp/decl.c:10451 +#: cp/decl.c:10732 msgid "member `%D' cannot be declared both virtual and static" msgstr "" -#: cp/decl.c:10460 +#: cp/decl.c:10741 msgid "`%T::%D' is not a valid declarator" msgstr "" -#: cp/decl.c:10471 +#: cp/decl.c:10753 msgid "storage class specifiers invalid in parameter declarations" msgstr "" -#: cp/decl.c:10475 +#: cp/decl.c:10757 msgid "typedef declaration invalid in parameter declaration" msgstr "" -#: cp/decl.c:10488 +#: cp/decl.c:10770 msgid "virtual outside class declaration" msgstr "" -#: cp/decl.c:10542 +#: cp/decl.c:10831 #, c-format msgid "storage class specified for %s `%s'" msgstr "" -#: cp/decl.c:10580 +#: cp/decl.c:10878 msgid "storage class specifiers invalid in friend function declarations" msgstr "" -#: cp/decl.c:10684 -msgid "size of member `%D' is not constant" -msgstr "" - -#: cp/decl.c:10763 +#: cp/decl.c:11048 msgid "destructor cannot be static member function" msgstr "" -#: cp/decl.c:10766 +#: cp/decl.c:11051 #, c-format msgid "destructors may not be `%s'" msgstr "" -#: cp/decl.c:10787 +#: cp/decl.c:11072 msgid "constructor cannot be static member function" msgstr "" -#: cp/decl.c:10790 +#: cp/decl.c:11075 msgid "constructors cannot be declared virtual" msgstr "" -#: cp/decl.c:10795 +#: cp/decl.c:11080 #, c-format msgid "constructors may not be `%s'" msgstr "" -#: cp/decl.c:10805 +#: cp/decl.c:11090 msgid "return value type specifier for constructor ignored" msgstr "" -#: cp/decl.c:10824 +#: cp/decl.c:11109 #, c-format msgid "can't initialize friend function `%s'" msgstr "" #. Cannot be both friend and virtual. -#: cp/decl.c:10828 +#: cp/decl.c:11113 msgid "virtual functions cannot be friends" msgstr "" -#: cp/decl.c:10833 +#: cp/decl.c:11118 msgid "friend declaration not in class definition" msgstr "" -#: cp/decl.c:10835 +#: cp/decl.c:11120 #, c-format msgid "can't define friend function `%s' in a local class definition" msgstr "" -#: cp/decl.c:10859 +#: cp/decl.c:11144 msgid "destructors may not have parameters" msgstr "" -#: cp/decl.c:10889 -#, c-format -msgid "cannot declare %s to references" +#: cp/decl.c:11175 cp/decl.c:11182 +msgid "cannot declare reference to `%#T'" msgstr "" -#: cp/decl.c:10900 -msgid "cannot declare pointer to `%#T' member" +#: cp/decl.c:11176 +msgid "cannot declare pointer to `%#T'" msgstr "" -#: cp/decl.c:10915 -msgid "invalid type: `void &'" +#: cp/decl.c:11181 +msgid "cannot declare pointer to `%#T' member" msgstr "" -#: cp/decl.c:11077 +#: cp/decl.c:11357 msgid "extra qualification `%T::' on member `%s' ignored" msgstr "" -#: cp/decl.c:11087 +#: cp/decl.c:11367 msgid "cannot declare member function `%T::%s' within `%T'" msgstr "" -#: cp/decl.c:11102 +#: cp/decl.c:11382 msgid "cannot declare member `%T::%s' within `%T'" msgstr "" +#: cp/decl.c:11460 +msgid "data member may not have variably modified type `%T'" +msgstr "" + #. [dcl.fct.spec] The explicit specifier shall only be used in #. declarations of constructors within a class definition. -#: cp/decl.c:11182 +#: cp/decl.c:11468 msgid "only declarations of constructors can be `explicit'" msgstr "" -#: cp/decl.c:11190 +#: cp/decl.c:11476 #, c-format msgid "non-member `%s' cannot be declared `mutable'" msgstr "" -#: cp/decl.c:11195 +#: cp/decl.c:11481 #, c-format msgid "non-object member `%s' cannot be declared `mutable'" msgstr "" -#: cp/decl.c:11201 +#: cp/decl.c:11487 #, c-format msgid "function `%s' cannot be declared `mutable'" msgstr "" -#: cp/decl.c:11206 +#: cp/decl.c:11492 #, c-format msgid "static `%s' cannot be declared `mutable'" msgstr "" -#: cp/decl.c:11211 +#: cp/decl.c:11497 #, c-format msgid "const `%s' cannot be declared `mutable'" msgstr "" -#: cp/decl.c:11224 +#: cp/decl.c:11510 msgid "template-id `%D' used as a declarator" msgstr "" -#: cp/decl.c:11245 +#: cp/decl.c:11531 msgid "ISO C++ forbids nested type `%D' with same name as enclosing class" msgstr "" -#: cp/decl.c:11292 +#: cp/decl.c:11580 msgid "typedef name may not be class-qualified" msgstr "" -#: cp/decl.c:11300 +#: cp/decl.c:11588 msgid "invalid type qualifier for non-member function type" msgstr "" -#: cp/decl.c:11316 -msgid "typedef declaration includes an initializer" -msgstr "" - -#: cp/decl.c:11366 +#: cp/decl.c:11651 msgid "type qualifiers specified for friend class declaration" msgstr "" -#: cp/decl.c:11371 +#: cp/decl.c:11656 msgid "`inline' specified for friend class declaration" msgstr "" -#: cp/decl.c:11381 +#: cp/decl.c:11664 msgid "template parameters cannot be friends" msgstr "" -#: cp/decl.c:11383 -msgid "friend declaration requires class-key, i.e. `friend class %T::%T'" +#: cp/decl.c:11666 +msgid "friend declaration requires class-key, i.e. `friend class %T::%D'" msgstr "" -#: cp/decl.c:11388 +#: cp/decl.c:11670 msgid "friend declaration requires class-key, i.e. `friend %#T'" msgstr "" -#: cp/decl.c:11402 +#: cp/decl.c:11684 msgid "trying to make class `%T' a friend of global scope" msgstr "" -#: cp/decl.c:11413 +#: cp/decl.c:11695 msgid "invalid qualifiers on non-member function type" msgstr "" -#: cp/decl.c:11432 +#: cp/decl.c:11714 msgid "abstract declarator `%T' used as declaration" msgstr "" -#: cp/decl.c:11444 +#: cp/decl.c:11726 msgid "unnamed variable or field declared void" msgstr "" -#: cp/decl.c:11453 +#: cp/decl.c:11735 msgid "variable or field declared void" msgstr "" -#: cp/decl.c:11463 +#: cp/decl.c:11745 msgid "cannot use `::' in parameter declaration" msgstr "" #. Something like struct S { int N::j; }; -#: cp/decl.c:11509 +#: cp/decl.c:11784 msgid "invalid use of `::'" msgstr "" -#: cp/decl.c:11521 +#: cp/decl.c:11796 msgid "function `%D' cannot be declared friend" msgstr "" -#: cp/decl.c:11533 +#: cp/decl.c:11808 msgid "can't make `%D' into a method -- not in a class" msgstr "" -#: cp/decl.c:11542 +#: cp/decl.c:11817 msgid "function `%D' declared virtual inside a union" msgstr "" -#: cp/decl.c:11554 +#: cp/decl.c:11829 msgid "`%D' cannot be declared virtual, since it is always static" msgstr "" -#: cp/decl.c:11627 +#: cp/decl.c:11902 msgid "field `%D' has incomplete type" msgstr "" -#: cp/decl.c:11629 +#: cp/decl.c:11904 msgid "name `%T' has incomplete type" msgstr "" -#: cp/decl.c:11638 +#: cp/decl.c:11913 msgid " in instantiation of template `%T'" msgstr "" -#: cp/decl.c:11648 +#: cp/decl.c:11923 #, c-format msgid "`%s' is neither function nor member function; cannot be declared friend" msgstr "" -#: cp/decl.c:11659 +#: cp/decl.c:11934 msgid "member functions are implicitly friends of their class" msgstr "" @@ -14751,101 +15195,106 @@ msgstr "" #. the rest of the compiler does not correctly #. handle the initialization unless the member is #. static so we make it static below. -#: cp/decl.c:11706 +#: cp/decl.c:11981 msgid "ISO C++ forbids initialization of member `%D'" msgstr "" -#: cp/decl.c:11708 +#: cp/decl.c:11983 msgid "making `%D' static" msgstr "" -#: cp/decl.c:11732 +#: cp/decl.c:12007 msgid "" "ISO C++ forbids static data member `%D' with same name as enclosing class" msgstr "" -#: cp/decl.c:11773 +#: cp/decl.c:12048 #, c-format msgid "storage class `auto' invalid for function `%s'" msgstr "" -#: cp/decl.c:11775 +#: cp/decl.c:12050 #, c-format msgid "storage class `register' invalid for function `%s'" msgstr "" -#: cp/decl.c:11786 +#: cp/decl.c:12052 +#, c-format +msgid "storage class `__thread' invalid for function `%s'" +msgstr "" + +#: cp/decl.c:12063 #, c-format msgid "" "storage class `static' invalid for function `%s' declared out of global scope" msgstr "" -#: cp/decl.c:11788 +#: cp/decl.c:12065 #, c-format msgid "" "storage class `inline' invalid for function `%s' declared out of global scope" msgstr "" -#: cp/decl.c:11795 +#: cp/decl.c:12072 #, c-format msgid "virtual non-class function `%s'" msgstr "" -#: cp/decl.c:11824 +#: cp/decl.c:12101 msgid "cannot declare member function `%D' to have static linkage" msgstr "" #. FIXME need arm citation -#: cp/decl.c:11830 +#: cp/decl.c:12107 msgid "cannot declare static function inside another function" msgstr "" -#: cp/decl.c:11858 +#: cp/decl.c:12135 msgid "" "`static' may not be used when defining (as opposed to declaring) a static " "data member" msgstr "" -#: cp/decl.c:11864 +#: cp/decl.c:12141 msgid "static member `%D' declared `register'" msgstr "" -#: cp/decl.c:11869 +#: cp/decl.c:12146 msgid "cannot explicitly declare member `%#D' to have extern linkage" msgstr "" -#: cp/decl.c:12041 +#: cp/decl.c:12318 msgid "default argument for `%#D' has type `%T'" msgstr "" -#: cp/decl.c:12044 +#: cp/decl.c:12321 msgid "default argument for parameter of type `%T' has type `%T'" msgstr "" -#: cp/decl.c:12061 +#: cp/decl.c:12338 msgid "default argument `%E' uses local variable `%D'" msgstr "" -#: cp/decl.c:12106 +#: cp/decl.c:12383 #, c-format msgid "invalid string constant `%E'" msgstr "" -#: cp/decl.c:12108 +#: cp/decl.c:12385 msgid "" "invalid integer constant in parameter list, did you forget to give parameter " "name?" msgstr "" -#: cp/decl.c:12146 +#: cp/decl.c:12423 msgid "parameter `%D' invalidly declared method type" msgstr "" -#: cp/decl.c:12152 +#: cp/decl.c:12429 msgid "parameter `%D' invalidly declared offset type" msgstr "" -#: cp/decl.c:12176 +#: cp/decl.c:12453 msgid "parameter `%D' includes %s to array of unknown bound `%T'" msgstr "" @@ -14864,563 +15313,549 @@ msgstr "" #. or implicitly defined), there's no need to worry about their #. existence. Theoretically, they should never even be #. instantiated, but that's hard to forestall. -#: cp/decl.c:12343 +#: cp/decl.c:12615 msgid "invalid constructor; you probably meant `%T (const %T&)'" msgstr "" -#: cp/decl.c:12494 +#: cp/decl.c:12766 msgid "`%D' must be a nonstatic member function" msgstr "" -#: cp/decl.c:12500 +#: cp/decl.c:12772 msgid "" "`%D' must be either a non-static member function or a non-member function" msgstr "" -#: cp/decl.c:12517 +#: cp/decl.c:12789 msgid "`%D' must have an argument of class or enumerated type" msgstr "" -#: cp/decl.c:12549 +#: cp/decl.c:12821 #, c-format msgid "conversion to %s%s will never use a type conversion operator" msgstr "" #. 13.4.0.3 -#: cp/decl.c:12556 +#: cp/decl.c:12828 msgid "ISO C++ prohibits overloading operator ?:" msgstr "" -#: cp/decl.c:12606 +#: cp/decl.c:12878 msgid "postfix `%D' must take `int' as its argument" msgstr "" -#: cp/decl.c:12610 +#: cp/decl.c:12882 msgid "postfix `%D' must take `int' as its second argument" msgstr "" -#: cp/decl.c:12617 +#: cp/decl.c:12889 msgid "`%D' must take either zero or one argument" msgstr "" -#: cp/decl.c:12619 +#: cp/decl.c:12891 msgid "`%D' must take either one or two arguments" msgstr "" -#: cp/decl.c:12640 +#: cp/decl.c:12912 msgid "prefix `%D' should return `%T'" msgstr "" -#: cp/decl.c:12646 +#: cp/decl.c:12918 msgid "postfix `%D' should return `%T'" msgstr "" -#: cp/decl.c:12655 +#: cp/decl.c:12927 msgid "`%D' must take `void'" msgstr "" -#: cp/decl.c:12657 cp/decl.c:12665 +#: cp/decl.c:12929 cp/decl.c:12937 msgid "`%D' must take exactly one argument" msgstr "" -#: cp/decl.c:12667 +#: cp/decl.c:12939 msgid "`%D' must take exactly two arguments" msgstr "" -#: cp/decl.c:12675 +#: cp/decl.c:12947 msgid "user-defined `%D' always evaluates both arguments" msgstr "" -#: cp/decl.c:12687 +#: cp/decl.c:12961 msgid "`%D' should return by value" msgstr "" -#: cp/decl.c:12699 cp/decl.c:12702 +#: cp/decl.c:12973 cp/decl.c:12976 msgid "`%D' cannot have default arguments" msgstr "" -#: cp/decl.c:12793 +#: cp/decl.c:13052 msgid "`%s %T' declares a new type at namespace scope" msgstr "" -#: cp/decl.c:12796 +#: cp/decl.c:13055 msgid "" " names from dependent base classes are not visible to unqualified name " "lookup - to refer to the inherited type, say `%s %T::%T'" msgstr "" -#: cp/decl.c:12834 +#: cp/decl.c:13093 msgid "using typedef-name `%D' after `%s'" msgstr "" -#: cp/decl.c:12839 +#: cp/decl.c:13098 msgid "using template type parameter `%T' after `%s'" msgstr "" -#: cp/decl.c:12919 +#: cp/decl.c:13178 msgid "use of enum `%#D' without previous declaration" msgstr "" -#: cp/decl.c:13017 +#: cp/decl.c:13264 msgid "derived union `%T' invalid" msgstr "" -#: cp/decl.c:13061 +#: cp/decl.c:13310 msgid "base type `%T' fails to be a struct or class type" msgstr "" -#: cp/decl.c:13071 +#: cp/decl.c:13320 msgid "base class `%T' has incomplete type" msgstr "" -#: cp/decl.c:13079 +#: cp/decl.c:13328 msgid "recursive type `%T' undefined" msgstr "" -#: cp/decl.c:13081 +#: cp/decl.c:13330 msgid "duplicate base type `%T' invalid" msgstr "" -#: cp/decl.c:13192 +#: cp/decl.c:13441 msgid "multiple definition of `%#T'" msgstr "" -#: cp/decl.c:13193 +#: cp/decl.c:13442 msgid "previous definition here" msgstr "" -#: cp/decl.c:13364 +#: cp/decl.c:13610 msgid "enumerator value for `%D' not integer constant" msgstr "" -#: cp/decl.c:13384 +#: cp/decl.c:13630 msgid "overflow in enumeration values at `%D'" msgstr "" -#: cp/decl.c:13470 +#: cp/decl.c:13716 msgid "return type `%#T' is incomplete" msgstr "" -#: cp/decl.c:13586 +#: cp/decl.c:13830 msgid "semicolon missing after declaration of `%#T'" msgstr "" -#: cp/decl.c:13607 +#: cp/decl.c:13851 msgid "return type for `main' changed to `int'" msgstr "" -#: cp/decl.c:13638 +#: cp/decl.c:13882 msgid "`%D' implicitly declared before its definition" msgstr "" -#: cp/decl.c:13660 cp/typeck.c:6541 +#: cp/decl.c:13904 cp/typeck.c:6229 msgid "`operator=' should return a reference to `*this'" msgstr "" -#: cp/decl.c:13924 +#: cp/decl.c:14164 msgid "parameter `%D' declared void" msgstr "" -#: cp/decl.c:14392 +#: cp/decl.c:14628 msgid "`%D' is already defined in class `%T'" msgstr "" -#: cp/decl.c:14609 +#: cp/decl.c:14845 msgid "static member function `%#D' declared with type qualifiers" msgstr "" -#: cp/decl2.c:521 -#, c-format -msgid "-f%s is no longer supported" -msgstr "" - -#: cp/decl2.c:527 -msgid "" -"-fhandle-exceptions has been renamed to -fexceptions (and is now on by " -"default)" -msgstr "" - -#: cp/decl2.c:553 -msgid "-fname-mangling-version is no longer supported" -msgstr "" - -#: cp/decl2.c:613 -msgid "-Wno-strict-prototypes is not supported in C++" -msgstr "" - -#: cp/decl2.c:752 +#: cp/decl2.c:154 #, c-format msgid "duplicate type qualifiers in %s declaration" msgstr "" -#: cp/decl2.c:791 +#: cp/decl2.c:193 msgid "template `%#D' instantiated in file without #pragma interface" msgstr "" -#: cp/decl2.c:797 +#: cp/decl2.c:199 msgid "template `%#D' defined in file without #pragma interface" msgstr "" -#: cp/decl2.c:954 +#: cp/decl2.c:366 msgid "name missing for member function" msgstr "" #. Something has gone very wrong. Assume we are mistakenly reducing #. an expression instead of a declaration. -#: cp/decl2.c:1017 +#: cp/decl2.c:429 msgid "parser may be lost: is there a '{' missing somewhere?" msgstr "" -#: cp/decl2.c:1048 cp/decl2.c:1062 +#: cp/decl2.c:460 cp/decl2.c:474 msgid "ambiguous conversion for array subscript" msgstr "" -#: cp/decl2.c:1056 +#: cp/decl2.c:468 msgid "invalid types `%T[%T]' for array subscript" msgstr "" -#: cp/decl2.c:1104 +#: cp/decl2.c:516 msgid "type `%#T' argument given to `delete', expected pointer" msgstr "" -#: cp/decl2.c:1112 +#: cp/decl2.c:524 msgid "anachronistic use of array size in vector delete" msgstr "" -#: cp/decl2.c:1122 +#: cp/decl2.c:534 msgid "" "cannot delete a function. Only pointer-to-objects are valid arguments to " "`delete'" msgstr "" -#: cp/decl2.c:1129 +#: cp/decl2.c:541 msgid "deleting `%T' is undefined" msgstr "" -#: cp/decl2.c:1137 +#: cp/decl2.c:549 msgid "deleting array `%#D'" msgstr "" #. 14.5.2.2 [temp.mem] #. #. A local class shall not have member templates. -#: cp/decl2.c:1171 +#: cp/decl2.c:583 msgid "invalid declaration of member template `%#D' in local class" msgstr "" -#: cp/decl2.c:1180 +#: cp/decl2.c:592 msgid "invalid use of `virtual' in template declaration of `%#D'" msgstr "" -#: cp/decl2.c:1190 cp/pt.c:2584 +#: cp/decl2.c:602 cp/pt.c:2586 msgid "template declaration of `%#D'" msgstr "" -#: cp/decl2.c:1240 +#: cp/decl2.c:652 msgid "Java method '%D' has non-Java return type `%T'" msgstr "" -#: cp/decl2.c:1249 +#: cp/decl2.c:661 msgid "Java method '%D' has non-Java parameter type `%T'" msgstr "" -#: cp/decl2.c:1345 +#: cp/decl2.c:737 msgid "prototype for `%#D' does not match any in class `%T'" msgstr "" -#: cp/decl2.c:1347 -msgid "candidate%s: %+#D" -msgstr "" - -#: cp/decl2.c:1350 -msgid " %#D" -msgstr "" - -#: cp/decl2.c:1402 +#: cp/decl2.c:819 msgid "local class `%#T' shall not have static data member `%#D'" msgstr "" -#: cp/decl2.c:1410 +#: cp/decl2.c:827 msgid "initializer invalid for static member with constructor" msgstr "" -#: cp/decl2.c:1413 +#: cp/decl2.c:830 msgid "(an out of class initialization is required)" msgstr "" -#: cp/decl2.c:1472 +#: cp/decl2.c:889 msgid "invalid data member initialization" msgstr "" -#: cp/decl2.c:1475 +#: cp/decl2.c:892 msgid "(use `=' to initialize static data members)" msgstr "" -#: cp/decl2.c:1515 +#: cp/decl2.c:938 msgid "member `%D' conflicts with virtual function table field name" msgstr "" -#: cp/decl2.c:1535 +#: cp/decl2.c:958 msgid "`%D' is already defined in `%T'" msgstr "" -#: cp/decl2.c:1586 +#: cp/decl2.c:1010 msgid "field initializer is not constant" msgstr "" -#: cp/decl2.c:1609 +#: cp/decl2.c:1034 msgid "`asm' specifiers are not permitted on non-static data members" msgstr "" -#: cp/decl2.c:1661 +#: cp/decl2.c:1086 msgid "cannot declare `%D' to be a bit-field type" msgstr "" -#: cp/decl2.c:1671 +#: cp/decl2.c:1096 msgid "cannot declare bit-field `%D' with function type" msgstr "" -#: cp/decl2.c:1678 +#: cp/decl2.c:1103 msgid "`%D' is already defined in the class %T" msgstr "" -#: cp/decl2.c:1685 +#: cp/decl2.c:1110 msgid "static member `%D' cannot be a bit-field" msgstr "" -#: cp/decl2.c:1754 +#: cp/decl2.c:1197 msgid "initializer specified for non-member function `%D'" msgstr "" -#: cp/decl2.c:1758 +#: cp/decl2.c:1201 msgid "invalid initializer for virtual method `%D'" msgstr "" -#: cp/decl2.c:1862 +#: cp/decl2.c:1315 msgid "anonymous struct not inside named type" msgstr "" -#: cp/decl2.c:1958 +#: cp/decl2.c:1411 msgid "namespace-scope anonymous aggregates must be static" msgstr "" -#: cp/decl2.c:1968 +#: cp/decl2.c:1424 msgid "anonymous aggregate with no members" msgstr "" -#: cp/decl2.c:2035 +#: cp/decl2.c:1493 msgid "`operator new' must return type `%T'" msgstr "" -#: cp/decl2.c:2043 +#: cp/decl2.c:1501 msgid "`operator new' takes type `size_t' (`%T') as first parameter" msgstr "" -#: cp/decl2.c:2070 +#: cp/decl2.c:1528 msgid "`operator delete' must return type `%T'" msgstr "" -#: cp/decl2.c:2078 +#: cp/decl2.c:1536 msgid "`operator delete' takes type `%T' as first parameter" msgstr "" #. Overflow occurred. That means there are at least 4 billion #. initialization functions. -#: cp/decl2.c:2819 +#: cp/decl2.c:2290 msgid "too many initialization functions required" msgstr "" -#: cp/decl2.c:3639 +#: cp/decl2.c:2966 +msgid "inline function `%D' used but never defined" +msgstr "" + +#: cp/decl2.c:3086 msgid "use of old-style cast" msgstr "" -#: cp/decl2.c:4220 +#: cp/decl2.c:3794 msgid "use of `%D' is ambiguous" msgstr "" -#: cp/decl2.c:4221 +#: cp/decl2.c:3795 msgid " first declared as `%#D' here" msgstr "" -#: cp/decl2.c:4224 +#: cp/decl2.c:3798 msgid " also declared as `%#D' here" msgstr "" -#: cp/decl2.c:4239 +#: cp/decl2.c:3813 msgid "`%D' denotes an ambiguous type" msgstr "" -#: cp/decl2.c:4240 +#: cp/decl2.c:3814 msgid " first type here" msgstr "" -#: cp/decl2.c:4241 +#: cp/decl2.c:3815 msgid " other type here" msgstr "" -#: cp/decl2.c:4338 +#: cp/decl2.c:3912 msgid "declaration of `%D' not in a namespace surrounding `%D'" msgstr "" -#: cp/decl2.c:4372 +#: cp/decl2.c:3946 msgid "`%D' should have been declared inside `%D'" msgstr "" -#: cp/decl2.c:4506 +#: cp/decl2.c:4079 msgid "`%D' is not a function," msgstr "" -#: cp/decl2.c:4507 +#: cp/decl2.c:4080 msgid " conflict with `%D'" msgstr "" #. The parser did not find it, so it's not there. -#: cp/decl2.c:4821 +#: cp/decl2.c:4396 msgid "unknown namespace `%D'" msgstr "" -#: cp/decl2.c:4855 cp/decl2.c:5125 +#: cp/decl2.c:4430 cp/decl2.c:4707 msgid "`%T' is not a namespace" msgstr "" -#: cp/decl2.c:4857 +#: cp/decl2.c:4432 msgid "`%D' is not a namespace" msgstr "" -#: cp/decl2.c:4866 +#: cp/decl2.c:4441 msgid "a using-declaration cannot specify a template-id. Try `using %D'" msgstr "" -#: cp/decl2.c:4880 +#: cp/decl2.c:4455 msgid "namespace `%D' not allowed in using-declaration" msgstr "" -#: cp/decl2.c:4909 +#: cp/decl2.c:4484 msgid "`%D' not declared" msgstr "" -#: cp/decl2.c:4960 +#: cp/decl2.c:4535 msgid "`%D' is already declared in this scope" msgstr "" -#: cp/decl2.c:4987 +#: cp/decl2.c:4562 msgid "using declaration `%D' introduced ambiguous type `%T'" msgstr "" -#: cp/decl2.c:5078 +#: cp/decl2.c:4653 msgid "using-declaration for non-member at class scope" msgstr "" -#: cp/decl2.c:5084 +#: cp/decl2.c:4659 msgid "using-declaration for destructor" msgstr "" -#: cp/decl2.c:5090 +#: cp/decl2.c:4665 msgid "a using-declaration cannot specify a template-id. Try `using %T::%D'" msgstr "" -#: cp/decl2.c:5119 +#: cp/decl2.c:4701 msgid "namespace `%T' undeclared" msgstr "" -#: cp/decl2.c:5148 +#: cp/decl2.c:4730 msgid "default argument missing for parameter %P of `%+#D'" msgstr "" -#: cp/decl2.c:5238 +#: cp/decl2.c:4829 msgid "extra qualification `%T::' on member `%D' ignored" msgstr "" -#: cp/decl2.c:5242 +#: cp/decl2.c:4833 msgid "`%T' does not have a class or union named `%D'" msgstr "" -#: cp/decl2.c:5255 +#: cp/decl2.c:4848 msgid "`%T' is not a class or union type" msgstr "" -#: cp/error.c:36 +#: cp/decl2.c:4862 +msgid "template argument is required for `%T'" +msgstr "" + +#: cp/error.c:35 #, c-format msgid "`%s' not supported by %s" msgstr "" -#: cp/error.c:576 +#: cp/error.c:571 #, c-format msgid "<anonymous %s>" msgstr "" -#: cp/error.c:813 +#: cp/error.c:808 #, c-format msgid "(static %s for %s)" msgstr "" -#: cp/error.c:2434 +#: cp/error.c:1482 +#, c-format +msgid "\\x%x" +msgstr "" + +#: cp/error.c:2430 #, c-format msgid "In %s `%s':" msgstr "" -#: cp/error.c:2489 +#: cp/error.c:2487 #, c-format msgid "%s: In instantiation of `%s':\n" msgstr "" -#: cp/error.c:2513 +#: cp/error.c:2511 #, c-format msgid "%s:%d: instantiated from `%s'\n" msgstr "" -#: cp/error.c:2518 +#: cp/error.c:2516 #, c-format msgid "%s:%d: instantiated from here\n" msgstr "" #. damn ICE suppression -#: cp/error.c:2671 +#: cp/error.c:2670 #, c-format msgid "unexpected letter `%c' in locate_error\n" msgstr "" #. Can't throw a reference. -#: cp/except.c:245 +#: cp/except.c:240 msgid "type `%T' is disallowed in Java `throw' or `catch'" msgstr "" -#: cp/except.c:256 +#: cp/except.c:251 msgid "call to Java `catch' or `throw' with `jthrowable' undefined" msgstr "" #. Thrown object must be a Throwable. -#: cp/except.c:263 +#: cp/except.c:258 msgid "type `%T' is not derived from `java::lang::Throwable'" msgstr "" -#: cp/except.c:327 +#: cp/except.c:322 msgid "mixing C++ and Java catches in a single translation unit" msgstr "" -#: cp/except.c:641 +#: cp/except.c:639 msgid "throwing NULL, which has integral, not pointer type" msgstr "" -#: cp/except.c:732 +#: cp/except.c:730 msgid " in thrown expression" msgstr "" -#: cp/except.c:858 +#: cp/except.c:856 msgid "" "expression '%E' of abstract class type '%T' cannot be used in throw-" "expression" msgstr "" -#: cp/except.c:946 +#: cp/except.c:944 msgid "exception of type `%T' will be caught" msgstr "" -#: cp/except.c:949 +#: cp/except.c:947 msgid " by earlier handler for `%T'" msgstr "" -#: cp/except.c:970 +#: cp/except.c:968 msgid "`...' handler must be the last handler for its try block" msgstr "" @@ -15432,140 +15867,127 @@ msgstr "" msgid "previous friend declaration of `%D'" msgstr "" -#: cp/friend.c:197 +#: cp/friend.c:202 msgid "invalid type `%T' declared `friend'" msgstr "" #. [temp.friend] -#. #. Friend declarations shall not declare partial #. specializations. -#: cp/friend.c:209 +#: cp/friend.c:218 msgid "partial specialization `%T' declared `friend'" msgstr "" -#: cp/friend.c:221 +#: cp/friend.c:227 msgid "class `%T' is implicitly friends with itself" msgstr "" #. template <class T> friend typename S<T>::X; -#: cp/friend.c:239 +#: cp/friend.c:245 msgid "typename type `%#T' declared `friend'" msgstr "" #. template <class T> friend class T; -#: cp/friend.c:245 +#: cp/friend.c:251 msgid "template parameter type `%T' declared `friend'" msgstr "" #. template <class T> friend class A; where A is not a template -#: cp/friend.c:251 +#: cp/friend.c:257 msgid "`%#T' is not a template" msgstr "" -#: cp/friend.c:266 +#: cp/friend.c:272 msgid "`%T' is already a friend of `%T'" msgstr "" -#: cp/friend.c:362 +#: cp/friend.c:370 msgid "member `%D' declared as friend before type `%T' defined" msgstr "" -#: cp/friend.c:417 +#: cp/friend.c:425 msgid "friend declaration `%#D' declares a non-template function" msgstr "" -#: cp/friend.c:420 +#: cp/friend.c:428 msgid "" "(if this is not what you intended, make sure the function template has " "already been declared and add <> after the function name here) -Wno-non-" "template-friend disables this warning" msgstr "" -#: cp/g++spec.c:198 java/jvspec.c:424 +#: cp/g++spec.c:209 java/jvspec.c:423 #, c-format msgid "argument to `%s' missing\n" msgstr "" -#: cp/init.c:264 +#: cp/init.c:320 +msgid "`%D' should be initialized in the member initialization list" +msgstr "" + +#: cp/init.c:369 msgid "default-initialization of `%#D', which has reference type" msgstr "" -#: cp/init.c:269 +#: cp/init.c:374 msgid "uninitialized reference member `%D'" msgstr "" -#: cp/init.c:277 +#: cp/init.c:382 msgid "initializer list treated as compound expression" msgstr "" -#: cp/init.c:389 -msgid "member initializers for `%#D'" +#: cp/init.c:523 +msgid "`%D' will be initialized after" msgstr "" -#: cp/init.c:391 -msgid " and `%#D'" +#: cp/init.c:526 +msgid "base `%T' will be initialized after" msgstr "" -#: cp/init.c:392 -msgid " will be re-ordered to match declaration order" +#: cp/init.c:529 +msgid " `%#D'" msgstr "" -#: cp/init.c:407 -msgid "multiple initializations given for member `%D'" +#: cp/init.c:531 +msgid " base `%T'" msgstr "" -#: cp/init.c:479 -msgid "initializations for multiple members of `%T'" -msgstr "" - -#: cp/init.c:596 -msgid "base initializers for `%#T'" +#: cp/init.c:549 +msgid "multiple initializations given for base `%T'" msgstr "" -#: cp/init.c:597 -msgid " and `%#T'" -msgstr "" - -#: cp/init.c:598 -msgid " will be re-ordered to match inheritance order" -msgstr "" - -#: cp/init.c:610 -msgid "base class `%T' already initialized" +#: cp/init.c:616 +msgid "initializations for multiple members of `%T'" msgstr "" -#: cp/init.c:681 +#: cp/init.c:671 msgid "" "base class `%#T' should be explicitly initialized in the copy constructor" msgstr "" -#: cp/init.c:724 -msgid "`%D' should be initialized in the member initialization list" -msgstr "" - -#: cp/init.c:966 +#: cp/init.c:916 msgid "class `%T' does not have any field named `%D'" msgstr "" -#: cp/init.c:972 +#: cp/init.c:922 msgid "" "field `%#D' is static; the only point of initialization is its definition" msgstr "" -#: cp/init.c:1011 +#: cp/init.c:956 msgid "unnamed initializer for `%T', which has no base classes" msgstr "" -#: cp/init.c:1018 +#: cp/init.c:963 msgid "unnamed initializer for `%T', which uses multiple inheritance" msgstr "" -#: cp/init.c:1047 +#: cp/init.c:1000 msgid "type `%D' is not a direct or virtual base of `%T'" msgstr "" -#: cp/init.c:1050 +#: cp/init.c:1003 msgid "type `%D' is not a direct base of `%T'" msgstr "" @@ -15581,554 +16003,522 @@ msgstr "" #. COMPLEX zees(1.0, 0.0)[10]; #. } #. -#: cp/init.c:1144 +#: cp/init.c:1097 msgid "bad array initializer" msgstr "" -#: cp/init.c:1356 +#: cp/init.c:1304 msgid "`%T' is not an aggregate type" msgstr "" -#: cp/init.c:1379 +#: cp/init.c:1327 msgid "`%T' fails to be an aggregate typedef" msgstr "" -#: cp/init.c:1388 +#: cp/init.c:1336 msgid "type `%T' is of non-aggregate type" msgstr "" -#: cp/init.c:1490 +#: cp/init.c:1439 msgid "cannot call destructor `%T::~%T' without object" msgstr "" -#: cp/init.c:1529 +#: cp/init.c:1483 msgid "invalid use of non-static field `%D'" msgstr "" #. We can get here when processing a bad default #. argument, like: #. struct S { int a; void f(int i = a); } -#: cp/init.c:1538 cp/method.c:163 +#: cp/init.c:1492 cp/method.c:160 msgid "invalid use of member `%D'" msgstr "" -#: cp/init.c:1548 +#: cp/init.c:1502 msgid "no method `%T::%D'" msgstr "" -#: cp/init.c:1641 +#: cp/init.c:1595 msgid "incomplete type `%T' does not have member `%D'" msgstr "" -#: cp/init.c:1710 +#: cp/init.c:1669 msgid "`%D' is not a member of type `%T'" msgstr "" -#: cp/init.c:1729 -msgid "illegal pointer to bit-field `%D'" +#: cp/init.c:1688 +msgid "invalid pointer to bit-field `%D'" msgstr "" -#: cp/init.c:1768 +#: cp/init.c:1727 msgid "object missing in use of pointer-to-member construct" msgstr "" -#: cp/init.c:1808 +#: cp/init.c:1767 msgid "member `%D' is non-static but referenced as a static member" msgstr "" -#: cp/init.c:1810 cp/typeck.c:3142 cp/typeck.c:3250 +#: cp/init.c:1769 cp/typeck.c:2828 cp/typeck.c:2932 msgid "at this point in file" msgstr "" -#: cp/init.c:1845 cp/typeck.c:2941 +#: cp/init.c:1806 #, c-format msgid "object missing in `%E'" msgstr "" -#: cp/init.c:1976 +#: cp/init.c:1937 msgid "new of array type fails to specify size" msgstr "" -#: cp/init.c:1987 +#: cp/init.c:1948 msgid "size in array new must have integral type" msgstr "" -#: cp/init.c:1993 +#: cp/init.c:1954 msgid "zero size array reserves no space" msgstr "" -#: cp/init.c:2058 +#: cp/init.c:2019 msgid "new cannot be applied to a reference type" msgstr "" -#: cp/init.c:2064 +#: cp/init.c:2025 msgid "new cannot be applied to a function type" msgstr "" -#: cp/init.c:2111 +#: cp/init.c:2072 msgid "call to Java constructor, while `jclass' undefined" msgstr "" -#: cp/init.c:2127 +#: cp/init.c:2088 msgid "can't find class$" msgstr "" -#: cp/init.c:2241 +#: cp/init.c:2202 msgid "invalid type `void' for new" msgstr "" -#: cp/init.c:2293 +#: cp/init.c:2254 #, c-format msgid "call to Java constructor with `%s' undefined" msgstr "" -#: cp/init.c:2400 +#: cp/init.c:2362 msgid "ISO C++ forbids initialization in array new" msgstr "" -#: cp/init.c:2418 cp/typeck2.c:359 cp/typeck2.c:1224 +#: cp/init.c:2380 cp/typeck2.c:360 cp/typeck2.c:1223 msgid "initializer list being treated as compound expression" msgstr "" -#: cp/init.c:2424 +#: cp/init.c:2386 msgid "ISO C++ forbids aggregate initializer to new" msgstr "" -#: cp/init.c:2510 +#: cp/init.c:2474 msgid "uninitialized const in `new' of `%#T'" msgstr "" -#: cp/init.c:2874 +#: cp/init.c:2840 msgid "initializer ends prematurely" msgstr "" -#: cp/init.c:2944 +#: cp/init.c:2910 msgid "cannot initialize multi-dimensional array with initializer" msgstr "" -#: cp/init.c:3119 +#: cp/init.c:3100 msgid "unknown array size in delete" msgstr "" -#: cp/init.c:3380 +#: cp/init.c:3365 msgid "type to vector delete is neither pointer or array type" msgstr "" -#: cp/lex.c:144 +#: cp/lex.c:136 msgid "type name expected before `*'" msgstr "" -#: cp/lex.c:166 +#: cp/lex.c:158 msgid "cannot declare references to references" msgstr "" -#: cp/lex.c:171 +#: cp/lex.c:163 msgid "cannot declare pointers to references" msgstr "" -#: cp/lex.c:175 +#: cp/lex.c:167 msgid "type name expected before `&'" msgstr "" -#: cp/lex.c:948 +#: cp/lex.c:894 #, c-format msgid "semicolon missing after %s declaration" msgstr "" -#: cp/lex.c:951 +#: cp/lex.c:897 msgid "semicolon missing after declaration of `%T'" msgstr "" -#: cp/lex.c:999 +#: cp/lex.c:945 #, c-format msgid "junk at end of #pragma %s" msgstr "" -#: cp/lex.c:1006 +#: cp/lex.c:952 #, c-format msgid "invalid #pragma %s" msgstr "" -#: cp/lex.c:1015 +#: cp/lex.c:961 msgid "#pragma vtable no longer supported" msgstr "" -#: cp/lex.c:1092 +#: cp/lex.c:1038 #, c-format msgid "#pragma implementation for %s appears after file is included" msgstr "" -#: cp/lex.c:1117 +#: cp/lex.c:1063 msgid "junk at end of #pragma GCC java_exceptions" msgstr "" -#: cp/lex.c:1205 +#: cp/lex.c:1107 msgid "`%D' not defined" msgstr "" -#: cp/lex.c:1210 +#: cp/lex.c:1110 msgid "`%D' was not declared in this scope" msgstr "" -#: cp/lex.c:1220 +#: cp/lex.c:1118 msgid "`%D' undeclared (first use this function)" msgstr "" -#: cp/lex.c:1224 +#: cp/lex.c:1122 msgid "" "(Each undeclared identifier is reported only once for each function it " "appears in.)" msgstr "" -#: cp/lex.c:1247 -#, c-format -msgid "name lookup of `%s' changed" -msgstr "" - -#: cp/lex.c:1249 -msgid " matches this `%D' under ISO standard rules" -msgstr "" - -#: cp/lex.c:1251 -msgid " matches this `%D' under old rules" -msgstr "" - -#: cp/lex.c:1261 cp/lex.c:1268 -#, c-format -msgid "name lookup of `%s' changed for new ISO `for' scoping" -msgstr "" - -#: cp/lex.c:1263 -msgid " cannot use obsolete binding at `%D' because it has a destructor" -msgstr "" - -#: cp/lex.c:1270 -msgid " using obsolete binding at `%D'" -msgstr "" - -#: cp/lex.c:1336 +#: cp/lex.c:1239 msgid "`::%D' undeclared (first use here)" msgstr "" -#: cp/mangle.c:1918 +#: cp/mangle.c:2061 msgid "real-valued template parameters when cross-compiling" msgstr "" -#: cp/method.c:157 +#: cp/mangle.c:2325 +msgid "the mangled name of `%D' will change in a future version of GCC" +msgstr "" + +#: cp/method.c:154 msgid "invalid use of member `%D' in static member function" msgstr "" -#: cp/method.c:205 +#: cp/method.c:216 msgid "use of namespace `%D' as expression" msgstr "" -#: cp/method.c:210 +#: cp/method.c:221 msgid "use of class template `%T' as expression" msgstr "" -#: cp/method.c:223 +#: cp/method.c:234 #, c-format msgid "use of %s from containing function" msgstr "" -#: cp/method.c:226 +#: cp/method.c:237 msgid " `%#D' declared here" msgstr "" -#: cp/method.c:244 +#: cp/method.c:255 msgid "request for member `%D' is ambiguous in multiple inheritance lattice" msgstr "" -#: cp/method.c:297 -msgid "implementation-reserved name `%D' used" -msgstr "" - -#: cp/method.c:428 +#: cp/method.c:455 msgid "generic thunk code fails for method `%#D' which uses `...'" msgstr "" -#: cp/method.c:653 +#: cp/method.c:694 msgid "non-static const member `%#D', can't use default assignment operator" msgstr "" -#: cp/method.c:658 +#: cp/method.c:699 msgid "" "non-static reference member `%#D', can't use default assignment operator" msgstr "" -#: parse.y:218 +#: parse.y:261 msgid "`%s' tag used in naming `%#T'" msgstr "" -#: parse.y:507 +#: parse.y:541 msgid "keyword `export' not implemented, and will be ignored" msgstr "" -#: parse.y:612 +#: parse.y:645 msgid "use of linkage spec `%D' is different from previous spec `%D'" msgstr "" -#: parse.y:685 -msgid "invalid default template argument" -msgstr "" - -#: parse.y:916 -msgid "only constructors take base initializers" -msgstr "" - -#: parse.y:918 +#: parse.y:942 msgid "no base or member initializers given following ':'" msgstr "" -#: parse.y:960 parse.y:966 +#: parse.y:983 parse.y:989 msgid "anachronistic old style base class initializer" msgstr "" #. Handle `Class<Class<Type>>' without space in the `>>' -#: parse.y:1092 +#: parse.y:1115 msgid "`>>' should be `> >' in template class name" msgstr "" -#: parse.y:1130 +#: parse.y:1153 msgid "use of template qualifier outside template" msgstr "" -#: parse.y:1159 parse.y:1168 +#: parse.y:1182 parse.y:1191 #, c-format msgid "ISO C++ forbids an empty condition for `%s'" msgstr "" -#: parse.y:1191 +#: parse.y:1214 msgid "definition of class `%T' in condition" msgstr "" -#: parse.y:1193 +#: parse.y:1216 msgid "definition of enum `%T' in condition" msgstr "" -#: parse.y:1204 +#: parse.y:1227 msgid "definition of array `%#D' in condition" msgstr "" -#: parse.y:1313 +#: parse.y:1340 msgid "old style placement syntax, use () instead" msgstr "" -#: parse.y:1324 +#: parse.y:1351 msgid "`%T' is not a valid expression" msgstr "" -#: parse.y:1335 -msgid "ISO C++ forbids initialization of new expression with `='" +#. This was previously allowed as an extension, but +#. was removed in G++ 3.3. +#: parse.y:1358 +msgid "initialization of new expression with `='" msgstr "" -#: parse.y:1366 +#: parse.y:1384 msgid "ISO C++ forbids compound literals" msgstr "" -#: parse.y:1608 +#: parse.y:1631 msgid "ISO C++ forbids braced-groups within expressions" msgstr "" -#: parse.y:2010 parse.y:2025 +#: parse.y:2035 parse.y:2050 msgid "sigof type specifier" msgstr "" -#: parse.y:2015 +#: parse.y:2040 msgid "`sigof' applied to non-aggregate expression" msgstr "" -#: parse.y:2030 +#: parse.y:2055 msgid "`sigof' applied to non-aggregate type" msgstr "" -#: parse.y:2296 +#: parse.y:2321 msgid "using `typename' outside of template" msgstr "" -#: parse.y:2367 +#: parse.y:2391 #, c-format msgid "storage class specifier `%s' not allowed after struct or class" msgstr "" -#: parse.y:2369 +#: parse.y:2393 #, c-format msgid "type specifier `%s' not allowed after struct or class" msgstr "" -#: parse.y:2371 +#: parse.y:2395 #, c-format msgid "type qualifier `%s' not allowed after struct or class" msgstr "" -#: parse.y:2373 +#: parse.y:2397 msgid "no body nor ';' separates two class, struct or union declarations" msgstr "" -#: parse.y:2505 +#: parse.y:2537 msgid "no bases given following `:'" msgstr "" -#: parse.y:2536 parse.y:2551 +#: parse.y:2568 parse.y:2583 msgid "`%D' access" msgstr "" -#: parse.y:2541 +#: parse.y:2573 msgid "multiple access specifiers" msgstr "" -#: parse.y:2559 +#: parse.y:2591 msgid "multiple `virtual' specifiers" msgstr "" -#: parse.y:2596 +#: parse.y:2628 msgid "missing ';' before right brace" msgstr "" -#: parse.y:2817 +#: parse.y:2849 msgid "ISO C++ forbids array dimensions with parenthesized type in new" msgstr "" -#: parse.y:3104 parse.y:3124 parse.y:3133 parse.y:3162 +#: parse.y:3136 parse.y:3156 parse.y:3165 parse.y:3194 msgid "`%T' is not a class or namespace" msgstr "" -#: parse.y:3329 +#: parse.y:3361 msgid "ISO C++ forbids label declarations" msgstr "" -#: parse.y:3489 +#: parse.y:3521 msgid "ISO C++ forbids computed gotos" msgstr "" -#: parse.y:3497 +#: parse.y:3529 msgid "label must be followed by statement" msgstr "" -#: parse.y:3542 +#: parse.y:3574 msgid "must have at least one catch per try block" msgstr "" -#: parse.y:3602 +#: parse.y:3634 msgid "ISO C++ forbids compound statements inside for initializations" msgstr "" #. This helps us recover from really nasty #. parse errors, for example, a missing right #. parenthesis. -#: parse.y:3689 parse.y:3699 +#: parse.y:3721 parse.y:3731 msgid "possibly missing ')'" msgstr "" -#: parse.y:3792 +#: parse.y:3824 msgid "type specifier omitted for parameter" msgstr "" -#: parse.y:3801 +#: parse.y:3833 #, c-format msgid "`%E' is not a type, use `typename %E' to make it one" msgstr "" -#: parse.y:3803 +#: parse.y:3835 msgid "no type `%D' in `%T'" msgstr "" -#: parse.y:3806 +#: parse.y:3838 #, c-format msgid "type specifier omitted for parameter `%E'" msgstr "" -#: parse.y:3814 +#: parse.y:3846 msgid "'%D' is used as a type, but is not defined as a type." msgstr "" -#: cp/pt.c:212 +#: cp/pt.c:198 msgid "data member `%D' cannot be a member template" msgstr "" -#: cp/pt.c:224 +#: cp/pt.c:210 msgid "invalid member template declaration `%D'" msgstr "" -#: cp/pt.c:619 +#: cp/pt.c:605 msgid "explicit specialization in non-namespace scope `%D'" msgstr "" -#: cp/pt.c:631 +#: cp/pt.c:617 msgid "enclosing class templates are not explicitly specialized" msgstr "" -#: cp/pt.c:706 +#: cp/pt.c:692 msgid "specializing `%#T' in different namespace" msgstr "" -#: cp/pt.c:707 +#: cp/pt.c:693 msgid " from definition of `%#D'" msgstr "" -#: cp/pt.c:715 +#: cp/pt.c:701 msgid "specialization of `%T' after instantiation" msgstr "" -#: cp/pt.c:718 +#: cp/pt.c:704 msgid "explicit specialization of non-template `%T'" msgstr "" -#: cp/pt.c:850 +#: cp/pt.c:836 msgid "specialization of %D after instantiation" msgstr "" -#: cp/pt.c:953 +#: cp/pt.c:939 msgid "%s %+#D" msgstr "" -#: cp/pt.c:1004 +#: cp/pt.c:990 msgid "`%D' is not a function template" msgstr "" -#: cp/pt.c:1127 +#: cp/pt.c:1129 msgid "template-id `%D' for `%+D' does not match any template declaration" msgstr "" -#: cp/pt.c:1135 +#: cp/pt.c:1137 msgid "ambiguous template specialization `%D' for `%+D'" msgstr "" #. This case handles bogus declarations like template <> #. template <class T> void f<int>(); -#: cp/pt.c:1362 cp/pt.c:1436 +#: cp/pt.c:1364 cp/pt.c:1438 msgid "template-id `%D' in declaration of primary template" msgstr "" -#: cp/pt.c:1375 +#: cp/pt.c:1377 msgid "template parameter list used in explicit instantiation" msgstr "" -#: cp/pt.c:1381 +#: cp/pt.c:1383 msgid "definition provided for explicit instantiation" msgstr "" -#: cp/pt.c:1387 +#: cp/pt.c:1389 msgid "too many template parameter lists in declaration of `%D'" msgstr "" -#: cp/pt.c:1403 +#: cp/pt.c:1405 msgid "too few template parameter lists in declaration of `%D'" msgstr "" -#: cp/pt.c:1420 +#: cp/pt.c:1422 msgid "explicit specialization not preceded by `template <>'" msgstr "" -#: cp/pt.c:1433 +#: cp/pt.c:1435 msgid "partial specialization `%D' of function template" msgstr "" -#: cp/pt.c:1465 +#: cp/pt.c:1467 msgid "default argument specified in explicit specialization" msgstr "" -#: cp/pt.c:1469 +#: cp/pt.c:1471 msgid "template specialization with C linkage" msgstr "" @@ -16140,99 +16530,99 @@ msgstr "" #. program is ill-formed. #. #. Similar language is found in [temp.explicit]. -#: cp/pt.c:1557 +#: cp/pt.c:1558 msgid "specialization of implicitly-declared special member function" msgstr "" -#: cp/pt.c:1601 +#: cp/pt.c:1602 msgid "no member function `%D' declared in `%T'" msgstr "" #. There are two many template parameter lists. -#: cp/pt.c:1749 +#: cp/pt.c:1750 msgid "too many template parameter lists in declaration of `%T'" msgstr "" -#: cp/pt.c:1845 +#: cp/pt.c:1846 msgid " shadows template parm `%#D'" msgstr "" -#: cp/pt.c:2249 +#: cp/pt.c:2250 msgid "template parameters not used in partial specialization:" msgstr "" -#: cp/pt.c:2253 +#: cp/pt.c:2254 msgid " `%D'" msgstr "" -#: cp/pt.c:2265 +#: cp/pt.c:2266 msgid "partial specialization `%T' does not specialize any template arguments" msgstr "" -#: cp/pt.c:2290 +#: cp/pt.c:2291 #, c-format msgid "template argument `%E' involves template parameter(s)" msgstr "" -#: cp/pt.c:2333 +#: cp/pt.c:2335 msgid "type `%T' of template argument `%E' depends on template parameter(s)" msgstr "" -#: cp/pt.c:2421 +#: cp/pt.c:2423 msgid "no default argument for `%D'" msgstr "" -#: cp/pt.c:2574 +#: cp/pt.c:2576 msgid "template with C linkage" msgstr "" -#: cp/pt.c:2577 +#: cp/pt.c:2579 msgid "template class without a name" msgstr "" -#: cp/pt.c:2654 +#: cp/pt.c:2656 msgid "`%D' does not declare a template type" msgstr "" -#: cp/pt.c:2660 +#: cp/pt.c:2662 msgid "template definition of non-template `%#D'" msgstr "" -#: cp/pt.c:2701 +#: cp/pt.c:2703 msgid "expected %d levels of template parms for `%#D', got %d" msgstr "" -#: cp/pt.c:2713 +#: cp/pt.c:2715 msgid "got %d template parameters for `%#D'" msgstr "" -#: cp/pt.c:2716 +#: cp/pt.c:2718 msgid "got %d template parameters for `%#T'" msgstr "" -#: cp/pt.c:2718 +#: cp/pt.c:2720 #, c-format msgid " but %d required" msgstr "" -#: cp/pt.c:2799 +#: cp/pt.c:2803 msgid "`%T' is not a template type" msgstr "" -#: cp/pt.c:2815 +#: cp/pt.c:2819 msgid "previous declaration `%D'" msgstr "" -#: cp/pt.c:2816 +#: cp/pt.c:2820 #, c-format msgid "used %d template parameter%s instead of %d" msgstr "" -#: cp/pt.c:2832 +#: cp/pt.c:2836 msgid "template parameter `%#D'" msgstr "" -#: cp/pt.c:2833 +#: cp/pt.c:2837 msgid "redeclared here as `%#D'" msgstr "" @@ -16240,613 +16630,603 @@ msgstr "" #. #. A template-parameter may not be given default arguments #. by two different declarations in the same scope. -#: cp/pt.c:2843 +#: cp/pt.c:2847 msgid "redefinition of default argument for `%#D'" msgstr "" -#: cp/pt.c:2844 +#: cp/pt.c:2848 msgid " original definition appeared here" msgstr "" -#: cp/pt.c:2937 +#: cp/pt.c:2941 #, c-format msgid "`%E' is not a valid template argument" msgstr "" -#: cp/pt.c:2941 +#: cp/pt.c:2945 msgid "it must be the address of a function with external linkage" msgstr "" -#: cp/pt.c:2943 +#: cp/pt.c:2947 msgid "it must be the address of an object with external linkage" msgstr "" -#: cp/pt.c:2947 +#: cp/pt.c:2951 msgid "it must be a pointer-to-member of the form `&X::Y'" msgstr "" -#: cp/pt.c:2958 +#: cp/pt.c:2962 #, c-format msgid "" "string literal %E is not a valid template argument because it is the address " "of an object with static linkage" msgstr "" -#: cp/pt.c:2970 +#: cp/pt.c:2974 #, c-format msgid "address of non-extern `%E' cannot be used as template argument" msgstr "" -#: cp/pt.c:2981 +#: cp/pt.c:2985 #, c-format msgid "non-constant `%E' cannot be used as template argument" msgstr "" -#: cp/pt.c:2988 +#: cp/pt.c:2992 #, c-format msgid "object `%E' cannot be used as template argument" msgstr "" -#: cp/pt.c:3368 +#: cp/pt.c:3367 #, c-format msgid "to refer to a type member of a template parameter, use `typename %E'" msgstr "" -#: cp/pt.c:3381 cp/pt.c:3397 cp/pt.c:3436 +#: cp/pt.c:3380 cp/pt.c:3396 cp/pt.c:3435 msgid "type/value mismatch at argument %d in template parameter list for `%D'" msgstr "" -#: cp/pt.c:3384 +#: cp/pt.c:3383 msgid " expected a constant of type `%T', got `%T'" msgstr "" -#: cp/pt.c:3388 +#: cp/pt.c:3387 #, c-format msgid " expected a type, got `%E'" msgstr "" -#: cp/pt.c:3400 +#: cp/pt.c:3399 msgid " expected a type, got `%T'" msgstr "" -#: cp/pt.c:3402 +#: cp/pt.c:3401 msgid " expected a class template, got `%T'" msgstr "" -#: cp/pt.c:3438 +#: cp/pt.c:3437 msgid " expected a template of type `%D', got `%D'" msgstr "" -#: cp/pt.c:3460 +#: cp/pt.c:3459 msgid "template-argument `%T' uses anonymous type" msgstr "" -#: cp/pt.c:3463 +#: cp/pt.c:3462 msgid "template-argument `%T' uses local type `%T'" msgstr "" -#: cp/pt.c:3498 +#: cp/pt.c:3472 +msgid "template-argument `%T' is a variably modified type" +msgstr "" + +#: cp/pt.c:3507 msgid "could not convert template argument `%E' to `%T'" msgstr "" -#: cp/pt.c:3542 +#: cp/pt.c:3551 #, c-format msgid "wrong number of template arguments (%d, should be %d)" msgstr "" -#: cp/pt.c:3546 +#: cp/pt.c:3555 msgid "provided for `%D'" msgstr "" -#: cp/pt.c:3593 +#: cp/pt.c:3602 #, c-format msgid "template argument %d is invalid" msgstr "" -#: cp/pt.c:3825 +#: cp/pt.c:3837 msgid "non-template used as template" msgstr "" -#: cp/pt.c:3943 +#: cp/pt.c:3968 msgid "`%T' is not a template" msgstr "" -#: cp/pt.c:3956 +#: cp/pt.c:3981 msgid "non-template type `%T' used as a template" msgstr "" -#: cp/pt.c:3958 +#: cp/pt.c:3983 msgid "for template declaration `%D'" msgstr "" -#: cp/pt.c:4521 +#: cp/pt.c:4598 msgid "" "template instantiation depth exceeds maximum of %d (use -ftemplate-depth-NN " "to increase the maximum) instantiating `%D'" msgstr "" -#: cp/pt.c:4961 +#: cp/pt.c:5074 msgid "ambiguous class template instantiation for `%#T'" msgstr "" -#: cp/pt.c:4968 +#: cp/pt.c:5081 msgid "%s %+#T" msgstr "" -#: cp/pt.c:5993 cp/pt.c:6098 +#: cp/pt.c:6104 cp/pt.c:6214 msgid "instantiation of `%D' as type `%T'" msgstr "" -#: cp/pt.c:6140 +#: cp/pt.c:6258 msgid "invalid parameter type `%T'" msgstr "" -#: cp/pt.c:6142 +#: cp/pt.c:6260 msgid "in declaration `%D'" msgstr "" -#: cp/pt.c:6217 +#: cp/pt.c:6335 msgid "creating pointer to member function of non-class type `%T'" msgstr "" -#: cp/pt.c:6380 +#: cp/pt.c:6498 msgid "creating array with size zero" msgstr "" -#: cp/pt.c:6394 +#: cp/pt.c:6512 #, c-format msgid "creating array with size zero (`%E')" msgstr "" -#: cp/pt.c:6633 +#: cp/pt.c:6751 msgid "forming reference to void" msgstr "" -#: cp/pt.c:6635 +#: cp/pt.c:6753 msgid "forming %s to reference type `%T'" msgstr "" -#: cp/pt.c:6673 +#: cp/pt.c:6791 msgid "creating pointer to member of non-class type `%T'" msgstr "" -#: cp/pt.c:6679 +#: cp/pt.c:6797 msgid "creating pointer to member reference type `%T'" msgstr "" -#: cp/pt.c:6757 +#: cp/pt.c:6875 msgid "creating array of `%T'" msgstr "" -#: cp/pt.c:6800 +#: cp/pt.c:6918 msgid "`%T' is not a class, struct, or union type" msgstr "" -#: cp/pt.c:6910 +#: cp/pt.c:7028 #, c-format msgid "use of `%s' in template" msgstr "" -#: cp/pt.c:7669 +#: cp/pt.c:7790 msgid "type `%T' composed from a local class is not a valid template-argument" msgstr "" -#: cp/pt.c:7670 +#: cp/pt.c:7791 msgid " trying to instantiate `%D'" msgstr "" -#: cp/pt.c:8100 +#: cp/pt.c:8230 msgid "incomplete type unification" msgstr "" -#: cp/pt.c:9067 +#: cp/pt.c:9178 #, c-format msgid "use of `%s' in template type unification" msgstr "" -#: cp/pt.c:9487 cp/pt.c:9555 +#: cp/pt.c:9596 cp/pt.c:9668 msgid "explicit instantiation of non-template `%#D'" msgstr "" -#: cp/pt.c:9503 cp/pt.c:9550 +#: cp/pt.c:9612 cp/pt.c:9663 msgid "no matching template for `%D' found" msgstr "" -#: cp/pt.c:9509 +#: cp/pt.c:9618 msgid "explicit instantiation of `%#D'" msgstr "" -#. [temp.spec] -#. -#. No program shall both explicitly instantiate and explicitly -#. specialize a template. -#: cp/pt.c:9526 -msgid "explicit instantiation of `%#D' after" -msgstr "" - -#: cp/pt.c:9527 cp/pt.c:9664 -msgid "explicit specialization here" -msgstr "" - -#: cp/pt.c:9542 +#: cp/pt.c:9655 msgid "duplicate explicit instantiation of `%#D'" msgstr "" -#: cp/pt.c:9567 +#: cp/pt.c:9680 msgid "ISO C++ forbids the use of `extern' on explicit instantiations" msgstr "" -#: cp/pt.c:9571 cp/pt.c:9649 +#: cp/pt.c:9684 cp/pt.c:9762 msgid "storage class `%D' applied to template instantiation" msgstr "" -#: cp/pt.c:9616 +#: cp/pt.c:9729 msgid "explicit instantiation of non-template type `%T'" msgstr "" -#: cp/pt.c:9630 +#: cp/pt.c:9743 msgid "explicit instantiation of `%#T' before definition of template" msgstr "" -#: cp/pt.c:9638 +#: cp/pt.c:9751 #, c-format msgid "ISO C++ forbids the use of `%s' on explicit instantiations" msgstr "" -#: cp/pt.c:9663 -msgid "explicit instantiation of `%#T' after" -msgstr "" - -#: cp/pt.c:9681 +#: cp/pt.c:9795 msgid "duplicate explicit instantiation of `%#T'" msgstr "" -#: cp/pt.c:10043 +#: cp/pt.c:10177 msgid "explicit instantiation of `%D' but no definition available" msgstr "" -#: cp/pt.c:10415 +#: cp/pt.c:10551 msgid "`%#T' is not a valid type for a template constant parameter" msgstr "" -#: cp/repo.c:272 +#: cp/repo.c:271 msgid "-frepo must be used with -c" msgstr "" -#: cp/repo.c:366 +#: cp/repo.c:361 #, c-format msgid "mysterious repository information in %s" msgstr "" -#: cp/repo.c:381 +#: cp/repo.c:376 #, c-format msgid "can't create repository information file `%s'" msgstr "" -#: cp/rtti.c:200 +#: cp/rtti.c:240 msgid "cannot use typeid with -fno-rtti" msgstr "" -#: cp/rtti.c:206 +#: cp/rtti.c:246 msgid "must #include <typeinfo> before using typeid" msgstr "" -#: cp/rtti.c:280 +#: cp/rtti.c:320 msgid "" "cannot create type information for type `%T' because its size is variable" msgstr "" -#: cp/rtti.c:525 cp/rtti.c:539 +#: cp/rtti.c:585 cp/rtti.c:599 msgid "dynamic_cast of `%#D' to `%#T' can never succeed" msgstr "" -#: cp/rtti.c:614 +#: cp/rtti.c:675 msgid "cannot dynamic_cast `%E' (of type `%#T') to type `%#T' (%s)" msgstr "" -#: cp/search.c:340 +#: cp/search.c:348 msgid "`%T' is an inaccessible base of `%T'" msgstr "" -#: cp/search.c:350 +#: cp/search.c:358 msgid "`%T' is an ambiguous base of `%T'" msgstr "" -#: cp/search.c:1818 +#: cp/search.c:1925 msgid "adjusting pointers for covariant returns" msgstr "" -#: cp/search.c:1822 cp/search.c:1829 +#: cp/search.c:1929 cp/search.c:1936 msgid "invalid covariant return type for `%#D'" msgstr "" -#: cp/search.c:1823 +#: cp/search.c:1930 msgid " overriding `%#D' (must be pointer or reference to class)" msgstr "" -#: cp/search.c:1830 +#: cp/search.c:1937 msgid " overriding `%#D' (must use pointer or reference)" msgstr "" -#: cp/search.c:1835 +#: cp/search.c:1942 msgid "conflicting return type specified for `%#D'" msgstr "" -#: cp/search.c:1836 +#: cp/search.c:1943 msgid " overriding `%#D'" msgstr "" -#: cp/search.c:1845 +#: cp/search.c:1952 #, c-format msgid "looser throw specifier for `%#F'" msgstr "" -#: cp/search.c:1846 +#: cp/search.c:1953 #, c-format msgid " overriding `%#F'" msgstr "" #. A static member function cannot match an inherited #. virtual member function. -#: cp/search.c:1936 +#: cp/search.c:2042 msgid "`%#D' cannot be declared" msgstr "" -#: cp/search.c:1937 +#: cp/search.c:2043 msgid " since `%#D' declared in base class" msgstr "" -#: cp/search.c:2078 +#: cp/search.c:2184 msgid "`%#D' needs a final overrider" msgstr "" -#: cp/semantics.c:894 +#: cp/semantics.c:919 #, c-format msgid "type of asm operand `%E' could not be determined" msgstr "" -#: cp/semantics.c:1026 +#: cp/semantics.c:1051 msgid "ISO C++ does not permit named return values" msgstr "" -#: cp/semantics.c:1035 +#: cp/semantics.c:1060 msgid "return identifier `%D' already in place" msgstr "" -#: cp/semantics.c:1043 +#: cp/semantics.c:1068 msgid "can't redefine default return value for constructors" msgstr "" -#: cp/semantics.c:1110 -msgid "base initializer for `%T'" -msgstr "" - -#: cp/semantics.c:1112 -msgid " will be re-ordered to precede member initializations" +#: cp/semantics.c:1100 +msgid "only constructors take base initializers" msgstr "" -#: cp/semantics.c:1300 +#: cp/semantics.c:1342 msgid "`this' is unavailable for static member functions" msgstr "" -#: cp/semantics.c:1306 +#: cp/semantics.c:1348 msgid "invalid use of `this' in non-member function" msgstr "" -#: cp/semantics.c:1308 +#: cp/semantics.c:1350 msgid "invalid use of `this' at top level" msgstr "" -#: cp/semantics.c:1346 +#: cp/semantics.c:1380 msgid "calling type `%T' like a method" msgstr "" -#: cp/semantics.c:1382 +#: cp/semantics.c:1418 msgid "destructor specifier `%T::~%T()' must have matching names" msgstr "" -#: cp/semantics.c:1388 +#: cp/semantics.c:1424 msgid "`%E' is not of type `%T'" msgstr "" -#: cp/semantics.c:1581 +#: cp/semantics.c:1612 msgid "template type parameters must use the keyword `class' or `typename'" msgstr "" -#: cp/semantics.c:1643 +#: cp/semantics.c:1651 +msgid "invalid default template argument" +msgstr "" + +#: cp/semantics.c:1693 msgid "definition of `%#T' inside template parameter list" msgstr "" -#: cp/semantics.c:1659 +#: cp/semantics.c:1709 msgid "invalid definition of qualified type `%T'" msgstr "" -#: cp/semantics.c:2008 +#: cp/semantics.c:2051 msgid "invalid base-class specification" msgstr "" -#: cp/semantics.c:2017 +#: cp/semantics.c:2060 msgid "base class `%T' has cv qualifiers" msgstr "" -#: cp/semantics.c:2050 +#: cp/semantics.c:2091 msgid "multiple declarators in template declaration" msgstr "" -#: cp/spew.c:239 +#: cp/spew.c:225 #, c-format msgid "identifier name `%s' conflicts with GNU C++ internal naming strategy" msgstr "" -#: cp/spew.c:1017 cp/spew.c:1292 +#: cp/spew.c:1002 cp/spew.c:1336 msgid "parse error at end of saved function text" msgstr "" -#: cp/spew.c:1062 +#: cp/spew.c:1090 cp/spew.c:1178 +msgid "%Hend of file read inside definition" +msgstr "" + +#: cp/spew.c:1121 msgid "parse error in method specification" msgstr "" -#: cp/spew.c:1104 +#: cp/spew.c:1161 msgid "function body for constructor missing" msgstr "" -#: cp/spew.c:1371 +#: cp/spew.c:1258 +msgid "%Hend of file read inside default argument" +msgstr "" + +#: cp/spew.c:1415 msgid "circular dependency in default args of `%#D'" msgstr "" -#: cp/spew.c:1435 +#: cp/spew.c:1479 msgid "invalid type `%T' for default argument to `%T'" msgstr "" -#: cp/spew.c:1495 +#: cp/spew.c:1539 #, c-format msgid "%s before `%s'" msgstr "" -#: cp/spew.c:1497 +#: cp/spew.c:1541 #, c-format msgid "%s before `%c'" msgstr "" -#: cp/spew.c:1499 +#: cp/spew.c:1543 #, c-format msgid "%s before `\\%o'" msgstr "" -#: cp/spew.c:1502 +#: cp/spew.c:1546 #, c-format msgid "%s before `%s' token" msgstr "" -#: cp/tree.c:223 +#: cp/tree.c:251 cp/tree.c:263 #, c-format msgid "non-lvalue in %s" msgstr "" -#: cp/tree.c:577 +#: cp/tree.c:635 msgid "`%V' qualifiers cannot be applied to `%T'" msgstr "" -#: cp/tree.c:580 -msgid "ignoring `%V' qualifiers on `%T'" -msgstr "" - -#: cp/tree.c:1921 +#: cp/tree.c:2012 #, c-format msgid "`%s' attribute can only be applied to Java class definitions" msgstr "" -#: cp/tree.c:1951 +#: cp/tree.c:2042 #, c-format msgid "`%s' attribute can only be applied to class definitions" msgstr "" -#: cp/tree.c:1957 +#: cp/tree.c:2048 #, c-format msgid "`%s' is obsolete; g++ vtables are now COM-compatible by default" msgstr "" -#: cp/tree.c:1982 +#: cp/tree.c:2073 msgid "requested init_priority is not an integer constant" msgstr "" -#: cp/tree.c:2003 +#: cp/tree.c:2094 #, c-format msgid "" "can only use `%s' attribute on file-scope definitions of objects of class " "type" msgstr "" -#: cp/tree.c:2011 +#: cp/tree.c:2102 msgid "requested init_priority is out of range" msgstr "" -#: cp/tree.c:2021 +#: cp/tree.c:2112 msgid "requested init_priority is reserved for internal use" msgstr "" -#: cp/tree.c:2031 +#: cp/tree.c:2122 #, c-format msgid "`%s' attribute is not supported on this platform" msgstr "" -#: cp/typeck.c:518 +#: cp/tree.c:2659 +#, c-format +msgid "lang_* check: failed in %s, at %s:%d" +msgstr "" + +#: cp/typeck.c:524 #, c-format msgid "" "ISO C++ forbids %s between pointer of type `void *' and pointer-to-function" msgstr "" -#: cp/typeck.c:539 +#: cp/typeck.c:545 msgid "%s between distinct pointer types `%T' and `%T' lacks a cast" msgstr "" -#: cp/typeck.c:1432 +#: cp/typeck.c:1438 msgid "ISO C++ prohibits conversion from `%#T' to `(...)'" msgstr "" -#: cp/typeck.c:1502 -msgid "ISO C++ forbids applying `sizeof' to a function type" -msgstr "" - -#: cp/typeck.c:1508 -msgid "ISO C++ forbids applying `sizeof' to a member function" -msgstr "" - -#: cp/typeck.c:1514 -msgid "" -"ISO C++ forbids applying `sizeof' to type `void' which is an incomplete type" -msgstr "" - -#: cp/typeck.c:1528 -msgid "`sizeof' applied to non-static member" +#: cp/typeck.c:1516 +#, c-format +msgid "invalid application of `%s' to a member function" msgstr "" -#: cp/typeck.c:1533 -msgid "`sizeof' applied to incomplete type `%T'" +#: cp/typeck.c:1522 +#, c-format +msgid "invalid application of `%s' to non-static member" msgstr "" -#: cp/typeck.c:1563 +#: cp/typeck.c:1540 msgid "sizeof applied to a bit-field" msgstr "" -#: cp/typeck.c:1566 +#: cp/typeck.c:1543 msgid "ISO C++ forbids applying `sizeof' to an expression of function type" msgstr "" -#: cp/typeck.c:1713 +#: cp/typeck.c:1655 msgid "invalid use of non-lvalue array" msgstr "" -#: cp/typeck.c:1819 +#: cp/typeck.c:1761 msgid "deprecated conversion from string constant to `%T'" msgstr "" -#: cp/typeck.c:1837 -msgid "request for member `%T::%D' in expression of non-aggregate type `%T'" +#: cp/typeck.c:1892 cp/typeck.c:2115 +msgid "request for member `%D' in `%E', which is of non-class type `%T'" msgstr "" -#: cp/typeck.c:2031 -msgid "destructor specifier `%T::~%T' must have matching names" +#: cp/typeck.c:1918 +msgid "`%D' is not a member of `%T'" msgstr "" -#: cp/typeck.c:2037 -msgid "type `%T' has no destructor" +#: cp/typeck.c:1958 cp/typeck.c:1979 +msgid "invalid access to non-static data member `%D' of NULL object" msgstr "" -#: cp/typeck.c:2054 cp/typeck.c:2145 -msgid "invalid use of type decl `%#D' as expression" +#: cp/typeck.c:1960 cp/typeck.c:1981 +msgid "(perhaps the `offsetof' macro was used incorrectly)" msgstr "" -#: cp/typeck.c:2059 -msgid "invalid use of template `%#D' as expression" +#: cp/typeck.c:2161 +msgid "`%D::%D' is not a member of `%T'" msgstr "" -#: cp/typeck.c:2136 -msgid "`%#T' has no member named `%D'" +#: cp/typeck.c:2187 +msgid "destructor specifier `%T::~%T' must have matching names" +msgstr "" + +#: cp/typeck.c:2193 +msgid "type `%T' has no destructor" msgstr "" -#: cp/typeck.c:2186 cp/typeck.c:2215 -msgid "invalid offsetof from non-POD type `%#T'; use pointer to member instead" +#: cp/typeck.c:2232 +msgid "`%D' is not a member template function" msgstr "" #. A pointer to incomplete type (other than cv void) can be @@ -16872,99 +17252,84 @@ msgstr "" msgid "subscripting array declared `register'" msgstr "" -#: cp/typeck.c:2648 cp/typeck.c:2803 -msgid "pointer to member function called, but not in class scope" -msgstr "" - -#: cp/typeck.c:2672 -msgid "object missing in call to method `%D'" -msgstr "" - -#: cp/typeck.c:2721 -msgid "" -"function `%D' declared overloaded, but no definitions appear with which to " -"resolve it?!?" -msgstr "" - -#: cp/typeck.c:2801 -msgid "" -"invalid call to member function needing `this' in static member function " -"scope" +#: cp/typeck.c:2558 +#, c-format +msgid "object missing in use of `%E'" msgstr "" -#: cp/typeck.c:2977 +#: cp/typeck.c:2663 msgid "ISO C++ forbids calling `::main' from within program" msgstr "" -#: cp/typeck.c:3002 +#: cp/typeck.c:2688 #, c-format msgid "must use .* or ->* to call pointer-to-member function in `%E (...)'" msgstr "" -#: cp/typeck.c:3015 +#: cp/typeck.c:2701 #, c-format msgid "`%E' cannot be used as a function" msgstr "" -#: cp/typeck.c:3140 +#: cp/typeck.c:2826 msgid "too many arguments to %s `%+#D'" msgstr "" -#: cp/typeck.c:3181 +#: cp/typeck.c:2867 msgid "parameter type of called function is incomplete" msgstr "" -#: cp/typeck.c:3248 +#: cp/typeck.c:2930 msgid "too few arguments to %s `%+#D'" msgstr "" -#: cp/typeck.c:3376 cp/typeck.c:3386 +#: cp/typeck.c:3058 cp/typeck.c:3068 msgid "assuming cast to type `%T' from overloaded function" msgstr "" -#: cp/typeck.c:3446 +#: cp/typeck.c:3128 #, c-format msgid "division by zero in `%E / 0'" msgstr "" -#: cp/typeck.c:3448 +#: cp/typeck.c:3130 #, c-format msgid "division by zero in `%E / 0.'" msgstr "" -#: cp/typeck.c:3478 +#: cp/typeck.c:3160 #, c-format msgid "division by zero in `%E %% 0'" msgstr "" -#: cp/typeck.c:3480 +#: cp/typeck.c:3162 #, c-format msgid "division by zero in `%E %% 0.'" msgstr "" -#: cp/typeck.c:3560 +#: cp/typeck.c:3242 #, c-format msgid "%s rotate count is negative" msgstr "" -#: cp/typeck.c:3563 +#: cp/typeck.c:3245 #, c-format msgid "%s rotate count >= width of type" msgstr "" -#: cp/typeck.c:3594 cp/typeck.c:3599 cp/typeck.c:3690 cp/typeck.c:3695 +#: cp/typeck.c:3276 cp/typeck.c:3281 cp/typeck.c:3372 cp/typeck.c:3377 msgid "ISO C++ forbids comparison between pointer and integer" msgstr "" -#: cp/typeck.c:3873 +#: cp/typeck.c:3555 msgid "comparison between types `%#T' and `%#T'" msgstr "" -#: cp/typeck.c:3909 +#: cp/typeck.c:3591 msgid "comparison between signed and unsigned integer expressions" msgstr "" -#: cp/typeck.c:3974 +#: cp/typeck.c:3656 msgid "invalid operands of types `%T' and `%T' to binary `%O'" msgstr "" @@ -16972,287 +17337,296 @@ msgstr "" #. performed. Note that pointer-difference and pointer-addition #. have already been handled above, and so we don't end up here in #. that case. -#: cp/typeck.c:3996 +#: cp/typeck.c:3678 msgid "NULL used in arithmetic" msgstr "" -#: cp/typeck.c:4063 +#: cp/typeck.c:3745 msgid "ISO C++ forbids using pointer of type `void *' in subtraction" msgstr "" -#: cp/typeck.c:4065 +#: cp/typeck.c:3747 msgid "ISO C++ forbids using pointer to a function in subtraction" msgstr "" -#: cp/typeck.c:4067 +#: cp/typeck.c:3749 msgid "ISO C++ forbids using pointer to a method in subtraction" msgstr "" -#: cp/typeck.c:4069 +#: cp/typeck.c:3751 msgid "ISO C++ forbids using pointer to a member in subtraction" msgstr "" -#: cp/typeck.c:4081 +#: cp/typeck.c:3763 msgid "invalid use of a pointer to an incomplete type in pointer arithmetic" msgstr "" -#: cp/typeck.c:4118 -msgid "attempt to take address of bit-field structure member `%D'" +#: cp/typeck.c:3823 +#, c-format +msgid "" +"invalid use of '%E' to form a pointer-to-member-function. Use a qualified-" +"id." msgstr "" -#: cp/typeck.c:4195 +#: cp/typeck.c:3829 +#, c-format +msgid "" +"parenthesis around '%E' cannot be used to form a pointer-to-member-function" +msgstr "" + +#: cp/typeck.c:3852 msgid "taking address of temporary" msgstr "" -#: cp/typeck.c:4398 +#: cp/typeck.c:4055 #, c-format msgid "ISO C++ forbids %sing an enum" msgstr "" -#: cp/typeck.c:4410 +#: cp/typeck.c:4067 msgid "cannot %s a pointer to incomplete type `%T'" msgstr "" -#: cp/typeck.c:4417 +#: cp/typeck.c:4074 msgid "ISO C++ forbids %sing a pointer of type `%T'" msgstr "" -#: cp/typeck.c:4442 +#: cp/typeck.c:4099 msgid "cast to non-reference type used as lvalue" msgstr "" -#: cp/typeck.c:4476 +#: cp/typeck.c:4133 msgid "invalid use of `--' on bool variable `%D'" msgstr "" #. ARM $3.4 -#: cp/typeck.c:4509 +#: cp/typeck.c:4166 msgid "ISO C++ forbids taking address of function `::main'" msgstr "" #. An expression like &memfn. -#: cp/typeck.c:4576 +#: cp/typeck.c:4233 msgid "" "ISO C++ forbids taking the address of an unqualified non-static member " "function to form a pointer to member function. Say `&%T::%D'" msgstr "" -#: cp/typeck.c:4578 +#: cp/typeck.c:4235 msgid "" "ISO C++ forbids taking the address of a bound member function to form a " "pointer to member function. Say `&%T::%D'" msgstr "" -#: cp/typeck.c:4602 +#: cp/typeck.c:4259 msgid "ISO C++ forbids taking the address of a cast to a non-lvalue expression" msgstr "" -#: cp/typeck.c:4618 -msgid "unary `&'" +#: cp/typeck.c:4290 +msgid "attempt to take address of bit-field structure member `%D'" msgstr "" -#: cp/typeck.c:4738 +#: cp/typeck.c:4418 msgid "taking address of destructor" msgstr "" -#: cp/typeck.c:4751 +#: cp/typeck.c:4431 msgid "taking address of bound pointer-to-member expression" msgstr "" -#: cp/typeck.c:4767 +#: cp/typeck.c:4447 msgid "cannot create pointer to reference member `%D'" msgstr "" -#: cp/typeck.c:4835 +#: cp/typeck.c:4510 msgid "cannot take the address of `this', which is an rvalue expression" msgstr "" -#: cp/typeck.c:4851 +#: cp/typeck.c:4529 msgid "address requested for `%D', which is declared `register'" msgstr "" -#: cp/typeck.c:5071 +#: cp/typeck.c:4750 msgid "static_cast from type `%T' to type `%T' casts away constness" msgstr "" -#: cp/typeck.c:5079 +#: cp/typeck.c:4758 msgid "invalid static_cast from type `%T' to type `%T'" msgstr "" -#: cp/typeck.c:5118 +#: cp/typeck.c:4797 msgid "" "invalid reinterpret_cast of an rvalue expression of type `%T' to type `%T'" msgstr "" -#: cp/typeck.c:5138 +#: cp/typeck.c:4817 msgid "reinterpret_cast from `%T' to `%T' loses precision" msgstr "" -#: cp/typeck.c:5151 +#: cp/typeck.c:4830 msgid "reinterpret_cast from `%T' to `%T' casts away const (or volatile)" msgstr "" -#: cp/typeck.c:5160 +#: cp/typeck.c:4839 msgid "" "ISO C++ forbids casting between pointer-to-function and pointer-to-object" msgstr "" -#: cp/typeck.c:5166 +#: cp/typeck.c:4845 msgid "invalid reinterpret_cast from type `%T' to type `%T'" msgstr "" -#: cp/typeck.c:5193 +#: cp/typeck.c:4872 msgid "" "invalid use of const_cast with type `%T', which is not a pointer, reference, " "nor a pointer-to-data-member type" msgstr "" -#: cp/typeck.c:5196 +#: cp/typeck.c:4875 msgid "" "invalid use of const_cast with type `%T', which is a pointer or reference to " "a function type" msgstr "" -#: cp/typeck.c:5219 +#: cp/typeck.c:4898 msgid "invalid const_cast of an rvalue of type `%T' to type `%T'" msgstr "" -#: cp/typeck.c:5235 +#: cp/typeck.c:4914 msgid "invalid const_cast from type `%T' to type `%T'" msgstr "" -#: cp/typeck.c:5277 cp/typeck.c:5282 +#: cp/typeck.c:4956 cp/typeck.c:4961 msgid "ISO C++ forbids casting to an array type `%T'" msgstr "" -#: cp/typeck.c:5290 +#: cp/typeck.c:4969 msgid "invalid cast to function type `%T'" msgstr "" -#: cp/typeck.c:5342 +#: cp/typeck.c:5021 msgid "cast from `%T' to `%T' discards qualifiers from pointer target type" msgstr "" -#: cp/typeck.c:5388 +#: cp/typeck.c:5067 msgid "cast from `%T' to `%T' increases required alignment of target type" msgstr "" -#: cp/typeck.c:5557 +#: cp/typeck.c:5235 msgid " in evaluation of `%Q(%#T, %#T)'" msgstr "" -#: cp/typeck.c:5599 +#: cp/typeck.c:5277 msgid "ISO C++ forbids cast to non-reference type used as lvalue" msgstr "" -#: cp/typeck.c:5670 +#: cp/typeck.c:5349 msgid "incompatible types in assignment of `%T' to `%T'" msgstr "" -#: cp/typeck.c:5677 +#: cp/typeck.c:5356 msgid "ISO C++ forbids assignment of arrays" msgstr "" -#: cp/typeck.c:5820 +#: cp/typeck.c:5499 msgid " in pointer to member function conversion" msgstr "" -#: cp/typeck.c:5828 +#: cp/typeck.c:5507 msgid " in pointer to member conversion" msgstr "" #. This is a reinterpret cast, we choose to do nothing. -#: cp/typeck.c:5839 cp/typeck.c:5858 +#: cp/typeck.c:5518 cp/typeck.c:5537 msgid "pointer to member cast via virtual base `%T' of `%T'" msgstr "" -#: cp/typeck.c:5862 +#: cp/typeck.c:5541 msgid "pointer to member conversion via virtual base `%T' of `%T'" msgstr "" -#: cp/typeck.c:5932 +#: cp/typeck.c:5611 msgid "invalid conversion to type `%T' from type `%T'" msgstr "" -#: cp/typeck.c:6097 +#: cp/typeck.c:5776 msgid "passing NULL used for non-pointer %s %P of `%D'" msgstr "" -#: cp/typeck.c:6100 +#: cp/typeck.c:5779 msgid "%s to non-pointer type `%T' from NULL" msgstr "" -#: cp/typeck.c:6108 +#: cp/typeck.c:5787 msgid "passing `%T' for %s %P of `%D'" msgstr "" -#: cp/typeck.c:6111 +#: cp/typeck.c:5790 msgid "%s to `%T' from `%T'" msgstr "" -#: cp/typeck.c:6121 +#: cp/typeck.c:5800 msgid "passing negative value `%E' for %s %P of `%D'" msgstr "" -#: cp/typeck.c:6124 +#: cp/typeck.c:5803 msgid "%s of negative value `%E' to `%T'" msgstr "" -#: cp/typeck.c:6211 +#: cp/typeck.c:5898 msgid "cannot convert `%T' to `%T' for argument `%P' to `%D'" msgstr "" -#: cp/typeck.c:6214 +#: cp/typeck.c:5901 msgid "cannot convert `%T' to `%T' in %s" msgstr "" -#: cp/typeck.c:6301 cp/typeck.c:6303 +#: cp/typeck.c:5988 cp/typeck.c:5990 msgid "in passing argument %P of `%+D'" msgstr "" -#: cp/typeck.c:6417 +#: cp/typeck.c:6105 msgid "returning reference to temporary" msgstr "" -#: cp/typeck.c:6424 +#: cp/typeck.c:6112 msgid "reference to non-lvalue returned" msgstr "" -#: cp/typeck.c:6436 +#: cp/typeck.c:6124 msgid "reference to local variable `%D' returned" msgstr "" -#: cp/typeck.c:6439 +#: cp/typeck.c:6127 msgid "address of local variable `%D' returned" msgstr "" -#: cp/typeck.c:6470 +#: cp/typeck.c:6158 msgid "returning a value from a destructor" msgstr "" #. If a return statement appears in a handler of the #. function-try-block of a constructor, the program is ill-formed. -#: cp/typeck.c:6478 +#: cp/typeck.c:6166 msgid "cannot return from a handler of a function-try-block of a constructor" msgstr "" #. You can't return a value from a constructor. -#: cp/typeck.c:6481 +#: cp/typeck.c:6169 msgid "returning a value from a constructor" msgstr "" -#: cp/typeck.c:6498 +#: cp/typeck.c:6186 msgid "" "return-statement with no value, in function declared with a non-void return " "type" msgstr "" -#: cp/typeck.c:6514 +#: cp/typeck.c:6202 msgid "" "return-statement with a value, in function declared with a void return type" msgstr "" -#: cp/typeck.c:6535 +#: cp/typeck.c:6223 msgid "" "`operator new' must not return NULL unless it is declared `throw()' (or -" "fcheck-new is in effect)" @@ -17298,194 +17672,150 @@ msgstr "" msgid " since type `%T' has abstract virtual functions" msgstr "" -#: cp/typeck2.c:213 -msgid "invalid use of undefined type `%#T'" -msgstr "" - -#: cp/typeck2.c:214 -msgid "forward declaration of `%#T'" -msgstr "" - -#: cp/typeck2.c:218 -msgid "invalid use of `%T'" -msgstr "" - -#: cp/typeck2.c:232 -msgid "invalid use of member (did you forget the `&' ?)" -msgstr "" - -#: cp/typeck2.c:236 -msgid "invalid use of template type parameter" -msgstr "" - -#: cp/typeck2.c:243 -msgid "address of overloaded function with no contextual type information" -msgstr "" - -#: cp/typeck2.c:245 -msgid "overloaded function with no contextual type information" -msgstr "" - -#: cp/typeck2.c:247 -msgid "insufficient contextual information to determine type" -msgstr "" - -#: cp/typeck2.c:301 +#: cp/typeck2.c:331 msgid "constructor syntax used, but no constructor declared for type `%T'" msgstr "" -#: cp/typeck2.c:311 -msgid "initializer list construction invalid for derived class object `%D'" -msgstr "" - -#: cp/typeck2.c:313 -msgid "initializer list construction invalid for polymorphic class object `%D'" -msgstr "" - -#: cp/typeck2.c:316 cp/typeck2.c:322 cp/typeck2.c:328 -msgid "initializer list construction invalid for `%D'" -msgstr "" - -#: cp/typeck2.c:317 -msgid "due to the presence of a constructor" -msgstr "" - -#: cp/typeck2.c:323 cp/typeck2.c:329 -msgid "due to non-public access of member `%D'" -msgstr "" - -#: cp/typeck2.c:341 +#: cp/typeck2.c:342 msgid "comma expression used to initialize return value" msgstr "" -#: cp/typeck2.c:350 +#: cp/typeck2.c:351 msgid "cannot initialize arrays using this syntax" msgstr "" -#: cp/typeck2.c:412 +#: cp/typeck2.c:406 msgid "ISO C++ forbids non-constant aggregate initializer expressions" msgstr "" -#: cp/typeck2.c:498 +#: cp/typeck2.c:490 msgid "initializing array with parameter list" msgstr "" -#: cp/typeck2.c:554 +#: cp/typeck2.c:546 msgid "initializer for scalar variable requires one element" msgstr "" -#: cp/typeck2.c:561 +#: cp/typeck2.c:553 msgid "braces around scalar initializer for `%T'" msgstr "" -#: cp/typeck2.c:564 +#: cp/typeck2.c:556 msgid "ignoring extra initializers for `%T'" msgstr "" -#: cp/typeck2.c:576 +#: cp/typeck2.c:568 msgid "variable-sized object of type `%T' may not be initialized" msgstr "" -#: cp/typeck2.c:586 +#: cp/typeck2.c:578 msgid "subobject of type `%T' must be initialized by constructor, not by `%E'" msgstr "" -#: cp/typeck2.c:652 +#: cp/typeck2.c:644 msgid "aggregate has a partly bracketed initializer" msgstr "" -#: cp/typeck2.c:690 cp/typeck2.c:791 +#: cp/typeck2.c:682 cp/typeck2.c:786 msgid "non-trivial labeled initializers" msgstr "" -#: cp/typeck2.c:707 +#: cp/typeck2.c:699 msgid "non-empty initializer for array of empty elements" msgstr "" -#: cp/typeck2.c:757 +#: cp/typeck2.c:752 msgid "initializer list for object of class with virtual base classes" msgstr "" -#: cp/typeck2.c:763 +#: cp/typeck2.c:758 msgid "initializer list for object of class with base classes" msgstr "" -#: cp/typeck2.c:769 +#: cp/typeck2.c:764 msgid "initializer list for object using virtual functions" msgstr "" -#: cp/typeck2.c:832 cp/typeck2.c:849 +#: cp/typeck2.c:827 cp/typeck2.c:843 msgid "missing initializer for member `%D'" msgstr "" -#: cp/typeck2.c:837 +#: cp/typeck2.c:832 msgid "uninitialized const member `%D'" msgstr "" -#: cp/typeck2.c:840 +#: cp/typeck2.c:834 msgid "member `%D' with uninitialized const fields" msgstr "" -#: cp/typeck2.c:843 +#: cp/typeck2.c:837 msgid "member `%D' is uninitialized reference" msgstr "" -#: cp/typeck2.c:886 +#: cp/typeck2.c:883 msgid "index value instead of field name in union initializer" msgstr "" -#: cp/typeck2.c:898 +#: cp/typeck2.c:895 msgid "no field `%D' in union being initialized" msgstr "" -#: cp/typeck2.c:906 +#: cp/typeck2.c:903 msgid "union `%T' with no named members cannot be initialized" msgstr "" -#: cp/typeck2.c:942 +#: cp/typeck2.c:939 msgid "excess elements in aggregate initializer" msgstr "" -#: cp/typeck2.c:1054 +#: cp/typeck2.c:1053 msgid "circular pointer delegation detected" msgstr "" -#: cp/typeck2.c:1067 +#: cp/typeck2.c:1066 msgid "base operand of `->' has non-pointer type `%T'" msgstr "" -#: cp/typeck2.c:1081 +#: cp/typeck2.c:1080 msgid "result of `operator->()' yields non-pointer result" msgstr "" -#: cp/typeck2.c:1083 +#: cp/typeck2.c:1082 msgid "base operand of `->' is not a pointer" msgstr "" -#: cp/typeck2.c:1149 +#: cp/typeck2.c:1148 msgid "`%E' cannot be used as a member pointer, since it is of type `%T'" msgstr "" -#: cp/typeck2.c:1156 +#: cp/typeck2.c:1155 msgid "" "cannot apply member pointer `%E' to `%E', which is of non-aggregate type `%T'" msgstr "" -#: cp/typeck2.c:1165 +#: cp/typeck2.c:1164 msgid "member type `%T::' incompatible with object type `%T'" msgstr "" -#: cp/typeck2.c:1202 +#: cp/typeck2.c:1201 msgid "`%T' fails to be a typedef or built-in type" msgstr "" -#: cp/typeck2.c:1275 +#: cp/typeck2.c:1274 #, c-format msgid "ISO C++ forbids defining types within %s" msgstr "" +#: cp/typeck2.c:1399 +msgid "call to function `%D' which throws incomplete type `%#T'" +msgstr "" + +#: cp/typeck2.c:1402 +msgid "call to function which throws incomplete type `%#T'" +msgstr "" + #. XXX Not i18n clean. -#: cp/cp-tree.h:3874 +#: cp/cp-tree.h:3846 #, c-format msgid "%s is deprecated, please see the documentation for details" msgstr "" @@ -17652,134 +17982,134 @@ msgstr "" msgid "Don't announce deprecation of compiler features" msgstr "" -#: f/bad.c:386 +#: f/bad.c:387 msgid "note:" msgstr "" -#: f/bad.c:390 +#: f/bad.c:391 msgid "warning:" msgstr "" -#: f/bad.c:394 +#: f/bad.c:395 msgid "fatal:" msgstr "" -#: f/bad.c:436 +#: f/bad.c:437 msgid "(continued):" msgstr "" -#: f/bad.c:486 f/bad.c:504 +#: f/bad.c:487 f/bad.c:505 msgid "[REPORT BUG!!] %" msgstr "" -#: f/bad.c:493 f/bad.c:525 +#: f/bad.c:494 f/bad.c:526 msgid "[REPORT BUG!!]" msgstr "" -#: f/com.c:3130 +#: f/com.c:3132 #, no-c-format msgid "ASSIGN'ed label cannot fit into `%A' at %0 -- using wider sibling" msgstr "" -#: f/com.c:11614 +#: f/com.c:11551 msgid "no INTEGER type can hold a pointer on this configuration" msgstr "" -#: f/com.c:11835 +#: f/com.c:11772 #, c-format msgid "configuration: REAL, INTEGER, and LOGICAL are %d bits wide," msgstr "" -#: f/com.c:11837 +#: f/com.c:11774 #, c-format msgid "and pointers are %d bits wide, but g77 doesn't yet work" msgstr "" -#: f/com.c:11839 +#: f/com.c:11776 msgid "properly unless they all are 32 bits wide" msgstr "" -#: f/com.c:11840 +#: f/com.c:11777 msgid "Please keep this in mind before you report bugs." msgstr "" #. I/O will probably crash. -#: f/com.c:11848 +#: f/com.c:11785 #, c-format msgid "configuration: char * holds %d bits, but ftnlen only %d" msgstr "" #. ASSIGN 10 TO I will crash. -#: f/com.c:11857 +#: f/com.c:11794 #, c-format msgid "" "configuration: char * holds %d bits, but INTEGER only %d --\n" " ASSIGN statement might fail" msgstr "" -#: f/com.c:13691 +#: f/com.c:13609 msgid "In statement function" msgstr "" -#: f/com.c:13701 +#: f/com.c:13619 msgid "Outside of any program unit:\n" msgstr "" -#: f/com.c:15408 +#: f/com.c:15248 #, no-c-format msgid "%A from %B at %0%C" msgstr "" -#: f/com.c:15585 +#: f/com.c:15425 msgid "directory name must immediately follow -I" msgstr "" -#: f/com.c:15728 +#: f/com.c:15568 #, no-c-format msgid "At %0, INCLUDE file %A exists, but is not readable" msgstr "" -#: f/com.c:15763 +#: f/com.c:15603 #, no-c-format msgid "At %0, INCLUDE nesting too deep" msgstr "" -#: f/expr.c:9613 +#: f/expr.c:9614 #, no-c-format msgid "Two arithmetic operators in a row at %0 and %1 -- use parentheses" msgstr "" -#: f/expr.c:9663 +#: f/expr.c:9664 #, no-c-format msgid "Operator at %0 has lower precedence than that at %1 -- use parentheses" msgstr "" -#: f/expr.c:10524 +#: f/expr.c:10525 #, no-c-format msgid "" "Use .EQV./.NEQV. instead of .EQ./.NE. at %0 for LOGICAL operands at %1 and %2" msgstr "" -#: f/expr.c:10895 +#: f/expr.c:10896 #, no-c-format msgid "Unsupported operand for ** at %1 -- converting to default INTEGER" msgstr "" -#: f/g77spec.c:256 +#: f/g77spec.c:255 #, c-format msgid "overflowed output arg list for `%s'" msgstr "" -#: f/g77spec.c:395 +#: f/g77spec.c:394 msgid "--driver no longer supported" msgstr "" -#: f/g77spec.c:408 +#: f/g77spec.c:407 #, c-format msgid "argument to `%s' missing" msgstr "" -#: f/g77spec.c:412 +#: f/g77spec.c:411 msgid "no input files; unwilling to write output files" msgstr "" @@ -17894,21 +18224,21 @@ msgstr "" msgid "INCLUDE at %0 not the only statement on the source line" msgstr "" -#: f/ste.c:1404 f/ste.c:1755 +#: f/ste.c:1400 f/ste.c:1747 msgid "ASSIGNed FORMAT specifier is too small" msgstr "" #. ~~~Someday handle CHARACTER*1, CHARACTER*N -#: f/ste.c:2636 +#: f/ste.c:2624 #, no-c-format msgid "SELECT CASE on CHARACTER type (at %0) not supported -- sorry" msgstr "" -#: f/ste.c:2965 +#: f/ste.c:2953 msgid "ASSIGN to variable that is too small" msgstr "" -#: f/ste.c:2993 +#: f/ste.c:2981 msgid "ASSIGNed GOTO target variable is too small" msgstr "" @@ -17917,7 +18247,7 @@ msgstr "" msgid "Local adjustable symbol `%A' at %0" msgstr "" -#: f/target.c:2560 +#: f/target.c:2550 msgid "data initializer on host with different endianness" msgstr "" @@ -19242,226 +19572,226 @@ msgstr "" msgid "In anything" msgstr "" -#: java/check-init.c:915 +#: java/check-init.c:917 #, c-format msgid "internal error in check-init: tree code not implemented: %s" msgstr "" -#: java/check-init.c:988 +#: java/check-init.c:990 #, c-format msgid "final field '%s' may not have been initialized" msgstr "" -#: java/class.c:568 java/class.c:593 +#: java/class.c:539 java/class.c:564 msgid "internal error - too many interface type" msgstr "" -#: java/class.c:744 +#: java/class.c:677 msgid "bad method signature" msgstr "" -#: java/class.c:793 +#: java/class.c:726 msgid "misplaced ConstantValue attribute (not in any field)" msgstr "" -#: java/class.c:795 +#: java/class.c:728 #, c-format msgid "duplicate ConstantValue attribute for field '%s'" msgstr "" -#: java/class.c:806 +#: java/class.c:739 #, c-format msgid "ConstantValue attribute of field '%s' has wrong type" msgstr "" -#: java/class.c:1170 +#: java/class.c:1103 #, c-format msgid "field '%s' not found in class" msgstr "" -#: java/class.c:1432 +#: java/class.c:1365 msgid "abstract method in non-abstract class" msgstr "" -#: java/class.c:2138 +#: java/class.c:2067 #, c-format msgid "non-static method '%s' overrides static method" msgstr "" -#: java/decl.c:1509 +#: java/decl.c:1537 #, c-format msgid "In %s: overlapped variable and exception ranges at %d" msgstr "" -#: java/decl.c:1593 +#: java/decl.c:1618 msgid "bad type in parameter debug info" msgstr "" -#: java/decl.c:1603 +#: java/decl.c:1628 #, c-format msgid "bad PC range for debug info for local `%s'" msgstr "" -#: java/expr.c:549 +#: java/expr.c:530 msgid "stack underflow - dup* operation" msgstr "" -#: java/expr.c:1537 +#: java/expr.c:1536 #, c-format msgid "" "reference `%s' is ambiguous: appears in interface `%s' and interface `%s'" msgstr "" -#: java/expr.c:1566 +#: java/expr.c:1565 #, c-format msgid "field `%s' not found" msgstr "" -#: java/expr.c:1721 +#: java/expr.c:1717 msgid "ret instruction not implemented" msgstr "" -#: java/expr.c:1858 +#: java/expr.c:1852 #, c-format msgid "method '%s' not found in class" msgstr "" -#: java/expr.c:2062 +#: java/expr.c:2055 #, c-format msgid "failed to find class '%s'" msgstr "" -#: java/expr.c:2074 +#: java/expr.c:2065 #, c-format msgid "class '%s' has no method named '%s' matching signature '%s'" msgstr "" -#: java/expr.c:2084 +#: java/expr.c:2075 msgid "invokestatic on non static method" msgstr "" -#: java/expr.c:2089 +#: java/expr.c:2080 msgid "invokestatic on abstract method" msgstr "" -#: java/expr.c:2097 +#: java/expr.c:2088 msgid "invoke[non-static] on static method" msgstr "" -#: java/expr.c:2382 +#: java/expr.c:2373 #, c-format msgid "missing field '%s' in '%s'" msgstr "" -#: java/expr.c:2388 +#: java/expr.c:2379 #, c-format msgid "mismatching signature for field '%s' in '%s'" msgstr "" -#: java/expr.c:2411 +#: java/expr.c:2402 #, c-format msgid "assignment to final field `%s' not in field's class" msgstr "" -#: java/expr.c:2416 +#: java/expr.c:2407 #, c-format msgid "assignment to final static field `%s' not in class initializer" msgstr "" -#: java/expr.c:2423 +#: java/expr.c:2414 #, c-format msgid "assignment to final field `%s' not in constructor" msgstr "" -#: java/expr.c:2664 +#: java/expr.c:2661 #, c-format msgid "can't expand %s" msgstr "" -#: java/expr.c:2840 +#: java/expr.c:2838 msgid "invalid PC in line number table" msgstr "" #. We've just reached the end of a region of dead code. -#: java/expr.c:2885 +#: java/expr.c:2883 #, c-format msgid "unreachable bytecode from %d to before %d" msgstr "" #. We've just reached the end of a region of dead code. -#: java/expr.c:2922 +#: java/expr.c:2920 #, c-format msgid "unreachable bytecode from %d to the end of the method" msgstr "" #. duplicate code from LOAD macro -#: java/expr.c:3236 +#: java/expr.c:3238 msgid "unrecogized wide sub-instruction" msgstr "" -#: java/jcf-io.c:410 +#: java/jcf-io.c:537 #, c-format msgid "" "source file for class `%s' is newer than its matching class file. Source " "file `%s' used instead" msgstr "" -#: java/jcf-parse.c:361 +#: java/jcf-parse.c:338 msgid "bad string constant" msgstr "" -#: java/jcf-parse.c:379 +#: java/jcf-parse.c:356 #, c-format msgid "bad value constant type %d, index %d" msgstr "" -#: java/jcf-parse.c:551 +#: java/jcf-parse.c:528 #, c-format msgid "can't reopen %s" msgstr "" -#: java/jcf-parse.c:556 +#: java/jcf-parse.c:533 #, c-format msgid "can't close %s" msgstr "" -#: java/jcf-parse.c:638 +#: java/jcf-parse.c:615 #, c-format msgid "cannot find file for class %s" msgstr "" -#: java/jcf-parse.c:650 +#: java/jcf-parse.c:627 msgid "not a valid Java .class file" msgstr "" -#: java/jcf-parse.c:653 +#: java/jcf-parse.c:630 msgid "error while parsing constant pool" msgstr "" -#: java/jcf-parse.c:656 +#: java/jcf-parse.c:633 #, c-format msgid "error in constant pool entry #%d\n" msgstr "" #. FIXME - where was first time -#: java/jcf-parse.c:668 +#: java/jcf-parse.c:645 #, c-format msgid "reading class %s for the second time from %s" msgstr "" -#: java/jcf-parse.c:686 +#: java/jcf-parse.c:663 msgid "error while parsing fields" msgstr "" -#: java/jcf-parse.c:689 +#: java/jcf-parse.c:666 msgid "error while parsing methods" msgstr "" -#: java/jcf-parse.c:692 +#: java/jcf-parse.c:669 msgid "error while parsing final attributes" msgstr "" -#: java/jcf-parse.c:706 +#: java/jcf-parse.c:683 #, c-format msgid "" "the `java.lang.Object' that was found in `%s' didn't have the special zero-" @@ -19470,99 +19800,104 @@ msgid "" "info page describing how to set the classpath" msgstr "" -#: java/jcf-parse.c:796 +#: java/jcf-parse.c:773 msgid "missing Code attribute" msgstr "" -#: java/jcf-parse.c:1032 +#: java/jcf-parse.c:1010 msgid "source file seen twice on command line and will be compiled only once" msgstr "" -#: java/jcf-parse.c:1048 +#: java/jcf-parse.c:1026 msgid "no input file specified" msgstr "" -#: java/jcf-parse.c:1077 +#: java/jcf-parse.c:1055 #, c-format msgid "can't close input file %s" msgstr "" -#: java/jcf-parse.c:1114 +#: java/jcf-parse.c:1092 #, c-format msgid "bad zip/jar file %s" msgstr "" -#: java/jcf-write.c:2636 +#: java/jcf-write.c:2641 #, c-format msgid "" "internal error in generate_bytecode_insn - tree code not implemented: %s" msgstr "" -#: java/jcf-write.c:2943 +#: java/jcf-write.c:2979 msgid "field initializer type mismatch" msgstr "" -#: java/jcf-write.c:3352 +#: java/jcf-write.c:3387 #, c-format msgid "can't create directory %s" msgstr "" -#: java/jv-scan.c:183 +#: java/jcf-write.c:3441 +#, c-format +msgid "can't create %s" +msgstr "" + +#: java/jv-scan.c:187 msgid "only one of `--print-main', `--list-class', and `--complexity' allowed" msgstr "" -#: java/jv-scan.c:186 +#: java/jv-scan.c:190 #, c-format msgid "can't open output file `%s'" msgstr "" -#: java/jv-scan.c:220 +#: java/jv-scan.c:224 #, c-format msgid "file not found `%s'" msgstr "" -#: java/jvspec.c:427 +#: java/jvspec.c:426 msgid "can't specify `-D' without `--main'\n" msgstr "" -#: java/jvspec.c:430 +#: java/jvspec.c:429 #, c-format msgid "`%s' is not a valid class name" msgstr "" -#: java/jvspec.c:436 -msgid "-R requires -o" +#: java/jvspec.c:435 +msgid "--resource requires -o" msgstr "" -#: java/jvspec.c:443 +#: java/jvspec.c:442 msgid "warning: already-compiled .class files ignored with -C" msgstr "" -#: java/jvspec.c:450 +#: java/jvspec.c:449 msgid "cannot specify both -C and -o" msgstr "" -#: java/jvspec.c:462 +#: java/jvspec.c:461 msgid "cannot create temporary file" msgstr "" -#: java/jvspec.c:490 +#: java/jvspec.c:489 msgid "using both @FILE with multiple files not implemented" msgstr "" -#: java/jvspec.c:548 +#: java/jvspec.c:538 msgid "cannot specify `main' class when not linking" msgstr "" -#: java/lang.c:487 +#: java/lang.c:543 msgid "can't do dependency tracking with input from stdin" msgstr "" -#: java/lang.c:503 +#: java/lang.c:559 msgid "couldn't determine target name for dependency tracking" msgstr "" -#: java/lex.c:308 +#: java/lex.c:303 #, c-format msgid "" "unknown encoding: `%s'\n" @@ -19577,268 +19912,266 @@ msgstr "" msgid "can't mangle %s" msgstr "" -#: java/mangle_name.c:145 java/mangle_name.c:217 +#: java/mangle_name.c:144 java/mangle_name.c:216 msgid "internal error - invalid Utf8 name" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:747 /var/repo/gcc/gcc/java/parse.y:785 -msgid "Missing name" +#: ../../gcc-cvs/gcc/java/parse-scan.y:881 ../../gcc-3cvs/gcc/java/parse.y:962 +#: ../../gcc-3cvs/gcc/java/parse.y:1303 ../../gcc-3cvs/gcc/java/parse.y:1364 +#: ../../gcc-3cvs/gcc/java/parse.y:1574 ../../gcc-3cvs/gcc/java/parse.y:1796 +#: ../../gcc-3cvs/gcc/java/parse.y:1805 ../../gcc-3cvs/gcc/java/parse.y:1816 +#: ../../gcc-3cvs/gcc/java/parse.y:1827 ../../gcc-3cvs/gcc/java/parse.y:1839 +#: ../../gcc-3cvs/gcc/java/parse.y:1854 ../../gcc-3cvs/gcc/java/parse.y:1871 +#: ../../gcc-3cvs/gcc/java/parse.y:1873 ../../gcc-3cvs/gcc/java/parse.y:1945 +#: ../../gcc-3cvs/gcc/java/parse.y:2116 ../../gcc-3cvs/gcc/java/parse.y:2178 +#: ../../gcc-3cvs/gcc/java/parse.y:2330 ../../gcc-3cvs/gcc/java/parse.y:2342 +#: ../../gcc-3cvs/gcc/java/parse.y:2349 ../../gcc-3cvs/gcc/java/parse.y:2356 +#: ../../gcc-3cvs/gcc/java/parse.y:2367 ../../gcc-3cvs/gcc/java/parse.y:2369 +#: ../../gcc-3cvs/gcc/java/parse.y:2407 ../../gcc-3cvs/gcc/java/parse.y:2409 +#: ../../gcc-3cvs/gcc/java/parse.y:2411 ../../gcc-3cvs/gcc/java/parse.y:2432 +#: ../../gcc-3cvs/gcc/java/parse.y:2434 ../../gcc-3cvs/gcc/java/parse.y:2436 +#: ../../gcc-3cvs/gcc/java/parse.y:2452 ../../gcc-3cvs/gcc/java/parse.y:2454 +#: ../../gcc-3cvs/gcc/java/parse.y:2475 ../../gcc-3cvs/gcc/java/parse.y:2477 +#: ../../gcc-3cvs/gcc/java/parse.y:2479 ../../gcc-3cvs/gcc/java/parse.y:2507 +#: ../../gcc-3cvs/gcc/java/parse.y:2509 ../../gcc-3cvs/gcc/java/parse.y:2511 +#: ../../gcc-3cvs/gcc/java/parse.y:2513 ../../gcc-3cvs/gcc/java/parse.y:2531 +#: ../../gcc-3cvs/gcc/java/parse.y:2533 ../../gcc-3cvs/gcc/java/parse.y:2544 +#: ../../gcc-3cvs/gcc/java/parse.y:2555 ../../gcc-3cvs/gcc/java/parse.y:2566 +#: ../../gcc-3cvs/gcc/java/parse.y:2577 ../../gcc-3cvs/gcc/java/parse.y:2588 +#: ../../gcc-3cvs/gcc/java/parse.y:2601 ../../gcc-3cvs/gcc/java/parse.y:2605 +#: ../../gcc-3cvs/gcc/java/parse.y:2607 ../../gcc-3cvs/gcc/java/parse.y:2620 +msgid "Missing term" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:749 /var/repo/gcc/gcc/java/parse.y:787 -#: /var/repo/gcc/gcc/java/parse.y:812 /var/repo/gcc/gcc/java/parse.y:996 -#: /var/repo/gcc/gcc/java/parse.y:1343 /var/repo/gcc/gcc/java/parse.y:1554 -#: /var/repo/gcc/gcc/java/parse.y:1556 /var/repo/gcc/gcc/java/parse.y:1785 -#: /var/repo/gcc/gcc/java/parse.y:1811 /var/repo/gcc/gcc/java/parse.y:1822 -#: /var/repo/gcc/gcc/java/parse.y:1833 /var/repo/gcc/gcc/java/parse.y:1845 +#: ../../gcc-cvs/gcc/java/parse-scan.y:883 ../../gcc-3cvs/gcc/java/parse.y:734 +#: ../../gcc-3cvs/gcc/java/parse.y:772 ../../gcc-3cvs/gcc/java/parse.y:797 +#: ../../gcc-3cvs/gcc/java/parse.y:983 ../../gcc-3cvs/gcc/java/parse.y:1338 +#: ../../gcc-3cvs/gcc/java/parse.y:1550 ../../gcc-3cvs/gcc/java/parse.y:1552 +#: ../../gcc-3cvs/gcc/java/parse.y:1781 ../../gcc-3cvs/gcc/java/parse.y:1807 +#: ../../gcc-3cvs/gcc/java/parse.y:1818 ../../gcc-3cvs/gcc/java/parse.y:1829 +#: ../../gcc-3cvs/gcc/java/parse.y:1841 ../../gcc-3cvs/gcc/java/parse.y:1856 msgid "';' expected" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:810 +#: ../../gcc-3cvs/gcc/java/parse.y:732 ../../gcc-3cvs/gcc/java/parse.y:770 +msgid "Missing name" +msgstr "" + +#: ../../gcc-3cvs/gcc/java/parse.y:795 msgid "'*' expected" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:824 +#: ../../gcc-3cvs/gcc/java/parse.y:809 msgid "Class or interface declaration expected" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:859 /var/repo/gcc/gcc/java/parse.y:861 +#: ../../gcc-3cvs/gcc/java/parse.y:846 ../../gcc-3cvs/gcc/java/parse.y:848 msgid "Missing class name" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:864 /var/repo/gcc/gcc/java/parse.y:868 -#: /var/repo/gcc/gcc/java/parse.y:876 /var/repo/gcc/gcc/java/parse.y:1041 -#: /var/repo/gcc/gcc/java/parse.y:1289 /var/repo/gcc/gcc/java/parse.y:1291 -#: /var/repo/gcc/gcc/java/parse.y:1620 /var/repo/gcc/gcc/java/parse.y:1856 -#: /var/repo/gcc/gcc/java/parse.y:1888 /var/repo/gcc/gcc/java/parse.y:1940 +#: ../../gcc-3cvs/gcc/java/parse.y:851 ../../gcc-3cvs/gcc/java/parse.y:855 +#: ../../gcc-3cvs/gcc/java/parse.y:863 ../../gcc-3cvs/gcc/java/parse.y:1023 +#: ../../gcc-3cvs/gcc/java/parse.y:1284 ../../gcc-3cvs/gcc/java/parse.y:1286 +#: ../../gcc-3cvs/gcc/java/parse.y:1616 ../../gcc-3cvs/gcc/java/parse.y:1867 +#: ../../gcc-3cvs/gcc/java/parse.y:1899 ../../gcc-3cvs/gcc/java/parse.y:1952 msgid "'{' expected" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:878 +#: ../../gcc-3cvs/gcc/java/parse.y:865 msgid "Missing super class name" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:888 /var/repo/gcc/gcc/java/parse.y:904 +#: ../../gcc-3cvs/gcc/java/parse.y:875 ../../gcc-3cvs/gcc/java/parse.y:891 msgid "Missing interface name" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:975 /var/repo/gcc/gcc/java/parse.y:1308 -#: /var/repo/gcc/gcc/java/parse.y:1369 /var/repo/gcc/gcc/java/parse.y:1578 -#: /var/repo/gcc/gcc/java/parse.y:1800 /var/repo/gcc/gcc/java/parse.y:1809 -#: /var/repo/gcc/gcc/java/parse.y:1820 /var/repo/gcc/gcc/java/parse.y:1831 -#: /var/repo/gcc/gcc/java/parse.y:1843 /var/repo/gcc/gcc/java/parse.y:1860 -#: /var/repo/gcc/gcc/java/parse.y:1862 /var/repo/gcc/gcc/java/parse.y:1933 -#: /var/repo/gcc/gcc/java/parse.y:2104 /var/repo/gcc/gcc/java/parse.y:2166 -#: /var/repo/gcc/gcc/java/parse.y:2318 /var/repo/gcc/gcc/java/parse.y:2330 -#: /var/repo/gcc/gcc/java/parse.y:2337 /var/repo/gcc/gcc/java/parse.y:2344 -#: /var/repo/gcc/gcc/java/parse.y:2355 /var/repo/gcc/gcc/java/parse.y:2357 -#: /var/repo/gcc/gcc/java/parse.y:2395 /var/repo/gcc/gcc/java/parse.y:2397 -#: /var/repo/gcc/gcc/java/parse.y:2399 /var/repo/gcc/gcc/java/parse.y:2420 -#: /var/repo/gcc/gcc/java/parse.y:2422 /var/repo/gcc/gcc/java/parse.y:2424 -#: /var/repo/gcc/gcc/java/parse.y:2440 /var/repo/gcc/gcc/java/parse.y:2442 -#: /var/repo/gcc/gcc/java/parse.y:2463 /var/repo/gcc/gcc/java/parse.y:2465 -#: /var/repo/gcc/gcc/java/parse.y:2467 /var/repo/gcc/gcc/java/parse.y:2495 -#: /var/repo/gcc/gcc/java/parse.y:2497 /var/repo/gcc/gcc/java/parse.y:2499 -#: /var/repo/gcc/gcc/java/parse.y:2501 /var/repo/gcc/gcc/java/parse.y:2519 -#: /var/repo/gcc/gcc/java/parse.y:2521 /var/repo/gcc/gcc/java/parse.y:2532 -#: /var/repo/gcc/gcc/java/parse.y:2543 /var/repo/gcc/gcc/java/parse.y:2554 -#: /var/repo/gcc/gcc/java/parse.y:2565 /var/repo/gcc/gcc/java/parse.y:2576 -#: /var/repo/gcc/gcc/java/parse.y:2589 /var/repo/gcc/gcc/java/parse.y:2593 -#: /var/repo/gcc/gcc/java/parse.y:2595 /var/repo/gcc/gcc/java/parse.y:2608 -msgid "Missing term" -msgstr "" - -#: /var/repo/gcc/gcc/java/parse.y:990 +#: ../../gcc-3cvs/gcc/java/parse.y:977 msgid "Missing variable initializer" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:1007 +#: ../../gcc-3cvs/gcc/java/parse.y:994 msgid "Invalid declaration" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:1013 -msgid "Can't specify array dimension in a declaration" -msgstr "" - -#: /var/repo/gcc/gcc/java/parse.y:1015 /var/repo/gcc/gcc/java/parse.y:1091 -#: /var/repo/gcc/gcc/java/parse.y:2141 /var/repo/gcc/gcc/java/parse.y:2163 -#: /var/repo/gcc/gcc/java/parse.y:2167 /var/repo/gcc/gcc/java/parse.y:2202 -#: /var/repo/gcc/gcc/java/parse.y:2279 /var/repo/gcc/gcc/java/parse.y:2289 +#: ../../gcc-3cvs/gcc/java/parse.y:997 ../../gcc-3cvs/gcc/java/parse.y:1082 +#: ../../gcc-3cvs/gcc/java/parse.y:2153 ../../gcc-3cvs/gcc/java/parse.y:2175 +#: ../../gcc-3cvs/gcc/java/parse.y:2179 ../../gcc-3cvs/gcc/java/parse.y:2214 +#: ../../gcc-3cvs/gcc/java/parse.y:2291 ../../gcc-3cvs/gcc/java/parse.y:2301 msgid "']' expected" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:1019 +#: ../../gcc-3cvs/gcc/java/parse.y:1001 msgid "Unbalanced ']'" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:1055 +#: ../../gcc-3cvs/gcc/java/parse.y:1037 msgid "Invalid method declaration, method name required" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:1061 /var/repo/gcc/gcc/java/parse.y:1063 -#: /var/repo/gcc/gcc/java/parse.y:2024 +#: ../../gcc-3cvs/gcc/java/parse.y:1042 ../../gcc-3cvs/gcc/java/parse.y:1047 +#: ../../gcc-3cvs/gcc/java/parse.y:1052 ../../gcc-3cvs/gcc/java/parse.y:2036 msgid "Identifier expected" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:1066 +#: ../../gcc-3cvs/gcc/java/parse.y:1057 msgid "Invalid method declaration, return type required" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:1089 /var/repo/gcc/gcc/java/parse.y:1534 -#: /var/repo/gcc/gcc/java/parse.y:1541 /var/repo/gcc/gcc/java/parse.y:1550 -#: /var/repo/gcc/gcc/java/parse.y:1552 /var/repo/gcc/gcc/java/parse.y:1580 -#: /var/repo/gcc/gcc/java/parse.y:1688 /var/repo/gcc/gcc/java/parse.y:1969 -#: /var/repo/gcc/gcc/java/parse.y:2022 +#: ../../gcc-3cvs/gcc/java/parse.y:1080 ../../gcc-3cvs/gcc/java/parse.y:1530 +#: ../../gcc-3cvs/gcc/java/parse.y:1537 ../../gcc-3cvs/gcc/java/parse.y:1546 +#: ../../gcc-3cvs/gcc/java/parse.y:1548 ../../gcc-3cvs/gcc/java/parse.y:1576 +#: ../../gcc-3cvs/gcc/java/parse.y:1684 ../../gcc-3cvs/gcc/java/parse.y:1981 +#: ../../gcc-3cvs/gcc/java/parse.y:2034 msgid "')' expected" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:1105 +#: ../../gcc-3cvs/gcc/java/parse.y:1096 msgid "Missing formal parameter term" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:1120 /var/repo/gcc/gcc/java/parse.y:1125 +#: ../../gcc-3cvs/gcc/java/parse.y:1111 ../../gcc-3cvs/gcc/java/parse.y:1116 msgid "Missing identifier" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:1145 /var/repo/gcc/gcc/java/parse.y:1154 +#: ../../gcc-3cvs/gcc/java/parse.y:1136 ../../gcc-3cvs/gcc/java/parse.y:1145 msgid "Missing class type term" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:1306 +#: ../../gcc-3cvs/gcc/java/parse.y:1301 msgid "Invalid interface type" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:1498 /var/repo/gcc/gcc/java/parse.y:1667 -#: /var/repo/gcc/gcc/java/parse.y:1669 +#: ../../gcc-3cvs/gcc/java/parse.y:1494 ../../gcc-3cvs/gcc/java/parse.y:1663 +#: ../../gcc-3cvs/gcc/java/parse.y:1665 msgid "':' expected" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:1520 /var/repo/gcc/gcc/java/parse.y:1525 -#: /var/repo/gcc/gcc/java/parse.y:1530 +#: ../../gcc-3cvs/gcc/java/parse.y:1516 ../../gcc-3cvs/gcc/java/parse.y:1521 +#: ../../gcc-3cvs/gcc/java/parse.y:1526 msgid "Invalid expression statement" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:1548 /var/repo/gcc/gcc/java/parse.y:1576 -#: /var/repo/gcc/gcc/java/parse.y:1616 /var/repo/gcc/gcc/java/parse.y:1684 -#: /var/repo/gcc/gcc/java/parse.y:1752 /var/repo/gcc/gcc/java/parse.y:1858 -#: /var/repo/gcc/gcc/java/parse.y:1926 /var/repo/gcc/gcc/java/parse.y:2016 -#: /var/repo/gcc/gcc/java/parse.y:2018 /var/repo/gcc/gcc/java/parse.y:2026 -#: /var/repo/gcc/gcc/java/parse.y:2262 /var/repo/gcc/gcc/java/parse.y:2264 +#: ../../gcc-3cvs/gcc/java/parse.y:1544 ../../gcc-3cvs/gcc/java/parse.y:1572 +#: ../../gcc-3cvs/gcc/java/parse.y:1612 ../../gcc-3cvs/gcc/java/parse.y:1680 +#: ../../gcc-3cvs/gcc/java/parse.y:1748 ../../gcc-3cvs/gcc/java/parse.y:1869 +#: ../../gcc-3cvs/gcc/java/parse.y:1938 ../../gcc-3cvs/gcc/java/parse.y:2028 +#: ../../gcc-3cvs/gcc/java/parse.y:2030 ../../gcc-3cvs/gcc/java/parse.y:2038 +#: ../../gcc-3cvs/gcc/java/parse.y:2274 ../../gcc-3cvs/gcc/java/parse.y:2276 msgid "'(' expected" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:1618 +#: ../../gcc-3cvs/gcc/java/parse.y:1614 msgid "Missing term or ')'" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:1665 +#: ../../gcc-3cvs/gcc/java/parse.y:1661 msgid "Missing or invalid constant expression" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:1686 +#: ../../gcc-3cvs/gcc/java/parse.y:1682 msgid "Missing term and ')' expected" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:1725 +#: ../../gcc-3cvs/gcc/java/parse.y:1721 msgid "Invalid control expression" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:1727 /var/repo/gcc/gcc/java/parse.y:1729 +#: ../../gcc-3cvs/gcc/java/parse.y:1723 ../../gcc-3cvs/gcc/java/parse.y:1725 msgid "Invalid update expression" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:1754 +#: ../../gcc-3cvs/gcc/java/parse.y:1750 msgid "Invalid init statement" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:1929 +#: ../../gcc-3cvs/gcc/java/parse.y:1941 msgid "Missing term or ')' expected" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:1971 +#: ../../gcc-3cvs/gcc/java/parse.y:1983 msgid "'class' or 'this' expected" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:1973 /var/repo/gcc/gcc/java/parse.y:1975 +#: ../../gcc-3cvs/gcc/java/parse.y:1985 ../../gcc-3cvs/gcc/java/parse.y:1987 msgid "'class' expected" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:2020 +#: ../../gcc-3cvs/gcc/java/parse.y:2032 msgid "')' or term expected" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:2139 +#: ../../gcc-3cvs/gcc/java/parse.y:2151 msgid "'[' expected" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:2217 +#: ../../gcc-3cvs/gcc/java/parse.y:2229 msgid "Field expected" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:2274 /var/repo/gcc/gcc/java/parse.y:2284 +#: ../../gcc-3cvs/gcc/java/parse.y:2286 ../../gcc-3cvs/gcc/java/parse.y:2296 msgid "Missing term and ']' expected" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:2388 +#: ../../gcc-3cvs/gcc/java/parse.y:2400 msgid "']' expected, invalid type expression" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:2391 +#: ../../gcc-3cvs/gcc/java/parse.y:2403 msgid "Invalid type expression" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:2503 +#: ../../gcc-3cvs/gcc/java/parse.y:2515 msgid "Invalid reference type" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:2981 +#: ../../gcc-3cvs/gcc/java/parse.y:2993 msgid "Constructor invocation must be first thing in a constructor" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:2983 +#: ../../gcc-3cvs/gcc/java/parse.y:2995 msgid "Only constructors can invoke constructors" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:2992 +#: ../../gcc-3cvs/gcc/java/parse.y:3004 #, c-format msgid ": `%s' JDK1.1(TM) feature" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:3052 /var/repo/gcc/gcc/java/parse.y:3054 +#: ../../gcc-3cvs/gcc/java/parse.y:3064 ../../gcc-3cvs/gcc/java/parse.y:3066 #, c-format msgid "" "%s.\n" "%s" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:6833 +#: ../../gcc-3cvs/gcc/java/parse.y:6867 #, c-format msgid "malformed .zip archive in CLASSPATH: %s" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:6904 +#: ../../gcc-3cvs/gcc/java/parse.y:6938 #, c-format msgid "" "Can't find default package `%s'. Check the CLASSPATH environment variable " "and the access to the archives" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:12228 +#: ../../gcc-3cvs/gcc/java/parse.y:12266 #, c-format msgid "missing static field `%s'" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:12233 +#: ../../gcc-3cvs/gcc/java/parse.y:12271 #, c-format msgid "not a static field `%s'" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:12276 +#: ../../gcc-3cvs/gcc/java/parse.y:12314 #, c-format msgid "No case for %s" msgstr "" -#: /var/repo/gcc/gcc/java/parse.y:13122 +#: ../../gcc-3cvs/gcc/java/parse.y:13240 #, c-format msgid "unregistered operator %s" msgstr "" @@ -19847,16 +20180,20 @@ msgstr "" msgid "junk at end of signature string" msgstr "" -#: java/verify.c:480 +#: java/verify.c:479 msgid "bad pc in exception_table" msgstr "" -#: java/verify.c:1392 +#: java/verify.c:485 +msgid "exception handler inside code that is being protected" +msgstr "" + +#: java/verify.c:1395 #, c-format msgid "unknown opcode %d@pc=%d during verification" msgstr "" -#: java/verify.c:1462 java/verify.c:1475 java/verify.c:1479 +#: java/verify.c:1465 java/verify.c:1478 java/verify.c:1482 #, c-format msgid "verification error at PC=%d" msgstr "" @@ -19925,122 +20262,132 @@ msgstr "" msgid "Use offset tables for virtual method calls" msgstr "" -#: objc/objc-act.c:567 -msgid "no class name specified as argument to -fconstant-string-class" -msgstr "" - -#: objc/objc-act.c:718 +#: objc/objc-act.c:651 #, c-format msgid "object does not conform to the `%s' protocol" msgstr "" -#: objc/objc-act.c:762 +#: objc/objc-act.c:737 objc/objc-act.c:810 #, c-format msgid "class `%s' does not implement the `%s' protocol" msgstr "" -#: objc/objc-act.c:843 +#: objc/objc-act.c:914 #, c-format msgid "`%s' cannot be statically allocated" msgstr "" -#: objc/objc-act.c:900 +#: objc/objc-act.c:963 #, c-format msgid "unexpected type for `id' (%s)" msgstr "" -#: objc/objc-act.c:905 +#: objc/objc-act.c:968 msgid "undefined type `id', please import <objc/objc.h>" msgstr "" -#: objc/objc-act.c:957 +#: objc/objc-act.c:1019 #, c-format msgid "protocol `%s' has circular dependency" msgstr "" -#: objc/objc-act.c:979 objc/objc-act.c:5187 +#: objc/objc-act.c:1041 objc/objc-act.c:5301 #, c-format msgid "cannot find protocol declaration for `%s'" msgstr "" -#: objc/objc-act.c:1237 objc/objc-act.c:5705 objc/objc-act.c:6035 -#: objc/objc-act.c:6084 objc/objc-act.c:6120 objc-parse.y:1764 +#: objc/objc-act.c:1289 objc/objc-act.c:5877 objc/objc-act.c:6195 +#: objc/objc-act.c:6244 objc/objc-act.c:6280 objc-parse.y:1800 #, c-format msgid "cannot find interface declaration for `%s'" msgstr "" -#: objc/objc-act.c:1262 +#: objc/objc-act.c:1328 #, c-format msgid "cannot find reference tag for class `%s'" msgstr "" -#: objc/objc-act.c:2272 +#: objc/objc-act.c:2050 +#, c-format +msgid "creating selector for non existant method %s" +msgstr "" + +#: objc/objc-act.c:2364 #, c-format msgid "cannot find class `%s'" msgstr "" -#: objc/objc-act.c:2274 +#: objc/objc-act.c:2366 #, c-format msgid "class `%s' already exists" msgstr "" #. fatal did not work with 2 args...should fix -#: objc/objc-act.c:2398 +#: objc/objc-act.c:2473 #, c-format msgid "cannot find interface declaration for `%s', superclass of `%s'" msgstr "" -#: objc/objc-act.c:2405 +#: objc/objc-act.c:2480 #, c-format msgid "circular inheritance in interface declaration for `%s'" msgstr "" -#: objc/objc-act.c:3458 objc/objc-act.c:3475 +#: objc/objc-act.c:3566 objc/objc-act.c:3583 msgid "inconsistent instance variable specification" msgstr "" -#: objc/objc-act.c:4668 +#: objc/objc-act.c:4580 +msgid "can not use an object as parameter to a method\n" +msgstr "" + +#: objc/objc-act.c:4780 #, c-format msgid "multiple declarations for method `%s'" msgstr "" -#: objc/objc-act.c:4834 +#: objc/objc-act.c:4946 #, c-format msgid "invalid receiver type `%s'" msgstr "" -#: objc/objc-act.c:4865 objc/objc-act.c:4891 objc/objc-act.c:4939 +#: objc/objc-act.c:4977 objc/objc-act.c:5003 objc/objc-act.c:5051 #, c-format msgid "`%s' does not respond to `%s'" msgstr "" -#: objc/objc-act.c:4871 objc/objc-act.c:7155 +#: objc/objc-act.c:4983 objc/objc-act.c:7318 #, c-format msgid "no super class declared in interface for `%s'" msgstr "" -#: objc/objc-act.c:4969 +#: objc/objc-act.c:5081 msgid "cannot find class (factory) method" msgstr "" -#: objc/objc-act.c:4970 objc/objc-act.c:5014 +#: objc/objc-act.c:5082 objc/objc-act.c:5126 #, c-format msgid "return type for `%s' defaults to id" msgstr "" -#: objc/objc-act.c:4987 +#: objc/objc-act.c:5099 #, c-format msgid "method `%s' not implemented by protocol" msgstr "" -#: objc/objc-act.c:4996 +#: objc/objc-act.c:5108 msgid "return type defaults to id" msgstr "" -#: objc/objc-act.c:5013 +#: objc/objc-act.c:5125 msgid "cannot find method" msgstr "" +#: objc/objc-act.c:5399 +#, c-format +msgid "undeclared selector `%s'" +msgstr "" + #. Historically, a class method that produced objects (factory #. method) would assign `self' to the instance that it #. allocated. This would effectively turn the class method into @@ -20050,108 +20397,108 @@ msgstr "" #. to an instance variable. It's better to catch the cases #. where this is done unknowingly than to support the above #. paradigm. -#: objc/objc-act.c:5256 +#: objc/objc-act.c:5443 #, c-format msgid "instance variable `%s' accessed in class method" msgstr "" -#: objc/objc-act.c:5506 +#: objc/objc-act.c:5678 #, c-format msgid "duplicate definition of class method `%s'" msgstr "" -#: objc/objc-act.c:5512 +#: objc/objc-act.c:5684 #, c-format msgid "duplicate declaration of class method `%s'" msgstr "" -#: objc/objc-act.c:5548 +#: objc/objc-act.c:5720 #, c-format msgid "duplicate definition of instance method `%s'" msgstr "" -#: objc/objc-act.c:5554 +#: objc/objc-act.c:5726 #, c-format msgid "duplicate declaration of instance method `%s'" msgstr "" -#: objc/objc-act.c:5594 +#: objc/objc-act.c:5766 #, c-format msgid "duplicate interface declaration for category `%s(%s)'" msgstr "" -#: objc/objc-act.c:5680 +#: objc/objc-act.c:5852 #, c-format msgid "instance variable `%s' is declared private" msgstr "" -#: objc/objc-act.c:5727 +#: objc/objc-act.c:5899 #, c-format msgid "instance variable `%s' is declared %s" msgstr "" -#: objc/objc-act.c:5737 +#: objc/objc-act.c:5909 msgid "static access to object of type `id'" msgstr "" -#: objc/objc-act.c:5774 objc/objc-act.c:5867 +#: objc/objc-act.c:5934 objc/objc-act.c:6027 #, c-format msgid "incomplete implementation of class `%s'" msgstr "" -#: objc/objc-act.c:5778 objc/objc-act.c:5872 +#: objc/objc-act.c:5938 objc/objc-act.c:6032 #, c-format msgid "incomplete implementation of category `%s'" msgstr "" -#: objc/objc-act.c:5783 objc/objc-act.c:5877 +#: objc/objc-act.c:5943 objc/objc-act.c:6037 #, c-format msgid "method definition for `%c%s' not found" msgstr "" -#: objc/objc-act.c:5921 +#: objc/objc-act.c:6081 #, c-format msgid "%s `%s' does not fully implement the `%s' protocol" msgstr "" -#: objc/objc-act.c:5979 objc/objc-act.c:8060 +#: objc/objc-act.c:6139 objc/objc-act.c:8249 msgid "`@end' missing in implementation context" msgstr "" -#: objc/objc-act.c:6007 +#: objc/objc-act.c:6167 #, c-format msgid "reimplementation of class `%s'" msgstr "" -#: objc/objc-act.c:6049 +#: objc/objc-act.c:6209 #, c-format msgid "conflicting super class name `%s'" msgstr "" -#: objc/objc-act.c:6064 +#: objc/objc-act.c:6224 #, c-format msgid "duplicate interface declaration for class `%s'" msgstr "" -#: objc/objc-act.c:6346 +#: objc/objc-act.c:6506 #, c-format msgid "duplicate declaration for protocol `%s'" msgstr "" -#: objc/objc-act.c:7196 +#: objc/objc-act.c:7363 msgid "[super ...] must appear in a method context" msgstr "" -#: objc/objc-act.c:8162 objc/objc-act.c:8178 +#: objc/objc-act.c:8354 objc/objc-act.c:8370 #, c-format msgid "potential selector conflict for method `%s'" msgstr "" -#: objc-parse.y:2617 +#: objc-parse.y:2656 msgid "`@end' must appear in an implementation context" msgstr "" -#: objc-parse.y:2891 +#: objc-parse.y:2932 msgid "method definition not in class context" msgstr "" @@ -20183,87 +20530,105 @@ msgstr "" msgid "Specify the name of the class for constant strings" msgstr "" -#: config/nextstep.h:160 config/nextstep.h:163 -msgid "-p profiling is no longer supported. Use -pg instead" +#. This is the contribution to the `lang_options' array in gcc.c for +#. treelang. +#: treelang/lang-options.h:26 +msgid "(debug) trace parsing process" msgstr "" -#: config/arm/arm.h:211 -msgid "-mapcs-26 and -mapcs-32 may not be used together" +#: treelang/lang-options.h:27 +msgid "(debug) trace lexical analysis" msgstr "" -#: config/arm/arm.h:223 -msgid "-msoft-float and -mhard_float may not be used together" +#: config/darwin.h:212 +msgid "-current_version only allowed with -dynamiclib" msgstr "" -#: config/arm/arm.h:234 -msgid "-mbig-endian and -mlittle-endian may not be used together" +#: config/darwin.h:215 +msgid "-install_name only allowed with -dynamiclib" msgstr "" -#: config/arm/arm.h:252 -msgid "incompatible interworking options" +#: config/darwin.h:220 +msgid "-bundle not allowed with -dynamiclib" msgstr "" -#: config/sparc/freebsd.h:31 config/ia64/freebsd.h:23 -#: config/alpha/freebsd.h:35 config/i386/freebsd-aout.h:223 -msgid "`-p' not supported; use `-pg' and gprof(1)" +#: config/darwin.h:221 +msgid "-bundle_loader not allowed with -dynamiclib" msgstr "" -#: config/sparc/linux64.h:254 config/sparc/linux64.h:265 -#: config/sparc/netbsd-elf.h:153 config/sparc/netbsd-elf.h:172 -#: config/sparc/sol2-bi.h:238 config/sparc/sol2-bi.h:248 -msgid "may not use both -m32 and -m64" +#: config/darwin.h:222 +msgid "-client_name not allowed with -dynamiclib" msgstr "" -#: config/mcore/mcore.h:60 -msgid "choose either big or little endian, not both" +#: config/darwin.h:225 +msgid "-force_cpusubtype_ALL not allowed with -dynamiclib" msgstr "" -#: config/mcore/mcore.h:63 -msgid "choose either m340 or m210 not both" +#: config/darwin.h:226 +msgid "-force_flat_namespace not allowed with -dynamiclib" msgstr "" -#: config/mcore/mcore.h:64 -msgid "the m210 does not have little endian support" +#: config/darwin.h:228 +msgid "-keep_private_externs not allowed with -dynamiclib" msgstr "" -#: gcc.c:673 f/lang-specs.h:35 +#: config/darwin.h:229 +msgid "-private_bundle not allowed with -dynamiclib" +msgstr "" + +#: f/lang-specs.h:38 gcc.c:689 msgid "GNU C does not support -C without using -E" msgstr "" -#: gcc.c:674 f/lang-specs.h:36 +#: f/lang-specs.h:39 gcc.c:690 msgid "GNU C does not support -CC without using -E" msgstr "" -#: gcc.c:701 java/jvspec.c:77 ada/lang-specs.h:38 -msgid "-pg and -fomit-frame-pointer are incompatible" +#: config/sparc/sol2-bi.h:168 config/sparc/sol2-bi.h:178 +#: config/sparc/linux64.h:197 config/sparc/linux64.h:208 +#: config/sparc/netbsd-elf.h:163 config/sparc/netbsd-elf.h:182 +msgid "may not use both -m32 and -m64" msgstr "" -#: gcc.c:846 -msgid "-E required when input is from standard input" +#: config/ia64/freebsd.h:23 config/sparc/freebsd.h:33 +#: config/i386/freebsd-aout.h:203 config/alpha/freebsd.h:42 +msgid "`-p' not supported; use `-pg' and gprof(1)" msgstr "" -#: gcc.c:850 -msgid "compilation of header file requested" +#: config/vax/vax.h:50 config/vax/vax.h:51 +msgid "profiling not supported with -mg\n" msgstr "" -#: config/mips/r3900.h:36 config/mips/r3900.h:42 -msgid "-mhard-float not supported" +#: config/mips/mips.h:954 +msgid "-pipe is not supported" msgstr "" -#: config/mips/r3900.h:38 config/mips/r3900.h:44 -msgid "-msingle-float and -msoft-float can not both be specified" +#: config/mips/mips.h:1147 config/arc/arc.h:63 +msgid "may not use both -EB and -EL" msgstr "" -#: config/i386/cygwin.h:106 +#: java/jvspec.c:77 gcc.c:716 ada/lang-specs.h:38 +msgid "-pg and -fomit-frame-pointer are incompatible" +msgstr "" + +#: config/rs6000/darwin.h:62 +msgid " conflicting code gen style switches are used" +msgstr "" + +#: config/i386/cygwin.h:115 msgid "mno-cygwin and mno-win32 are not compatible" msgstr "" -#: config/i386/cygwin.h:161 config/i386/mingw32.h:69 +#: config/i386/cygwin.h:170 config/i386/mingw32.h:84 msgid "shared and mdll are not compatible" msgstr "" -#: ada/lang-specs.h:41 -msgid "-c or -S required for Ada" +#: gcc.c:867 +msgid "-E required when input is from standard input" +msgstr "" + +#: gcc.c:871 +msgid "compilation of header file requested" msgstr "" #: java/lang-specs.h:33 @@ -20278,74 +20643,74 @@ msgstr "" msgid "-femit-class-file should used along with -fsyntax-only" msgstr "" -#: config/i860/fx2800.h:290 -msgid "-p option not supported: use -pg instead" +#: treelang/lang-specs.h:52 +msgid "-pg or -p and -fomit-frame-pointer are incompatible" +msgstr "" + +#: config/vax/netbsd-elf.h:42 +msgid "The -shared option is not currently supported for VAX ELF." msgstr "" -#: config/arm/riscix.h:73 config/arm/riscix.h:133 -msgid "-mbsd and -pedantic incompatible" +#: config/mcore/mcore.h:60 +msgid "choose either big or little endian, not both" msgstr "" -#: config/arm/riscix.h:74 config/arm/riscix.h:134 -msgid "-mbsd and -mxopen incompatible" +#: config/mcore/mcore.h:63 +msgid "choose either m340 or m210 not both" msgstr "" -#: config/arm/riscix.h:75 config/arm/riscix.h:135 -msgid "-mxopen and -pedantic incompatible" +#: config/mcore/mcore.h:64 +msgid "the m210 does not have little endian support" msgstr "" -#: config/arc/arc.h:59 config/mips/mips.h:1004 -msgid "may not use both -EB and -EL" +#: config/arm/arm.h:178 +msgid "-mapcs-26 and -mapcs-32 may not be used together" msgstr "" -#: config/vax/vax.h:42 config/vax/vax.h:43 -msgid "profiling not supported with -mg\n" +#: config/arm/arm.h:180 +msgid "-msoft-float and -mhard_float may not be used together" msgstr "" -#: config/mips/mips.h:834 -msgid "-pipe is not supported" +#: config/arm/arm.h:182 +msgid "-mbig-endian and -mlittle-endian may not be used together" msgstr "" -#: config/mips/mips.h:1000 -msgid "may not use both -mfp64 and -msingle-float" +#: config/mips/r3900.h:35 +msgid "-mhard-float not supported" msgstr "" -#: config/mips/mips.h:1001 -msgid "may not use both -mfp64 and -m4650" +#: config/mips/r3900.h:37 +msgid "-msingle-float and -msoft-float can not both be specified" msgstr "" -#: config/mips/mips.h:1003 -msgid "may not use both -mgp32 and -mfp64" +#: ada/lang-specs.h:41 +msgid "-c or -S required for Ada" msgstr "" -#: config/i386/sco5.h:658 config/i386/sco5.h:729 +#: config/i386/sco5.h:585 config/i386/sco5.h:666 msgid "-static not valid with -mcoff" msgstr "" -#: config/i386/sco5.h:659 config/i386/sco5.h:730 +#: config/i386/sco5.h:586 config/i386/sco5.h:667 msgid "-shared not valid with -mcoff" msgstr "" -#: config/i386/sco5.h:660 config/i386/sco5.h:731 +#: config/i386/sco5.h:587 config/i386/sco5.h:668 msgid "-symbolic not valid with -mcoff" msgstr "" -#: config/i386/sco5.h:696 +#: config/i386/sco5.h:636 msgid "-fpic is not valid with -mcoff" msgstr "" -#: config/i386/sco5.h:697 +#: config/i386/sco5.h:637 msgid "-fPIC is not valid with -mcoff" msgstr "" -#: config/i386/sco5.h:732 +#: config/i386/sco5.h:669 msgid "-fpic not valid with -mcoff" msgstr "" -#: config/i386/sco5.h:733 +#: config/i386/sco5.h:670 msgid "-fPIC not valid with -mcoff" msgstr "" - -#: config/mmix/mmix.h:112 -msgid "options -mabi=mmixware and -mabi=gnu are mutually exclusive" -msgstr "" diff --git a/gcc/predict.c b/gcc/predict.c index 7e581468dec..6ac8286f5a0 100644 --- a/gcc/predict.c +++ b/gcc/predict.c @@ -51,10 +51,10 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "target.h" #include "loop.h" -/* real constants: 0, 1, 1-1/REG_BR_PROB_BASE, REG_BR_PROB_BASE, 0.5, - REAL_BB_FREQ_MAX. */ +/* real constants: 0, 1, 1-1/REG_BR_PROB_BASE, REG_BR_PROB_BASE, + 1/REG_BR_PROB_BASE, 0.5, BB_FREQ_MAX. */ static REAL_VALUE_TYPE real_zero, real_one, real_almost_one, real_br_prob_base, - real_one_half, real_bb_freq_max; + real_inv_br_prob_base, real_one_half, real_bb_freq_max; /* Random guesstimation given names. */ #define PROB_VERY_UNLIKELY (REG_BR_PROB_BASE / 10 - 1) @@ -986,20 +986,25 @@ propagate_freq (loop) TYPE_MODE (double_type_node)); REAL_ARITHMETIC (tmp, MULT_EXPR, tmp, BLOCK_INFO (e->src)->frequency); - REAL_ARITHMETIC (tmp, RDIV_EXPR, tmp, real_br_prob_base); + REAL_ARITHMETIC (tmp, MULT_EXPR, tmp, real_inv_br_prob_base); REAL_ARITHMETIC (frequency, PLUS_EXPR, frequency, tmp); } - if (REAL_VALUES_LESS (real_almost_one, cyclic_probability)) - memcpy (&cyclic_probability, &real_almost_one, sizeof (real_zero)); + if (REAL_VALUES_IDENTICAL (cyclic_probability, real_zero)) + memcpy (&BLOCK_INFO (bb)->frequency, &frequency, sizeof (frequency)); + else + { + if (REAL_VALUES_LESS (real_almost_one, cyclic_probability)) + memcpy (&cyclic_probability, &real_almost_one, sizeof (real_zero)); - /* BLOCK_INFO (bb)->frequency = frequency / (1 - cyclic_probability) - */ + /* BLOCK_INFO (bb)->frequency = frequency / (1 - cyclic_probability) + */ - REAL_ARITHMETIC (cyclic_probability, MINUS_EXPR, real_one, + REAL_ARITHMETIC (cyclic_probability, MINUS_EXPR, real_one, cyclic_probability); - REAL_ARITHMETIC (BLOCK_INFO (bb)->frequency, - RDIV_EXPR, frequency, cyclic_probability); + REAL_ARITHMETIC (BLOCK_INFO (bb)->frequency, + RDIV_EXPR, frequency, cyclic_probability); + } } BLOCK_INFO (bb)->tovisit = 0; @@ -1018,7 +1023,7 @@ propagate_freq (loop) REAL_ARITHMETIC (tmp, MULT_EXPR, tmp, BLOCK_INFO (bb)->frequency); REAL_ARITHMETIC (EDGE_INFO (e)->back_edge_prob, - RDIV_EXPR, tmp, real_br_prob_base); + MULT_EXPR, tmp, real_inv_br_prob_base); } @@ -1149,11 +1154,9 @@ estimate_bb_frequencies (loops) REAL_VALUE_FROM_INT (real_br_prob_base, REG_BR_PROB_BASE, 0, double_mode); REAL_VALUE_FROM_INT (real_bb_freq_max, BB_FREQ_MAX, 0, double_mode); REAL_VALUE_FROM_INT (real_one_half, 2, 0, double_mode); - REAL_ARITHMETIC (real_one_half, RDIV_EXPR, real_one, real_one_half); - - REAL_ARITHMETIC (real_almost_one, RDIV_EXPR, real_one, real_br_prob_base); - REAL_ARITHMETIC (real_almost_one, MINUS_EXPR, real_one, real_almost_one); + REAL_ARITHMETIC (real_inv_br_prob_base, RDIV_EXPR, real_one, real_br_prob_base); + REAL_ARITHMETIC (real_almost_one, MINUS_EXPR, real_one, real_inv_br_prob_base); mark_dfs_back_edges (); /* Fill in the probability values in flowgraph based on the REG_BR_PROB @@ -1197,8 +1200,8 @@ estimate_bb_frequencies (loops) REAL_VALUE_FROM_INT (EDGE_INFO (e)->back_edge_prob, e->probability, 0, double_mode); REAL_ARITHMETIC (EDGE_INFO (e)->back_edge_prob, - RDIV_EXPR, EDGE_INFO (e)->back_edge_prob, - real_br_prob_base); + MULT_EXPR, EDGE_INFO (e)->back_edge_prob, + real_inv_br_prob_base); } } @@ -1213,13 +1216,14 @@ estimate_bb_frequencies (loops) memcpy (&freq_max, &BLOCK_INFO (bb)->frequency, sizeof (freq_max)); + REAL_ARITHMETIC (freq_max, RDIV_EXPR, real_bb_freq_max, freq_max); + FOR_BB_BETWEEN (bb, ENTRY_BLOCK_PTR, NULL, next_bb) { REAL_VALUE_TYPE tmp; REAL_ARITHMETIC (tmp, MULT_EXPR, BLOCK_INFO (bb)->frequency, - real_bb_freq_max); - REAL_ARITHMETIC (tmp, RDIV_EXPR, tmp, freq_max); + freq_max); REAL_ARITHMETIC (tmp, PLUS_EXPR, tmp, real_one_half); bb->frequency = REAL_VALUE_UNSIGNED_FIX (tmp); } diff --git a/gcc/print-rtl.c b/gcc/print-rtl.c index c01f9185add..0a0ac9e0427 100644 --- a/gcc/print-rtl.c +++ b/gcc/print-rtl.c @@ -1,5 +1,5 @@ /* Print RTL for GNU C Compiler. - Copyright (C) 1987, 1988, 1992, 1997, 1998, 1999, 2000 + Copyright (C) 1987, 1988, 1992, 1997, 1998, 1999, 2000, 2002, 2003 Free Software Foundation, Inc. This file is part of GCC. @@ -491,6 +491,7 @@ print_rtx (in_rtx) switch (GET_CODE (in_rtx)) { +#ifndef GENERATOR_FILE case MEM: fputs (" [", outfile); fprintf (outfile, HOST_WIDE_INT_PRINT_DEC, MEM_ALIAS_SET (in_rtx)); @@ -518,7 +519,6 @@ print_rtx (in_rtx) fputc (']', outfile); break; -#ifndef GENERATOR_FILE case CONST_DOUBLE: if (FLOAT_MODE_P (GET_MODE (in_rtx))) { diff --git a/gcc/real.c b/gcc/real.c index d9a4b801e3d..e57aeaba496 100644 --- a/gcc/real.c +++ b/gcc/real.c @@ -1,6 +1,6 @@ /* real.c - software floating point emulation. Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, - 1999, 2000, 2002 Free Software Foundation, Inc. + 1999, 2000, 2002, 2003 Free Software Foundation, Inc. Contributed by Stephen L. Moshier (moshier@world.std.com). Re-written by Richard Henderson <rth@redhat.com> @@ -3254,8 +3254,23 @@ encode_ibm_extended (fmt, buf, r) u = *r; clear_significand_below (&u, SIGNIFICAND_BITS - 53); - /* v = remainder containing additional 53 bits of significand. */ - do_add (&v, r, &u, 1); + normalize (&u); + /* If the upper double is zero, we have a denormal double, so + move it to the first double and leave the second as zero. */ + if (u.class == rvc_zero) + { + v = u; + u = *r; + normalize (&u); + } + else + { + /* v = remainder containing additional 53 bits of significand. */ + do_add (&v, r, &u, 1); + round_for_format (&ieee_double_format, &v); + } + + round_for_format (&ieee_double_format, &u); encode_ieee_double (&ieee_double_format, &buf[0], &u); encode_ieee_double (&ieee_double_format, &buf[2], &v); @@ -3292,7 +3307,7 @@ const struct real_format ibm_extended_format = 2, 1, 53 + 53, - -1021, + -1021 + 53, 1024, true, true, diff --git a/gcc/reload.c b/gcc/reload.c index a5069241cc3..d5c69f93115 100644 --- a/gcc/reload.c +++ b/gcc/reload.c @@ -258,6 +258,7 @@ static int alternative_allows_memconst PARAMS ((const char *, int)); static rtx find_reloads_toplev PARAMS ((rtx, int, enum reload_type, int, int, rtx, int *)); static rtx make_memloc PARAMS ((rtx, int)); +static int maybe_memory_address_p PARAMS ((enum machine_mode, rtx, rtx *)); static int find_reloads_address PARAMS ((enum machine_mode, rtx *, rtx, rtx *, int, enum reload_type, int, rtx)); static rtx subst_reg_equivs PARAMS ((rtx, rtx)); @@ -4561,6 +4562,27 @@ make_memloc (ad, regno) return tem; } +/* Returns true if AD could be turned into a valid memory reference + to mode MODE by reloading the part pointed to by PART into a + register. */ + +static int +maybe_memory_address_p (mode, ad, part) + enum machine_mode mode; + rtx ad; + rtx *part; +{ + int retv; + rtx tem = *part; + rtx reg = gen_rtx_REG (GET_MODE (tem), max_reg_num ()); + + *part = reg; + retv = memory_address_p (mode, ad); + *part = tem; + + return retv; +} + /* Record all reloads needed for handling memory address AD which appears in *LOC in a memory reference to mode MODE which itself is found in location *MEMREFLOC. @@ -4860,7 +4882,7 @@ find_reloads_address (mode, memrefloc, ad, loc, opnum, type, ind_levels, insn) || XEXP (XEXP (ad, 0), 0) == arg_pointer_rtx #endif || XEXP (XEXP (ad, 0), 0) == stack_pointer_rtx) - && ! memory_address_p (mode, ad)) + && ! maybe_memory_address_p (mode, ad, &XEXP (XEXP (ad, 0), 1))) { *loc = ad = gen_rtx_PLUS (GET_MODE (ad), plus_constant (XEXP (XEXP (ad, 0), 0), @@ -4885,7 +4907,7 @@ find_reloads_address (mode, memrefloc, ad, loc, opnum, type, ind_levels, insn) || XEXP (XEXP (ad, 0), 1) == arg_pointer_rtx #endif || XEXP (XEXP (ad, 0), 1) == stack_pointer_rtx) - && ! memory_address_p (mode, ad)) + && ! maybe_memory_address_p (mode, ad, &XEXP (XEXP (ad, 0), 0))) { *loc = ad = gen_rtx_PLUS (GET_MODE (ad), XEXP (XEXP (ad, 0), 0), diff --git a/gcc/reload1.c b/gcc/reload1.c index 399b1f1de2d..d9e1332e299 100644 --- a/gcc/reload1.c +++ b/gcc/reload1.c @@ -7612,6 +7612,11 @@ delete_output_reload (insn, j, last_reload_reg) rtx i1; rtx substed; + /* It is possible that this reload has been only used to set another reload + we eliminated earlier and thus deleted this instruction too. */ + if (INSN_DELETED_P (output_reload_insn)) + return; + /* Get the raw pseudo-register referred to. */ while (GET_CODE (reg) == SUBREG) diff --git a/gcc/rtl.c b/gcc/rtl.c index 065c02b40c3..fba8ccaf550 100644 --- a/gcc/rtl.c +++ b/gcc/rtl.c @@ -1,6 +1,6 @@ /* RTL utility routines. - Copyright (C) 1987, 1988, 1991, 1994, 1997, 1998, 1999, 2000, 2001, 2002 - Free Software Foundation, Inc. + Copyright (C) 1987, 1988, 1991, 1994, 1997, 1998, 1999, 2000, 2001, 2002, + 2003 Free Software Foundation, Inc. This file is part of GCC. @@ -396,29 +396,6 @@ shallow_copy_rtx (orig) return copy; } - -/* Return the alignment of MODE. This will be bounded by 1 and - BIGGEST_ALIGNMENT. */ - -unsigned int -get_mode_alignment (mode) - enum machine_mode mode; -{ - unsigned int alignment; - - if (GET_MODE_CLASS (mode) == MODE_COMPLEX_FLOAT - || GET_MODE_CLASS (mode) == MODE_COMPLEX_INT) - alignment = GET_MODE_UNIT_SIZE (mode); - else - alignment = GET_MODE_SIZE (mode); - - /* Extract the LSB of the size. */ - alignment = alignment & -alignment; - alignment *= BITS_PER_UNIT; - - alignment = MIN (BIGGEST_ALIGNMENT, MAX (1, alignment)); - return alignment; -} /* This is 1 until after the rtl generation pass. */ int rtx_equal_function_value_matters; diff --git a/gcc/rtlanal.c b/gcc/rtlanal.c index c992c439bc3..4af2d80a0dd 100644 --- a/gcc/rtlanal.c +++ b/gcc/rtlanal.c @@ -2138,7 +2138,6 @@ volatile_insn_p (x) case REG: case SCRATCH: case CLOBBER: - case ASM_INPUT: case ADDR_VEC: case ADDR_DIFF_VEC: case CALL: @@ -2149,6 +2148,7 @@ volatile_insn_p (x) /* case TRAP_IF: This isn't clear yet. */ return 1; + case ASM_INPUT: case ASM_OPERANDS: if (MEM_VOLATILE_P (x)) return 1; @@ -2205,7 +2205,6 @@ volatile_refs_p (x) case REG: case SCRATCH: case CLOBBER: - case ASM_INPUT: case ADDR_VEC: case ADDR_DIFF_VEC: return 0; @@ -2214,6 +2213,7 @@ volatile_refs_p (x) return 1; case MEM: + case ASM_INPUT: case ASM_OPERANDS: if (MEM_VOLATILE_P (x)) return 1; @@ -2269,7 +2269,6 @@ side_effects_p (x) case PC: case REG: case SCRATCH: - case ASM_INPUT: case ADDR_VEC: case ADDR_DIFF_VEC: return 0; @@ -2292,6 +2291,7 @@ side_effects_p (x) return 1; case MEM: + case ASM_INPUT: case ASM_OPERANDS: if (MEM_VOLATILE_P (x)) return 1; diff --git a/gcc/stmt.c b/gcc/stmt.c index f283b7590c6..b4f8a0e5eea 100644 --- a/gcc/stmt.c +++ b/gcc/stmt.c @@ -1107,18 +1107,26 @@ n_occurrences (c, s) } /* Generate RTL for an asm statement (explicit assembler code). - BODY is a STRING_CST node containing the assembler code text, - or an ADDR_EXPR containing a STRING_CST. */ + STRING is a STRING_CST node containing the assembler code text, + or an ADDR_EXPR containing a STRING_CST. VOL nonzero means the + insn is volatile; don't optimize it. */ void -expand_asm (body) - tree body; +expand_asm (string, vol) + tree string; + int vol; { - if (TREE_CODE (body) == ADDR_EXPR) - body = TREE_OPERAND (body, 0); + rtx body; + + if (TREE_CODE (string) == ADDR_EXPR) + string = TREE_OPERAND (string, 0); + + body = gen_rtx_ASM_INPUT (VOIDmode, TREE_STRING_POINTER (string)); - emit_insn (gen_rtx_ASM_INPUT (VOIDmode, - TREE_STRING_POINTER (body))); + MEM_VOLATILE_P (body) = vol; + + emit_insn (body); + clear_last_expr (); } @@ -1597,6 +1605,7 @@ expand_asm_operands (string, outputs, inputs, clobbers, vol, filename, line) bool is_inout; bool allows_reg; bool allows_mem; + rtx op; if (!parse_output_constraint (&constraints[i], i, ninputs, noutputs, &allows_mem, &allows_reg, @@ -1620,24 +1629,28 @@ expand_asm_operands (string, outputs, inputs, clobbers, vol, filename, line) || ! allows_reg || is_inout) { - output_rtx[i] = expand_expr (val, NULL_RTX, VOIDmode, EXPAND_WRITE); + op = expand_expr (val, NULL_RTX, VOIDmode, EXPAND_WRITE); + if (GET_CODE (op) == MEM) + op = validize_mem (op); - if (! allows_reg && GET_CODE (output_rtx[i]) != MEM) + if (! allows_reg && GET_CODE (op) != MEM) error ("output number %d not directly addressable", i); - if ((! allows_mem && GET_CODE (output_rtx[i]) == MEM) - || GET_CODE (output_rtx[i]) == CONCAT) + if ((! allows_mem && GET_CODE (op) == MEM) + || GET_CODE (op) == CONCAT) { - real_output_rtx[i] = protect_from_queue (output_rtx[i], 1); - output_rtx[i] = gen_reg_rtx (GET_MODE (output_rtx[i])); + real_output_rtx[i] = protect_from_queue (op, 1); + op = gen_reg_rtx (GET_MODE (op)); if (is_inout) - emit_move_insn (output_rtx[i], real_output_rtx[i]); + emit_move_insn (op, real_output_rtx[i]); } } else { - output_rtx[i] = assign_temp (type, 0, 0, 1); - TREE_VALUE (tail) = make_tree (type, output_rtx[i]); + op = assign_temp (type, 0, 0, 1); + op = validize_mem (op); + TREE_VALUE (tail) = make_tree (type, op); } + output_rtx[i] = op; generating_concat_p = old_generating_concat_p; @@ -1689,6 +1702,8 @@ expand_asm_operands (string, outputs, inputs, clobbers, vol, filename, line) /* Never pass a CONCAT to an ASM. */ if (GET_CODE (op) == CONCAT) op = force_reg (GET_MODE (op), op); + else if (GET_CODE (op) == MEM) + op = validize_mem (op); if (asm_operand_ok (op, constraint) <= 0) { @@ -1698,7 +1713,10 @@ expand_asm_operands (string, outputs, inputs, clobbers, vol, filename, line) warning ("asm operand %d probably doesn't match constraints", i + noutputs); else if (CONSTANT_P (op)) - op = force_const_mem (TYPE_MODE (type), op); + { + op = force_const_mem (TYPE_MODE (type), op); + op = validize_mem (op); + } else if (GET_CODE (op) == REG || GET_CODE (op) == SUBREG || GET_CODE (op) == ADDRESSOF @@ -1708,7 +1726,7 @@ expand_asm_operands (string, outputs, inputs, clobbers, vol, filename, line) (TYPE_QUALS (type) | TYPE_QUAL_CONST)); rtx memloc = assign_temp (qual_type, 1, 1, 1); - + memloc = validize_mem (memloc); emit_move_insn (memloc, op); op = memloc; } diff --git a/gcc/stor-layout.c b/gcc/stor-layout.c index db4c09f29f7..9f94d029c6d 100644 --- a/gcc/stor-layout.c +++ b/gcc/stor-layout.c @@ -1,6 +1,6 @@ /* C-compiler utilities for types and variables storage layout Copyright (C) 1987, 1988, 1992, 1993, 1994, 1995, 1996, 1996, 1998, - 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GCC. @@ -298,6 +298,29 @@ int_mode_for_mode (mode) return mode; } +/* Return the alignment of MODE. This will be bounded by 1 and + BIGGEST_ALIGNMENT. */ + +unsigned int +get_mode_alignment (mode) + enum machine_mode mode; +{ + unsigned int alignment; + + if (GET_MODE_CLASS (mode) == MODE_COMPLEX_FLOAT + || GET_MODE_CLASS (mode) == MODE_COMPLEX_INT) + alignment = GET_MODE_UNIT_SIZE (mode); + else + alignment = GET_MODE_SIZE (mode); + + /* Extract the LSB of the size. */ + alignment = alignment & -alignment; + alignment *= BITS_PER_UNIT; + + alignment = MIN (BIGGEST_ALIGNMENT, MAX (1, alignment)); + return alignment; +} + /* Return the value of VALUE, rounded up to a multiple of DIVISOR. This can only be applied to objects of a sizetype. */ diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7fc603cc378..e9041edcf34 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,198 @@ +2003-01-31 Paolo Carlini <pcarlini@unitus.it> + + Further tweaks for Bison-1.875. + * g++.dg/lookup/using2.C: Test for "(parse|syntax) error". + * g++.dg/other/do1.C: Likewise. + * g++.dg/parse/angle-bracket.C: Likewise. + * g++.dg/template/typename3.C: Likewise. + +2003-01-31 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + + PR c++/8849 + * g++.dg/template/ptrmem4.C: New test. + +2003-01-31 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + + PR c++/9453 + * g++.dg/template/friend14.C: New test. + * g++.dg/template/friend15.C: New test. + * g++.old-deja/g++.other/defarg1.C: Adjust error message. + +2003-01-29 Nathan Sidwell <nathan@codesourcery.com> + + PR c++/9437 + * g++.dg/template/unify4.C: New test. + +2003-01-28 Nathan Sidwell <nathan@codesourcery.com> + + * g++.dg/abi/dcast1.C: New test. + +2003-01-28 Toon Moene <toon@moene.indiv.nluug.nl> + + PR fortran/9258 + * g77.dg/pr9258.f: New test. + +2003-01-27 Jeffrey D. Oldham <oldham@codesourcery.com> + + PR c++/47 + * g++.old-deja/g++.other/lookup24.C: New test. + +2003-01-27 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + PR middle-end/7227 + * gcc.dg/uninit-C.c: New test. + +Sat Jan 25 21:06:49 CET 2003 Jan Hubicka <jh@suse.cz> + + PR opt/8492 + * gcc.c-torture/compile/20030125-1.c + +2003-01-25 Ulrich Weigand <uweigand@de.ibm.com> + + * gcc.dg/20030123-1.c: New test. + +2003-01-25 Paolo Carlini <pcarlini@unitus.it> + + Tweaks for Bison-1.875. From the NEWS file: + "- `parse error' -> `syntax error' + Bison now uniformly uses the term `syntax error'" + * gcc.dg/cpp/19990413-1.c: Test for "(parse|syntax) error". + * gcc.dg/cpp/digraph2.c: Likewise. + * gcc.dg/cpp/direct2.c: Likewise. + * gcc.dg/cpp/paste4.c: Likewise. + * gcc.dg/c90-restrict-1.c: Likewise. + * gcc.dg/c99-func-2.c: Likewise. + * gcc.dg/noncompile/920721-2.c: Likewise. + * gcc.dg/noncompile/930622-2.c: Likewise. + * gcc.dg/noncompile/940112-1.c: Likewise. + * gcc.dg/noncompile/950921-1.c: Likewise. + * gcc.dg/noncompile/951123-1.c: Likewise. + * gcc.dg/noncompile/971104-1.c: Likewise. + * gcc.dg/noncompile/990416-1.c: Likewise. + +2003-01-22 Mark Mitchell <mark@codesourcery.com> + + PR c++/9328 + * g++.dg/ext/typeof3.C: New test. + +2003-01-20 Kazu Hirata <kazu@cs.umass.edu> + + * gcc.c-torture/execute/20030120-1.c: New. + +2003-01-15 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * gcc.c-torture/execute/builtin-constant.x: XFAIL the test. + +2003-01-15 Stephane Carrez <stcarrez@nerim.fr> + + * gcc.c-torture/compile/20000804-1.x: Don't execute this test at + all for HC11/HC12. + * gcc.c-torture/compile/20001205-1.x: Likewise. + * gcc.c-torture/compile/20001226-1.x: Likewise. + * gcc.c-torture/compile/920520-1.x: Likewise. + * gcc.c-torture/compile/961203-1.x: Likewise. + * gcc.c-torture/compile/20020604-1.x: Likewise. + +2003-01-14 Eric Botcazou <ebotcazou@libertysurf.fr> + + * gcc.dg/i386-mmx-3.c: New test. + +2003-01-10 Josef Zlomek <zlomekj@suse.cz> + + * gcc.c-torture/compile/20030110-1.c: New test. + +2003-01-09 Eric Botcazou <ebotcazou@libertysurf.fr> + + * gcc.dg/old-style-asm-1.c: New test. + +2003-01-09 Eric Botcazou <ebotcazou@libertysurf.fr> + + * gcc.c-torture/execute/20030109-1.c: New test. + +2003-01-07 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + + PR c++/9030 + * g++.dg/template/friend12.C: New test. + * g++.dg/template/friend13.C: Likewise. + * g++.old-deja/g++.eh/spec6.C: Add missing error message. + * g++.old-deja/g++.other/defarg1.C: Change expected error message. + +2003-01-06 Mark Mitchell <mark@codesourcery.com> + + PR c++/9165 + * g++.dg/warn/Wunused-3.C: New test. + +2003-01-03 Nathan Sidwell <nathan@codesourcery.com> + + * g++.dg/template/ntp2.C: New test. + +2003-01-02 Kazu Hirata <kazu@cs.umass.edu> + + * gcc.dg/h8300-stack-1.c: New. + +2002-12-31 Janis Johnson <janis187@us.ibm.com> + + * lib/profopt.exp: Change the name of a global variable to avoid + possible clashes with other test suites. + +2002-12-26 Nathan Sidwell <nathan@codesourcery.com> + + * g++.dg/warn/inline1.C: New test. + * g++.old-deja/g++.brendan/crash64.C: Remove spurious inlines. + * g++.old-deja/g++.jason/synth10.C: Likewise. + * g++.old-deja/g++.mike/net31.C: Likewise. + * g++.old-deja/g++.mike/p8786.C: Likewise. + + * g++.dg/template/friend10.C: New test. + * g++.dg/template/conv5.C: New test. + +2002-12-24 Nathan Sidwell <nathan@codesourcery.com> + + * g++.dg/lookup/scoped3.C: New test. + + * g++.dg/lookup/decl1.C: New test. + * g++.dg/lookup/decl2.C: New test. + +2002-12-24 Joseph S. Myers <jsm@polyomino.org.uk> + + * g++.dg/init/new1.C, g++.dg/template/alignof1.C, + gcc.c-torture/compile/20021015-1.c, + gcc.c-torture/compile/20021015-2.c, + gcc.c-torture/compile/20021123-1.c, + gcc.c-torture/compile/20021123-2.c, + gcc.c-torture/compile/20021123-3.c, + gcc.c-torture/compile/20021123-4.c, + gcc.c-torture/execute/20021024-1.c: Add tests previously added + only to 3.1 or 3.2 branch. + +2002-12-22 Nathan Sidwell <nathan@codesourcery.com> + + * g++.dg/parse/conv_op1.C: New test. + +2002-12-19 Devang Patel <dpatel@apple.com> + + * gcc.dg/darwin-ld-5.c: Rewrite test to test -dynamic. + +2002-12-19 Eric Botcazou <ebotcazou@libertysurf.fr> + + * gcc.c-torture/execute/20021219-1.c: New test. + +2002-12-18 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + + PR c++/8099 + * g++.dg/template/friend9.C: New test. + +2002-12-18 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + + PR c++/3663 + * g++.dg/template/access7.C: New test. + +2002-12-18 Kriang Lerdsuwanakij <lerdsuwa@users.sourceforge.net> + + PR c++/8442 + * g++.dg/template/type2.C: New test. + * g++.dg/template/ttp3.C: Change expected error message. + 2002-12-12 Devang Patel <dpatel@apple.com> * gcc.dg/darwin-ld-1.c: New test. * gcc.dg/darwin-ld-2.c: New test. diff --git a/gcc/testsuite/g++.dg/abi/dcast1.C b/gcc/testsuite/g++.dg/abi/dcast1.C new file mode 100644 index 00000000000..402684ff446 --- /dev/null +++ b/gcc/testsuite/g++.dg/abi/dcast1.C @@ -0,0 +1,29 @@ +// { dg-do compile } + +// Copyright (C) 2003 Free Software Foundation, Inc. +// Contributed by Nathan Sidwell 28 Jan 2003 <nathan@codesourcery.com> + +// PR 9433. segfault at runtime. + +struct A { virtual void f() {}; }; +struct B {int b;}; +struct C : A, B { virtual void f() {}; int c;}; +struct D : C {int d;}; +struct E : C {int e;}; +struct F : protected D, E {int f;}; +struct H : virtual F {int h;}; +struct I : H {int i;}; +struct J : H {int j;}; +struct K : I, J { virtual void f() {}; int k; }; +struct M : K {int m;}; +struct N : M {int n;}; +struct O : M {int o;}; +struct P : N, O { virtual void f() {}; int p;}; + +int main() +{ + P obj; + A* a1 = (D *) (&obj); + H* hp = dynamic_cast<H*>(a1); + return hp != 0; +} diff --git a/gcc/testsuite/g++.dg/ext/typeof3.C b/gcc/testsuite/g++.dg/ext/typeof3.C new file mode 100644 index 00000000000..cf78c7c6196 --- /dev/null +++ b/gcc/testsuite/g++.dg/ext/typeof3.C @@ -0,0 +1,4 @@ +double f(double); +float f(float); +void h(typeof(f) g) {} // { dg-error "" } + diff --git a/gcc/testsuite/g++.dg/init/new1.C b/gcc/testsuite/g++.dg/init/new1.C new file mode 100644 index 00000000000..24b60d3c409 --- /dev/null +++ b/gcc/testsuite/g++.dg/init/new1.C @@ -0,0 +1,20 @@ +// Origin: asharji@uwaterloo.ca + +// { dg-do compile } +// { dg-options "-fvolatile" } + +typedef __SIZE_TYPE__ size_t; + +class bar { + int i; + public : + void * operator new ( size_t , void * storage ); +}; + +class foo { + int storage[ 5 ]; + public: + void mem ( ) { + bar *s = new ( ( void * ) & storage ) bar; + } +}; diff --git a/gcc/testsuite/g++.dg/lookup/decl1.C b/gcc/testsuite/g++.dg/lookup/decl1.C new file mode 100644 index 00000000000..d9af65604cb --- /dev/null +++ b/gcc/testsuite/g++.dg/lookup/decl1.C @@ -0,0 +1,32 @@ +// { dg-do compile } + +// Copyright (C) 2002 Free Software Foundation, Inc. +// Contributed by Nathan Sidwell 24 Dec 2002 <nathan@codesourcery.com> + +// PR 8702. Failure to match templates. + +template <typename X> struct C1{}; + +template <typename X> +struct C2 { + template<typename Y> operator C1<Y>(); + template<typename Y> operator C2<Y>(); +}; + +template<typename X> template<typename Y> +C2<X>::operator C1<Y>() +{ + return C1<Y>(); +} + +struct A +{ + operator int (); // { dg-error "operator" "" } + operator float (); // { dg-error "operator" "" } + operator float () const; // { dg-error "operator" "" } + template <typename T> operator T * (); // { dg-error "candidates" "" } +}; + +A::operator short () { // { dg-error "prototype for" "" } + return 0; +} diff --git a/gcc/testsuite/g++.dg/lookup/decl2.C b/gcc/testsuite/g++.dg/lookup/decl2.C new file mode 100644 index 00000000000..75ce0967a4b --- /dev/null +++ b/gcc/testsuite/g++.dg/lookup/decl2.C @@ -0,0 +1,27 @@ +// { dg-do compile } + +// Copyright (C) 2002 Free Software Foundation, Inc. +// Contributed by Nathan Sidwell 24 Dec 2002 <nathan@codesourcery.com> +// Source Martin Buchholz martin@xemacs.org + +// PR 9053. Failed to consider templates that are disambiguated by +// return type. + +template <typename T> class bar; +template <> struct bar<const char*> { typedef void type; }; +template <typename T> class qux; +template <> struct qux<int> { typedef void type; }; + +template <typename T> +typename bar<T>::type foo (T t) { } + +template <typename T> +typename qux<T>::type foo (T t) { } + + +int +main (int argc, char *argv[]) +{ + foo ("foo"); + foo (7); +} diff --git a/gcc/testsuite/g++.dg/lookup/scoped3.C b/gcc/testsuite/g++.dg/lookup/scoped3.C new file mode 100644 index 00000000000..992f1d12809 --- /dev/null +++ b/gcc/testsuite/g++.dg/lookup/scoped3.C @@ -0,0 +1,23 @@ + +// { dg-do compile } + +// Copyright (C) 2002 Free Software Foundation, Inc. +// Contributed by Nathan Sidwell 24 Dec 2002 <nathan@codesourcery.com> + +// PR 7964. ICE with scoped method call + +struct A { + virtual void ostr() const; +}; + +class B : public virtual A {}; + +template<typename T> +struct C : public B +{ + void ostr() const + { B::ostr(); } +}; + + +template C<int>; diff --git a/gcc/testsuite/g++.dg/lookup/using2.C b/gcc/testsuite/g++.dg/lookup/using2.C index 92f134eaf84..b20ef0377c2 100644 --- a/gcc/testsuite/g++.dg/lookup/using2.C +++ b/gcc/testsuite/g++.dg/lookup/using2.C @@ -25,7 +25,7 @@ namespace N template<int> void f() {} } -using N; // { dg-error "parse error" "" } +using N; // { dg-error "(parse|syntax) error" "" } using ::N; // { dg-error "using-declaration" "" } using N::f< 0 >; // { dg-error "using-declaration" "" } @@ -41,6 +41,6 @@ struct B : A { struct C : A { using A::f<double>; // { dg-error "using-declaration" "" } - using A::X<int>; // { dg-error "parse error" "" } + using A::X<int>; // { dg-error "(parse|syntax) error" "" } }; diff --git a/gcc/testsuite/g++.dg/other/do1.C b/gcc/testsuite/g++.dg/other/do1.C index 5ff6c5682ba..5113ed727d0 100644 --- a/gcc/testsuite/g++.dg/other/do1.C +++ b/gcc/testsuite/g++.dg/other/do1.C @@ -8,6 +8,6 @@ void init () { do { } while (0) - obj = 0; // { dg-error "parse error" "" } + obj = 0; // { dg-error "(parse|syntax) error" "" } } diff --git a/gcc/testsuite/g++.dg/parse/angle-bracket.C b/gcc/testsuite/g++.dg/parse/angle-bracket.C index 9c1f2476c71..5fad51b44f9 100644 --- a/gcc/testsuite/g++.dg/parse/angle-bracket.C +++ b/gcc/testsuite/g++.dg/parse/angle-bracket.C @@ -4,6 +4,6 @@ int main() { - ( int() > int() ); // { dg-bogus "parse" "" { xfail *-*-* } } + ( int() > int() ); // { dg-bogus "parse|syntax" "" { xfail *-*-* } } return 0; } diff --git a/gcc/testsuite/g++.dg/parse/conv_op1.C b/gcc/testsuite/g++.dg/parse/conv_op1.C new file mode 100644 index 00000000000..e892f01aadd --- /dev/null +++ b/gcc/testsuite/g++.dg/parse/conv_op1.C @@ -0,0 +1,30 @@ + +// { dg-do compile } + +// Copyright (C) 2002 Free Software Foundation, Inc. +// Contributed by Nathan Sidwell 21 Dec 2002 <nathan@codesourcery.com> + +// PR 8572. ICE with templated conversion operators. + +template <typename T> struct A +{ + struct B { }; + operator B* () const; + B *Foo (); +}; + +template <typename T> typename A<T>::B *A<T>::Foo () +{ + return 0; +} + +template <typename T> A<T>::operator typename A<T>::B* () const +{ + return 0; +} + +void Foo (A<int> &p) +{ + p.Foo (); + static_cast <A<int>::B *> (p); +} diff --git a/gcc/testsuite/g++.dg/template/access7.C b/gcc/testsuite/g++.dg/template/access7.C new file mode 100644 index 00000000000..92d4c68db39 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/access7.C @@ -0,0 +1,18 @@ +// { dg-do compile } + +// PR c++/3663 +// Enforce access of nested type. + +template <typename A> +class S { + class T {}; // { dg-error "private" } +}; + +template <typename A> +typename A::T* f (A) { // { dg-error "this context" } + return 0; +} + +void g () { + f (S<int> ()); // { dg-error "context|instantiated" } +} diff --git a/gcc/testsuite/g++.dg/template/alignof1.C b/gcc/testsuite/g++.dg/template/alignof1.C new file mode 100644 index 00000000000..50a32183cfc --- /dev/null +++ b/gcc/testsuite/g++.dg/template/alignof1.C @@ -0,0 +1,13 @@ +template<typename T> +int my_alignof() +{ + return __alignof__(T); +} + +template<typename> +struct X { }; + +int main() +{ + return my_alignof<X<void> >(); +} diff --git a/gcc/testsuite/g++.dg/template/conv5.C b/gcc/testsuite/g++.dg/template/conv5.C new file mode 100644 index 00000000000..80835437a98 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/conv5.C @@ -0,0 +1,22 @@ +// { dg-do compile } + +// Copyright (C) 2001 Free Software Foundation, Inc. +// Contributed by Nathan Sidwell 26 Dec 2002 <nathan@codesourcery.com> + +// PR 764. Failed to find friend in overload resolution + +template <class T> +struct S +{ + friend bool operator== (const S&, const S&) { + return true; + } +}; + +int main () +{ + // S<int> s; + + const S<int> *p = 0; + *p == *p; // error +} diff --git a/gcc/testsuite/g++.dg/template/friend10.C b/gcc/testsuite/g++.dg/template/friend10.C new file mode 100644 index 00000000000..cab5e346f0b --- /dev/null +++ b/gcc/testsuite/g++.dg/template/friend10.C @@ -0,0 +1,45 @@ +// { dg-do run } + +// Copyright (C) 2002 Free Software Foundation, Inc. +// Contributed by Nathan Sidwell 24 Dec 2002 <nathan@codesourcery.com> + +// PR 5116. template instantiation can add a friend into a namespace, +// and thus change overload resolution. + +#include <iostream> + +static int right; +static int wrong; + +struct Buggy {}; + +template <typename T>struct Handle +{ + Handle(T* p) {} + + operator bool() const { wrong++; return true; } + + friend std::ostream& operator<<(std::ostream& ostr, const Handle& r) + { + right++; + + return ostr << "in operator<<(ostream&, const Handle&)"; + } +}; + +typedef Handle<Buggy> Buggy_h; + +bool cmp (const Buggy_h& b1, const Buggy_h& b2) +{ + std::cout << b1 << " " << b2 << std::endl; + return false; +} + +int main() +{ + Buggy o; + + cmp (&o, &o); + + return !(right == 2 && !wrong); +} diff --git a/gcc/testsuite/g++.dg/template/friend12.C b/gcc/testsuite/g++.dg/template/friend12.C new file mode 100644 index 00000000000..0cd561b5a2a --- /dev/null +++ b/gcc/testsuite/g++.dg/template/friend12.C @@ -0,0 +1,24 @@ +// { dg-do compile } + +// Origin: Wolfgang Bangerth <bangerth@ticam.utexas.edu> + +// PR 9030. Perform access checking to parameter and return type of +// function template correctly when the template is friend. + +template <class T> class Outer { + private: + struct Inner {}; + + template <class T_> + friend typename Outer<T_>::Inner foo (); +}; + +template <class T> +typename Outer<T>::Inner +foo () { + return typename Outer<T>::Inner(); +} + +void f() { + foo<int>(); +} diff --git a/gcc/testsuite/g++.dg/template/friend13.C b/gcc/testsuite/g++.dg/template/friend13.C new file mode 100644 index 00000000000..6eebf6b951f --- /dev/null +++ b/gcc/testsuite/g++.dg/template/friend13.C @@ -0,0 +1,21 @@ +// { dg-do compile } + +// Perform access checking to parameter and return type of +// function template correctly when only specialization is friend. + +template <class T> +typename T::Inner +foo () { + return typename T::Inner(); +} + +class Outer { + private: + struct Inner {}; + + friend Outer::Inner foo<Outer> (); +}; + +void f() { + foo<Outer>(); +} diff --git a/gcc/testsuite/g++.dg/template/friend14.C b/gcc/testsuite/g++.dg/template/friend14.C new file mode 100644 index 00000000000..6e07b98932a --- /dev/null +++ b/gcc/testsuite/g++.dg/template/friend14.C @@ -0,0 +1,20 @@ +// { dg-do compile } + +// Origin: Wolfgang Bangerth <bangerth@ticam.utexas.edu> + +// Perform access checking to parameter and return type of +// function template correctly when the template is friend. + +template <class T> class O { + struct I { I (int); }; + + template <class T_> + friend typename O<T_>::I f (); +}; + +template <class T_> +typename O<T_>::I f () { return 1; } + +struct X { + void g() { f<int>(); } +}; diff --git a/gcc/testsuite/g++.dg/template/friend15.C b/gcc/testsuite/g++.dg/template/friend15.C new file mode 100644 index 00000000000..4acbf2d1a56 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/friend15.C @@ -0,0 +1,19 @@ +// { dg-do compile } + +// Origin: Wolfgang Bangerth <bangerth@ticam.utexas.edu> + +// PR c++/9453 +// Access checking when template friend is defined in class. + +template <typename> class X { + private: + struct Inner; + + template <typename R> + friend typename X<R>::Inner * foo () { return 0; } +}; +template class X<void>; + +struct U { + void bar () { foo<void> (); } +}; diff --git a/gcc/testsuite/g++.dg/template/friend9.C b/gcc/testsuite/g++.dg/template/friend9.C new file mode 100644 index 00000000000..4464e5f8ee8 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/friend9.C @@ -0,0 +1,18 @@ +// { dg-do compile } +// Origin: Wolfgang Bangerth <bangerth@ticam.utexas.edu> + +// PR c++/8099 +// Partial specialization as friend class + +template <int N, typename T> struct X; +template <typename T> struct X<1,T>; + +template <typename P> class Y { + static int i; + template <int N, typename T> friend struct X; + friend struct X<1,P>; +}; + +template <typename T> struct X<1,T> { + X () { Y<T>::i; }; // access private field +}; diff --git a/gcc/testsuite/g++.dg/template/ntp2.C b/gcc/testsuite/g++.dg/template/ntp2.C new file mode 100644 index 00000000000..42219e0fcb0 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/ntp2.C @@ -0,0 +1,16 @@ +// { dg-do compile } + +// Copyright (C) 2002 Free Software Foundation, Inc. +// Contributed by Nathan Sidwell 26 Dec 2002 <nathan@codesourcery.com> + +// PR 3784: We were confusing non-type template parms. + +template <unsigned N> class X { }; + +template <short N> void foo1(X<N>); +template <unsigned N> void foo2(X<N>); + +int main() { + X<2> x; + foo2(x); +} diff --git a/gcc/testsuite/g++.dg/template/ptrmem4.C b/gcc/testsuite/g++.dg/template/ptrmem4.C new file mode 100644 index 00000000000..23107286913 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/ptrmem4.C @@ -0,0 +1,20 @@ +// { dg-do compile } + +// Origin: Scott Snyder <snyder@fnal.gov> + +// PR c++/8849 +// Pointer to member function template argument deduction ICE. + + +template <class CONT> void queryAliases(CONT& fill_me); // { dg-error "argument" } + +struct SpyExample +{ + void ready(); + void inputs(); +}; + +void SpyExample::ready() +{ + queryAliases(inputs); // { dg-error "convert" } +} diff --git a/gcc/testsuite/g++.dg/template/ttp3.C b/gcc/testsuite/g++.dg/template/ttp3.C index 05bd44a172e..fe9bd9eb382 100644 --- a/gcc/testsuite/g++.dg/template/ttp3.C +++ b/gcc/testsuite/g++.dg/template/ttp3.C @@ -14,7 +14,7 @@ class OUTER { template <class T> class List { }; - vector<class List> data; // { dg-error "type/value mismatch|expected a type|ISO C" "" } + vector<class List> data; // { dg-error "argument is required|ISO C" "" } }; template <class T> diff --git a/gcc/testsuite/g++.dg/template/type2.C b/gcc/testsuite/g++.dg/template/type2.C new file mode 100644 index 00000000000..509c4820d6b --- /dev/null +++ b/gcc/testsuite/g++.dg/template/type2.C @@ -0,0 +1,16 @@ +// { dg-do compile } +// Origin: Juan Carlos Arevalo-Baeza <jcab@JCABs-Rumblings.com> + +// PR c++/8442 +// Type template parameter incorrectly treated as template template +// parameter. + +template <typename T> struct A {}; + +template <typename T> struct B +{ + template <typename U> struct C {}; + template <typename U> A<C<U> > foo(U); +}; + +B<void> b; diff --git a/gcc/testsuite/g++.dg/template/typename3.C b/gcc/testsuite/g++.dg/template/typename3.C index 1c573baa0df..a9a914286a9 100644 --- a/gcc/testsuite/g++.dg/template/typename3.C +++ b/gcc/testsuite/g++.dg/template/typename3.C @@ -3,5 +3,5 @@ template <class A> struct B { - typedef A::C::D E; // { dg-error "no type|parse error" } + typedef A::C::D E; // { dg-error "no type|(parse|syntax) error" } }; diff --git a/gcc/testsuite/g++.dg/template/unify4.C b/gcc/testsuite/g++.dg/template/unify4.C new file mode 100644 index 00000000000..19d9f3a9f03 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/unify4.C @@ -0,0 +1,18 @@ +// { dg-do compile } + +// Copyright (C) 2003 Free Software Foundation, Inc. +// Contributed by Nathan Sidwell 28 Jan 2003 <nathan@codesourcery.com> + +// PR 9437. We'd unify 'T *' with 'U C::*', which is obviously broken + +struct X +{ + template <typename T> + operator T* () const { return static_cast<T*> (0); } +} null; + +struct A { int i; }; + +static void f (int A::* pmi) { } + +int main () { f (null); } // { dg-error "cannot convert" "" } diff --git a/gcc/testsuite/g++.dg/warn/Wunused-3.C b/gcc/testsuite/g++.dg/warn/Wunused-3.C new file mode 100644 index 00000000000..31009094352 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wunused-3.C @@ -0,0 +1,11 @@ +// { dg-do compile } +// { dg-options "-Wunused -O" } + +void do_cleanups(); + +class Cleanup { +public: + ~Cleanup() { do_cleanups();} +}; + +static Cleanup dummy; diff --git a/gcc/testsuite/g++.dg/warn/inline1.C b/gcc/testsuite/g++.dg/warn/inline1.C new file mode 100644 index 00000000000..24836e744eb --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/inline1.C @@ -0,0 +1,23 @@ +// { dg-do compile } + +// Copyright (C) 2002 Free Software Foundation, Inc. +// Contributed by Nathan Sidwell 26 Dec 2002 <nathan@codesourcery.com> + +// PR 4803. Used inline functions must have a definition. + +inline void Foo1 (); // { dg-warning "inline function" "" } +inline void Bar1 (); +template <typename T> inline void Foo2(T); // { dg-warning "inline function" "" } +template <typename T> inline void Bar2(T); + +void Baz () +{ + Foo1 (); + Foo2 (1); + + Bar1 (); + Bar2 (1); +} + +inline void Bar1 () {} +template <typename T> inline void Bar2(T) {} diff --git a/gcc/testsuite/g++.old-deja/g++.brendan/crash64.C b/gcc/testsuite/g++.old-deja/g++.brendan/crash64.C index ccba22e245a..6c2825802f4 100644 --- a/gcc/testsuite/g++.old-deja/g++.brendan/crash64.C +++ b/gcc/testsuite/g++.old-deja/g++.brendan/crash64.C @@ -4,8 +4,8 @@ typedef long unsigned int size_t; typedef void (*RF_Ptr)(void *); struct _im_pers_mem_spec { - inline _im_pers_mem_spec(void ); - inline _im_pers_mem_spec(auto int of, auto int n); + _im_pers_mem_spec(void ); + _im_pers_mem_spec(auto int of, auto int n); }; struct _type_desc { diff --git a/gcc/testsuite/g++.old-deja/g++.eh/spec6.C b/gcc/testsuite/g++.old-deja/g++.eh/spec6.C index 1bde4cb92b8..d9d4edf1f48 100644 --- a/gcc/testsuite/g++.old-deja/g++.eh/spec6.C +++ b/gcc/testsuite/g++.old-deja/g++.eh/spec6.C @@ -25,7 +25,7 @@ template<class T> void fnx(T *) throw(T){} // ERROR - invalid use of void expre void fx() { fnx((int *)0); - fnx((void *)0); + fnx((void *)0); // ERROR - instantiated from here } // [except.spec] 2, exception specifiers must be the same set of types (but diff --git a/gcc/testsuite/g++.old-deja/g++.jason/synth10.C b/gcc/testsuite/g++.old-deja/g++.jason/synth10.C index d94e6bdebe9..07a372586c0 100644 --- a/gcc/testsuite/g++.old-deja/g++.jason/synth10.C +++ b/gcc/testsuite/g++.old-deja/g++.jason/synth10.C @@ -7,14 +7,14 @@ class A; class AH { public: - inline AH ( A * p = 0 ); + AH ( A * p = 0 ); AH ( const AH & from ) : pointer( from.pointer ) { inc(); } ~ AH () { dec(); } private: A * pointer; - inline void inc() const; - inline void dec() const; + void inc() const; + void dec() const; }; class A diff --git a/gcc/testsuite/g++.old-deja/g++.mike/net31.C b/gcc/testsuite/g++.old-deja/g++.mike/net31.C index 3ecf81c7349..05617a8b4ff 100644 --- a/gcc/testsuite/g++.old-deja/g++.mike/net31.C +++ b/gcc/testsuite/g++.old-deja/g++.mike/net31.C @@ -13,7 +13,7 @@ class foo_b { foo_b(); ~foo_b(); foo_b(const foo_b&); - inline double& operator()(int); + double& operator()(int); foo_b& operator=(foo_b&); void bar_a(int); }; diff --git a/gcc/testsuite/g++.old-deja/g++.mike/p8786.C b/gcc/testsuite/g++.old-deja/g++.mike/p8786.C index b5443c0fa6b..0565fb2558a 100644 --- a/gcc/testsuite/g++.old-deja/g++.mike/p8786.C +++ b/gcc/testsuite/g++.old-deja/g++.mike/p8786.C @@ -4,7 +4,7 @@ class B { public: - inline ~B(); + ~B(); }; class D : public B { diff --git a/gcc/testsuite/g++.old-deja/g++.other/lookup24.C b/gcc/testsuite/g++.old-deja/g++.other/lookup24.C new file mode 100644 index 00000000000..c8988e278d1 --- /dev/null +++ b/gcc/testsuite/g++.old-deja/g++.other/lookup24.C @@ -0,0 +1,25 @@ +// Build don't link: +// +// Copyright (C) 2003 Free Software Foundation, Inc. +// Contributed by Raymond <raymond@magma.magma-da.com>. +// +// PR c++/47 The parser failed to resolve 'B' in the return type of +// A::C::D::foo. + +class A { +public: + class B; + class C; +}; + +class A::B { +}; + +class A::C { + class D; +}; + +class A::C::D { +public: + B* foo(); +}; diff --git a/gcc/testsuite/g++.old-deja/g++.robertl/eb42.C b/gcc/testsuite/g++.old-deja/g++.robertl/eb42.C deleted file mode 100644 index c27aa8d2df7..00000000000 --- a/gcc/testsuite/g++.old-deja/g++.robertl/eb42.C +++ /dev/null @@ -1,19 +0,0 @@ -//Build don't link: -#include <vector> -#include <algorithm> - -template <class T> class Expr -{ -public : -Expr(){}; -Expr(const T&){}; -}; - -template <class T > -inline bool compare(const Expr<T> a, const Expr<T> b){ return true; }; - -int main() -{ - std::vector<int> a(3); - std::sort( a.begin(), a.end(), compare ); // ERROR - no matching function -} diff --git a/gcc/testsuite/g77.dg/pr9258.f b/gcc/testsuite/g77.dg/pr9258.f new file mode 100644 index 00000000000..9961b72b7f6 --- /dev/null +++ b/gcc/testsuite/g77.dg/pr9258.f @@ -0,0 +1,18 @@ +C Test case for PR/9258 +C Origin: kmccarty@princeton.edu +C +C { dg-do compile } + SUBROUTINE FOO (B) + + 10 CALL BAR (A) + ASSIGN 20 TO M + IF (100.LT.A) GOTO 10 + GOTO 40 +C + 20 IF (B.LT.ABS(A)) GOTO 10 + ASSIGN 30 TO M + GOTO 40 +C + 30 ASSIGN 10 TO M + 40 GOTO M,(10,20,30) + END diff --git a/gcc/testsuite/gcc.c-torture/compile/20000804-1.x b/gcc/testsuite/gcc.c-torture/compile/20000804-1.x index d2c3cec91a2..458c8e720e3 100644 --- a/gcc/testsuite/gcc.c-torture/compile/20000804-1.x +++ b/gcc/testsuite/gcc.c-torture/compile/20000804-1.x @@ -1,9 +1,8 @@ # This does not work on m68hc11 due to the use of an asm statement # to force a 'long long' (64-bits) to go in a register. -global target_triplet if { [istarget "m6811-*-*"] || [istarget "m6812-*-*"] } { - set torture_compile_xfail "$target_triplet" + return 1 } return 0 diff --git a/gcc/testsuite/gcc.c-torture/compile/20001205-1.x b/gcc/testsuite/gcc.c-torture/compile/20001205-1.x index bde61fd93da..134cdf109fe 100644 --- a/gcc/testsuite/gcc.c-torture/compile/20001205-1.x +++ b/gcc/testsuite/gcc.c-torture/compile/20001205-1.x @@ -1,8 +1,7 @@ # This does not work on m68hc11 due to the asm statement which # forces two 'long' (32-bits) variables to go in registers. -global target_triplet if { [istarget "m6811-*-*"] || [istarget "m6812-*-*"] } { - set torture_compile_xfail "$target_triplet" + return 1 } return 0 diff --git a/gcc/testsuite/gcc.c-torture/compile/20001226-1.x b/gcc/testsuite/gcc.c-torture/compile/20001226-1.x index 13616c69f37..6e46f46724e 100644 --- a/gcc/testsuite/gcc.c-torture/compile/20001226-1.x +++ b/gcc/testsuite/gcc.c-torture/compile/20001226-1.x @@ -3,7 +3,7 @@ global target_triplet if { [istarget "m6811-*-*"] || [istarget "m6812-*-*"] } { - set torture_compile_xfail "$target_triplet" + return 1 } # It doesn't work on Xtensa with -O0 because the function is larger diff --git a/gcc/testsuite/gcc.c-torture/compile/20020604-1.x b/gcc/testsuite/gcc.c-torture/compile/20020604-1.x index 4d4a49ef9e0..bced22f0f44 100644 --- a/gcc/testsuite/gcc.c-torture/compile/20020604-1.x +++ b/gcc/testsuite/gcc.c-torture/compile/20020604-1.x @@ -3,4 +3,8 @@ if { [istarget "h8300-*-*"] } { return 1; } +if { [istarget "m6811-*-*"] || [istarget "m6812-*-*"] } { + return 1; +} + return 0 diff --git a/gcc/testsuite/gcc.c-torture/compile/20021015-1.c b/gcc/testsuite/gcc.c-torture/compile/20021015-1.c new file mode 100644 index 00000000000..789b8a8b176 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/20021015-1.c @@ -0,0 +1,12 @@ +/* PR target/7370. */ + +int g (int *x, int *y); + +void f () +{ + int x, y; + char a[4000]; + + g (&x, &y); + x = x/y + x; +} diff --git a/gcc/testsuite/gcc.c-torture/compile/20021015-2.c b/gcc/testsuite/gcc.c-torture/compile/20021015-2.c new file mode 100644 index 00000000000..6b158c5bdc8 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/20021015-2.c @@ -0,0 +1,7 @@ +/* PR target/8232. */ + +int f (char *p, char *q, int i) +{ + return bcmp (p, q, i); +} + diff --git a/gcc/testsuite/gcc.c-torture/compile/20021123-1.c b/gcc/testsuite/gcc.c-torture/compile/20021123-1.c new file mode 100644 index 00000000000..dd2aa7e09dd --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/20021123-1.c @@ -0,0 +1,10 @@ +/* PR c/8439 */ +/* Verify that GCC properly handles null increments. */ + +struct empty { +}; + +void foo(struct empty *p) +{ + p++; +} diff --git a/gcc/testsuite/gcc.c-torture/compile/20021123-2.c b/gcc/testsuite/gcc.c-torture/compile/20021123-2.c new file mode 100644 index 00000000000..423f8ec1964 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/20021123-2.c @@ -0,0 +1,9 @@ +/* PR c/8518 */ +/* Contributed by Volker Reichelt. */ + +/* Verify that GCC doesn't get confused by the + redefinition of an extern inline function. */ + +extern int inline foo () { return 0; } +extern int inline bar () { return 0; } +static int inline bar () { return foo(); } diff --git a/gcc/testsuite/gcc.c-torture/compile/20021123-3.c b/gcc/testsuite/gcc.c-torture/compile/20021123-3.c new file mode 100644 index 00000000000..51f0e257dfd --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/20021123-3.c @@ -0,0 +1,9 @@ +/* PR c/8518 */ +/* Contributed by Volker Reichelt. */ + +/* Verify that GCC doesn't get confused by the + redefinition of an extern inline function. */ + +extern int inline foo () { return 0; } +extern int inline bar () { return 0; } +static int bar () { return foo(); } diff --git a/gcc/testsuite/gcc.c-torture/compile/20021123-4.c b/gcc/testsuite/gcc.c-torture/compile/20021123-4.c new file mode 100644 index 00000000000..d4306b89b99 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/20021123-4.c @@ -0,0 +1,11 @@ +/* PR c/8588 */ +/* Contributed by Volker Reichelt. */ + +/* Verify that GCC converts integer constants + in shift operations. */ + +void foo() +{ + unsigned int i, j; + j = (i >> 0xf0); +} diff --git a/gcc/testsuite/gcc.c-torture/compile/20030110-1.c b/gcc/testsuite/gcc.c-torture/compile/20030110-1.c new file mode 100644 index 00000000000..1cbbaea3c10 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/20030110-1.c @@ -0,0 +1,39 @@ +extern char bpp; + +void foo() +{ + if (bpp == 32) + { + if (2 < 8) + { + do + { + while (inb(0x9ae8) & (0x0100 >> (2 +1))); + } + while(0); + } + else + { + do + { + while (inb(0x9ae8) & (0x0100 >> (2))); + } + while(0); + } + } + else + do + { + while (inb(0x9ae8) & (0x0100 >> (1))); + } + while(0); + if (8 < 8) + { + do + { + while (inb(0x9ae8) & (0x0100 >> (8 +1))); + } + while(0); + } +} + diff --git a/gcc/testsuite/gcc.c-torture/compile/20030125-1.c b/gcc/testsuite/gcc.c-torture/compile/20030125-1.c new file mode 100644 index 00000000000..656304e2d67 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/compile/20030125-1.c @@ -0,0 +1,24 @@ + int count; + + int func(int *valp) { + int val, locked = 0; + + while ((val = *valp) != 0) { + if (count) { + if (count) + locked = 1; + else + locked = 1; + + if (!locked) + continue; + } + + if (!count) + count--; + + break; + } + + return val; + } diff --git a/gcc/testsuite/gcc.c-torture/compile/920520-1.x b/gcc/testsuite/gcc.c-torture/compile/920520-1.x index f7a13c87abc..3687bf6145d 100644 --- a/gcc/testsuite/gcc.c-torture/compile/920520-1.x +++ b/gcc/testsuite/gcc.c-torture/compile/920520-1.x @@ -3,8 +3,7 @@ set options "-S" # This does not work on m68hc11 due to the asm which forces a # float or a double to go in a register. -global target_triplet if { [istarget "m6811-*-*"] || [istarget "m6812-*-*"] } { - set torture_compile_xfail "$target_triplet" + return 1 } return 0 diff --git a/gcc/testsuite/gcc.c-torture/compile/961203-1.x b/gcc/testsuite/gcc.c-torture/compile/961203-1.x index e6fd4e41a70..e705ffe167a 100644 --- a/gcc/testsuite/gcc.c-torture/compile/961203-1.x +++ b/gcc/testsuite/gcc.c-torture/compile/961203-1.x @@ -10,9 +10,8 @@ if { [istarget "h8300-*-*"] } { # Array 'a' in this test is too large to fit in 64K. -global target_triplet if { [istarget "m6811-*-*"] || [istarget "m6812-*-*"]} { - set torture_compile_xfail "$target_triplet" + return 1 } return 0 diff --git a/gcc/testsuite/gcc.c-torture/execute/20021024-1.c b/gcc/testsuite/gcc.c-torture/execute/20021024-1.c new file mode 100644 index 00000000000..f7d98e929a2 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/20021024-1.c @@ -0,0 +1,43 @@ +/* Origin: PR target/6981 from Mattias Engdegaard <mattias@virtutech.se>. */ + +void exit (int); +void abort (void); + +unsigned long long *cp, m; + +void foo (void) +{ +} + +void bar (unsigned rop, unsigned long long *r) +{ + unsigned rs1, rs2, rd; + +top: + rs2 = (rop >> 23) & 0x1ff; + rs1 = (rop >> 9) & 0x1ff; + rd = rop & 0x1ff; + + *cp = 1; + m = r[rs1] + r[rs2]; + *cp = 2; + foo(); + if (!rd) + goto top; + r[rd] = 1; +} + +int main(void) +{ + static unsigned long long r[64]; + unsigned long long cr; + cp = &cr; + + r[4] = 47; + r[8] = 11; + bar((8 << 23) | (4 << 9) | 15, r); + + if (m != 47 + 11) + abort (); + exit (0); +} diff --git a/gcc/testsuite/gcc.c-torture/execute/20021219-1.c b/gcc/testsuite/gcc.c-torture/execute/20021219-1.c new file mode 100644 index 00000000000..2e658a5a885 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/20021219-1.c @@ -0,0 +1,18 @@ +/* PR optimization/8988 */ +/* Contributed by Kevin Easton */ + +void foo(char *p1, char **p2) +{} + +int main(void) +{ + char str[] = "foo { xx }"; + char *ptr = str + 5; + + foo(ptr, &ptr); + + while (*ptr && (*ptr == 13 || *ptr == 32)) + ptr++; + + return 0; +} diff --git a/gcc/testsuite/gcc.c-torture/execute/20030109-1.c b/gcc/testsuite/gcc.c-torture/execute/20030109-1.c new file mode 100644 index 00000000000..1bea931f64c --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/20030109-1.c @@ -0,0 +1,20 @@ +/* PR c/8032 */ +/* Verify that an empty initializer inside a partial + parent initializer doesn't confuse GCC. */ + +struct X +{ + int a; + int b; + int z[]; +}; + +struct X x = { .b = 40, .z = {} }; + +int main () +{ + if (x.b != 40) + abort (); + + return 0; +} diff --git a/gcc/testsuite/gcc.c-torture/execute/20030120-1.c b/gcc/testsuite/gcc.c-torture/execute/20030120-1.c new file mode 100644 index 00000000000..0ac0ecf7025 --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/20030120-1.c @@ -0,0 +1,50 @@ +/* On H8/300 port, NOTICE_UPDATE_CC had a bug that causes the final + pass to remove test insns that should be kept. */ + +unsigned short +test1 (unsigned short w) +{ + if ((w & 0xff00) == 0) + { + if (w == 0) + w = 2; + } + return w; +} + +unsigned long +test2 (unsigned long w) +{ + if ((w & 0xffff0000) == 0) + { + if (w == 0) + w = 2; + } + return w; +} + +int +test3 (unsigned short a) +{ + if (a & 1) + return 1; + else if (a) + return 1; + else + return 0; +} + +int +main () +{ + if (test1 (1) != 1) + abort (); + + if (test2 (1) != 1) + abort (); + + if (test3 (2) != 1) + abort (); + + exit (0); +} diff --git a/gcc/testsuite/gcc.c-torture/execute/20030120-2.c b/gcc/testsuite/gcc.c-torture/execute/20030120-2.c new file mode 100644 index 00000000000..298bc4f5b4f --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/20030120-2.c @@ -0,0 +1,19 @@ +/* PR 8848 */ + +extern void abort (); + +int foo(int status) +{ + int s = 0; + if (status == 1) s=1; + if (status == 3) s=3; + if (status == 4) s=4; + return s; +} + +int main() +{ + if (foo (3) != 3) + abort (); + return 0; +} diff --git a/gcc/testsuite/gcc.c-torture/execute/builtin-constant.x b/gcc/testsuite/gcc.c-torture/execute/builtin-constant.x new file mode 100644 index 00000000000..f1a6be7f02e --- /dev/null +++ b/gcc/testsuite/gcc.c-torture/execute/builtin-constant.x @@ -0,0 +1,11 @@ +set torture_eval_before_execute { + global compiler_conditional_xfail_data + set compiler_conditional_xfail_data { + "This test fails on all targets when optimizing." \ + { "*-*-*" } \ + { "*" } \ + { "-O0" } + } +} + +return 0 diff --git a/gcc/testsuite/gcc.dg/20030120-1.c b/gcc/testsuite/gcc.dg/20030120-1.c new file mode 100644 index 00000000000..05689ad0961 --- /dev/null +++ b/gcc/testsuite/gcc.dg/20030120-1.c @@ -0,0 +1,10 @@ +/* PR 7154 */ +/* { dg-do compile } */ +/* { dg-options "-O -fpic" } */ +/* { dg-warning "not supported" "PIC unsupported" { target cris-*-elf* mmix-*-* } 0 } */ + +const int x[1]={ 1 }; +void foo(int i, int *p) +{ + asm volatile("" : "+r"(i) : "m" (x[0]), "r"(p)); +} diff --git a/gcc/testsuite/gcc.dg/20030123-1.c b/gcc/testsuite/gcc.dg/20030123-1.c new file mode 100644 index 00000000000..1f5858808c4 --- /dev/null +++ b/gcc/testsuite/gcc.dg/20030123-1.c @@ -0,0 +1,17 @@ +/* This used to ICE due to a reload bug on s390*. */ + +/* { dg-do compile { target s390*-*-* } } */ +/* { dg-options "-O2" } */ + +void func (char *p); + +void test (void) +{ + char *p = alloca (4096); + long idx; + + asm ("" : "=r" (idx) : : "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12"); + + func (p + idx + 1); +} + diff --git a/gcc/testsuite/gcc.dg/c90-restrict-1.c b/gcc/testsuite/gcc.dg/c90-restrict-1.c index 17af58b4b58..60d91b830a1 100644 --- a/gcc/testsuite/gcc.dg/c90-restrict-1.c +++ b/gcc/testsuite/gcc.dg/c90-restrict-1.c @@ -4,4 +4,4 @@ /* { dg-options "-std=iso9899:1990 -pedantic-errors" } */ char *restrict foo; /* { dg-bogus "warning" "warning in place of error" } */ -/* { dg-error "parse error|no type" "restrict not in C90" { target *-*-* } 6 } */ +/* { dg-error "(parse|syntax) error|no type" "restrict not in C90" { target *-*-* } 6 } */ diff --git a/gcc/testsuite/gcc.dg/c99-func-2.c b/gcc/testsuite/gcc.dg/c99-func-2.c index d6a6f243f91..9dc8b58c673 100644 --- a/gcc/testsuite/gcc.dg/c99-func-2.c +++ b/gcc/testsuite/gcc.dg/c99-func-2.c @@ -6,5 +6,5 @@ void foo (void) { - __func__ "foo"; /* { dg-error "parse error" "before string constant" } */ + __func__ "foo"; /* { dg-error "(parse|syntax) error" "before string constant" } */ } diff --git a/gcc/testsuite/gcc.dg/cpp/19990413-1.c b/gcc/testsuite/gcc.dg/cpp/19990413-1.c index 9abddb942fd..22fc5db2218 100644 --- a/gcc/testsuite/gcc.dg/cpp/19990413-1.c +++ b/gcc/testsuite/gcc.dg/cpp/19990413-1.c @@ -9,5 +9,5 @@ func(void) { FOO(i = 4) - else; /* { dg-error "parse error" "error on this line" { target *-*-* } { 12 } } */ + else; /* { dg-error "(parse|syntax) error" "error on this line" { target *-*-* } { 12 } } */ } diff --git a/gcc/testsuite/gcc.dg/cpp/digraph2.c b/gcc/testsuite/gcc.dg/cpp/digraph2.c index e67ec53878b..cac4e256b0a 100644 --- a/gcc/testsuite/gcc.dg/cpp/digraph2.c +++ b/gcc/testsuite/gcc.dg/cpp/digraph2.c @@ -9,7 +9,7 @@ int main (int argc, char *argv[]) { return 0; -%> /* { dg-error "parse error" } */ +%> /* { dg-error "(parse|syntax) error" } */ /* Place this after main () so we get to test both the compiler above and the preprocessor below. */ diff --git a/gcc/testsuite/gcc.dg/cpp/direct2.c b/gcc/testsuite/gcc.dg/cpp/direct2.c index d6dc1088c37..52d1e31f45f 100644 --- a/gcc/testsuite/gcc.dg/cpp/direct2.c +++ b/gcc/testsuite/gcc.dg/cpp/direct2.c @@ -33,5 +33,5 @@ void f () #define slashstar /##* #define starslash *##/ -slashstar starslash /* { dg-error "parse error" "not a comment" } */ +slashstar starslash /* { dg-error "(parse|syntax) error" "not a comment" } */ /* { dg-warning "does not give" "paste warning(s)" { target *-*-* } 36 } */ diff --git a/gcc/testsuite/gcc.dg/cpp/paste4.c b/gcc/testsuite/gcc.dg/cpp/paste4.c index 2215b34a7ad..4e575c2954e 100644 --- a/gcc/testsuite/gcc.dg/cpp/paste4.c +++ b/gcc/testsuite/gcc.dg/cpp/paste4.c @@ -11,6 +11,6 @@ int main () { - double d = glue (1.0e, +1); /* { dg-error "exponent|parse error" } */ + double d = glue (1.0e, +1); /* { dg-error "exponent|(parse|syntax) error" } */ return 0; } diff --git a/gcc/testsuite/gcc.dg/darwin-ld-5.c b/gcc/testsuite/gcc.dg/darwin-ld-5.c index e32f1d9d3ca..0540f92bcbb 100644 --- a/gcc/testsuite/gcc.dg/darwin-ld-5.c +++ b/gcc/testsuite/gcc.dg/darwin-ld-5.c @@ -1,7 +1,7 @@ -/* Test Darwin linker option -bundle_loader. */ +/* Test Darwin linker option -dynamic. */ /* Developed by Devang Patel <dpatel@apple.com>. */ -/* { dg-options "-bundle -bundle_loader foo" } */ +/* { dg-options "-dynamic" } */ /* { dg-do link { target *-*-darwin* } } */ int main() diff --git a/gcc/testsuite/gcc.dg/h8300-stack-1.c b/gcc/testsuite/gcc.dg/h8300-stack-1.c new file mode 100644 index 00000000000..b63bde29c9c --- /dev/null +++ b/gcc/testsuite/gcc.dg/h8300-stack-1.c @@ -0,0 +1,14 @@ +/* Make sure that the H8 backend does not generate a non-atomic stack + adjustment. */ +/* { dg-do compile { target h8300-*-* } } */ +/* { dg-options "" } */ + +void foo (short, short, short, short, short, short); + +void +bar () +{ + foo (0, 0, 0, 0, 0, 0); +} + +/* { dg-final { scan-assembler-not "addx" } } */ diff --git a/gcc/testsuite/gcc.dg/i386-mmx-3.c b/gcc/testsuite/gcc.dg/i386-mmx-3.c new file mode 100644 index 00000000000..f44fa0fbfdd --- /dev/null +++ b/gcc/testsuite/gcc.dg/i386-mmx-3.c @@ -0,0 +1,17 @@ +/* PR target/8870 */ +/* Originator: otaylor@redhat.com */ +/* { dg-do compile { target i?86-*-* } } */ +/* { dg-options "-O1 -mmmx -march=i686" } */ + +typedef int v4hi __attribute__ ((mode (V4HI))); + +static inline v4hi cvtsi_v4hi (int i) +{ + long long tmp = i; + return (v4hi) tmp; +} + +v4hi bar (unsigned short a) +{ + return cvtsi_v4hi (a); +} diff --git a/gcc/testsuite/gcc.dg/noncompile/920721-2.c b/gcc/testsuite/gcc.dg/noncompile/920721-2.c index 9ec223c3af4..c698b085ea9 100644 --- a/gcc/testsuite/gcc.dg/noncompile/920721-2.c +++ b/gcc/testsuite/gcc.dg/noncompile/920721-2.c @@ -2,5 +2,5 @@ void f(int n) { int s; for(s=0;s<n;s++) - s==5?1 n=1; /* { dg-error "parse error" } */ + s==5?1 n=1; /* { dg-error "(parse|syntax) error" } */ } diff --git a/gcc/testsuite/gcc.dg/noncompile/930622-2.c b/gcc/testsuite/gcc.dg/noncompile/930622-2.c index a1450afbf1f..3409118f0e2 100644 --- a/gcc/testsuite/gcc.dg/noncompile/930622-2.c +++ b/gcc/testsuite/gcc.dg/noncompile/930622-2.c @@ -1,6 +1,6 @@ f () { int i; - for (i--) /* { dg-error "parse" } */ + for (i--) /* { dg-error "parse|syntax" } */ ; } diff --git a/gcc/testsuite/gcc.dg/noncompile/940112-1.c b/gcc/testsuite/gcc.dg/noncompile/940112-1.c index 24780df554e..953840f6dc8 100644 --- a/gcc/testsuite/gcc.dg/noncompile/940112-1.c +++ b/gcc/testsuite/gcc.dg/noncompile/940112-1.c @@ -4,4 +4,4 @@ f (int x) double e = 1; e = 1; return (e) -} /* { dg-error "parse error" } */ +} /* { dg-error "(parse|syntax) error" } */ diff --git a/gcc/testsuite/gcc.dg/noncompile/950921-1.c b/gcc/testsuite/gcc.dg/noncompile/950921-1.c index ed44338fcd1..0f6378524ec 100644 --- a/gcc/testsuite/gcc.dg/noncompile/950921-1.c +++ b/gcc/testsuite/gcc.dg/noncompile/950921-1.c @@ -1,10 +1,10 @@ typedef enum { - a = (X) 0, /* { dg-error "undeclared|not integer|parse error" } */ + a = (X) 0, /* { dg-error "undeclared|not integer|(parse|syntax) error" } */ b } c; typedef enum { - d = (X) 0 /* { dg-error "undeclared|not integer|parse error" } */ + d = (X) 0 /* { dg-error "undeclared|not integer|(parse|syntax) error" } */ } e; diff --git a/gcc/testsuite/gcc.dg/noncompile/951123-1.c b/gcc/testsuite/gcc.dg/noncompile/951123-1.c index 9a5a3215ed6..787cf1e94fa 100644 --- a/gcc/testsuite/gcc.dg/noncompile/951123-1.c +++ b/gcc/testsuite/gcc.dg/noncompile/951123-1.c @@ -1,2 +1,2 @@ struct S { int a; int b[2]; }; -struct S x = { 0, [0]; }; /* { dg-error "array index|near|parse" } */ +struct S x = { 0, [0]; }; /* { dg-error "array index|near|(parse|syntax)" } */ diff --git a/gcc/testsuite/gcc.dg/noncompile/971104-1.c b/gcc/testsuite/gcc.dg/noncompile/971104-1.c index a20b17add58..ed7cb523c3b 100644 --- a/gcc/testsuite/gcc.dg/noncompile/971104-1.c +++ b/gcc/testsuite/gcc.dg/noncompile/971104-1.c @@ -23,6 +23,6 @@ static void up(int sem){ printf("%s had processes sleeping on it!\n", ({ "MUTEX ", "BARB_SEM 1", "BARB_SEM 2", "CUST_SEM 1", "CUST_SEM 2", "WAIT_SEM 1", "WAIT_SEM 2", "WAIT_SEM 3", - "WAIT_SEM 4"} /* { dg-error "parse error" } */ + "WAIT_SEM 4"} /* { dg-error "(parse|syntax) error" } */ [( sb.sem_num )]) ); } diff --git a/gcc/testsuite/gcc.dg/noncompile/990416-1.c b/gcc/testsuite/gcc.dg/noncompile/990416-1.c index 1e874871de2..6b69ead2fe1 100644 --- a/gcc/testsuite/gcc.dg/noncompile/990416-1.c +++ b/gcc/testsuite/gcc.dg/noncompile/990416-1.c @@ -1,7 +1,7 @@ typedef int word_type; static void -copy_reg (unsigned int reg, frame_state *udata, /* { dg-error "parse" } */ +copy_reg (unsigned int reg, frame_state *udata, /* { dg-error "parse|syntax" } */ frame_state *target_udata) { word_type *preg = get_reg_addr (reg, udata, 0); /* { dg-error "undeclared|function|without a cast" } */ diff --git a/gcc/testsuite/gcc.dg/old-style-asm-1.c b/gcc/testsuite/gcc.dg/old-style-asm-1.c new file mode 100644 index 00000000000..006cf0949b0 --- /dev/null +++ b/gcc/testsuite/gcc.dg/old-style-asm-1.c @@ -0,0 +1,19 @@ +/* PR inline-asm/8832 */ +/* { dg-do compile } */ +/* { dg-options "-O2" } */ + +/* Verify that GCC doesn't optimize + old style asm instructions. */ + +void foo(int v) +{ + if (v) + asm ("dummy1"); + + asm ("dummy2"); + + if (v) + asm ("dummy3"); +} + +/* { dg-final { scan-assembler "L2" } } */ diff --git a/gcc/testsuite/gcc.dg/tls/alias-1.c b/gcc/testsuite/gcc.dg/tls/alias-1.c new file mode 100644 index 00000000000..3372da3d10c --- /dev/null +++ b/gcc/testsuite/gcc.dg/tls/alias-1.c @@ -0,0 +1,21 @@ +/* { dg-do link } */ +/* Test that encode_section_info handles the change from externally + defined to locally defined (via hidden). Extracted from glibc. */ + +struct __res_state { + char x[123]; +}; + +extern __thread struct __res_state bar + __attribute__ ((tls_model ("initial-exec"))); + +int main() +{ + bar.x[0] = 0; + return 0; +} + +__thread struct __res_state foo; +extern __thread struct __res_state bar + __attribute__ ((alias ("foo"))) + __attribute__ ((visibility ("hidden"))); diff --git a/gcc/testsuite/gcc.dg/uninit-C.c b/gcc/testsuite/gcc.dg/uninit-C.c new file mode 100644 index 00000000000..c81ada4abfc --- /dev/null +++ b/gcc/testsuite/gcc.dg/uninit-C.c @@ -0,0 +1,15 @@ +/* Spurious uninitialized variable warning, inspired by libgcc2.c. */ +/* { dg-do compile } */ +/* { dg-options "-O -Wuninitialized" } */ + +typedef int TItype __attribute__ ((mode (TI))); + +TItype +__subvdi3 (TItype a, TItype b) +{ + TItype w; + + w = a - b; + + return w; +} diff --git a/gcc/testsuite/lib/profopt.exp b/gcc/testsuite/lib/profopt.exp index 5ecf314977f..4d32ff2fdbe 100644 --- a/gcc/testsuite/lib/profopt.exp +++ b/gcc/testsuite/lib/profopt.exp @@ -66,7 +66,7 @@ if ![info exists PROFOPT_OPTIONS] { { -Os } ] } -set option_list $PROFOPT_OPTIONS +set prof_option_list $PROFOPT_OPTIONS # # profopt-cleanup -- remove profiling or performance results files. @@ -126,7 +126,7 @@ proc profopt-perf-value { testcase perf_ext optstr } { # proc profopt-execute { src } { global srcdir tmpdir - global option_list + global prof_option_list global tool profile_option feedback_option prof_ext perf_ext perf_delta global verbose @@ -142,7 +142,7 @@ proc profopt-execute { src } { set executable $tmpdir/[file tail [file rootname $src].x] set count 0 - foreach option $option_list { + foreach option $prof_option_list { set execname1 "${executable}${count}1" set execname2 "${executable}${count}2" set execname3 "${executable}${count}3" diff --git a/gcc/timevar.c b/gcc/timevar.c index 7a10fe78b47..47f2a68b89a 100644 --- a/gcc/timevar.c +++ b/gcc/timevar.c @@ -111,6 +111,7 @@ static float clocks_to_msec; #include "flags.h" #include "timevar.h" +#include "toplev.h" /* See timevar.h for an explanation of timing variables. */ @@ -317,7 +318,11 @@ timevar_pop (timevar) return; if (&timevars[timevar] != stack->timevar) - abort (); + { + sorry ("cannot timevar_pop '%s' when top of timevars stack is '%s'", + timevars[timevar].name, stack->timevar->name); + abort (); + } /* What time is it? */ get_time (&now); diff --git a/gcc/timevar.def b/gcc/timevar.def index 49eeedbf0a7..d26f10a6599 100644 --- a/gcc/timevar.def +++ b/gcc/timevar.def @@ -51,6 +51,9 @@ DEFTIMEVAR (TV_LIFE_UPDATE , "life info update") DEFTIMEVAR (TV_CPP , "preprocessing") DEFTIMEVAR (TV_LEX , "lexical analysis") DEFTIMEVAR (TV_PARSE , "parser") +DEFTIMEVAR (TV_NAME_LOOKUP , "name lookup") +DEFTIMEVAR (TV_OVERLOAD , "overload resolution") +DEFTIMEVAR (TV_TEMPLATE_INSTANTIATION, "template instantiation") DEFTIMEVAR (TV_EXPAND , "expand") DEFTIMEVAR (TV_VARCONST , "varconst") DEFTIMEVAR (TV_INTEGRATION , "integration") diff --git a/gcc/timevar.h b/gcc/timevar.h index 149751c3467..dcf1701aef9 100644 --- a/gcc/timevar.h +++ b/gcc/timevar.h @@ -76,6 +76,9 @@ typedef enum timevar_id_t; #undef DEFTIMEVAR +/* Execute the sequence: timevar_pop (TV), return (E); */ +#define POP_TIMEVAR_AND_RETURN(TV, E) return (timevar_pop (TV), (E)) + extern void init_timevar PARAMS ((void)); extern void timevar_push PARAMS ((timevar_id_t)); extern void timevar_pop PARAMS ((timevar_id_t)); diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c index 0f5ab59158f..751c2364b94 100644 --- a/gcc/tree-inline.c +++ b/gcc/tree-inline.c @@ -125,6 +125,8 @@ static tree add_stmt_to_compound PARAMS ((tree, tree, tree)); #endif /* INLINER_FOR_JAVA */ static tree find_alloca_call_1 PARAMS ((tree *, int *, void *)); static tree find_alloca_call PARAMS ((tree)); +static tree find_builtin_longjmp_call_1 PARAMS ((tree *, int *, void *)); +static tree find_builtin_longjmp_call PARAMS ((tree)); /* The approximate number of instructions per statement. This number need not be particularly accurate; it is used only to make @@ -871,7 +873,7 @@ tree_inlinable_function_p (fn) return inlinable_function_p (fn, NULL); } -/* if *TP is possibly call to alloca, return nonzero. */ +/* If *TP is possibly call to alloca, return nonzero. */ static tree find_alloca_call_1 (tp, walk_subtrees, data) tree *tp; @@ -883,8 +885,7 @@ find_alloca_call_1 (tp, walk_subtrees, data) return NULL; } -/* Return subexpression representing possible alloca call, - if any. */ +/* Return subexpression representing possible alloca call, if any. */ static tree find_alloca_call (exp) tree exp; @@ -892,6 +893,32 @@ find_alloca_call (exp) return walk_tree (&exp, find_alloca_call_1, NULL, NULL); } +static tree +find_builtin_longjmp_call_1 (tp, walk_subtrees, data) + tree *tp; + int *walk_subtrees ATTRIBUTE_UNUSED; + void *data ATTRIBUTE_UNUSED; +{ + tree exp = *tp, decl; + + if (TREE_CODE (exp) == CALL_EXPR + && TREE_CODE (TREE_OPERAND (exp, 0)) == ADDR_EXPR + && (decl = TREE_OPERAND (TREE_OPERAND (exp, 0), 0), + TREE_CODE (decl) == FUNCTION_DECL) + && DECL_BUILT_IN_CLASS (decl) == BUILT_IN_NORMAL + && DECL_FUNCTION_CODE (decl) == BUILT_IN_LONGJMP) + return decl; + + return NULL; +} + +static tree +find_builtin_longjmp_call (exp) + tree exp; +{ + return walk_tree (&exp, find_builtin_longjmp_call_1, NULL, NULL); +} + /* Returns nonzero if FN is a function that can be inlined into the inlining context ID_. If ID_ is NULL, check whether the function can be inlined at all. */ @@ -932,6 +959,14 @@ inlinable_function_p (fn, id) else if (! (*lang_hooks.tree_inlining.disregard_inline_limits) (fn) && currfn_insns > MAX_INLINE_INSNS_SINGLE) ; + /* We can't inline functions that call __builtin_longjmp at all. + The non-local goto machenery really requires the destination + be in a different function. If we allow the function calling + __builtin_longjmp to be inlined into the function calling + __builtin_setjmp, Things will Go Awry. */ + /* ??? Need front end help to identify "regular" non-local goto. */ + else if (find_builtin_longjmp_call (DECL_SAVED_TREE (fn))) + ; /* Refuse to inline alloca call unless user explicitly forced so as this may change program's memory overhead drastically when the function using alloca is called in loop. In GCC present in SPEC2000 inlining into schedule_block @@ -1617,6 +1652,7 @@ walk_tree (tp, func, data, htab_) case ENUMERAL_TYPE: case BLOCK: case RECORD_TYPE: + case CHAR_TYPE: /* None of thse have subtrees other than those already walked above. */ break; diff --git a/gcc/tree.h b/gcc/tree.h index 36e7fd4eeb3..68a670e62f1 100644 --- a/gcc/tree.h +++ b/gcc/tree.h @@ -2821,7 +2821,7 @@ extern void expand_decl_init PARAMS ((tree)); extern void clear_last_expr PARAMS ((void)); extern void expand_label PARAMS ((tree)); extern void expand_goto PARAMS ((tree)); -extern void expand_asm PARAMS ((tree)); +extern void expand_asm PARAMS ((tree, int)); extern void expand_start_cond PARAMS ((tree, int)); extern void expand_end_cond PARAMS ((void)); extern void expand_start_else PARAMS ((void)); diff --git a/gcc/treelang/ChangeLog b/gcc/treelang/ChangeLog index 138a96dd8fa..fca05888b35 100644 --- a/gcc/treelang/ChangeLog +++ b/gcc/treelang/ChangeLog @@ -1,3 +1,25 @@ +2003-01-26 Christian Cornelssen <ccorn@cs.tu-berlin.de> + + * Make-lang.in (treelang.install.common.done) + (treelang.install-info, treelang.uninstall): Prepend + $(DESTDIR) to destination paths in all (un)installation + commands. + +2002-12-28 Joseph S. Myers <jsm@polyomino.org.uk> + + * treelang.texi: Use @copying. + +2002-12-23 Joseph S. Myers <jsm@polyomino.org.uk> + + * treelang.texi: Include gcc-common.texi. + * Make-lang.in ($(srcdir)/treelang/treelang.info, treelang.dvi): + Depend on gcc-common.texi. Add other missing dependencies. + (treelang.dvi): Use texi2dvi. + +2002-12-22 Joseph S. Myers <jsm@polyomino.org.uk> + + * treelang.texi: Use @ifnottex instead of @ifinfo. + 2002-09-09 Tim Josling <tej@melbpc.org.au> * treetree.c (objc_is_id): New. diff --git a/gcc/treelang/Make-lang.in b/gcc/treelang/Make-lang.in index a1337672872..ffcf681272f 100644 --- a/gcc/treelang/Make-lang.in +++ b/gcc/treelang/Make-lang.in @@ -134,15 +134,21 @@ treelang.rest.encap: .phony:treelang.info treelang.info: $(srcdir)/treelang/treelang.info -$(srcdir)/treelang/treelang.info: $(srcdir)/treelang/treelang.texi +$(srcdir)/treelang/treelang.info: $(srcdir)/treelang/treelang.texi \ + $(srcdir)/doc/include/gcc-common.texi \ + $(srcdir)/doc/include/gpl.texi \ + $(srcdir)/doc/include/fdl.texi \ + $(srcdir)/doc/include/funding.texi cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -Idoc/include \ -o treelang/treelang.info treelang/treelang.texi -treelang.dvi: $(srcdir)/treelang/treelang.texi - TEXINPUTS=$(srcdir)/treelang:$(srcdir):$$TEXINPUTS $(TEXI2DVI) $(srcdir)/treelang/treelang.texi; \ - texindex treelang.??; \ - TEXINPUTS=$(srcdir)/treelang:$(srcdir):$$TEXINPUTS $(TEXI2DVI) $(srcdir)/treelang/treelang.texi; \ - mv treelang.dvi treelang; +treelang.dvi: $(srcdir)/treelang/treelang.texi \ + $(srcdir)/doc/include/gcc-common.texi \ + $(srcdir)/doc/include/gpl.texi \ + $(srcdir)/doc/include/fdl.texi \ + $(srcdir)/doc/include/funding.texi + s=`cd $(srcdir); ${PWD}`; export s; \ + cd treelang && $(TEXI2DVI) -I $$s/doc/include $$s/treelang/treelang.texi treelang.generated-manpages: @@ -163,10 +169,10 @@ treelang.install.common.done: installdirs treelang.done do \ if [ -f $$name ] ; then \ name2="`echo \`basename $$name\` | sed -e '$(program_transform_name)' `"; \ - rm -f $(bindir)/$$name2$(exeext); \ - echo $(INSTALL_PROGRAM) $$name$(exeext) $(bindir)/$$name2$(exeext); \ - $(INSTALL_PROGRAM) $$name$(exeext) $(bindir)/$$name2$(exeext); \ - chmod a+x $(bindir)/$$name2$(exeext); \ + rm -f $(DESTDIR)$(bindir)/$$name2$(exeext); \ + echo $(INSTALL_PROGRAM) $$name$(exeext) $(DESTDIR)$(bindir)/$$name2$(exeext); \ + $(INSTALL_PROGRAM) $$name$(exeext) $(DESTDIR)$(bindir)/$$name2$(exeext); \ + chmod a+x $(DESTDIR)$(bindir)/$$name2$(exeext); \ fi ; \ done $(STAMP) treelang.install.common.done @@ -176,9 +182,9 @@ treelang.install-info: $(srcdir)/treelang/treelang.info do \ if [ -f $$name ] ; then \ name2="`echo \`basename $$name\` | sed -e '$(program_transform_name)' `"; \ - rm -f $(libsubdir)/$$name2$(exeext); \ - $(INSTALL_PROGRAM) $$name$(exeext) $(libsubdir)/$$name2$(exeext); \ - chmod a+x $(libsubdir)/$$name2$(exeext); \ + rm -f $(DESTDIR)$(libsubdir)/$$name2$(exeext); \ + $(INSTALL_PROGRAM) $$name$(exeext) $(DESTDIR)$(libsubdir)/$$name2$(exeext); \ + chmod a+x $(DESTDIR)$(libsubdir)/$$name2$(exeext); \ fi ; \ done @@ -190,8 +196,8 @@ treelang.uninstall: echo $$name; \ name2="`echo $$name | sed -e '$(program_transform_name)' `"; \ echo becomes $$name2; \ - echo -rm -rf $(bindir)/$$name2$(exeext); \ - rm -rf $(bindir)/$$name2$(exeext); \ + echo -rm -rf $(DESTDIR)$(bindir)/$$name2$(exeext); \ + rm -rf $(DESTDIR)$(bindir)/$$name2$(exeext); \ done -rm treelang.install.common.done diff --git a/gcc/treelang/treelang.texi b/gcc/treelang/treelang.texi index 52bcb7ddd23..fc8d6d41502 100644 --- a/gcc/treelang/treelang.texi +++ b/gcc/treelang/treelang.texi @@ -8,15 +8,12 @@ @c %**start of header @setfilename treelang.info +@include gcc-common.texi + +@set version-treelang 1.0 + @set last-update 2001-07-30 @set copyrights-treelang 1995,1996,1997,1998,1999,2000,2001,2002 -@c DEVELOPMENT is set to indicate an in-development version, -@c as compared to a release version. When making a release -@c (e.g. a release branch in the CVS repository for GCC), -@c clear this and set the version information correctly. -@clear DEVELOPMENT -@set version-treelang 1.0 -@set version-GCC 3.0 @set email-general gcc@@gcc.gnu.org @set email-bugs gcc-bugs@@gcc.gnu.org or bug-gcc@@gnu.org @@ -46,14 +43,6 @@ @c and make sure the following does NOT begin with '@c': @c @clear USING -@c 6/27/96 FSF DO wants smallbook fmt for 1st bound edition. (from gcc.texi) -@c @smallbook - -@c i also commented out the finalout command, so if there *are* any -@c overfulls, you'll (hopefully) see the rectangle in the right hand -@c margin. -- burley 1999-03-13 (from mew's comment in GCC.texi). -@c @finalout - @ifset INTERNALS @ifset USING @settitle Using and Maintaining GNU Treelang @@ -92,7 +81,29 @@ @c \global\normaloffset =0.75in @c @end tex -@ifinfo +@copying +Copyright @copyright{} @value{copyrights-treelang} Free Software Foundation, Inc. + +Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU Free Documentation License, Version 1.1 or +any later version published by the Free Software Foundation; with the +Invariant Sections being ``GNU General Public License'', the Front-Cover +texts being (a) (see below), and with the Back-Cover Texts being (b) +(see below). A copy of the license is included in the section entitled +``GNU Free Documentation License''. + +(a) The FSF's Front-Cover Text is: + + A GNU Manual + +(b) The FSF's Back-Cover Text is: + + You have freedom to copy and modify this GNU Manual, like GNU + software. Copies published by the Free Software Foundation raise + funds for GNU development. +@end copying + +@ifnottex @dircategory Programming @direntry * treelang: (treelang). The GNU Treelang compiler. @@ -118,26 +129,8 @@ Published by the Free Software Foundation 59 Temple Place - Suite 330 Boston, MA 02111-1307 USA -Copyright (C) @value{copyrights-treelang} Free Software Foundation, Inc. - -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or -any later version published by the Free Software Foundation; with the -Invariant Sections being ``GNU General Public License'', the Front-Cover -texts being (a) (see below), and with the Back-Cover Texts being (b) -(see below). A copy of the license is included in the section entitled -``GNU Free Documentation License''. - -(a) The FSF's Front-Cover Text is: - - A GNU Manual - -(b) The FSF's Back-Cover Text is: - - You have freedom to copy and modify this GNU Manual, like GNU - software. Copies published by the Free Software Foundation raise - funds for GNU development. -@end ifinfo +@insertcopying +@end ifnottex treelang was Contributed by Tim Josling (@email{@value{email-josling}}). Inspired by and based on the 'toy' language, written by Richard Kenner. @@ -168,8 +161,6 @@ documentation. @center for version @value{version-treelang} @page @vskip 0pt plus 1filll -Copyright @copyright{} @value{copyrights-treelang} Free Software Foundation, Inc. -@sp 2 For the @value{which-treelang} Version* @sp 1 Published by the Free Software Foundation @* @@ -179,27 +170,11 @@ Boston, MA 02111-1307, USA@* @c Printed copies are available for $? each.@* @c ISBN ??? @sp 1 -Permission is granted to copy, distribute and/or modify this document -under the terms of the GNU Free Documentation License, Version 1.1 or -any later version published by the Free Software Foundation; with the -Invariant Sections being ``GNU General Public License'', the Front-Cover -texts being (a) (see below), and with the Back-Cover Texts being (b) -(see below). A copy of the license is included in the section entitled -``GNU Free Documentation License''. - -(a) The FSF's Front-Cover Text is: - - A GNU Manual - -(b) The FSF's Back-Cover Text is: - - You have freedom to copy and modify this GNU Manual, like GNU - software. Copies published by the Free Software Foundation raise - funds for GNU development. +@insertcopying @end titlepage @page -@ifinfo +@ifnottex @node Top, Copying,, (dir) @top Introduction @@ -226,7 +201,7 @@ new features and incompatibilities, and how to report bugs. It corresponds to the @value{which-treelang} version of @code{treelang}. @end ifclear -@end ifinfo +@end ifnottex @ifset DEVELOPMENT @emph{Warning:} This document is still under development, and might not diff --git a/gcc/unwind-dw2-fde.h b/gcc/unwind-dw2-fde.h index b7d96cfe992..7565c49f754 100644 --- a/gcc/unwind-dw2-fde.h +++ b/gcc/unwind-dw2-fde.h @@ -1,5 +1,5 @@ /* Subroutines needed for unwinding stack frames for exception handling. */ -/* Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 +/* Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. Contributed by Jason Merrill <jason@cygnus.com>. @@ -166,7 +166,7 @@ next_fde (fde *f) extern fde * _Unwind_Find_FDE (void *, struct dwarf_eh_bases *); static inline int -last_fde (struct object *obj, fde *f) +last_fde (struct object *obj __attribute__ ((__unused__)), fde *f) { #ifdef DWARF2_OBJECT_END_PTR_EXTENSION return (char *)f == obj->fde_end || f->length == 0; diff --git a/gcc/unwind-dw2.c b/gcc/unwind-dw2.c index 3c5feea4e03..2325e1396f4 100644 --- a/gcc/unwind-dw2.c +++ b/gcc/unwind-dw2.c @@ -1,5 +1,5 @@ /* DWARF2 exception handling and frame unwind runtime interface routines. - Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 + Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GCC. @@ -782,6 +782,9 @@ execute_cfa_program (const unsigned char *insn_ptr, case DW_CFA_undefined: case DW_CFA_same_value: + insn_ptr = read_uleb128 (insn_ptr, ®); + break; + case DW_CFA_nop: break; diff --git a/gcc/varasm.c b/gcc/varasm.c index 8b321af8296..2790862bff3 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -1,6 +1,6 @@ /* Output variables, constants and external declarations, for GNU compiler. Copyright (C) 1987, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1997, - 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GCC. @@ -2859,9 +2859,6 @@ struct constant_descriptor_rtx GTY(()) /* More constant_descriptors with the same hash code. */ struct constant_descriptor_rtx *next; - /* The label of the constant. */ - const char *label; - /* A MEM for the constant. */ rtx rtl; diff --git a/gcc/version.c b/gcc/version.c index 0e2662e910f..0b0f5408b6b 100644 --- a/gcc/version.c +++ b/gcc/version.c @@ -6,7 +6,7 @@ please modify this string to indicate that, e.g. by putting your organization's name in parentheses at the end of the string. */ -const char version_string[] = "3.3 20021213 (experimental)"; +const char version_string[] = "3.3 20030131 (prerelease)"; /* This is the location of the online document giving instructions for reporting bugs. If you distribute a modified version of GCC, diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog index 12c566ee949..78a821206b5 100644 --- a/libf2c/ChangeLog +++ b/libf2c/ChangeLog @@ -1,3 +1,17 @@ +2003-01-27 Alexandre Oliva <aoliva@redhat.com> + + * Makefile.in ($(LIBG2C)): -rpath is glibcpp_toolexeclibdir. + * aclocal.m4 (glibcpp_toolexeclibdir): Instead of + $(MULTISUBDIR), use `$CC -print-multi-os-directory`, unless + version_specific_libs is enabled. + * configure: Rebuilt. + +2003-01-26 Christian Cornelssen <ccorn@cs.tu-berlin.de> + + * Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR. + (install, uninstall): Prepend $(DESTDIR) to destination + paths in all (un)installation commands. + 2002-11-19 Toon Moene <toon@moene.indiv.nluug.nl> PR fortran/8587 diff --git a/libf2c/Makefile.in b/libf2c/Makefile.in index 5806a0b9594..4aae68f0b9e 100644 --- a/libf2c/Makefile.in +++ b/libf2c/Makefile.in @@ -1,5 +1,5 @@ # Makefile for GNU F77 compiler runtime. -# Copyright (C) 1995-1998, 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 1995-1998, 2001, 2002, 2003 Free Software Foundation, Inc. # Contributed by Dave Love (d.love@dl.ac.uk). # #This file is part of GNU Fortran. @@ -81,6 +81,7 @@ FLAGS_TO_PASS= \ WARN_CFLAGS='$(WARN_CFLAGS)' \ CFLAGS='$(CFLAGS)' \ CPPFLAGS='$(CPPFLAGS)' \ + DESTDIR='$(DESTDIR)' \ AR='$(AR)' \ RANLIB='$(RANLIB)' \ prefix='$(prefix)' \ @@ -152,7 +153,7 @@ i77 f77 u77: g2c.h $(LIBG2C): s-libi77 s-libf77 s-libu77 s-libe77 $(LIBTOOL) --mode=link $(CC) -o $@ \ -version-info $(VERSION_MAJOR):$(VERSION_MINOR):$(VERSION_SUB) \ - -rpath $(libdir)$(MULTISUBDIR) \ + -rpath $(glibcpp_toolexeclibdir) \ -objectlist s-libe77 \ -objectlist s-libf77 \ -objectlist s-libi77 \ @@ -214,21 +215,21 @@ check: cd libU77; $(MAKE) G77DIR=../../../gcc/ check install: all - $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(glibcpp_toolexeclibdir) - $(LIBTOOL) --mode=install $(INSTALL) $(LIBG2C) $(glibcpp_toolexeclibdir) - $(INSTALL_DATA) libfrtbegin.a $(glibcpp_toolexeclibdir) - $(RANLIB) $(glibcpp_toolexeclibdir)/libfrtbegin.a - $(INSTALL_DATA) g2c.h $(libsubdir)/include/g2c.h + $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(DESTDIR)$(glibcpp_toolexeclibdir) + $(LIBTOOL) --mode=install $(INSTALL) $(LIBG2C) $(DESTDIR)$(glibcpp_toolexeclibdir) + $(INSTALL_DATA) libfrtbegin.a $(DESTDIR)$(glibcpp_toolexeclibdir) + $(RANLIB) $(DESTDIR)$(glibcpp_toolexeclibdir)/libfrtbegin.a + $(INSTALL_DATA) g2c.h $(DESTDIR)$(libsubdir)/include/g2c.h $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@" - @-$(LIBTOOL) --mode=finish $(glibcpp_toolexeclibdir) + @-$(LIBTOOL) --mode=finish $(DESTDIR)$(glibcpp_toolexeclibdir) install-strip: $(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install uninstall: - rm -f $(libsubdir)/include/g2c.h - rm -f $(glibcpp_toolexeclibdir)/libfrtbegin.a - $(LIBTOOL) --mode=uninstall rm -f $(glibcpp_toolexeclibdir)$(LIBG2C_BASE).la + rm -f $(DESTDIR)$(libsubdir)/include/g2c.h + rm -f $(DESTDIR)$(glibcpp_toolexeclibdir)/libfrtbegin.a + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(glibcpp_toolexeclibdir)$(LIBG2C_BASE).la $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@" mostlyclean: diff --git a/libf2c/aclocal.m4 b/libf2c/aclocal.m4 index b7d61e3c5a0..5d39edcfcbe 100644 --- a/libf2c/aclocal.m4 +++ b/libf2c/aclocal.m4 @@ -207,11 +207,12 @@ if test x"$glibcpp_toolexecdir" = x"no"; then if test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)' - glibcpp_toolexeclibdir='$(toolexecdir)/lib$(MULTISUBDIR)' + glibcpp_toolexeclibdir='$(toolexecdir)/lib' else glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' - glibcpp_toolexeclibdir='$(libdir)$(MULTISUBDIR)' + glibcpp_toolexeclibdir='$(libdir)' fi + glibcpp_toolexeclibdir=$glibcpp_toolexeclibdir/`$CC -print-multi-os-directory` fi AC_SUBST(glibcpp_prefixdir) diff --git a/libf2c/configure b/libf2c/configure index af8502045c8..fbc562f5cf5 100755 --- a/libf2c/configure +++ b/libf2c/configure @@ -49,7 +49,6 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= -sitefile= srcdir= target=NONE verbose= @@ -164,7 +163,6 @@ Configuration: --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages - --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -335,11 +333,6 @@ EOF -site=* | --site=* | --sit=*) site="$ac_optarg" ;; - -site-file | --site-file | --site-fil | --site-fi | --site-f) - ac_prev=sitefile ;; - -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) - sitefile="$ac_optarg" ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -505,16 +498,12 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$sitefile"; then - if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -else - CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -642,7 +631,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:646: checking host system type" >&5 +echo "configure:635: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -663,7 +652,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:667: checking target system type" >&5 +echo "configure:656: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -681,7 +670,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:685: checking build system type" >&5 +echo "configure:674: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -713,12 +702,12 @@ else fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:717: checking for Cygwin environment" >&5 +echo "configure:706: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 722 "configure" +#line 711 "configure" #include "confdefs.h" int main() { @@ -729,7 +718,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:733: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -746,19 +735,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:750: checking for mingw32 environment" >&5 +echo "configure:739: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 755 "configure" +#line 744 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:762: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:751: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -793,7 +782,7 @@ esac # be 'cp -p' if linking isn't available. #ac_cv_prog_LN_S='cp -p' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:797: checking whether ln -s works" >&5 +echo "configure:786: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -849,7 +838,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:853: checking for $ac_word" >&5 +echo "configure:842: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -879,7 +868,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:883: checking for $ac_word" >&5 +echo "configure:872: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -928,7 +917,7 @@ fi fi echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:932: checking whether we are using GNU C" >&5 +echo "configure:921: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -937,7 +926,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:941: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:930: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -952,7 +941,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:956: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:945: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -983,7 +972,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:987: checking for $ac_word" >&5 +echo "configure:976: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1015,7 +1004,7 @@ fi # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1019: checking for $ac_word" >&5 +echo "configure:1008: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1047,7 +1036,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1051: checking for $ac_word" >&5 +echo "configure:1040: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1079,7 +1068,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1083: checking for $ac_word" >&5 +echo "configure:1072: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1123,7 +1112,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1127: checking for a BSD compatible install" >&5 +echo "configure:1116: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1191,7 +1180,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1195: checking for executable suffix" >&5 +echo "configure:1184: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1201,10 +1190,10 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.c | *.o | *.obj | *.ilk | *.pdb) ;; + *.c | *.o | *.obj) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -1231,13 +1220,13 @@ glibcpp_toolexeclibdir=no glibcpp_prefixdir=${prefix} echo $ac_n "checking for interface version number""... $ac_c" 1>&6 -echo "configure:1235: checking for interface version number" >&5 +echo "configure:1224: checking for interface version number" >&5 libstdcxx_interface=$INTERFACE echo "$ac_t""$libstdcxx_interface" 1>&6 # Process the option "--enable-version-specific-runtime-libs" echo $ac_n "checking for --enable-version-specific-runtime-libs""... $ac_c" 1>&6 -echo "configure:1241: checking for --enable-version-specific-runtime-libs" >&5 +echo "configure:1230: checking for --enable-version-specific-runtime-libs" >&5 # Check whether --enable-version-specific-runtime-libs or --disable-version-specific-runtime-libs was given. if test "${enable_version_specific_runtime_libs+set}" = set; then enableval="$enable_version_specific_runtime_libs" @@ -1272,11 +1261,12 @@ if test x"$glibcpp_toolexecdir" = x"no"; then if test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)' - glibcpp_toolexeclibdir='$(toolexecdir)/lib$(MULTISUBDIR)' + glibcpp_toolexeclibdir='$(toolexecdir)/lib' else glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' - glibcpp_toolexeclibdir='$(libdir)$(MULTISUBDIR)' + glibcpp_toolexeclibdir='$(libdir)' fi + glibcpp_toolexeclibdir=$glibcpp_toolexeclibdir/`$CC -print-multi-os-directory` fi @@ -1291,7 +1281,7 @@ fi compiler_name=f771 rm -f skip-this-dir echo $ac_n "checking if compiler $compiler_name has been built""... $ac_c" 1>&6 -echo "configure:1295: checking if compiler $compiler_name has been built" >&5 +echo "configure:1285: checking if compiler $compiler_name has been built" >&5 if eval "test \"`echo '$''{'g77_cv_compiler_exists'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1399,7 +1389,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1403: checking for ld used by GCC" >&5 +echo "configure:1393: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1429,10 +1419,10 @@ echo "configure:1403: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1433: checking for GNU ld" >&5 +echo "configure:1423: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1436: checking for non-GNU ld" >&5 +echo "configure:1426: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1467,7 +1457,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1471: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1461: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1484,7 +1474,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1488: checking for $LD option to reload object files" >&5 +echo "configure:1478: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1496,7 +1486,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1500: checking for BSD-compatible nm" >&5 +echo "configure:1490: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1534,7 +1524,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:1538: checking how to recognise dependant libraries" >&5 +echo "configure:1528: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1707,13 +1697,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1711: checking for object suffix" >&5 +echo "configure:1701: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1737,7 +1727,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:1741: checking for ${ac_tool_prefix}file" >&5 +echo "configure:1731: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1799,7 +1789,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:1803: checking for file" >&5 +echo "configure:1793: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1870,7 +1860,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1874: checking for $ac_word" >&5 +echo "configure:1864: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1902,7 +1892,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1906: checking for $ac_word" >&5 +echo "configure:1896: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1937,7 +1927,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1941: checking for $ac_word" >&5 +echo "configure:1931: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1969,7 +1959,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1973: checking for $ac_word" >&5 +echo "configure:1963: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2036,8 +2026,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2040 "configure"' > conftest.$ac_ext - if { (eval echo configure:2041: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2030 "configure"' > conftest.$ac_ext + if { (eval echo configure:2031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2056,7 +2046,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2060: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2050: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2069,12 +2059,54 @@ ia64-*-hpux*) rm -rf conftest* ;; +x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo configure:2066: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + case "`/usr/bin/file conftest.o`" in + *32-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2078: checking whether the C compiler needs -belf" >&5 +echo "configure:2110: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2087,14 +2119,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2091 "configure" +#line 2123 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2218,7 +2250,7 @@ else # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2222: checking for $ac_word" >&5 +echo "configure:2254: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2258,7 +2290,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:2262: checking for a BSD compatible install" >&5 +echo "configure:2294: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2311,7 +2343,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:2315: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:2347: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2340,7 +2372,7 @@ fi # Sanity check for the cross-compilation case: echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2344: checking how to run the C preprocessor" >&5 +echo "configure:2376: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2355,13 +2387,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 2359 "configure" +#line 2391 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2365: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2397: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2372,13 +2404,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 2376 "configure" +#line 2408 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2389,13 +2421,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 2393 "configure" +#line 2425 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2399: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2431: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2421,17 +2453,17 @@ echo "$ac_t""$CPP" 1>&6 ac_safe=`echo "stdio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for stdio.h""... $ac_c" 1>&6 -echo "configure:2425: checking for stdio.h" >&5 +echo "configure:2457: checking for stdio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2430 "configure" +#line 2462 "configure" #include "confdefs.h" #include <stdio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2435: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2467: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2459,12 +2491,12 @@ fi echo $ac_n "checking for built-in g77 integer types""... $ac_c" 1>&6 -echo "configure:2463: checking for built-in g77 integer types" >&5 +echo "configure:2495: checking for built-in g77 integer types" >&5 if eval "test \"`echo '$''{'libf2c_cv_has_g77_builtin_types'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2468 "configure" +#line 2500 "configure" #include "confdefs.h" int main() { @@ -2474,7 +2506,7 @@ __g77_longint g77l; __g77_ulongint g77ul; ; return 0; } EOF -if { (eval echo configure:2478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libf2c_cv_has_g77_builtin_types=yes else @@ -2571,15 +2603,34 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then we branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +cat >confdef2opt.sed <<\_ACEOF +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +t quote +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +t quote +d +: quote +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,\[,\\&,g +s,\],\\&,g +s,\$,$$,g +p +_ACEOF +# We use echo to avoid assuming a particular line-breaking character. +# The extra dot is to prevent the shell from consuming trailing +# line-breaks from the sub-command output. A line-break within +# single-quotes doesn't work because, if this script is created in a +# platform that uses two characters for line-breaks (e.g., DOS), tr +# would break. +ac_LF_and_DOT=`echo; echo .` +DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +rm -f confdef2opt.sed # Without the "./", some shells look in PATH for config.status. diff --git a/libffi/ChangeLog b/libffi/ChangeLog index 8ed3398ea1e..91ae46ba04e 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,63 @@ +2003-01-31 Christian Cornelssen <ccorn@cs.tu-berlin.de>, + Andreas Schwab <schwab@suse.de> + + * configure.in: Adjust command to source config-ml.in to account + for changes to the libffi_basedir definition. + (libffi_basedir): Remove ${srcdir} from value and include trailing + slash if nonempty. + + * configure: Regenerate. + +2003-01-29 Franz Sirl <Franz.Sirl-kernel@lauterbach.com> + + * src/powerpc/ppc_closure.S: Recode to fit shared libs. + +2003-01-28 Andrew Haley <aph@redhat.com> + + * include/ffi.h.in: Enable FFI_CLOSURES for x86_64. + * src/x86/ffi64.c (ffi_prep_closure): New. + (ffi_closure_UNIX64_inner): New. + * src/x86/unix64.S (ffi_closure_UNIX64): New. + +2003-01-22 Andrew Haley <aph@redhat.com> + + * src/powerpc/darwin.S (_ffi_call_AIX): Add Augmentation size to + unwind info. + +2003-01-21 Andreas Tobler <a.tobler@schweiz.ch> + + * src/powerpc/darwin.S: Add unwind info. + * src/powerpc/darwin_closure.S: Likewise. + +2003-01-14 Andrew Haley <aph@redhat.com> + + * src/x86/ffi64.c (ffi_prep_args): Check for void retval. + (ffi_prep_cif_machdep): Likewise. + * src/x86/unix64.S: Add unwind info. + +2003-01-14 Andreas Jaeger <aj@suse.de> + + * src/ffitest.c (main): Only use ffi_closures if those are + supported. + +2003-01-13 Andreas Tobler <a.tobler@schweiz.ch> + + * libffi/src/ffitest.c + add closure testcases + +2003-01-13 Kevin B. Hendricks <khendricks@ivey.uwo.ca> + + * libffi/src/powerpc/ffi.c + fix alignment bug for float (4 byte aligned iso 8 byte) + +2003-01-03 Jeff Sturm <jsturm@one-point.com> + + * include/ffi.h.in: Add closure defines for SPARC, SPARC64. + * src/ffitest.c (main): Use static storage for closure. + * src/sparc/ffi.c (ffi_prep_closure, ffi_closure_sparc_inner): New. + * src/sparc/v8.S (ffi_closure_v8): New. + * src/sparc/v9.S (ffi_closure_v9): New. + 2002-11-10 Ranjit Mathew <rmathew@hotmail.com> * include/ffi.h.in: Added FFI_STDCALL ffi_type diff --git a/libffi/ChangeLog.libgcj b/libffi/ChangeLog.libgcj index 4c5be6d3fd0..751b31b3b2f 100644 --- a/libffi/ChangeLog.libgcj +++ b/libffi/ChangeLog.libgcj @@ -1,3 +1,10 @@ +2002-01-27 Alexandre Oliva <aoliva@redhat.com> + + * configure.in (toolexecdir, toolexeclibdir): Set and AC_SUBST. + Remove USE_LIBDIR conditional. + * Makefile.am (toolexecdir, toolexeclibdir): Don't override. + * Makefile.in, configure: Rebuilt. + Mon Aug 9 18:33:38 1999 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> * include/Makefile.in: Rebuilt. diff --git a/libffi/Makefile.am b/libffi/Makefile.am index 9ee70acc02f..8cae05309bb 100644 --- a/libffi/Makefile.am +++ b/libffi/Makefile.am @@ -76,15 +76,6 @@ MULTISUBDIR = MULTIDO = true MULTICLEAN = true -## Install a library built with a cross compiler in tooldir, not -## libdir. -if USE_LIBDIR -toolexeclibdir = $(libdir)$(MULTISUBDIR) -else -toolexecdir = $(exec_prefix)/$(target_alias) -toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR) -endif - toolexeclib_LTLIBRARIES = libffi.la noinst_LTLIBRARIES = libffi_convenience.la diff --git a/libffi/Makefile.in b/libffi/Makefile.in index 37adbf795a4..598d683d7b7 100644 --- a/libffi/Makefile.in +++ b/libffi/Makefile.in @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am +# Makefile.in generated automatically by automake 1.4 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -80,6 +80,8 @@ TARGET = @TARGET@ TARGETDIR = @TARGETDIR@ VERSION = @VERSION@ libffi_basedir = @libffi_basedir@ +toolexecdir = @toolexecdir@ +toolexeclibdir = @toolexeclibdir@ AUTOMAKE_OPTIONS = cygnus @@ -152,9 +154,6 @@ MULTIDIRS = MULTISUBDIR = MULTIDO = true MULTICLEAN = true -@USE_LIBDIR_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR) -@USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR) -@USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias) toolexeclib_LTLIBRARIES = libffi.la noinst_LTLIBRARIES = libffi_convenience.la @@ -216,7 +215,7 @@ libffi_la_common_SOURCES = src/debug.c src/prep_cif.c src/types.c \ @ARM_TRUE@libffi_convenience_la_SOURCES = @ARM_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_ARM) @S390_TRUE@libffi_convenience_la_SOURCES = @S390_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_S390) @X86_64_TRUE@libffi_convenience_la_SOURCES = @X86_64_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_X86_64) -@SH_TRUE@libffi_convenience_la_SOURCES = @SH_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_SH) +@SH_TRUE@libfficonvenience_la_SOURCES = @SH_TRUE@$(libffi_la_common_SOURCES) $(TARGET_SRC_SH) AM_CFLAGS = -fexceptions @@ -224,7 +223,7 @@ libffi_la_LDFLAGS = -release $(VERSION) INCLUDES = -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs +mkinstalldirs = $(SHELL) $(top_srcdir)/${libffi_basedir}/../mkinstalldirs CONFIG_HEADER = fficonfig.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) $(toolexeclib_LTLIBRARIES) @@ -236,112 +235,112 @@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ libffi_convenience_la_LDFLAGS = libffi_convenience_la_LIBADD = -@MIPS_GCC_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \ -@MIPS_GCC_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \ -@MIPS_GCC_TRUE@src/java_raw_api.lo src/mips/ffi.lo src/mips/o32.lo \ -@MIPS_GCC_TRUE@src/mips/n32.lo -@POWERPC_AIX_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \ -@POWERPC_AIX_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \ -@POWERPC_AIX_TRUE@src/java_raw_api.lo src/powerpc/ffi_darwin.lo \ -@POWERPC_AIX_TRUE@src/powerpc/aix.lo src/powerpc/aix_closures.lo @ALPHA_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \ @ALPHA_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \ @ALPHA_TRUE@src/java_raw_api.lo src/alpha/ffi.lo src/alpha/osf.lo @IA64_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo src/prep_cif.lo \ @IA64_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ @IA64_TRUE@src/ia64/ffi.lo src/ia64/unix.lo -@POWERPC_DARWIN_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \ -@POWERPC_DARWIN_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \ -@POWERPC_DARWIN_TRUE@src/java_raw_api.lo src/powerpc/ffi_darwin.lo \ -@POWERPC_DARWIN_TRUE@src/powerpc/darwin.lo \ -@POWERPC_DARWIN_TRUE@src/powerpc/darwin_closure.lo -@MIPS_SGI_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \ -@MIPS_SGI_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \ -@MIPS_SGI_TRUE@src/java_raw_api.lo src/mips/ffi.lo src/mips/o32.lo \ -@MIPS_SGI_TRUE@src/mips/n32.lo -@MIPS_LINUX_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \ -@MIPS_LINUX_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \ -@MIPS_LINUX_TRUE@src/java_raw_api.lo src/mips/ffi.lo src/mips/o32.lo +@MIPS_GCC_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \ +@MIPS_GCC_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \ +@MIPS_GCC_TRUE@src/java_raw_api.lo src/mips/ffi.lo src/mips/o32.lo \ +@MIPS_GCC_TRUE@src/mips/n32.lo @S390_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo src/prep_cif.lo \ @S390_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ @S390_TRUE@src/s390/sysv.lo src/s390/ffi.lo -@SH_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo src/prep_cif.lo \ -@SH_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ -@SH_TRUE@src/sh/sysv.lo src/sh/ffi.lo +@M68K_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo src/prep_cif.lo \ +@M68K_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ +@M68K_TRUE@src/m68k/ffi.lo src/m68k/sysv.lo @X86_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo src/prep_cif.lo \ @X86_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ @X86_TRUE@src/x86/ffi.lo src/x86/sysv.lo -@X86_WIN32_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \ -@X86_WIN32_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \ -@X86_WIN32_TRUE@src/java_raw_api.lo src/x86/ffi.lo src/x86/win32.lo -@ARM_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo src/prep_cif.lo \ -@ARM_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ -@ARM_TRUE@src/arm/sysv.lo src/arm/ffi.lo @POWERPC_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \ @POWERPC_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \ @POWERPC_TRUE@src/java_raw_api.lo src/powerpc/ffi.lo \ @POWERPC_TRUE@src/powerpc/sysv.lo src/powerpc/ppc_closure.lo +@MIPS_LINUX_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \ +@MIPS_LINUX_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \ +@MIPS_LINUX_TRUE@src/java_raw_api.lo src/mips/ffi.lo src/mips/o32.lo +@X86_WIN32_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \ +@X86_WIN32_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \ +@X86_WIN32_TRUE@src/java_raw_api.lo src/x86/ffi.lo src/x86/win32.lo +@X86_64_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \ +@X86_64_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \ +@X86_64_TRUE@src/java_raw_api.lo src/x86/ffi64.lo src/x86/unix64.lo \ +@X86_64_TRUE@src/x86/ffi.lo src/x86/sysv.lo @SPARC_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \ @SPARC_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \ @SPARC_TRUE@src/java_raw_api.lo src/sparc/ffi.lo src/sparc/v8.lo \ @SPARC_TRUE@src/sparc/v9.lo -@M68K_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo src/prep_cif.lo \ -@M68K_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ -@M68K_TRUE@src/m68k/ffi.lo src/m68k/sysv.lo +@POWERPC_AIX_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \ +@POWERPC_AIX_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \ +@POWERPC_AIX_TRUE@src/java_raw_api.lo src/powerpc/ffi_darwin.lo \ +@POWERPC_AIX_TRUE@src/powerpc/aix.lo src/powerpc/aix_closures.lo +@MIPS_SGI_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \ +@MIPS_SGI_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \ +@MIPS_SGI_TRUE@src/java_raw_api.lo src/mips/ffi.lo src/mips/o32.lo \ +@MIPS_SGI_TRUE@src/mips/n32.lo +@POWERPC_DARWIN_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo \ +@POWERPC_DARWIN_TRUE@src/prep_cif.lo src/types.lo src/raw_api.lo \ +@POWERPC_DARWIN_TRUE@src/java_raw_api.lo src/powerpc/ffi_darwin.lo \ +@POWERPC_DARWIN_TRUE@src/powerpc/darwin.lo \ +@POWERPC_DARWIN_TRUE@src/powerpc/darwin_closure.lo +@ARM_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo src/prep_cif.lo \ +@ARM_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ +@ARM_TRUE@src/arm/sysv.lo src/arm/ffi.lo libffi_la_LIBADD = -@MIPS_GCC_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \ -@MIPS_GCC_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ -@MIPS_GCC_TRUE@src/mips/ffi.lo src/mips/o32.lo src/mips/n32.lo -@POWERPC_AIX_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \ -@POWERPC_AIX_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ -@POWERPC_AIX_TRUE@src/powerpc/ffi_darwin.lo src/powerpc/aix.lo \ -@POWERPC_AIX_TRUE@src/powerpc/aix_closures.lo -@ALPHA_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \ -@ALPHA_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ -@ALPHA_TRUE@src/alpha/ffi.lo src/alpha/osf.lo +@SH_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo src/types.lo \ +@SH_TRUE@src/raw_api.lo src/java_raw_api.lo src/sh/sysv.lo \ +@SH_TRUE@src/sh/ffi.lo @IA64_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \ @IA64_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ @IA64_TRUE@src/ia64/ffi.lo src/ia64/unix.lo -@POWERPC_DARWIN_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \ -@POWERPC_DARWIN_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ -@POWERPC_DARWIN_TRUE@src/powerpc/ffi_darwin.lo src/powerpc/darwin.lo \ -@POWERPC_DARWIN_TRUE@src/powerpc/darwin_closure.lo -@MIPS_SGI_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \ -@MIPS_SGI_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ -@MIPS_SGI_TRUE@src/mips/ffi.lo src/mips/o32.lo src/mips/n32.lo -@MIPS_LINUX_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \ -@MIPS_LINUX_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ -@MIPS_LINUX_TRUE@src/mips/ffi.lo src/mips/o32.lo -@S390_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \ -@S390_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ -@S390_TRUE@src/s390/sysv.lo src/s390/ffi.lo -@X86_64_TRUE@libffi_convenience_la_OBJECTS = src/debug.lo src/prep_cif.lo \ -@X86_64_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ -@X86_64_TRUE@src/x86/ffi.lo src/x86/sysv.lo src/x86/unix64.lo src/x86/ffi64.lo -@SH_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo src/types.lo \ -@SH_TRUE@src/raw_api.lo src/java_raw_api.lo src/sh/sysv.lo src/sh/ffi.lo @X86_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo src/types.lo \ @X86_TRUE@src/raw_api.lo src/java_raw_api.lo src/x86/ffi.lo \ @X86_TRUE@src/x86/sysv.lo -@X86_WIN32_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \ -@X86_WIN32_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ -@X86_WIN32_TRUE@src/x86/ffi.lo src/x86/win32.lo -@ARM_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo src/types.lo \ -@ARM_TRUE@src/raw_api.lo src/java_raw_api.lo src/arm/sysv.lo \ -@ARM_TRUE@src/arm/ffi.lo @POWERPC_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \ @POWERPC_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ @POWERPC_TRUE@src/powerpc/ffi.lo src/powerpc/sysv.lo \ @POWERPC_TRUE@src/powerpc/ppc_closure.lo +@MIPS_LINUX_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \ +@MIPS_LINUX_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ +@MIPS_LINUX_TRUE@src/mips/ffi.lo src/mips/o32.lo @SPARC_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \ @SPARC_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ @SPARC_TRUE@src/sparc/ffi.lo src/sparc/v8.lo src/sparc/v9.lo +@POWERPC_AIX_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \ +@POWERPC_AIX_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ +@POWERPC_AIX_TRUE@src/powerpc/ffi_darwin.lo src/powerpc/aix.lo \ +@POWERPC_AIX_TRUE@src/powerpc/aix_closures.lo +@MIPS_SGI_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \ +@MIPS_SGI_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ +@MIPS_SGI_TRUE@src/mips/ffi.lo src/mips/o32.lo src/mips/n32.lo +@ARM_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo src/types.lo \ +@ARM_TRUE@src/raw_api.lo src/java_raw_api.lo src/arm/sysv.lo \ +@ARM_TRUE@src/arm/ffi.lo +@ALPHA_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \ +@ALPHA_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ +@ALPHA_TRUE@src/alpha/ffi.lo src/alpha/osf.lo +@MIPS_GCC_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \ +@MIPS_GCC_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ +@MIPS_GCC_TRUE@src/mips/ffi.lo src/mips/o32.lo src/mips/n32.lo +@S390_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \ +@S390_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ +@S390_TRUE@src/s390/sysv.lo src/s390/ffi.lo @M68K_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \ @M68K_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ @M68K_TRUE@src/m68k/ffi.lo src/m68k/sysv.lo -@X86_64_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo src/types.lo \ -@X86_64_TRUE@src/raw_api.lo src/java_raw_api.lo src/x86/ffi.lo \ -@X86_64_TRUE@src/x86/sysv.lo src/x86/unix64.lo src/x86/ffi64.lo +@X86_WIN32_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \ +@X86_WIN32_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ +@X86_WIN32_TRUE@src/x86/ffi.lo src/x86/win32.lo +@X86_64_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \ +@X86_64_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ +@X86_64_TRUE@src/x86/ffi64.lo src/x86/unix64.lo src/x86/ffi.lo \ +@X86_64_TRUE@src/x86/sysv.lo +@POWERPC_DARWIN_TRUE@libffi_la_OBJECTS = src/debug.lo src/prep_cif.lo \ +@POWERPC_DARWIN_TRUE@src/types.lo src/raw_api.lo src/java_raw_api.lo \ +@POWERPC_DARWIN_TRUE@src/powerpc/ffi_darwin.lo src/powerpc/darwin.lo \ +@POWERPC_DARWIN_TRUE@src/powerpc/darwin_closure.lo noinst_PROGRAMS = ffitest$(EXEEXT) PROGRAMS = $(noinst_PROGRAMS) @@ -524,7 +523,7 @@ maintainer-clean-recursive: dot_seen=no; \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev="$$subdir $$rev"; \ - test "$$subdir" != "." || dot_seen=yes; \ + test "$$subdir" = "." && dot_seen=yes; \ done; \ test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ @@ -617,7 +616,7 @@ distdir: $(DISTFILES) -chmod 777 $(distdir) $(mkinstalldirs) $(distdir)/src/alpha $(distdir)/src/arm \ $(distdir)/src/m68k $(distdir)/src/mips \ - $(distdir)/src/powerpc $(distdir)/src/s390 \ + $(distdir)/src/powerpc $(distdir)/src/s390 $(distdir)/src/sh \ $(distdir)/src/sparc $(distdir)/src/x86 @for file in $(DISTFILES); do \ if test -f $$file; then d=.; else d=$(srcdir); fi; \ diff --git a/libffi/configure b/libffi/configure index 13a6187c2b4..8b1f9a7f296 100755 --- a/libffi/configure +++ b/libffi/configure @@ -53,7 +53,6 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= -sitefile= srcdir= target=NONE verbose= @@ -168,7 +167,6 @@ Configuration: --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages - --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -339,11 +337,6 @@ EOF -site=* | --site=* | --sit=*) site="$ac_optarg" ;; - -site-file | --site-file | --site-fil | --site-fi | --site-f) - ac_prev=sitefile ;; - -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) - sitefile="$ac_optarg" ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -509,16 +502,12 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$sitefile"; then - if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -else - CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -557,12 +546,12 @@ else fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:561: checking for Cygwin environment" >&5 +echo "configure:550: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 566 "configure" +#line 555 "configure" #include "confdefs.h" int main() { @@ -573,7 +562,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -590,19 +579,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:594: checking for mingw32 environment" >&5 +echo "configure:583: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 599 "configure" +#line 588 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -644,16 +633,16 @@ fi if test "${srcdir}" = "."; then if test "${with_target_subdir}" != "."; then - libffi_basedir="${srcdir}/${with_multisrctop}.." + libffi_basedir="${with_multisrctop}.." else - libffi_basedir="${srcdir}/${with_multisrctop}" + libffi_basedir="${with_multisrctop}" fi else - libffi_basedir="${srcdir}" + libffi_basedir= fi ac_aux_dir= -for ac_dir in ${libffi_basedir}/.. $srcdir/${libffi_basedir}/..; do +for ac_dir in ${libffi_basedir}.. $srcdir/${libffi_basedir}..; do if test -f $ac_dir/install-sh; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -665,7 +654,7 @@ for ac_dir in ${libffi_basedir}/.. $srcdir/${libffi_basedir}/..; do fi done if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in ${libffi_basedir}/.. $srcdir/${libffi_basedir}/.." 1>&2; exit 1; } + { echo "configure: error: can not find install-sh or install.sh in ${libffi_basedir}.. $srcdir/${libffi_basedir}.." 1>&2; exit 1; } fi ac_config_guess=$ac_aux_dir/config.guess ac_config_sub=$ac_aux_dir/config.sub @@ -679,7 +668,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:683: checking host system type" >&5 +echo "configure:672: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -770,7 +759,7 @@ else fi echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:774: checking build system type" >&5 +echo "configure:763: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -790,7 +779,7 @@ echo "$ac_t""$build" 1>&6 # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:794: checking for $ac_word" >&5 +echo "configure:783: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -820,7 +809,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:824: checking for $ac_word" >&5 +echo "configure:813: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -871,7 +860,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:875: checking for $ac_word" >&5 +echo "configure:864: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -903,7 +892,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:907: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:896: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -914,12 +903,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 918 "configure" +#line 907 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -945,12 +934,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:949: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:938: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:954: checking whether we are using GNU C" >&5 +echo "configure:943: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -959,7 +948,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:952: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -978,7 +967,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:982: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:971: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1021,7 +1010,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1025: checking for ld used by GCC" >&5 +echo "configure:1014: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1051,10 +1040,10 @@ echo "configure:1025: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1055: checking for GNU ld" >&5 +echo "configure:1044: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1058: checking for non-GNU ld" >&5 +echo "configure:1047: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1089,7 +1078,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1093: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1082: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1106,7 +1095,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1110: checking for $LD option to reload object files" >&5 +echo "configure:1099: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1118,7 +1107,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1122: checking for BSD-compatible nm" >&5 +echo "configure:1111: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1156,7 +1145,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1160: checking whether ln -s works" >&5 +echo "configure:1149: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1177,7 +1166,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:1181: checking how to recognise dependant libraries" >&5 +echo "configure:1170: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1350,13 +1339,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1354: checking for object suffix" >&5 +echo "configure:1343: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1376,7 +1365,7 @@ ac_objext=$ac_cv_objext echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1380: checking for executable suffix" >&5 +echo "configure:1369: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1386,10 +1375,10 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.c | *.o | *.obj | *.ilk | *.pdb) ;; + *.c | *.o | *.obj) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -1419,7 +1408,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:1423: checking for ${ac_tool_prefix}file" >&5 +echo "configure:1412: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1481,7 +1470,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:1485: checking for file" >&5 +echo "configure:1474: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1552,7 +1541,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1556: checking for $ac_word" >&5 +echo "configure:1545: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1584,7 +1573,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1588: checking for $ac_word" >&5 +echo "configure:1577: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1619,7 +1608,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1623: checking for $ac_word" >&5 +echo "configure:1612: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1651,7 +1640,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1655: checking for $ac_word" >&5 +echo "configure:1644: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1718,8 +1707,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1722 "configure"' > conftest.$ac_ext - if { (eval echo configure:1723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1711 "configure"' > conftest.$ac_ext + if { (eval echo configure:1712: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -1738,7 +1727,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:1742: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:1731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -1751,12 +1740,54 @@ ia64-*-hpux*) rm -rf conftest* ;; +x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo configure:1747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + case "`/usr/bin/file conftest.o`" in + *32-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:1760: checking whether the C compiler needs -belf" >&5 +echo "configure:1791: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1769,14 +1800,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 1773 "configure" +#line 1804 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:1780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -1904,7 +1935,7 @@ exec 5>>./config.log # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1908: checking for a BSD compatible install" >&5 +echo "configure:1939: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1957,7 +1988,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:1961: checking whether build environment is sane" >&5 +echo "configure:1992: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -2014,7 +2045,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:2018: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:2049: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2053,7 +2084,7 @@ fi missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:2057: checking for working aclocal" >&5 +echo "configure:2088: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -2066,7 +2097,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:2070: checking for working autoconf" >&5 +echo "configure:2101: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -2079,7 +2110,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:2083: checking for working automake" >&5 +echo "configure:2114: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -2092,7 +2123,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:2096: checking for working autoheader" >&5 +echo "configure:2127: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -2105,7 +2136,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:2109: checking for working makeinfo" >&5 +echo "configure:2140: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -2122,7 +2153,7 @@ fi echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:2126: checking for executable suffix" >&5 +echo "configure:2157: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2132,10 +2163,10 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:2136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:2167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.c | *.o | *.obj | *.ilk | *.pdb) ;; + *.c | *.o | *.obj) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -2153,7 +2184,7 @@ echo "$ac_t""${ac_cv_exeext}" 1>&6 ac_exeext=$EXEEXT echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:2157: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:2188: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -2179,7 +2210,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2183: checking for $ac_word" >&5 +echo "configure:2214: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2209,7 +2240,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2213: checking for $ac_word" >&5 +echo "configure:2244: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2260,7 +2291,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2264: checking for $ac_word" >&5 +echo "configure:2295: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2292,7 +2323,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2296: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2327: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2303,12 +2334,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 2307 "configure" +#line 2338 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2334,12 +2365,12 @@ if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2338: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2369: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2343: checking whether we are using GNU C" >&5 +echo "configure:2374: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2348,7 +2379,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2352: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2367,7 +2398,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2371: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2402: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2590,7 +2621,7 @@ if test x$TARGET = xMIPS_LINUX; then fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2594: checking how to run the C preprocessor" >&5 +echo "configure:2625: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2605,13 +2636,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 2609 "configure" +#line 2640 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2646: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2622,13 +2653,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 2626 "configure" +#line 2657 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2632: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2663: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2639,13 +2670,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 2643 "configure" +#line 2674 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2670,12 +2701,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2674: checking for ANSI C header files" >&5 +echo "configure:2705: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2679 "configure" +#line 2710 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -2683,7 +2714,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2687: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2700,7 +2731,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 2704 "configure" +#line 2735 "configure" #include "confdefs.h" #include <string.h> EOF @@ -2718,7 +2749,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 2722 "configure" +#line 2753 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -2739,7 +2770,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 2743 "configure" +#line 2774 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2750,7 +2781,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2776,12 +2807,12 @@ fi for ac_func in memcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2780: checking for $ac_func" >&5 +echo "configure:2811: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2785 "configure" +#line 2816 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2804,7 +2835,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2831,19 +2862,19 @@ done # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:2835: checking for working alloca.h" >&5 +echo "configure:2866: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2840 "configure" +#line 2871 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:2847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2878: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -2864,12 +2895,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2868: checking for alloca" >&5 +echo "configure:2899: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2873 "configure" +#line 2904 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -2897,7 +2928,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:2901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -2929,12 +2960,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:2933: checking whether alloca needs Cray hooks" >&5 +echo "configure:2964: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2938 "configure" +#line 2969 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -2959,12 +2990,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2963: checking for $ac_func" >&5 +echo "configure:2994: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2968 "configure" +#line 2999 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2987,7 +3018,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3014,7 +3045,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:3018: checking stack direction for C alloca" >&5 +echo "configure:3049: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3022,7 +3053,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 3026 "configure" +#line 3057 "configure" #include "confdefs.h" find_stack_direction () { @@ -3041,7 +3072,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:3045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -3064,13 +3095,13 @@ fi echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:3068: checking size of short" >&5 +echo "configure:3099: checking size of short" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 12 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext <<EOF -#line 3074 "configure" +#line 3105 "configure" #include "confdefs.h" #include "confdefs.h" #include <sys/types.h> @@ -3080,7 +3111,7 @@ int main() { switch (0) case 0: case (sizeof (short) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:3084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3115: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_short=$ac_size else @@ -3103,13 +3134,13 @@ EOF echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:3107: checking size of int" >&5 +echo "configure:3138: checking size of int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 12 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext <<EOF -#line 3113 "configure" +#line 3144 "configure" #include "confdefs.h" #include "confdefs.h" #include <sys/types.h> @@ -3119,7 +3150,7 @@ int main() { switch (0) case 0: case (sizeof (int) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:3123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_int=$ac_size else @@ -3142,13 +3173,13 @@ EOF echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:3146: checking size of long" >&5 +echo "configure:3177: checking size of long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 12 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext <<EOF -#line 3152 "configure" +#line 3183 "configure" #include "confdefs.h" #include "confdefs.h" #include <sys/types.h> @@ -3158,7 +3189,7 @@ int main() { switch (0) case 0: case (sizeof (long) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:3162: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3193: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_long=$ac_size else @@ -3181,13 +3212,13 @@ EOF echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:3185: checking size of long long" >&5 +echo "configure:3216: checking size of long long" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 12 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext <<EOF -#line 3191 "configure" +#line 3222 "configure" #include "confdefs.h" #include "confdefs.h" #include <sys/types.h> @@ -3197,7 +3228,7 @@ int main() { switch (0) case 0: case (sizeof (long long) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:3201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_long_long=$ac_size else @@ -3220,13 +3251,13 @@ EOF echo $ac_n "checking size of float""... $ac_c" 1>&6 -echo "configure:3224: checking size of float" >&5 +echo "configure:3255: checking size of float" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_float'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 12 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext <<EOF -#line 3230 "configure" +#line 3261 "configure" #include "confdefs.h" #include "confdefs.h" #include <sys/types.h> @@ -3236,7 +3267,7 @@ int main() { switch (0) case 0: case (sizeof (float) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:3240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_float=$ac_size else @@ -3259,13 +3290,13 @@ EOF echo $ac_n "checking size of double""... $ac_c" 1>&6 -echo "configure:3263: checking size of double" >&5 +echo "configure:3294: checking size of double" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 12 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext <<EOF -#line 3269 "configure" +#line 3300 "configure" #include "confdefs.h" #include "confdefs.h" #include <sys/types.h> @@ -3275,7 +3306,7 @@ int main() { switch (0) case 0: case (sizeof (double) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:3279: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_double=$ac_size else @@ -3298,13 +3329,13 @@ EOF echo $ac_n "checking size of long double""... $ac_c" 1>&6 -echo "configure:3302: checking size of long double" >&5 +echo "configure:3333: checking size of long double" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_double'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 12 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext <<EOF -#line 3308 "configure" +#line 3339 "configure" #include "confdefs.h" #include "confdefs.h" #include <sys/types.h> @@ -3314,7 +3345,7 @@ int main() { switch (0) case 0: case (sizeof (long double) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:3318: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_long_double=$ac_size else @@ -3338,13 +3369,13 @@ EOF echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:3342: checking size of void *" >&5 +echo "configure:3373: checking size of void *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 12 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext <<EOF -#line 3348 "configure" +#line 3379 "configure" #include "confdefs.h" #include "confdefs.h" #include <sys/types.h> @@ -3354,7 +3385,7 @@ int main() { switch (0) case 0: case (sizeof (void *) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:3358: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3389: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_void_p=$ac_size else @@ -3377,14 +3408,14 @@ EOF echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3381: checking whether byte ordering is bigendian" >&5 +echo "configure:3412: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 3388 "configure" +#line 3419 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -3395,11 +3426,11 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:3399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 3403 "configure" +#line 3434 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -3410,7 +3441,7 @@ int main() { #endif ; return 0; } EOF -if { (eval echo configure:3414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -3430,7 +3461,7 @@ if test "$cross_compiling" = yes; then echo $ac_n "cross-compiling... " 2>&6 else cat > conftest.$ac_ext <<EOF -#line 3434 "configure" +#line 3465 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -3443,7 +3474,7 @@ main () { exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:3447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian=no else @@ -3461,7 +3492,7 @@ fi echo "$ac_t""$ac_cv_c_bigendian" 1>&6 if test $ac_cv_c_bigendian = unknown; then echo $ac_n "checking to probe for byte ordering""... $ac_c" 1>&6 -echo "configure:3465: checking to probe for byte ordering" >&5 +echo "configure:3496: checking to probe for byte ordering" >&5 cat >conftest.c <<EOF short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; @@ -3511,7 +3542,7 @@ fi if test x$TARGET = xSPARC; then echo $ac_n "checking assembler and linker support unaligned pc related relocs""... $ac_c" 1>&6 -echo "configure:3515: checking assembler and linker support unaligned pc related relocs" >&5 +echo "configure:3546: checking assembler and linker support unaligned pc related relocs" >&5 if eval "test \"`echo '$''{'libffi_cv_as_sparc_ua_pcrel'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3521,14 +3552,14 @@ else CFLAGS="$CFLAGS -fpic" LDFLAGS="$LDFLAGS -shared" cat > conftest.$ac_ext <<EOF -#line 3525 "configure" +#line 3556 "configure" #include "confdefs.h" asm (".text; foo: nop; .data; .align 4; .byte 0; .uaword %r_disp32(foo); .text"); int main() { ; return 0; } EOF -if { (eval echo configure:3532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* libffi_cv_as_sparc_ua_pcrel=yes else @@ -3604,15 +3635,17 @@ EOF fi - - -if test -z "$with_cross_host"; then - USE_LIBDIR_TRUE= - USE_LIBDIR_FALSE='#' +if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + toolexecdir='$(exec_prefix)/$(target_alias)' + toolexeclibdir='$(toolexecdir)/lib' else - USE_LIBDIR_TRUE='#' - USE_LIBDIR_FALSE= + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' fi +toolexeclibdir=$toolexeclibdir/`$CC -print-multi-os-directory` + + if test "${multilib}" = "yes"; then multilib_arg="--enable-multilib" @@ -3821,8 +3854,8 @@ s%@CPP@%$CPP%g s%@ALLOCA@%$ALLOCA%g s%@TARGET@%$TARGET%g s%@TARGETDIR@%$TARGETDIR%g -s%@USE_LIBDIR_TRUE@%$USE_LIBDIR_TRUE%g -s%@USE_LIBDIR_FALSE@%$USE_LIBDIR_FALSE%g +s%@toolexecdir@%$toolexecdir%g +s%@toolexeclibdir@%$toolexeclibdir%g CEOF EOF @@ -4057,7 +4090,7 @@ test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h if test -n "$CONFIG_FILES"; then LD="${ORIGINAL_LD_FOR_MULTILIBS}" - ac_file=Makefile . ${libffi_basedir}/../config-ml.in + ac_file=Makefile . ${srcdir}/${libffi_basedir}/../config-ml.in fi exit 0 diff --git a/libffi/configure.in b/libffi/configure.in index 3dccbeb85b3..2b6dea9b2dd 100644 --- a/libffi/configure.in +++ b/libffi/configure.in @@ -22,12 +22,12 @@ dnl --with-target-subdir, --with-multisrctop, --with-multisubdir if test "${srcdir}" = "."; then if test "${with_target_subdir}" != "."; then - libffi_basedir="${srcdir}/${with_multisrctop}.." + libffi_basedir="${with_multisrctop}.." else - libffi_basedir="${srcdir}/${with_multisrctop}" + libffi_basedir="${with_multisrctop}" fi else - libffi_basedir="${srcdir}" + libffi_basedir= fi AC_SUBST(libffi_basedir) AC_CONFIG_AUX_DIR(${libffi_basedir}/..) @@ -164,7 +164,17 @@ AC_ARG_ENABLE(purify-safety, AC_DEFINE(USING_PURIFY) fi) -AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host") +if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + toolexecdir='$(exec_prefix)/$(target_alias)' + toolexeclibdir='$(toolexecdir)/lib' +else + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' +fi +toolexeclibdir=$toolexeclibdir/`$CC -print-multi-os-directory` +AC_SUBST(toolexecdir) +AC_SUBST(toolexeclibdir) if test "${multilib}" = "yes"; then multilib_arg="--enable-multilib" @@ -176,7 +186,7 @@ AC_OUTPUT(include/Makefile include/ffi.h Makefile, [ if test -n "$CONFIG_FILES"; then LD="${ORIGINAL_LD_FOR_MULTILIBS}" - ac_file=Makefile . ${libffi_basedir}/../config-ml.in + ac_file=Makefile . ${srcdir}${libffi_basedir}/../config-ml.in fi ], srcdir=${srcdir} diff --git a/libffi/include/ffi.h.in b/libffi/include/ffi.h.in index c660ede75af..02853846c9f 100644 --- a/libffi/include/ffi.h.in +++ b/libffi/include/ffi.h.in @@ -1,5 +1,5 @@ /* -----------------------------------------------------------------*-C-*- - libffi @VERSION@ - Copyright (c) 1996-2002 Cygnus Solutions + libffi @VERSION@ - Copyright (c) 1996-2003 Cygnus Solutions Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -443,6 +443,18 @@ struct ffi_ia64_trampoline_struct { #define FFI_TRAMPOLINE_SIZE 24 /* see struct below */ #define FFI_NATIVE_RAW_API 0 +#elif defined(SPARC64) + +#define FFI_CLOSURES 1 +#define FFI_TRAMPOLINE_SIZE 24 +#define FFI_NATIVE_RAW_API 0 + +#elif defined(SPARC) + +#define FFI_CLOSURES 1 +#define FFI_TRAMPOLINE_SIZE 16 +#define FFI_NATIVE_RAW_API 0 + #elif defined(S390) #define FFI_CLOSURES 1 @@ -459,6 +471,12 @@ struct ffi_ia64_trampoline_struct { #define FFI_TRAMPOLINE_SIZE 16 #define FFI_NATIVE_RAW_API 0 +#elif defined(__x86_64__) + +#define FFI_CLOSURES 1 +#define FFI_TRAMPOLINE_SIZE 24 +#define FFI_NATIVE_RAW_API 0 + #else #define FFI_CLOSURES 0 diff --git a/libffi/src/ffitest.c b/libffi/src/ffitest.c index da528317bb3..a05b746865d 100644 --- a/libffi/src/ffitest.c +++ b/libffi/src/ffitest.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------- - ffitest.c - Copyright (c) 1996, 1997, 1998, 2002 Red Hat, Inc. + ffitest.c - Copyright (c) 1996, 1997, 1998, 2002, 2003 Red Hat, Inc. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the @@ -288,10 +288,121 @@ static test_structure_9 struct9 (test_structure_9 ts) static void closure_test_fn(ffi_cif* cif,void* resp,void** args, void* userdata) { - *(ffi_arg*)resp = *(int*)args[0] + (int)(*(float*)args[1]) + (int)(long)userdata; + *(ffi_arg*)resp = + (int)*(unsigned long long *)args[0] + (int)(*(int *)args[1]) + + (int)(*(unsigned long long *)args[2]) + (int)*(int *)args[3] + + (int)(*(signed short *)args[4]) + + (int)(*(unsigned long long *)args[5]) + + (int)*(int *)args[6] + (int)(*(int *)args[7]) + + (int)(*(double *)args[8]) + (int)*(int *)args[9] + + (int)(*(int *)args[10]) + (int)(*(float *)args[11]) + + (int)*(int *)args[12] + (int)(*(int *)args[13]) + + (int)(*(int *)args[14]) + *(int *)args[15] + (int)(long)userdata; + + printf("%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d: %d\n", + (int)*(unsigned long long *)args[0], (int)(*(int *)args[1]), + (int)(*(unsigned long long *)args[2]), + (int)*(int *)args[3], (int)(*(signed short *)args[4]), + (int)(*(unsigned long long *)args[5]), + (int)*(int *)args[6], (int)(*(int *)args[7]), + (int)(*(double *)args[8]), (int)*(int *)args[9], + (int)(*(int *)args[10]), (int)(*(float *)args[11]), + (int)*(int *)args[12], (int)(*(int *)args[13]), + (int)(*(int *)args[14]),*(int *)args[15], + (int)(long)userdata, *(int*)resp); } -typedef int (*closure_test_type)(int, float); +typedef int (*closure_test_type)(unsigned long long, int, unsigned long long, + int, signed short, unsigned long long, int, + int, double, int, int, float, int, int, + int, int); + +static void closure_test_fn1(ffi_cif* cif,void* resp,void** args, + void* userdata) + { + *(ffi_arg*)resp = + (int)*(float *)args[0] +(int)(*(float *)args[1]) + + (int)(*(float *)args[2]) + (int)*(float *)args[3] + + (int)(*(signed short *)args[4]) + (int)(*(float *)args[5]) + + (int)*(float *)args[6] + (int)(*(int *)args[7]) + + (int)(*(double*)args[8]) + (int)*(int *)args[9] + + (int)(*(int *)args[10]) + (int)(*(float *)args[11]) + + (int)*(int *)args[12] + (int)(*(int *)args[13]) + + (int)(*(int *)args[14]) + *(int *)args[15] + (int)(long)userdata; + + printf("%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d: %d\n", + (int)*(float *)args[0], (int)(*(float *)args[1]), + (int)(*(float *)args[2]), (int)*(float *)args[3], + (int)(*(signed short *)args[4]), (int)(*(float *)args[5]), + (int)*(float *)args[6], (int)(*(int *)args[7]), + (int)(*(double *)args[8]), (int)*(int *)args[9], + (int)(*(int *)args[10]), (int)(*(float *)args[11]), + (int)*(int *)args[12], (int)(*(int *)args[13]), + (int)(*(int *)args[14]), *(int *)args[15], + (int)(long)userdata, *(int*)resp); +} + +typedef int (*closure_test_type1)(float, float, float, float, signed short, + float, float, int, double, int, int, float, + int, int, int, int); + +static void closure_test_fn2(ffi_cif* cif,void* resp,void** args, + void* userdata) + { + *(ffi_arg*)resp = + (int)*(double *)args[0] +(int)(*(double *)args[1]) + + (int)(*(double *)args[2]) + (int)*(double *)args[3] + + (int)(*(signed short *)args[4]) + (int)(*(double *)args[5]) + + (int)*(double *)args[6] + (int)(*(int *)args[7]) + + (int)(*(double *)args[8]) + (int)*(int *)args[9] + + (int)(*(int *)args[10]) + (int)(*(float *)args[11]) + + (int)*(int *)args[12] + (int)(*(float *)args[13]) + + (int)(*(int *)args[14]) + *(int *)args[15] + (int)(long)userdata; + + printf("%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d: %d\n", + (int)*(double *)args[0], (int)(*(double *)args[1]), + (int)(*(double *)args[2]), (int)*(double *)args[3], + (int)(*(signed short *)args[4]), (int)(*(double *)args[5]), + (int)*(double *)args[6], (int)(*(int *)args[7]), + (int)(*(double*)args[8]), (int)*(int *)args[9], + (int)(*(int *)args[10]), (int)(*(float *)args[11]), + (int)*(int *)args[12], (int)(*(float *)args[13]), + (int)(*(int *)args[14]), *(int *)args[15], (int)(long)userdata, + *(int*)resp); + } + +typedef int (*closure_test_type2)(double, double, double, double, signed short, + double, double, int, double, int, int, float, + int, float, int, int); + +static void closure_test_fn3(ffi_cif* cif,void* resp,void** args, + void* userdata) + { + *(ffi_arg*)resp = + (int)*(float *)args[0] +(int)(*(float *)args[1]) + + (int)(*(float *)args[2]) + (int)*(float *)args[3] + + (int)(*(float *)args[4]) + (int)(*(float *)args[5]) + + (int)*(float *)args[6] + (int)(*(float *)args[7]) + + (int)(*(double *)args[8]) + (int)*(int *)args[9] + + (int)(*(float *)args[10]) + (int)(*(float *)args[11]) + + (int)*(int *)args[12] + (int)(*(float *)args[13]) + + (int)(*(float *)args[14]) + *(int *)args[15] + (int)(long)userdata; + + printf("%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d %d: %d\n", + (int)*(float *)args[0], (int)(*(float *)args[1]), + (int)(*(float *)args[2]), (int)*(float *)args[3], + (int)(*(float *)args[4]), (int)(*(float *)args[5]), + (int)*(float *)args[6], (int)(*(float *)args[7]), + (int)(*(double *)args[8]), (int)*(int *)args[9], + (int)(*(float *)args[10]), (int)(*(float *)args[11]), + (int)*(int *)args[12], (int)(*(float *)args[13]), + (int)(*(float *)args[14]), *(int *)args[15], (int)(long)userdata, + *(int*)resp); + } + +typedef int (*closure_test_type3)(float, float, float, float, float, float, + float, float, double, int, float, float, int, + float, float, int); #endif int main(/*@unused@*/ int argc, /*@unused@*/ char *argv[]) @@ -315,6 +426,14 @@ int main(/*@unused@*/ int argc, /*@unused@*/ char *argv[]) ffi_arg rint; long long rlonglong; +# if FFI_CLOSURES + /* The closure must not be an automatic variable on + platforms (Solaris) that forbid stack execution by default. */ + static ffi_closure cl; +#endif + + ffi_type * cl_arg_types[17]; + ffi_type ts1_type; ffi_type ts2_type; ffi_type ts3_type; @@ -1044,22 +1163,137 @@ int main(/*@unused@*/ int argc, /*@unused@*/ char *argv[]) # if FFI_CLOSURES /* A simple closure test */ { - ffi_closure cl; - ffi_type * cl_arg_types[3]; + (void) puts("\nEnter FFI_CLOSURES\n"); + + cl_arg_types[0] = &ffi_type_uint64; + cl_arg_types[1] = &ffi_type_uint; + cl_arg_types[2] = &ffi_type_uint64; + cl_arg_types[3] = &ffi_type_uint; + cl_arg_types[4] = &ffi_type_sshort; + cl_arg_types[5] = &ffi_type_uint64; + cl_arg_types[6] = &ffi_type_uint; + cl_arg_types[7] = &ffi_type_uint; + cl_arg_types[8] = &ffi_type_double; + cl_arg_types[9] = &ffi_type_uint; + cl_arg_types[10] = &ffi_type_uint; + cl_arg_types[11] = &ffi_type_float; + cl_arg_types[12] = &ffi_type_uint; + cl_arg_types[13] = &ffi_type_uint; + cl_arg_types[14] = &ffi_type_uint; + cl_arg_types[15] = &ffi_type_uint; + cl_arg_types[16] = NULL; + + /* Initialize the cif */ + CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 16, + &ffi_type_sint, cl_arg_types) == FFI_OK); + + CHECK(ffi_prep_closure(&cl, &cif, closure_test_fn, + (void *) 3 /* userdata */) == FFI_OK); + + CHECK((*((closure_test_type)(&cl))) + (1LL, 2, 3LL, 4, 127, 429LL, 7, 8, 9.5, 10, 11, 12, 13, + 19, 21, 1) == 680); + } + + { - cl_arg_types[0] = &ffi_type_sint; + cl_arg_types[0] = &ffi_type_float; cl_arg_types[1] = &ffi_type_float; - cl_arg_types[2] = NULL; + cl_arg_types[2] = &ffi_type_float; + cl_arg_types[3] = &ffi_type_float; + cl_arg_types[4] = &ffi_type_sshort; + cl_arg_types[5] = &ffi_type_float; + cl_arg_types[6] = &ffi_type_float; + cl_arg_types[7] = &ffi_type_uint; + cl_arg_types[8] = &ffi_type_double; + cl_arg_types[9] = &ffi_type_uint; + cl_arg_types[10] = &ffi_type_uint; + cl_arg_types[11] = &ffi_type_float; + cl_arg_types[12] = &ffi_type_uint; + cl_arg_types[13] = &ffi_type_uint; + cl_arg_types[14] = &ffi_type_uint; + cl_arg_types[15] = &ffi_type_uint; + cl_arg_types[16] = NULL; /* Initialize the cif */ - CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 2, - &ffi_type_sint, cl_arg_types) == FFI_OK); + CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 16, + &ffi_type_sint, cl_arg_types) == FFI_OK); - CHECK(ffi_prep_closure(&cl, &cif, closure_test_fn, - (void *) 3 /* userdata */) - == FFI_OK); - CHECK((*((closure_test_type)(&cl)))(1, 2.0) == 6); + CHECK(ffi_prep_closure(&cl, &cif, closure_test_fn1, + (void *) 3 /* userdata */) == FFI_OK); + + CHECK((*((closure_test_type1)(&cl))) + (1.1, 2.2, 3.3, 4.4, 127, 5.5, 6.6, 8, 9, 10, 11, 12.0, 13, + 19, 21, 1) == 255); + } + + { + + cl_arg_types[0] = &ffi_type_double; + cl_arg_types[1] = &ffi_type_double; + cl_arg_types[2] = &ffi_type_double; + cl_arg_types[3] = &ffi_type_double; + cl_arg_types[4] = &ffi_type_sshort; + cl_arg_types[5] = &ffi_type_double; + cl_arg_types[6] = &ffi_type_double; + cl_arg_types[7] = &ffi_type_uint; + cl_arg_types[8] = &ffi_type_double; + cl_arg_types[9] = &ffi_type_uint; + cl_arg_types[10] = &ffi_type_uint; + cl_arg_types[11] = &ffi_type_float; + cl_arg_types[12] = &ffi_type_uint; + cl_arg_types[13] = &ffi_type_float; + cl_arg_types[14] = &ffi_type_uint; + cl_arg_types[15] = &ffi_type_uint; + cl_arg_types[16] = NULL; + + /* Initialize the cif */ + CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 16, + &ffi_type_sint, cl_arg_types) == FFI_OK); + + CHECK(ffi_prep_closure(&cl, &cif, closure_test_fn2, + (void *) 3 /* userdata */) == FFI_OK); + + CHECK((*((closure_test_type2)(&cl))) + (1, 2, 3, 4, 127, 5, 6, 8, 9, 10, 11, 12.0, 13, + 19.0, 21, 1) == 255); + + } + + { + + cl_arg_types[0] = &ffi_type_float; + cl_arg_types[1] = &ffi_type_float; + cl_arg_types[2] = &ffi_type_float; + cl_arg_types[3] = &ffi_type_float; + cl_arg_types[4] = &ffi_type_float; + cl_arg_types[5] = &ffi_type_float; + cl_arg_types[6] = &ffi_type_float; + cl_arg_types[7] = &ffi_type_float; + cl_arg_types[8] = &ffi_type_double; + cl_arg_types[9] = &ffi_type_uint; + cl_arg_types[10] = &ffi_type_float; + cl_arg_types[11] = &ffi_type_float; + cl_arg_types[12] = &ffi_type_uint; + cl_arg_types[13] = &ffi_type_float; + cl_arg_types[14] = &ffi_type_float; + cl_arg_types[15] = &ffi_type_uint; + cl_arg_types[16] = NULL; + + /* Initialize the cif */ + CHECK(ffi_prep_cif(&cif, FFI_DEFAULT_ABI, 16, + &ffi_type_sint, cl_arg_types) == FFI_OK); + + CHECK(ffi_prep_closure(&cl, &cif, closure_test_fn3, + (void *) 3 /* userdata */) == FFI_OK); + + CHECK((*((closure_test_type3)(&cl))) + (1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9, 10, 11.11, 12.0, 13, + 19.19, 21.21, 1) == 135); } + + (void) puts("\nFinished FFI_CLOSURES\n"); + # endif /* If we arrived here, all is good */ diff --git a/libffi/src/powerpc/darwin.S b/libffi/src/powerpc/darwin.S index 9da89bde287..108d2acff72 100644 --- a/libffi/src/powerpc/darwin.S +++ b/libffi/src/powerpc/darwin.S @@ -3,8 +3,6 @@ PowerPC Assembly glue. - $Id: darwin.S,v 1.1 2001/10/09 05:32:15 bryce Exp $ - Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ``Software''), to deal in the Software without restriction, including @@ -39,30 +37,34 @@ .text .align 2 _ffi_call_DARWIN: - mr r12,r8 // We only need r12 until the call, so it doesn't have to be saved... +LFB0: + mr r12,r8 /* We only need r12 until the call, + so it doesn't have to be saved... */ +LFB1: /* Save the old stack pointer as AP. */ mr r8,r1 - +LCFI0: /* Allocate the stack space we need. */ stwux r1,r1,r4 /* Save registers we use. */ mflr r9 - stw r28,-16(r8) + stw r28,-16(r8) stw r29,-12(r8) stw r30, -8(r8) stw r31, -4(r8) - - stw r9, 8(r8) + + stw r9, 8(r8) stw r2, 20(r1) +LCFI1: /* Save arguments over call... */ - mr r31,r5 /* flags, */ - mr r30,r6 /* rvalue, */ - mr r29,r7 /* function address, */ - mr r28,r8 /* our AP. */ - + mr r31,r5 /* flags, */ + mr r30,r6 /* rvalue, */ + mr r29,r7 /* function address, */ + mr r28,r8 /* our AP. */ +LCFI2: /* Call ffi_prep_args. */ mr r4,r1 li r9,0 @@ -145,7 +147,8 @@ L(fp_return_value): L(float_return_value): stfs f1,0(r30) b L(done_return_value) -//END(_ffi_call_DARWIN) +LFE1: +/* END(_ffi_call_DARWIN) */ /* Provide a null definition of _ffi_call_AIX. */ .text @@ -155,5 +158,61 @@ L(float_return_value): .align 2 _ffi_call_AIX: blr -//END(_ffi_call_AIX) - +/* END(_ffi_call_AIX) */ + +.data +.section __TEXT,__eh_frame +Lframe1: + .set L$set$0,LECIE1-LSCIE1 + .long L$set$0 ; Length of Common Information Entry +LSCIE1: + .long 0x0 ; CIE Identifier Tag + .byte 0x1 ; CIE Version + .ascii "zR\0" ; CIE Augmentation + .byte 0x1 ; uleb128 0x1; CIE Code Alignment Factor + .byte 0x7c ; sleb128 -4; CIE Data Alignment Factor + .byte 0x41 ; CIE RA Column + .byte 0x1 ; uleb128 0x1; Augmentation size + .byte 0x10 ; FDE Encoding (pcrel) + .byte 0xc ; DW_CFA_def_cfa + .byte 0x1 ; uleb128 0x1 + .byte 0x0 ; uleb128 0x0 + .align 2 +LECIE1: +LSFDE1: + .set L$set$1,LEFDE1-LASFDE1 + .long L$set$1 ; FDE Length +LASFDE1: + .set L$set$2,LASFDE1-Lframe1 + .long L$set$2 ; FDE CIE offset + .long LFB0-. ; FDE initial location + .set L$set$3,LFE1-LFB0 + .long L$set$3 ; FDE address range + .byte 0x0 ; uleb128 0x0; Augmentation size + .byte 0x4 ; DW_CFA_advance_loc4 + .set L$set$4,LCFI0-LFB1 + .long L$set$4 + .byte 0xd ; DW_CFA_def_cfa_register + .byte 0x08 ; uleb128 0x08 + .byte 0x4 ; DW_CFA_advance_loc4 + .set L$set$5,LCFI1-LCFI0 + .long L$set$5 + .byte 0x11 ; DW_CFA_offset_extended_sf + .byte 0x41 ; uleb128 0x41 + .byte 0x7e ; sleb128 -2 + .byte 0x9f ; DW_CFA_offset, column 0x1f + .byte 0x1 ; uleb128 0x1 + .byte 0x9e ; DW_CFA_offset, column 0x1e + .byte 0x2 ; uleb128 0x2 + .byte 0x9d ; DW_CFA_offset, column 0x1d + .byte 0x3 ; uleb128 0x3 + .byte 0x9c ; DW_CFA_offset, column 0x1c + .byte 0x4 ; uleb128 0x4 + .byte 0x4 ; DW_CFA_advance_loc4 + .set L$set$6,LCFI2-LCFI1 + .long L$set$6 + .byte 0xd ; DW_CFA_def_cfa_register + .byte 0x1c ; uleb128 0x1c + .align 2 +LEFDE1: + diff --git a/libffi/src/powerpc/darwin_closure.S b/libffi/src/powerpc/darwin_closure.S index 9e54d2231b9..5420c77cfb5 100644 --- a/libffi/src/powerpc/darwin_closure.S +++ b/libffi/src/powerpc/darwin_closure.S @@ -1,6 +1,6 @@ /* ----------------------------------------------------------------------- - darwin_closures.S - Copyright (c) 2002 Free Software Foundation, Inc. - based on ppc_closures.S + darwin_closure.S - Copyright (c) 2002 2003 Free Software Foundation, + Inc. based on ppc_closure.S PowerPC Assembly glue. @@ -37,20 +37,20 @@ .text .align 2 _ffi_closure_ASM: - - mflr r0 /* extract return address */ - stw r0, 8(r1) /* save the return address */ - +LFB1: + mflr r0 /* extract return address */ + stw r0, 8(r1) /* save the return address */ +LCFI0: /* 24 Bytes (Linkage Area) */ /* 32 Bytes (outgoing parameter area, always reserved) */ /* 104 Bytes (13*8 from FPR) */ /* 4 Bytes (result) /* 164 Bytes */ - stwu r1,-164(r1) /* skip over caller save area */ - -/* we want to build up an area for the parameters passed */ -/* in registers (both floating point and integer) */ + stwu r1,-164(r1) /* skip over caller save area */ +LCFI1: + /* we want to build up an area for the parameters passed + in registers (both floating point and integer) */ /* we store gpr 3 to gpr 10 (aligned to 4) */ /* in the parents outgoing area */ @@ -111,7 +111,9 @@ _ffi_closure_ASM: lwzx r3,r4,r3 /* get the contents of that table value */ add r3,r3,r4 /* add contents of table to table address */ mtctr r3 - bctr /* jump to it */ + bctr /* jump to it */ +LFE1: + .align 2 .L60: .long .L44-.L60 /* FFI_TYPE_VOID */ @@ -185,5 +187,49 @@ _ffi_closure_ASM: mtlr r0 /* reset link register */ blr -/* END(ffi_closure_ASM) */ +/* END(ffi_closure_ASM) */ + +.data +.section __TEXT,__eh_frame +Lframe1: + .set L$set$0,LECIE1-LSCIE1 + .long L$set$0 ; Length of Common Information Entry +LSCIE1: + .long 0x0 ; CIE Identifier Tag + .byte 0x1 ; CIE Version + .ascii "zR\0" ; CIE Augmentation + .byte 0x1 ; uleb128 0x1; CIE Code Alignment Factor + .byte 0x7c ; sleb128 -4; CIE Data Alignment Factor + .byte 0x41 ; CIE RA Column + .byte 0x1 ; uleb128 0x1; Augmentation size + .byte 0x10 ; FDE Encoding (pcrel) + .byte 0xc ; DW_CFA_def_cfa + .byte 0x1 ; uleb128 0x1 + .byte 0x0 ; uleb128 0x0 + .align 2 +LECIE1: +LSFDE1: + .set L$set$1,LEFDE1-LASFDE1 + .long L$set$1 ; FDE Length + +LASFDE1: + .set L$set$2,LASFDE1-Lframe1 + .long L$set$2 ; FDE CIE offset + .long LFB1-. ; FDE initial location + .set L$set$3,LFE1-LFB1 + .long L$set$3 ; FDE address range + .byte 0x0 ; uleb128 0x0; Augmentation size + .byte 0x4 ; DW_CFA_advance_loc4 + .set L$set$3,LCFI1-LCFI0 + .long L$set$3 + .byte 0xe ; DW_CFA_def_cfa_offset + .byte 164,1 ; uleb128 164 + .byte 0x4 ; DW_CFA_advance_loc4 + .set L$set$4,LCFI0-LFB1 + .long L$set$4 + .byte 0x11 ; DW_CFA_offset_extended_sf + .byte 0x41 ; uleb128 0x41 + .byte 0x7e ; sleb128 -2 + .align 2 +LEFDE1: diff --git a/libffi/src/powerpc/ffi.c b/libffi/src/powerpc/ffi.c index c93aec0ed87..ea1a14e8f65 100644 --- a/libffi/src/powerpc/ffi.c +++ b/libffi/src/powerpc/ffi.c @@ -137,11 +137,20 @@ void ffi_prep_args(extended_cif *ecif, unsigned *const stack) switch ((*ptr)->type) { case FFI_TYPE_FLOAT: - case FFI_TYPE_DOUBLE: - if ((*ptr)->type == FFI_TYPE_FLOAT) - double_tmp = *(float *)*p_argv; + double_tmp = *(float *)*p_argv; + if (fparg_count >= NUM_FPR_ARG_REGISTERS) + { + *(float *)next_arg = (float)double_tmp; + next_arg += 1; + } else - double_tmp = *(double *)*p_argv; + *fpr_base++ = double_tmp; + fparg_count++; + FFI_ASSERT(flags & FLAG_FP_ARGUMENTS); + break; + + case FFI_TYPE_DOUBLE: + double_tmp = *(double *)*p_argv; if (fparg_count >= NUM_FPR_ARG_REGISTERS) { @@ -320,6 +329,10 @@ ffi_status ffi_prep_cif_machdep(ffi_cif *cif) switch ((*ptr)->type) { case FFI_TYPE_FLOAT: + fparg_count++; + /* floating singles are not 8-aligned on stack */ + break; + case FFI_TYPE_DOUBLE: fparg_count++; /* If this FP arg is going on the stack, it must be @@ -612,20 +625,15 @@ ffi_closure_helper_SYSV (ffi_closure* closure, void * rvalue, case FFI_TYPE_FLOAT: /* unfortunately float values are stored as doubles * in the ffi_closure_SYSV code (since we don't check - * the type in that routine). This is also true - * of floats passed on the outgoing parameter stack. - * Also, on the outgoing stack all values are aligned - * to 8 - * - * Don't you just love the simplicity of this ABI! + * the type in that routine). */ /* there are 8 64bit floating point registers */ if (nf < 8) { - temp = *(double*)pfr; + temp = *(double*)pfr; *(float*)pfr = (float)temp; - avalue[i] = pfr; + avalue[i] = pfr; nf++; pfr+=2; } else { @@ -634,12 +642,9 @@ ffi_closure_helper_SYSV (ffi_closure* closure, void * rvalue, * parameter stack. This is probably a really * naughty thing to do but... */ - if (((long)pst) & 4) pst++; - temp = *(double*)pst; - *(float*)pst = (float)temp; avalue[i] = pst; nf++; - pst+=2; + pst+=1; } break; diff --git a/libffi/src/powerpc/ppc_closure.S b/libffi/src/powerpc/ppc_closure.S index a9ea9c7ee52..e402fb5cda3 100644 --- a/libffi/src/powerpc/ppc_closure.S +++ b/libffi/src/powerpc/ppc_closure.S @@ -1,14 +1,13 @@ #define LIBFFI_ASM #include <powerpc/asm.h> -.globl ffi_closure_helper_SYSV + .file "ppc_closure.S" ENTRY(ffi_closure_SYSV) .LFB1: stwu %r1,-144(%r1) .LCFI0: mflr %r0 - stw %r31,140(%r1) .LCFI1: stw %r0,148(%r1) @@ -63,87 +62,136 @@ ENTRY(ffi_closure_SYSV) # look up the proper starting point in table # by using return type as offset addi %r5,%r1,112 # get pointer to results area - addis %r4,0,.L60@ha # get address of jump table - addi %r4,%r4,.L60@l - slwi %r3,%r3,2 # now multiply return type by 4 - lwzx %r3,%r4,%r3 # get the contents of that table value - add %r3,%r3,%r4 # add contents of table to table address + bl .Lget_ret_type0_addr # get pointer to .Lret_type0 into LR + mflr %r4 # move to r4 + slwi %r3,%r3,4 # now multiply return type by 16 + add %r3,%r3,%r4 # add contents of table to table address mtctr %r3 bctr # jump to it .LFE1: - .align 2 -.L60: - .long .L44-.L60 # FFI_TYPE_VOID - .long .L50-.L60 # FFI_TYPE_INT - .long .L47-.L60 # FFI_TYPE_FLOAT - .long .L46-.L60 # FFI_TYPE_DOUBLE - .long .L46-.L60 # FFI_TYPE_LONGDOUBLE - .long .L56-.L60 # FFI_TYPE_UINT8 - .long .L55-.L60 # FFI_TYPE_SINT8 - .long .L58-.L60 # FFI_TYPE_UINT16 - .long .L57-.L60 # FFI_TYPE_SINT16 - .long .L50-.L60 # FFI_TYPE_UINT32 - .long .L50-.L60 # FFI_TYPE_SINT32 - .long .L48-.L60 # FFI_TYPE_UINT64 - .long .L48-.L60 # FFI_TYPE_SINT64 - .long .L44-.L60 # FFI_TYPE_STRUCT - .long .L50-.L60 # FFI_TYPE_POINTER - - -# case double -.L46: - lfd %f1,0(%r5) - b .L44 -# case float -.L47: +# Each of the ret_typeX code fragments has to be exactly 16 bytes long +# (4 instructions). For cache effectiveness we align to a 16 byte boundary +# first. + .align 4 + + nop + nop + nop +.Lget_ret_type0_addr: + blrl + +# case FFI_TYPE_VOID +.Lret_type0: + b .Lfinish + nop + nop + nop + +# case FFI_TYPE_INT +.Lret_type1: + lwz %r3,0(%r5) + b .Lfinish + nop + nop + +# case FFI_TYPE_FLOAT +.Lret_type2: lfs %f1,0(%r5) - b .L44 - -# case long long -.L48: + b .Lfinish + nop + nop + +# case FFI_TYPE_DOUBLE +.Lret_type3: + lfd %f1,0(%r5) + b .Lfinish + nop + nop + +# case FFI_TYPE_LONGDOUBLE +.Lret_type4: + lfd %f1,0(%r5) + b .Lfinish + nop + nop + +# case FFI_TYPE_UINT8 +.Lret_type5: + lbz %r3,3(%r5) + b .Lfinish + nop + nop + +# case FFI_TYPE_SINT8 +.Lret_type6: + lbz %r3,3(%r5) + extsb %r3,%r3 + b .Lfinish + nop + +# case FFI_TYPE_UINT16 +.Lret_type7: + lhz %r3,2(%r5) + b .Lfinish + nop + nop + +# case FFI_TYPE_SINT16 +.Lret_type8: + lha %r3,2(%r5) + b .Lfinish + nop + nop + +# case FFI_TYPE_UINT32 +.Lret_type9: + lwz %r3,0(%r5) + b .Lfinish + nop + nop + +# case FFI_TYPE_SINT32 +.Lret_type10: + lwz %r3,0(%r5) + b .Lfinish + nop + nop + +# case FFI_TYPE_UINT64 +.Lret_type11: lwz %r3,0(%r5) lwz %r4,4(%r5) - b .L44 - -# case default / int32 / pointer -.L50: + b .Lfinish + nop + +# case FFI_TYPE_SINT64 +.Lret_type12: lwz %r3,0(%r5) - b .L44 - -# case signed int8 -.L55: - addi %r5,%r5,3 - lbz %r3,0(%r5) - extsb %r3,%r3 - b .L44 - -# case unsigned int8 -.L56: - addi %r5,%r5,3 - lbz %r3,0(%r5) - b .L44 - -# case signed int16 -.L57: - addi %r5,%r5,2 - lhz %r3,0(%r5) - extsh %r3,%r3 - b .L44 - -#case unsigned int16 -.L58: - addi %r5,%r5,2 - lhz %r3,0(%r5) - -# case void / done -.L44: + lwz %r4,4(%r5) + b .Lfinish + nop + +# case FFI_TYPE_STRUCT +.Lret_type13: + b .Lfinish + nop + nop + nop + +# case FFI_TYPE_POINTER +.Lret_type14: + lwz %r3,0(%r5) + b .Lfinish + nop + nop + +# case done +.Lfinish: - lwz %r11,0(%r1) - lwz %r0,4(%r11) + lwz %r0,148(%r1) mtlr %r0 - lwz %r31,-4(%r11) - mr %r1,%r11 + addi %r1,%r1,144 blr END(ffi_closure_SYSV) diff --git a/libffi/src/sparc/ffi.c b/libffi/src/sparc/ffi.c index dc975356b4b..573fc84ee5a 100644 --- a/libffi/src/sparc/ffi.c +++ b/libffi/src/sparc/ffi.c @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------- - ffi.c - Copyright (c) 1996 Cygnus Solutions + ffi.c - Copyright (c) 1996, 2003 Cygnus Solutions Sparc Foreign Function Interface @@ -28,6 +28,12 @@ #include <stdlib.h> +#ifdef SPARC64 +extern void ffi_closure_v9(void); +#else +extern void ffi_closure_v8(void); +#endif + /* ffi_prep_args is called by the assembly routine once stack space has been allocated for the function's arguments */ @@ -409,3 +415,101 @@ void ffi_call(ffi_cif *cif, void (*fn)(), void *rvalue, void **avalue) } } + +ffi_status +ffi_prep_closure (ffi_closure* closure, + ffi_cif* cif, + void (*fun)(ffi_cif*, void*, void**, void*), + void *user_data) +{ + unsigned int *tramp = (unsigned int *) &closure->tramp[0]; + unsigned long fn; + unsigned long ctx = (unsigned long) closure; + +#ifdef SPARC64 + /* Trampoline address is equal to the closure address. We take advantage + of that to reduce the trampoline size by 8 bytes. */ + FFI_ASSERT (cif->abi == FFI_V9); + fn = (unsigned long) ffi_closure_v9; + tramp[0] = 0x83414000; /* rd %pc, %g1 */ + tramp[1] = 0xca586010; /* ldx [%g1+16], %g5 */ + tramp[2] = 0x81c14000; /* jmp %g5 */ + tramp[3] = 0x01000000; /* nop */ + *((unsigned long *) &tramp[4]) = fn; +#else + FFI_ASSERT (cif->abi == FFI_V8); + fn = (unsigned long) ffi_closure_v8; + tramp[0] = 0x03000000 | fn >> 10; /* sethi %hi(fn), %g1 */ + tramp[1] = 0x05000000 | ctx >> 10; /* sethi %hi(ctx), %g2 */ + tramp[2] = 0x81c06000 | (fn & 0x3ff); /* jmp %g1+%lo(fn) */ + tramp[3] = 0x8410a000 | (ctx & 0x3ff);/* or %g2, %lo(ctx) */ +#endif + + closure->cif = cif; + closure->fun = fun; + closure->user_data = user_data; + + /* Flush the Icache. FIXME: alignment isn't certain, assume 8 bytes */ +#ifdef SPARC64 + asm volatile ("flush %0" : : "r" (closure) : "memory"); + asm volatile ("flush %0" : : "r" (((char *) closure) + 8) : "memory"); +#else + asm volatile ("iflush %0" : : "r" (closure) : "memory"); + asm volatile ("iflush %0" : : "r" (((char *) closure) + 8) : "memory"); +#endif + + return FFI_OK; +} + +int +ffi_closure_sparc_inner(ffi_closure *closure, + void *rvalue, unsigned long *gpr, double *fpr) +{ + ffi_cif *cif; + void **avalue; + ffi_type **arg_types; + int i, avn, argn; + + cif = closure->cif; + avalue = alloca(cif->nargs * sizeof(void *)); + + argn = 0; + + /* Copy the caller's structure return address to that the closure + returns the data directly to the caller. */ + if (cif->flags == FFI_TYPE_STRUCT) + { + rvalue = (void *) gpr[0]; + argn = 1; + } + + i = 0; + avn = cif->nargs; + arg_types = cif->arg_types; + + /* Grab the addresses of the arguments from the stack frame. */ + while (i < avn) + { + /* Assume big-endian. FIXME */ + argn += ALIGN(arg_types[i]->size, SIZEOF_ARG) / SIZEOF_ARG; + +#ifdef SPARC64 + if (i < 6 && (arg_types[i]->type == FFI_TYPE_FLOAT + || arg_types[i]->type == FFI_TYPE_DOUBLE +#if FFI_TYPE_LONGDOUBLE != FFI_TYPE_DOUBLE + || arg_types[i]->type == FFI_TYPE_LONGDOUBLE +#endif + )) + avalue[i] = ((char *) &fpr[argn]) - arg_types[i]->size; + else +#endif + avalue[i] = ((char *) &gpr[argn]) - arg_types[i]->size; + i++; + } + + /* Invoke the closure. */ + (closure->fun) (cif, rvalue, avalue, closure->user_data); + + /* Tell ffi_closure_sparc how to perform return type promotions. */ + return cif->rtype->type; +} diff --git a/libffi/src/sparc/v8.S b/libffi/src/sparc/v8.S index d94fe03d2aa..299200a089c 100644 --- a/libffi/src/sparc/v8.S +++ b/libffi/src/sparc/v8.S @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------- - v8.S - Copyright (c) 1996, 1997 Cygnus Solutions + v8.S - Copyright (c) 1996, 1997, 2003 Cygnus Solutions Sparc Foreign Function Interface @@ -94,6 +94,72 @@ longlong: .ffi_call_V8_end: .size ffi_call_V8,.ffi_call_V8_end-ffi_call_V8 + +#define STACKFRAME 104 /* 16*4 register window + + 1*4 struct return + + 6*4 args backing store + + 3*4 locals */ + +/* ffi_closure_v8(...) + + Receives the closure argument in %g2. */ + + .text + .align 8 + .globl ffi_closure_v8 + +ffi_closure_v8: + .register %g2, #scratch +.LLFB2: + save %sp, -STACKFRAME, %sp +.LLCFI1: + + ! Store all of the potential argument registers in va_list format. + st %i0, [%fp+68+0] + st %i1, [%fp+68+4] + st %i2, [%fp+68+8] + st %i3, [%fp+68+12] + st %i4, [%fp+68+16] + st %i5, [%fp+68+20] + + ! Call ffi_closure_sparc_inner to do the bulk of the work. + mov %g2, %o0 + add %fp, -8, %o1 + add %fp, 68, %o2 + call ffi_closure_sparc_inner + mov 0, %o3 + + ! Load up the return value in the proper type. + cmp %o0, FFI_TYPE_VOID + be done1 + + cmp %o0, FFI_TYPE_FLOAT + be,a done1 + ld [%fp-8], %f0 + + cmp %o0, FFI_TYPE_DOUBLE + be,a done1 + ldd [%fp-8], %f0 + + cmp %o0, FFI_TYPE_SINT64 + be,a integer + ld [%fp-4], %i1 + + cmp %o0, FFI_TYPE_UINT64 + be,a integer + ld [%fp-4], %i1 + +integer: + ld [%fp-8], %i0 + +done1: + ret + restore +.LLFE2: + +.ffi_closure_v8_end: + .size ffi_closure_v8,.ffi_closure_v8_end-ffi_closure_v8 + #ifdef SPARC64 #define WS 8 #define nword xword @@ -148,3 +214,26 @@ longlong: .byte 0x1f ! uleb128 0x1f .align WS .LLEFDE1: +.LLSFDE2: + .uaword .LLEFDE2-.LLASFDE2 ! FDE Length +.LLASFDE2: + .uaword .LLASFDE2-.LLframe1 ! FDE CIE offset +#ifdef HAVE_AS_SPARC_UA_PCREL + .uaword %r_disp32(.LLFB2) + .uaword .LLFE2-.LLFB2 ! FDE address range +#else + .align WS + .nword .LLFB2 + .uanword .LLFE2-.LLFB2 ! FDE address range +#endif + .byte 0x0 ! uleb128 0x0; Augmentation size + .byte 0x4 ! DW_CFA_advance_loc4 + .uaword .LLCFI1-.LLFB2 + .byte 0xd ! DW_CFA_def_cfa_register + .byte 0x1e ! uleb128 0x1e + .byte 0x2d ! DW_CFA_GNU_window_save + .byte 0x9 ! DW_CFA_register + .byte 0xf ! uleb128 0xf + .byte 0x1f ! uleb128 0x1f + .align WS +.LLEFDE2: diff --git a/libffi/src/sparc/v9.S b/libffi/src/sparc/v9.S index bd358c0d84d..8dc9c90f661 100644 --- a/libffi/src/sparc/v9.S +++ b/libffi/src/sparc/v9.S @@ -1,5 +1,5 @@ /* ----------------------------------------------------------------------- - v9.S - Copyright (c) 2000 Cygnus Solutions + v9.S - Copyright (c) 2000, 2003 Cygnus Solutions Sparc 64bit Foreign Function Interface @@ -99,7 +99,7 @@ _ffi_call_V9: cmp %i3, FFI_TYPE_STRUCT be,pn %icc, dostruct - cmp %i3, FFI_TYPE_LONGDOUBLE + cmp %i3, FFI_TYPE_LONGDOUBLE bne,pt %icc, done nop std %f0, [%i4+0] @@ -125,6 +125,88 @@ dostruct: .ffi_call_V9_end: .size ffi_call_V9,.ffi_call_V9_end-ffi_call_V9 + +#define STACKFRAME 240 /* 16*8 register window + + 6*8 args backing store + + 8*8 locals */ +#define FP %fp+STACK_BIAS + +/* ffi_closure_v9(...) + + Receives the closure argument in %g1. */ + + .text + .align 8 + .globl ffi_closure_v9 + +ffi_closure_v9: +.LLFB2: + save %sp, -STACKFRAME, %sp +.LLCFI1: + + ! Store all of the potential argument registers in va_list format. + stx %i0, [FP+128+0] + stx %i1, [FP+128+8] + stx %i2, [FP+128+16] + stx %i3, [FP+128+24] + stx %i4, [FP+128+32] + stx %i5, [FP+128+40] + + ! Store possible floating point argument registers too. + std %f0, [FP-48] + std %f2, [FP-40] + std %f4, [FP-32] + std %f6, [FP-24] + std %f8, [FP-16] + std %f10, [FP-8] + + ! Call ffi_closure_sparc_inner to do the bulk of the work. + mov %g1, %o0 + add %fp, STACK_BIAS-64, %o1 + add %fp, STACK_BIAS+128, %o2 + call ffi_closure_sparc_inner + add %fp, STACK_BIAS-48, %o3 + + ! Load up the return value in the proper type. + cmp %o0, FFI_TYPE_VOID + be,pn %icc, done1 + + cmp %o0, FFI_TYPE_FLOAT + be,a,pn %icc, done1 + ld [FP-64], %f0 + + cmp %o0, FFI_TYPE_DOUBLE + be,a,pn %icc, done1 + ldd [FP-64], %f0 + + cmp %o0, FFI_TYPE_LONGDOUBLE + be,a,pn %icc, longdouble1 + ldd [FP-64], %f0 + + cmp %o0, FFI_TYPE_STRUCT + be,pn %icc, struct1 + + ! FFI_TYPE_UINT64 | FFI_TYPE_SINT64 | FFI_TYPE_POINTER + ldx [FP-64], %i0 + +done1: + ret + restore + +struct1: + ldx [FP-56], %i2 + ret + restore + +longdouble1: + ldd [FP-56], %f2 + ret + restore +.LLFE2: + +.ffi_closure_v9_end: + .size ffi_closure_v9,.ffi_closure_v9_end-ffi_closure_v9 + .section ".eh_frame",#alloc,#write .LLframe1: .uaword .LLECIE1-.LLSCIE1 ! Length of Common Information Entry @@ -169,5 +251,27 @@ dostruct: .byte 0x1f ! uleb128 0x1f .align 8 .LLEFDE1: - +.LLSFDE2: + .uaword .LLEFDE2-.LLASFDE2 ! FDE Length +.LLASFDE2: + .uaword .LLASFDE2-.LLframe1 ! FDE CIE offset +#ifdef HAVE_AS_SPARC_UA_PCREL + .uaword %r_disp32(.LLFB2) + .uaword .LLFE2-.LLFB2 ! FDE address range +#else + .align 8 + .xword .LLFB2 + .uaxword .LLFE2-.LLFB2 ! FDE address range +#endif + .byte 0x0 ! uleb128 0x0; Augmentation size + .byte 0x4 ! DW_CFA_advance_loc4 + .uaword .LLCFI1-.LLFB2 + .byte 0xd ! DW_CFA_def_cfa_register + .byte 0x1e ! uleb128 0x1e + .byte 0x2d ! DW_CFA_GNU_window_save + .byte 0x9 ! DW_CFA_register + .byte 0xf ! uleb128 0xf + .byte 0x1f ! uleb128 0x1f + .align 8 +.LLEFDE2: #endif diff --git a/libffi/src/x86/ffi64.c b/libffi/src/x86/ffi64.c index f278a924eda..9427a37c8b5 100644 --- a/libffi/src/x86/ffi64.c +++ b/libffi/src/x86/ffi64.c @@ -27,6 +27,7 @@ #include <ffi_common.h> #include <stdlib.h> +#include <stdarg.h> /* ffi_prep_args is called by the assembly routine once stack space has been allocated for the function's arguments */ @@ -285,7 +286,8 @@ ffi_prep_args (stackLayout *stack, extended_cif *ecif) /* First check if the return value should be passed in memory. If so, pass the pointer as the first argument. */ gprcount = ssecount = 0; - if (examine_argument (ecif->cif->rtype, 1, &g, &s) == 0) + if (ecif->cif->rtype->type != FFI_TYPE_VOID + && examine_argument (ecif->cif->rtype, 1, &g, &s) == 0) (void *)stack->gpr[gprcount++] = ecif->rvalue; for (i=ecif->cif->nargs, p_arg=ecif->cif->arg_types, p_argv = ecif->avalue; @@ -389,8 +391,8 @@ ffi_prep_cif_machdep (ffi_cif *cif) /* If the return value should be passed in memory, pass the pointer as the first argument. The actual memory isn't allocated here. */ - - if (examine_argument (cif->rtype, 1, &g, &s) == 0) + if (cif->rtype->type != FFI_TYPE_VOID + && examine_argument (cif->rtype, 1, &g, &s) == 0) gprcount = 1; /* Go over all arguments and determine the way they should be passed. @@ -570,4 +572,135 @@ void ffi_call(/*@dependent@*/ ffi_cif *cif, } } +extern void ffi_closure_UNIX64(void); + +ffi_status +ffi_prep_closure (ffi_closure* closure, + ffi_cif* cif, + void (*fun)(ffi_cif*, void*, void**, void*), + void *user_data) +{ + volatile unsigned short *tramp; + + /* FFI_ASSERT (cif->abi == FFI_OSF); */ + + tramp = (volatile unsigned short *) &closure->tramp[0]; + tramp[0] = 0xbb49; /* mov <code>, %r11 */ + tramp[5] = 0xba49; /* mov <data>, %r10 */ + tramp[10] = 0xff49; /* jmp *%r11 */ + tramp[11] = 0x00e3; + *(void * volatile *) &tramp[1] = ffi_closure_UNIX64; + *(void * volatile *) &tramp[6] = closure; + + closure->cif = cif; + closure->fun = fun; + closure->user_data = user_data; + + return FFI_OK; +} + +int +ffi_closure_UNIX64_inner(ffi_closure *closure, va_list l, void *rp) +{ + ffi_cif *cif; + void **avalue; + ffi_type **arg_types; + long i, avn, argn; + + cif = closure->cif; + avalue = alloca(cif->nargs * sizeof(void *)); + + argn = 0; + + i = 0; + avn = cif->nargs; + arg_types = cif->arg_types; + + /* Grab the addresses of the arguments from the stack frame. */ + while (i < avn) + { + switch (arg_types[i]->type) + { + case FFI_TYPE_SINT8: + case FFI_TYPE_UINT8: + case FFI_TYPE_SINT16: + case FFI_TYPE_UINT16: + case FFI_TYPE_SINT32: + case FFI_TYPE_UINT32: + case FFI_TYPE_SINT64: + case FFI_TYPE_UINT64: + case FFI_TYPE_POINTER: + { + if (l->gp_offset > 48-8) + { + avalue[i] = l->overflow_arg_area; + l->overflow_arg_area = (char *)l->overflow_arg_area + 8; + } + else + { + avalue[i] = (char *)l->reg_save_area + l->gp_offset; + l->gp_offset += 8; + } + } + break; + + case FFI_TYPE_STRUCT: + /* FIXME */ + FFI_ASSERT(0); + break; + + case FFI_TYPE_DOUBLE: + { + if (l->fp_offset > 176-16) + { + avalue[i] = l->overflow_arg_area; + l->overflow_arg_area = (char *)l->overflow_arg_area + 8; + } + else + { + avalue[i] = (char *)l->reg_save_area + l->fp_offset; + l->fp_offset += 16; + } + } +#if DEBUG_FFI + fprintf (stderr, "double arg %d = %g\n", i, *(double *)avalue[i]); +#endif + break; + + case FFI_TYPE_FLOAT: + { + if (l->fp_offset > 176-16) + { + avalue[i] = l->overflow_arg_area; + l->overflow_arg_area = (char *)l->overflow_arg_area + 8; + } + else + { + avalue[i] = (char *)l->reg_save_area + l->fp_offset; + l->fp_offset += 16; + } + } +#if DEBUG_FFI + fprintf (stderr, "float arg %d = %g\n", i, *(float *)avalue[i]); +#endif + break; + + default: + FFI_ASSERT(0); + } + + argn += ALIGN(arg_types[i]->size, SIZEOF_ARG) / SIZEOF_ARG; + i++; + } + + /* Invoke the closure. */ + (closure->fun) (cif, rp, avalue, closure->user_data); + + /* FIXME: Structs not supported. */ + FFI_ASSERT(cif->rtype->type != FFI_TYPE_STRUCT); + + /* Tell ffi_closure_UNIX64 how to perform return type promotions. */ + + return cif->rtype->type; +} #endif /* ifndef __x86_64__ */ diff --git a/libffi/src/x86/unix64.S b/libffi/src/x86/unix64.S index 2e64b4195bf..f0cd3c9c0c9 100644 --- a/libffi/src/x86/unix64.S +++ b/libffi/src/x86/unix64.S @@ -162,5 +162,141 @@ sse2floatfloat: movaps (%rdi), %xmm0 movq %xmm0, (%rsi) ret - + + .align 2 +.globl ffi_closure_UNIX64 + .type ffi_closure_UNIX64,@function + +ffi_closure_UNIX64: +.LFB2: + pushq %rbp +.LCFI10: + movq %rsp, %rbp +.LCFI11: + subq $240, %rsp +.LCFI12: + movq %rdi, -176(%rbp) + movq %rsi, -168(%rbp) + movq %rdx, -160(%rbp) + movq %rcx, -152(%rbp) + movq %r8, -144(%rbp) + movq %r9, -136(%rbp) + /* FIXME: We can avoid all this stashing of XMM registers by + (in ffi_prep_closure) computing the number of + floating-point args and moving it into %rax before calling + this function. Once this is done, uncomment the next few + lines and only the essential XMM registers will be written + to memory. This is a significant saving. */ +/* movzbl %al, %eax */ +/* movq %rax, %rdx */ +/* leaq 0(,%rdx,4), %rax */ +/* leaq 2f(%rip), %rdx */ +/* subq %rax, %rdx */ + leaq -1(%rbp), %rax +/* jmp *%rdx */ + movaps %xmm7, -15(%rax) + movaps %xmm6, -31(%rax) + movaps %xmm5, -47(%rax) + movaps %xmm4, -63(%rax) + movaps %xmm3, -79(%rax) + movaps %xmm2, -95(%rax) + movaps %xmm1, -111(%rax) + movaps %xmm0, -127(%rax) +2: + movl %edi, -180(%rbp) + movl $0, -224(%rbp) + movl $48, -220(%rbp) + leaq 16(%rbp), %rax + movq %rax, -216(%rbp) + leaq -176(%rbp), %rdx + movq %rdx, -208(%rbp) + leaq -224(%rbp), %rsi + movq %r10, %rdi + movq %rsp, %rdx + call ffi_closure_UNIX64_inner@PLT + + cmpl $FFI_TYPE_FLOAT, %eax + je 1f + cmpl $FFI_TYPE_DOUBLE, %eax + je 2f + cmpl $FFI_TYPE_LONGDOUBLE, %eax + je 3f + cmpl $FFI_TYPE_STRUCT, %eax + je 4f + popq %rax + leave + ret +1: +2: +3: + movaps -240(%rbp), %xmm0 + leave + ret +4: + leave + ret +.LFE2: + + .section .eh_frame,"a",@progbits +.Lframe0: + .long .LECIE1-.LSCIE1 +.LSCIE1: + .long 0x0 + .byte 0x1 + .string "zR" + .uleb128 0x1 + .sleb128 -8 + .byte 0x10 + .uleb128 0x1 + .byte 0x1b + .byte 0xc + .uleb128 0x7 + .uleb128 0x8 + .byte 0x90 + .uleb128 0x1 + .align 8 +.LECIE1: +.LSFDE1: + .long .LEFDE1-.LASFDE1 +.LASFDE1: + .long .LASFDE1-.Lframe0 + + .long .LFB1-. + .long .LFE1-.LFB1 + .uleb128 0x0 + .byte 0x4 # DW_CFA_advance_loc4 + .long .LCFI0-.LFB1 + .byte 0xe # DW_CFA_def_cfa_offset + .uleb128 0x10 + .byte 0x86 # DW_CFA_offset: r6 at cfa-16 + .uleb128 0x2 + .byte 0x4 # DW_CFA_advance_loc4 + .long .LCFI1-.LCFI0 + .byte 0x86 # DW_CFA_offset: r6 at cfa-16 + .uleb128 0x2 + .byte 0xd # DW_CFA_def_cfa_reg: r6 + .uleb128 0x6 + .align 8 +.LEFDE1: +.LSFDE3: + .long .LEFDE3-.LASFDE3 # FDE Length +.LASFDE3: + .long .LASFDE3-.Lframe0 # FDE CIE offset + + .long .LFB2-. # FDE initial location + .long .LFE2-.LFB2 # FDE address range + .uleb128 0x0 # Augmentation size + .byte 0x4 # DW_CFA_advance_loc4 + .long .LCFI10-.LFB2 + .byte 0xe # DW_CFA_def_cfa_offset + .uleb128 0x10 + .byte 0x86 # DW_CFA_offset, column 0x6 + .uleb128 0x2 + .byte 0x4 # DW_CFA_advance_loc4 + .long .LCFI11-.LCFI10 + .byte 0xd # DW_CFA_def_cfa_register + .uleb128 0x6 + .align 8 +.LEFDE3: + #endif /* __x86_64__ */ diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 7280aa03747..e2e3dd5dbe8 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,26 @@ +2003-01-28 Christian Cornelssen <ccorn@cs.tu-berlin.de> + + * Makefile.in (all-subdir, check-subdir, installcheck-subdir) + (info-subdir, install-info-subdir, clean-info-subdir) + (dvi-subdir, install-subdir, etags-subdir, mostlyclean-subdir) + (clean-subdir, distclean-subdir, maintainer-clean-subdir): + Pass $(FLAGS_TO_PASS). + +2003-01-27 Alexandre Oliva <aoliva@redhat.com> + + * Makefile.in (install_to_tooldir): Instead of $(MULTISUBDIR), use + /`$$CC -print-multi-os-directory`. + +2003-01-26 Christian Cornelssen <ccorn@cs.tu-berlin.de> + + * Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR. + (install_to_libdir, install_to_tooldir): Add a mkinstalldirs + command. + +2003-01-20 Josef Zlomek <zlomekj@suse.cz> + + * hashtab.c (htab_expand): Fix allocation of new entries. + 2002-12-04 Danny Smith <dannysmith@users.sourceforge.net> * make-relative-prefix.c (HAVE_HOST_EXECUTABLE_SUFFIX): diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in index cdf14a4311b..00497f18312 100644 --- a/libiberty/Makefile.in +++ b/libiberty/Makefile.in @@ -1,6 +1,6 @@ # # Makefile -# Copyright (C) 1990, 91-99, 2000, 2001, 2002 +# Copyright (C) 1990, 91-99, 2000, 2001, 2002, 2003 # Free Software Foundation # # This file is part of the libiberty library. @@ -84,6 +84,7 @@ FLAGS_TO_PASS = \ "AR_FLAGS=$(AR_FLAGS)" \ "CC=$(CC)" \ "CFLAGS=$(CFLAGS)" \ + "DESTDIR=$(DESTDIR)" \ "LIBCFLAGS=$(LIBCFLAGS)" \ "EXTRA_OFILES=$(EXTRA_OFILES)" \ "HDEFINES=$(HDEFINES)" \ @@ -261,6 +262,7 @@ INSTALL_DEST = @INSTALL_DEST@ install: install_to_$(INSTALL_DEST) install-subdir install_to_libdir: all + ${mkinstalldirs} $(DESTDIR)$(libdir)$(MULTISUBDIR) $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n ( cd $(DESTDIR)$(libdir)$(MULTISUBDIR) ; $(RANLIB) $(TARGETLIB)n ) mv -f $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)$(MULTISUBDIR)/$(TARGETLIB) @@ -277,9 +279,10 @@ install_to_libdir: all @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install install_to_tooldir: all - $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib$(MULTISUBDIR)/$(TARGETLIB)n - ( cd $(DESTDIR)$(tooldir)/lib$(MULTISUBDIR) ; $(RANLIB) $(TARGETLIB)n ) - mv -f $(DESTDIR)$(tooldir)/lib$(MULTISUBDIR)/$(TARGETLIB)n $(DESTDIR)$(tooldir)/lib$(MULTISUBDIR)/$(TARGETLIB) + ${mkinstalldirs} $(DESTDIR)$(tooldir)/lib/`$$CC -print-multi-os-directory` + $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(tooldir)/lib/`$$CC -print-multi-os-directory`/$(TARGETLIB)n + ( cd $(DESTDIR)$(tooldir)/lib/`$$CC -print-multi-os-directory` ; $(RANLIB) $(TARGETLIB)n ) + mv -f $(DESTDIR)$(tooldir)/lib/`$$CC -print-multi-os-directory`/$(TARGETLIB)n $(DESTDIR)$(tooldir)/lib/`$$CC -print-multi-os-directory`/$(TARGETLIB) @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install # needed-list is used by libstdc++. NEEDED is the list of functions @@ -390,7 +393,7 @@ maintainer-clean-subdir: config.h @subdirs='$(SUBDIRS)'; \ target=`echo $@ | sed -e 's/-subdir//'`; \ for dir in $$subdirs ; do \ - cd $$dir && $(MAKE) $$target; \ + cd $$dir && $(MAKE) $(FLAGS_TO_PASS) $$target; \ done $(REQUIRED_OFILES) $(EXTRA_OFILES) $(LIBOBJS): stamp-picdir diff --git a/libiberty/hashtab.c b/libiberty/hashtab.c index 6bf59ff7378..27741ef6247 100644 --- a/libiberty/hashtab.c +++ b/libiberty/hashtab.c @@ -306,16 +306,18 @@ htab_expand (htab) PTR *olimit; PTR *p; PTR *nentries; + size_t nsize; oentries = htab->entries; olimit = oentries + htab->size; - htab->size = higher_prime_number (htab->size * 2); + nsize = higher_prime_number (htab->size * 2); - nentries = (PTR *) (*htab->alloc_f) (htab->size, sizeof (PTR *)); + nentries = (PTR *) (*htab->alloc_f) (nsize, sizeof (PTR)); if (nentries == NULL) return 0; htab->entries = nentries; + htab->size = nsize; htab->n_elements -= htab->n_deleted; htab->n_deleted = 0; diff --git a/libjava/ChangeLog b/libjava/ChangeLog index d9c65cc89b1..ab507ffe069 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,528 @@ +2003-01-31 Tom Tromey <tromey@redhat.com> + + * aclocal.m4, configure, include/config.h.in: Rebuilt. + * acinclude.m4 (CHECK_FOR_BROKEN_MINGW_LD): Moved from + aclocal.m4. + +2003-01-31 Julian Dolby <dolby@us.ibm.com> + + * java/util/Properties.java (load): Ignore backslash before EOF. + +2003-01-28 Oscar Pearce <oscar@pearceenterprises.com> + + * java/awt/Component.java (processPaintEvent): Dispose of Graphics + object when finished. + +2003-01-28 Andreas Tobler <a.tobler@schweiz.ch> + + * libjava/configure.host: Disable can_unwind_signal on darwin. + +2003-01-28 Ranjit Mathew <rmathew@hotmail.com> + + Fixes PR java/9254: + * include/win32-threads.h (_Jv_Mutex_t): Convert to a struct + additionally containing id of the owner thread as well as + the number of nested times the thread has acquired the mutex. + (_Jv_MutexInit): Initialise owner thread id and refcount to 0. + (_Jv_MutexDestroy): Reset owner thread id and refcount to 0. + (_Jv_MutexUnlock): Check if really the owner thread, reset + owner thread id to 0 before leaving, if leaving for the last + time. + (_Jv_MutexLock): Set owner thread id in the mutex and increment + refcount. + (_Jv_ThreadYield): Yield using a call to Sleep(0). + * win32-threads.cc (_Jv_CondWait): Check if really owner of + the passed mutex. + Pass handle of the broadcast event, instead of a pointer to it + in Win32 ResetEvent( ) call. + Remove incorrect return values. + (_Jv_CondDestroy): Close both event handles and delete + critical section. + (_Jv_CondNotify): Check if really the owner thread. + (_Jv_CondNotifyAll): Check if really the owner thread. + (_Jv_InitThreads): Change daemon_cond to a manual-reset event. + (really_start): Use SetEvent( ) to signal daemon_cond. + (_Jv_ThreadWait): Remove SignalObjectAndWait( ) and use + WaitForSingleObject( ) instead to wait for daemon_cond to be + signalled. + +2003-01-28 Ranjit Mathew <rmathew@hotmail.com> + + * configure.in: Specifically define HAVE_BACKTRACE if building + for MinGW. + * include/win32.h: Remove HAVE_BACKTRACE definition. + * gnu/gcj/runtime/natStackTrace.cc: Include platform.h. + * configure: Rebuilt. + +2003-01-27 Alexandre Oliva <aoliva@redhat.com> + + * configure.in (toolexecdir, toolexecmainlibdir, toolexeclibdir): + Set and AC_SUBST. Remove USE_LIBDIR conditional. + * Makefile.am (toolexecdir, toolexeclibdir): Don't override. + (toolexecmainlib_DATA): Renamed from toolexeclib_DATA. + * Makefile.in, configure: Rebuilt. + +2003-01-24 Ranjit Mathew <rmathew@hotmail.com> + + Fixes PR java/9253: + * java/io/natFileWin32.cc (performList): Append only "*.*" + if the canonical file path already has a "\" at the end. + +2003-01-24 Tom Tromey <tromey@redhat.com> + + * java/lang/ClassLoader.java (findLoadedClass): Removed erroneous + comment. + +2003-01-22 Andrew Haley <aph@redhat.com> + + * x86_64-signal.h: Add simple handler for x86_64 32-bit mode. + * configure.host (CHECKREFSPEC): Define for x86_64. + +2003-01-21 Tom Tromey <tromey@redhat.com> + + * java/util/natResourceBundle.cc (getCallingClassLoader): Start + search at 2, not 3. + +2003-01-21 Vladimir Puskas <vpuskas@eunet.yu> + + * java/io/natFileWin32.cc (isAbsolute): Check path length before + looking at any characters. + * java/io/natFilePosix.cc (_stat): Only compute `buf' if it will + be used. + (isAbsolute): Check path's length as well. + +2003-01-17 Mark Wielaard <mark@klomp.org> + + * Makefile.am (core_java_source_files): Add VMObjectStreamClass.java. + (nat_source_files): Add natVMObjectStreamClass.cc. + * Makefile.in: Regenerated. + * gcj/javaprims.h (namespace java): Regenerated. + * java/io/ObjectStreamClass.java (getClassUID): Call + VMObjectStreamClass.hasClassInitializer(). + (hasClassInitializer): Removed. + * java/io/VMObjectStreamClass.java: New class. + * java/io/natVMObjectStreamClass.cc: New file. + * java/lang/Class.h: Make java::io::VMObjectStreamClass friend class. + +2003-01-19 Michael Koch <konqueror@gmx.de> + + * java/net/MulticastSocket.java + (setInterface): Reindented. + +2003-01-16 Mark Wielaard <mark@klomp.org> + + * java/net/SocketImpl.java (toString): Don't explicitly call + toString() on possible null address. + +2003-01-15 Scott Gilbertson <scottg@mantatest.com> + + * gnu/gcj/xlib/natGC.cc (fillPolygon): New method. + * gnu/gcj/xlib/GC.java (fillPolygon): Declare. + * gnu/awt/xlib/XGraphics.java (fillPolygon): Added translateX and + translateY arguments. Implement. + * gnu/awt/j2d/IntegerGraphicsState.java (fillPolygon): Pass + down translation arguments. + (drawPolyline, drawPolygon): Fix incorrect tests. + * gnu/awt/j2d/DirectRasterGraphics.java (fillPolygon): Added + translateX and translateY arguments. + +2003-01-15 Scott Gilbertson <scottg@mantatest.com> + + * Makefile.in: Rebuilt. + * Makefile.am (xlib_includes): New macro. + (INCLUDES): Use it. + +2003-01-15 Scott Gilbertson <scottg@mantatest.com> + + * gnu/awt/xlib/XToolkit.java (getColorModel): Implemented. + * gnu/awt/xlib/XGraphicsConfiguration.java (getPixel): Work with + 16-bit display mode. + +2003-01-15 Scott Gilbertson <scottg@mantatest.com> + + * java/awt/CardLayout.java (show): Rewrote. + (gotoComponent): Removed `target' argument. Simplified code. + Don't pre-compute `choice' unless `what' is FIRST or LAST. + Changed all callers. + (NONE): Removed. + +2003-01-14 Michael Koch <konqueror@gmx.de> + + * java/net/InetSocketAddress.java + (serialVersionUID): New member variable. + * java/net/NetPermission.java + (NetPermission): Dont implement java.io.Serialization directly. + * java/net/SocketAddress.java: + (serialVersionUID): Documentation added. + +2003-01-14 Michael Koch <konqueror@gmx.de> + + * java/awt/Label.java + (Label): Implements javax.accessibility.Accessible; + * java/awt/List.java + (List): Implements javax.accessibility.Accessible; + * java/awt/ScrollPane.java + (ScrollPane): Implements javax.accessibility.Accessible; + * java/awt/Scrollbar.java + (Scrollbar): Implements javax.accessibility.Accessible; + * java/awt/TextComponent.java + (setCaretPosition): Throw exception, documentation added. + * java/awt/Toolkit.java: + Added some newlines in method documentations. + (createButton): Exception documentation added. + (createTextField): Exception documentation added. + (createLabel): Exception documentation added. + (createList): Exception documentation added. + (createCheckbox): Exception documentation added. + (createScrollbar): Exception documentation added. + (createScrollPane): Exception documentation added. + (createTextArea): Exception documentation added. + (createChoice): Exception documentation added. + (createFrame): Exception documentation added. + (createWindow): Exception documentation added. + (createDialog): Exception documentation added. + (createMenuBar): Exception documentation added. + (createMenu): Exception documentation added. + (createMenuItem): Exception documentation added. + (createFileDialog): Exception documentation added. + (createCheckboxMenuItem): Exception documentation added. + (loadSystemColors): Exception documentation added. + (setDynamicLayout): Exception documentation added. + (isDynamicLayoutSet): Exception documentation added. + (isDynamicLayoutActive): Exception documentation added. + (getScreenSize): Exception documentation added. + (getScreenResolution): Exception documentation added. + (getScreenInsets): Exception documentation added. + (getColorModel): Exception documentation added. + (getSystemClipboard): Exception documentation added. + (getSystemSelection): Exception documentation added. + (getMenuShortcutKeyMask): Exception documentation added. + (getSystemEventQueue): Exception documentation added. + * java/awt/Window.java: + Reindented some code. + (Window): Centralized implementation, documentation added. + (finalize): Documentation added. + (hide): Fixed typo in comment. + (getWindowListeners): Documentation added. + * java/awt/color/ColorSpace.java + (toRGB): Documentation added. + * java/awt/color/ICC_ColorSpace.java + (ICC_ColorSpace): Documentation added. + (toRGB): Throw exception, documentation added. + (fromRGB): Throw exception, documentation added. + (toCIEXYZ): Documentation added. + (fromCIEXYZ): Documentation added. + (getMinValue): Documentation added. + (getMaxValue): Documentation added. + * java/awt/geom/Dimension2D.java + (clone): Documentation added. + * java/awt/geom/GeneralPath.java + (clone): Documentation added. + * java/awt/geom/Line2D.java + (clone): Documentation added. + * java/awt/geom/QuadCurve2D.java + (clone): Documentation added. + * java/awt/image/ColorModel.java + (ColorModel): Throw exception, documentation added. + * java/awt/image/ImageFilter.java + (clone): Doesnt throw CloneNotSupportedException. + +2003-01-14 Andrew Haley <aph@redhat.com> + + * java/lang/natRuntime.cc (_load): StackTrace access needs to be + in a try block. + +2003-01-10 Andrew Haley <aph@redhat.com> + + * include/dwarf2-signal.h: Remove x86_64. + * configure.host (x86_64 DIVIDESPEC): Remove. + * include/x86_64-signal.h: New file. + * configure.in: Regenerate. + +2003-01-10 Michael Koch <konqueror@gmx.de> + + * java/net/DatagramSocket.java + (ch): Description added. + (remotePort): Initialize with -1. + (connect): Doesnt throws SocketException. + * java/net/MulticastSocket.java + (setInterface): Merge with Classpath. + * java/net/ServerSocket.java + (closed): New member variable. + (bind): Check if socket is closed. + (close): Close an associated channel too, set new value to closed. + (isBound): Reindented. + (isClosed): Implemented. + * java/net/Socket.java + (closed): New member variable. + (bind): Check if socket is closed. + (connect): Check if socket is closed. + (close): Close an associated channel too, set new value to closed. + (isClosed): Implemented. + +2003-01-10 Michael Koch <konqueror@gmx.de> + + * java/awt/DisplayMode.java + (equals): Fixed argument type and implementation. + +2003-01-07 Michael Koch <konqueror@gmx.de> + + * java/net/DatagramSocket.java: + Added classpath license info. + (DatagramSocket): Merged description with classpath. + (close): Merged description with classpath. + (getChannel): Merged description with classpath. + (getInetAddress): Merged description with classpath. + (getPort): Merged description with classpath. + (getLocalAddress): Merged description with classpath. + (getLocalPort): Merged description with classpath. + (getSoTimeout): Merged description with classpath. + (setSoTimeout): Merged description with classpath. + (getSendBufferSize): Merged description with classpath. + (setSendBufferSize): Merged description with classpath. + (getReceiveBufferSize): Merged description with classpath. + (setReceiveBufferSize): Merged description with classpath. + +2003-01-07 Tom Tromey <tromey@redhat.com> + + * include/posix.h (_Jv_platform_usleep): Wrap in ifdef + JV_HASH_SYNCHRONIZATION. + * include/win32.h (_Jv_platform_usleep): Wrap in ifdef + JV_HASH_SYNCHRONIZATION. + +2003-01-04 Tom Tromey <tromey@redhat.com> + + * java/awt/List.java: Merged with Classpath. + +2003-01-03 Mark Wielaard <mark@klomp.org> + + * java/io/FileDescriptor.java (position): New private field. + * java/io/natFileDescriptorPosix.cc (write): Up position. + (setLength): Use and set position. + (seek): Set position. + (getFilePointer): Return position. + (read): Up position. + +2003-01-03 Mark Wielaard <mark@klomp.org> + + Merge with Classpath: + * java/io/ObjectStreamClass.java (lookup): Split method and call + lookupForClassObject(). + (lookupForClassObject): New method. + (isProxyClass): New field. + (setClass): Set isProxyClass, add object to classLookupTable, set + superClass and calculateOffsets. + (ObjectStreamClass): Set isProxyClass. Only set uid when Serializable + and not a proxy class. + (setFields): Set accessible true for serialPersistentFields. + (getClassUID): Same for suid. And check if suid is of type long. + (hasClassInitializer): Don't throw NoSuchMethodError. + +2003-01-03 Jeff Sturm <jsturm@one-point.com> + + * configure.host (sparc*-*): Enable bytecode interpreter. + +2003-01-03 Mark Wielaard <mark@klomp.org> + + * java/io/FileInputStream.java (finalize): Don't explicitly + finalize FileDescriptor. + +2003-01-03 Dhek Bhun Kho <bhun@chello.nl> + + * gnu/java/rmi/server/UnicastServerRef.java (unexportObject): + Don't throw RemoteException. + * java/rmi/server/UnicastRemoteObject.java (unexportObject): Don't + throw RemoteException. + +2003-01-03 Joerg Brunsmann <joerg_brunsmann@yahoo.de> + + * gnu/gcj/protocol/http/Connection.java (proxyPort, proxyInUse, + proxyHost): New static fields. + (<clinit>): Initialize new fields. + (connect): Use proxy if necessary. + (usingProxy): Implement. + +2003-01-03 Eric Blake <ebb9@email.byu.edu> + + * java/util/TreeMap.java (fabricateTree): Fix off-by-one error. + (TreeIterator.remove): Prefer IllegalStateException over + ConcurrentModificationException, to match Sun. + +2002-01-02 Anthony Green <green@redhat.com> + + * boehm.cc (_Jv_MarkObj): Mark the protectionDomain of a class. + +2003-01-02 Mark Wielaard <mark@klomp.org> + + * java/net/HttpURLConnection.java (HTTP_NOT_IMPLEMENTED): Must be + public. + (HTTP_USE_PROXY): Add field. + (getResponseVals): Only set responseCode when not yet explicitly + set by subclass. + +2003-01-02 Artur Biesiadowski <abies@pg.gda.pl> + Mark Wielaard <mark@klomp.org> + + * java/util/zip/ZipFile.java (entries): Now HashMap. + (readLeShort(DataInput, byte[])): Read from given byte array. + (readLeInt(DataInput, byte[]): Likewise. + (readLeShort(byte[] b, int off)): New method. + (readLeInt(byte[] b, int off)): Likewise. + (readEntries): Use byte arrays to read info in bigger chunks. + (getEntries): Return HashMap. + (getEntry): Use HashMap. + (locBuf): New private field. + (checkLocalHeader): Use locBuf to read info in one chunk. + (getInputStream): Use entries HashMap, wrap PartialInputStream + in BufferedInputStream. + (ZipEntryEnumeration): Use HashMap and Interator. + +2003-01-02 Mark Wielaard <mark@klomp.org> + Jeroen Frijters <jeroen@sumatra.nl> + + * java/net/URLClassLoader.java (Resource.getCodeSource): + Fix check certs == null. + (getCanonicalFileURL): Removed method. + (JarURLLoader): Don't call removed method. + (FileURLLoader): Likewise. + (FileURLLoader.getResource): Don't canonicalize file name. + +2003-01-01 Tom Tromey <tromey@redhat.com> + + * Makefile.in: Rebuilt. + * Makefile.am (rmi_java_source_files): Added RMIClassLoaderSpi. + * java/awt/AlphaComposite.java, java/awt/BasicStroke.java, + java/awt/BufferCapabilities.java, java/awt/Button.java, + java/awt/CheckboxMenuItem.java, java/awt/Choice.java, + java/awt/Container.java, java/awt/Cursor.java, + java/awt/EventQueue.java, java/awt/FileDialog.java, + java/awt/Graphics2D.java, java/awt/Label.java, java/awt/Menu.java, + java/awt/MenuBar.java, java/awt/MenuComponent.java, + java/awt/PopupMenu.java, java/awt/ScrollPane.java, + java/awt/Scrollbar.java, java/awt/TextArea.java, + java/awt/TextField.java, java/awt/color/CMMException.java, + java/awt/color/ColorSpace.java, java/awt/color/ICC_Profile.java, + java/awt/color/ProfileDataException.java, + java/awt/datatransfer/Clipboard.java, + java/awt/datatransfer/DataFlavor.java, + java/awt/datatransfer/FlavorMap.java, + java/awt/datatransfer/SystemFlavorMap.java, + java/awt/dnd/DragGestureEvent.java, + java/awt/dnd/DragGestureRecognizer.java, + java/awt/dnd/DragSource.java, java/awt/dnd/DropTarget.java, + java/awt/event/WindowEvent.java, java/awt/geom/PathIterator.java, + java/awt/im/InputMethodHighlight.java, + java/io/PipedOutputStream.java, java/io/PipedWriter.java, + java/rmi/server/RMIClassLoader.java: Merged from Classpath. + + * gnu/awt/j2d/Graphics2DImpl.java (drawImage): Changed type of + `op' to BufferedImageOp. + +2002-12-31 Tom Tromey <tromey@redhat.com> + + Fix for PR libgcj/7416: + * javax/naming/InitialContext.java (init): Use + gnu.classpath.home.url. + * java/security/Security.java: Use new properties. + (loadProviders): Accept base url; use it. + * java/lang/System.java: Document gnu.classpath.vm.shortname, and + gnu.classpath.home.url. + (gnu.classpath.home.url): Define. + (gnu.classpath.vm.shortname): Likewise. + +2002-12-31 Tom Tromey <tromey@redhat.com> + Ranjit Mathew <rmathew@hotmail.com> + + Fix for PR libgcj/8997: + * java/lang/natObject.cc (spin): Use _Jv_platform_usleep. + Include platform.h. + * include/posix.h (_Jv_platform_usleep): New function. + * include/win32.h (_Jv_platform_usleep): New function. + +2002-12-30 Tom Tromey <tromey@redhat.com> + + * gcj/javaprims.h: Updated class list. + +2002-12-30 Mark Wielaard <mark@klomp.org> + + * java/net/URLStreamHandler.java (toExternalForm): Ignore port + if zero or smaller. + +2002-12-30 Mark Wielaard <mark@klomp.org> + + * java/util/Properties (formatForOutput): Don't fall through to + default case after escaping character. + +2002-11-30 Mark Wielaard <mark@klomp.org> + + * java/lang/StringBuffer.java (getChars): Remove wrong dstOffset check + against count. + +2002-11-21 Anthony Green <green@redhat.com> + + * Makefile.am: Move org.xml.sax and org.w3c.dom into their own + libraries. + * Makefile.in: Rebuilt. + +2002-12-19 Anthony Green <green@redhat.com> + + * Makefile.am (ordinary_java_source_files): Add + org/xml/sax/helpers/NewInstance.java. + * Makefile.in: Rebuilt. + * org/xml/sax/package.html, org/xml/sax/ext/package.html, + org/xml/sax/helpers/package.html: New files. + * org/xml/sax/*: Upgrade to SAX 2.0.1 release from + http://www.saxproject.org. + +2002-12-19 Andrew Haley <aph@redhat.com> + + * java/util/natResourceBundle.cc: Include + ArrayIndexOutOfBoundsException.h. + (getCallingClassLoader): Don't put upper bound on stack search. + Catch ArrayIndexOutOfBoundsException. + +2002-12-19 Tom Tromey <tromey@redhat.com> + + * libtool-version: Increased `current'. + +2002-12-19 Tom Tromey <tromey@redhat.com> + + * java/lang/natClassLoader.cc (defineClass0): Removed erroneous + comment. + * java/lang/ClassLoader.java (defineClass): Use chained + exception when rethrowing. + * defineclass.cc (handleClassBegin): Mark class as interpreted. + * java/lang/reflect/Modifier.java (INVISIBLE, INTERPRETED): New + constants. + * resolve.cc (_Jv_PrepareMissingMethods): New function. + (_Jv_PrepareClass): Use it. + * include/java-interp.h (_Jv_IsInterpretedClass): Rewrote. + (_Jv_InterpClass): _Jv_PrepareMissingMethods now friend. + * java/lang/Class.h (Class::getModifiers): Mask with ALL_FLAGS. + (Class): _Jv_PrepareMissingMethods now friend. + * java/lang/natClassLoader.cc (defineClass0): Use JvSynchronize. + Record `NULL' for system class loader. + (_Jv_RegisterInitiatingLoader): Use JvSynchronize. Special case + system class loader. + (_Jv_FindClassInCache): Likewise. + (_Jv_UnregisterClass): Use JvSynchronize. Free old loader info. + (_Jv_FindClass): Special case system class loader. + * java/lang/natClass.cc (_Jv_abstractMethodError): New function. + (_Jv_SetVTableEntries): Put _Jv_abstractMethodError into empty + vtable slots. + (_Jv_LayoutVTableMethods): Don't generate vtable slot for a method + in a final class. + (_getDeclaredMethod): Don't return synthetic methods. + (getDeclaredMethods): Likewise. + (_getMethod): Likewise. + (_getMethods): Likewise. + +2002-12-18 Raif Naffah <raif@fl.net.au> + + * java/math/BigInteger.java (euclidInv): Make sure quot and rem are in + canonical form after divide(). + (modInverse): Likewise. + 2002-12-13 Casey Marshall <rsdio@metastatic.org> Mark Wielaard <mark@klomp.org> diff --git a/libjava/Makefile.am b/libjava/Makefile.am index 0db820f360f..4d680de6ad3 100644 --- a/libjava/Makefile.am +++ b/libjava/Makefile.am @@ -14,23 +14,17 @@ endif ## What gets installed, and where. ## -## Install a library built with a cross compiler in tooldir, not -## libdir. -if USE_LIBDIR -toolexeclibdir = $(libdir)$(MULTISUBDIR) -else -toolexecdir = $(exec_prefix)/$(target_alias) -toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR) -endif - if XLIB_AWT cond_x_ltlibrary = libgcjx.la +## We require libstdc++-v3 to be in the same build tree. +xlib_includes = -I../libstdc++-v3/include -I../libstdc++-v3/include/$(target_alias) -I$(srcdir)/../libstdc++-v3/libsupc++ else cond_x_ltlibrary = +xlib_includes = endif -toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary) -toolexeclib_DATA = libgcj.spec +toolexeclib_LTLIBRARIES = libgcj.la lib-org-xml-sax.la lib-org-w3c-dom.la $(cond_x_ltlibrary) +toolexecmainlib_DATA = libgcj.spec jardir = $(datadir)/java jar_DATA = libgcj-@gcc_version@.jar @@ -107,10 +101,9 @@ JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS) LIBFFIINCS = @LIBFFIINCS@ INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \ - $(GCINCS) $(THREADINCS) $(INCLTDL) \ + $(GCINCS) $(THREADINCS) $(INCLTDL) $(xlib_includes) \ $(GCC_UNWIND_INCLUDE) $(ZINCS) $(LIBFFIINCS) - ## ################################################################ ## @@ -147,6 +140,63 @@ libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \ -version-info `grep -v '^\#' $(srcdir)/libtool-version` libgcj_la_LINK = $(LIBLINK) +lib_org_w3c_dom_la_SOURCES = org/w3c/dom/Attr.java \ +org/w3c/dom/CDATASection.java \ +org/w3c/dom/CharacterData.java \ +org/w3c/dom/Comment.java \ +org/w3c/dom/DOMException.java \ +org/w3c/dom/DOMImplementation.java \ +org/w3c/dom/Document.java \ +org/w3c/dom/DocumentFragment.java \ +org/w3c/dom/DocumentType.java \ +org/w3c/dom/Element.java \ +org/w3c/dom/Entity.java \ +org/w3c/dom/EntityReference.java \ +org/w3c/dom/NamedNodeMap.java \ +org/w3c/dom/Node.java \ +org/w3c/dom/NodeList.java \ +org/w3c/dom/Notation.java \ +org/w3c/dom/ProcessingInstruction.java \ +org/w3c/dom/Text.java \ +org/w3c/dom/ranges/DocumentRange.java \ +org/w3c/dom/ranges/Range.java \ +org/w3c/dom/ranges/RangeException.java \ +org/w3c/dom/traversal/DocumentTraversal.java \ +org/w3c/dom/traversal/NodeFilter.java \ +org/w3c/dom/traversal/NodeIterator.java \ +org/w3c/dom/traversal/TreeWalker.java + +lib_org_xml_sax_la_SOURCES = org/xml/sax/ext/DeclHandler.java \ +org/xml/sax/ext/LexicalHandler.java \ +org/xml/sax/helpers/AttributeListImpl.java \ +org/xml/sax/helpers/AttributesImpl.java \ +org/xml/sax/helpers/DefaultHandler.java \ +org/xml/sax/helpers/LocatorImpl.java \ +org/xml/sax/helpers/NamespaceSupport.java \ +org/xml/sax/helpers/NewInstance.java \ +org/xml/sax/helpers/ParserAdapter.java \ +org/xml/sax/helpers/ParserFactory.java \ +org/xml/sax/helpers/XMLFilterImpl.java \ +org/xml/sax/helpers/XMLReaderAdapter.java \ +org/xml/sax/helpers/XMLReaderFactory.java \ +org/xml/sax/AttributeList.java \ +org/xml/sax/Attributes.java \ +org/xml/sax/ContentHandler.java \ +org/xml/sax/DTDHandler.java \ +org/xml/sax/DocumentHandler.java \ +org/xml/sax/EntityResolver.java \ +org/xml/sax/ErrorHandler.java \ +org/xml/sax/HandlerBase.java \ +org/xml/sax/InputSource.java \ +org/xml/sax/Locator.java \ +org/xml/sax/Parser.java \ +org/xml/sax/SAXException.java \ +org/xml/sax/SAXNotRecognizedException.java \ +org/xml/sax/SAXNotSupportedException.java \ +org/xml/sax/SAXParseException.java \ +org/xml/sax/XMLFilter.java \ +org/xml/sax/XMLReader.java + libgcjx_la_SOURCES = $(x_nat_source_files) EXTRA_libgcjx_la_SOURCES = $(x_java_source_files) libgcjx_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(x_javao_files) @@ -168,6 +218,8 @@ install-exec-hook: all_java_source_files = \ $(java_source_files) \ $(built_java_source_files) \ + $(lib_org_xml_sax_la_SOURCES) \ + $(lib_org_w3c_dom_la_SOURCES) \ $(x_java_source_files) all_java_class_files = $(all_java_source_files:.java=.class) @@ -218,7 +270,7 @@ $(c_files): %.lo: %.c $(c_files): java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h ## FIXME: GNU make. -$(javao_files) $(x_javao_files): %.lo: %.java +$(javao_files) $(x_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS): %.lo: %.java $(GCJCOMPILE) -o $@ $< ## Pass the list of object files to libtool in a temporary file to @@ -1277,6 +1329,7 @@ java/rmi/server/LogStream.java \ java/rmi/server/ObjID.java \ java/rmi/server/Operation.java \ java/rmi/server/RMIClassLoader.java \ +java/rmi/server/RMIClassLoaderSpi.java \ java/rmi/server/RMIClientSocketFactory.java \ java/rmi/server/RMIFailureHandler.java \ java/rmi/server/RMIServerSocketFactory.java \ @@ -1630,6 +1683,7 @@ java/io/StringWriter.java \ java/io/SyncFailedException.java \ java/io/UTFDataFormatException.java \ java/io/UnsupportedEncodingException.java \ +java/io/VMObjectStreamClass.java \ java/io/WriteAbortedException.java \ java/io/Writer.java \ java/util/AbstractCollection.java \ @@ -2220,60 +2274,6 @@ java/util/zip/ZipException.java \ java/util/zip/ZipFile.java \ java/util/zip/ZipInputStream.java \ java/util/zip/ZipOutputStream.java \ -org/w3c/dom/Attr.java \ -org/w3c/dom/CDATASection.java \ -org/w3c/dom/CharacterData.java \ -org/w3c/dom/Comment.java \ -org/w3c/dom/DOMException.java \ -org/w3c/dom/DOMImplementation.java \ -org/w3c/dom/Document.java \ -org/w3c/dom/DocumentFragment.java \ -org/w3c/dom/DocumentType.java \ -org/w3c/dom/Element.java \ -org/w3c/dom/Entity.java \ -org/w3c/dom/EntityReference.java \ -org/w3c/dom/NamedNodeMap.java \ -org/w3c/dom/Node.java \ -org/w3c/dom/NodeList.java \ -org/w3c/dom/Notation.java \ -org/w3c/dom/ProcessingInstruction.java \ -org/w3c/dom/Text.java \ -org/w3c/dom/ranges/DocumentRange.java \ -org/w3c/dom/ranges/Range.java \ -org/w3c/dom/ranges/RangeException.java \ -org/w3c/dom/traversal/DocumentTraversal.java \ -org/w3c/dom/traversal/NodeFilter.java \ -org/w3c/dom/traversal/NodeIterator.java \ -org/w3c/dom/traversal/TreeWalker.java \ -org/xml/sax/ext/DeclHandler.java \ -org/xml/sax/ext/LexicalHandler.java \ -org/xml/sax/helpers/AttributeListImpl.java \ -org/xml/sax/helpers/AttributesImpl.java \ -org/xml/sax/helpers/DefaultHandler.java \ -org/xml/sax/helpers/LocatorImpl.java \ -org/xml/sax/helpers/NamespaceSupport.java \ -org/xml/sax/helpers/ParserAdapter.java \ -org/xml/sax/helpers/ParserFactory.java \ -org/xml/sax/helpers/XMLFilterImpl.java \ -org/xml/sax/helpers/XMLReaderAdapter.java \ -org/xml/sax/helpers/XMLReaderFactory.java \ -org/xml/sax/AttributeList.java \ -org/xml/sax/Attributes.java \ -org/xml/sax/ContentHandler.java \ -org/xml/sax/DTDHandler.java \ -org/xml/sax/DocumentHandler.java \ -org/xml/sax/EntityResolver.java \ -org/xml/sax/ErrorHandler.java \ -org/xml/sax/HandlerBase.java \ -org/xml/sax/InputSource.java \ -org/xml/sax/Locator.java \ -org/xml/sax/Parser.java \ -org/xml/sax/SAXException.java \ -org/xml/sax/SAXNotRecognizedException.java \ -org/xml/sax/SAXNotSupportedException.java \ -org/xml/sax/SAXParseException.java \ -org/xml/sax/XMLFilter.java \ -org/xml/sax/XMLReader.java \ $(rmi_java_source_files) \ $(awt_java_source_files) \ $(convert_source_files) \ @@ -2325,6 +2325,7 @@ java/io/natFile.cc \ java/io/natFileDescriptor.cc \ java/io/natObjectInputStream.cc \ java/io/natObjectOutputStream.cc \ +java/io/natVMObjectStreamClass.cc \ java/lang/natCharacter.cc \ java/lang/natClass.cc \ java/lang/natClassLoader.cc \ diff --git a/libjava/Makefile.in b/libjava/Makefile.in index c8d722f0521..0d7eee72dba 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -127,18 +127,20 @@ here = @here@ libgcj_basedir = @libgcj_basedir@ mkinstalldirs = @mkinstalldirs@ tool_include_dir = @tool_include_dir@ +toolexecdir = @toolexecdir@ +toolexeclibdir = @toolexeclibdir@ +toolexecmainlibdir = @toolexecmainlibdir@ AUTOMAKE_OPTIONS = foreign @TESTSUBDIR_TRUE@SUBDIRS = @TESTSUBDIR_TRUE@$(DIRLTDL) testsuite gcj include @TESTSUBDIR_FALSE@SUBDIRS = @TESTSUBDIR_FALSE@$(DIRLTDL) gcj include -@USE_LIBDIR_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR) -@USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR) -@USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias) @XLIB_AWT_TRUE@cond_x_ltlibrary = @XLIB_AWT_TRUE@libgcjx.la @XLIB_AWT_FALSE@cond_x_ltlibrary = +@XLIB_AWT_TRUE@xlib_includes = @XLIB_AWT_TRUE@-I../libstdc++-v3/include -I../libstdc++-v3/include/$(target_alias) -I$(srcdir)/../libstdc++-v3/libsupc++ +@XLIB_AWT_FALSE@xlib_includes = -toolexeclib_LTLIBRARIES = libgcj.la $(cond_x_ltlibrary) -toolexeclib_DATA = libgcj.spec +toolexeclib_LTLIBRARIES = libgcj.la lib-org-xml-sax.la lib-org-w3c-dom.la $(cond_x_ltlibrary) +toolexecmainlib_DATA = libgcj.spec jardir = $(datadir)/java jar_DATA = libgcj-@gcc_version@.jar @@ -182,7 +184,7 @@ JC1FLAGS = @LIBGCJ_JAVAFLAGS@ $(GCJFLAGS) LIBFFIINCS = @LIBFFIINCS@ INCLUDES = -I$(top_srcdir) -Iinclude -I$(top_srcdir)/include \ - $(GCINCS) $(THREADINCS) $(INCLTDL) \ + $(GCINCS) $(THREADINCS) $(INCLTDL) $(xlib_includes) \ $(GCC_UNWIND_INCLUDE) $(ZINCS) $(LIBFFIINCS) @@ -218,6 +220,65 @@ libgcj_la_LDFLAGS = -rpath $(toolexeclibdir) $(THREADLDFLAGS) $(THREADLIBS) \ libgcj_la_LINK = $(LIBLINK) +lib_org_w3c_dom_la_SOURCES = org/w3c/dom/Attr.java \ +org/w3c/dom/CDATASection.java \ +org/w3c/dom/CharacterData.java \ +org/w3c/dom/Comment.java \ +org/w3c/dom/DOMException.java \ +org/w3c/dom/DOMImplementation.java \ +org/w3c/dom/Document.java \ +org/w3c/dom/DocumentFragment.java \ +org/w3c/dom/DocumentType.java \ +org/w3c/dom/Element.java \ +org/w3c/dom/Entity.java \ +org/w3c/dom/EntityReference.java \ +org/w3c/dom/NamedNodeMap.java \ +org/w3c/dom/Node.java \ +org/w3c/dom/NodeList.java \ +org/w3c/dom/Notation.java \ +org/w3c/dom/ProcessingInstruction.java \ +org/w3c/dom/Text.java \ +org/w3c/dom/ranges/DocumentRange.java \ +org/w3c/dom/ranges/Range.java \ +org/w3c/dom/ranges/RangeException.java \ +org/w3c/dom/traversal/DocumentTraversal.java \ +org/w3c/dom/traversal/NodeFilter.java \ +org/w3c/dom/traversal/NodeIterator.java \ +org/w3c/dom/traversal/TreeWalker.java + + +lib_org_xml_sax_la_SOURCES = org/xml/sax/ext/DeclHandler.java \ +org/xml/sax/ext/LexicalHandler.java \ +org/xml/sax/helpers/AttributeListImpl.java \ +org/xml/sax/helpers/AttributesImpl.java \ +org/xml/sax/helpers/DefaultHandler.java \ +org/xml/sax/helpers/LocatorImpl.java \ +org/xml/sax/helpers/NamespaceSupport.java \ +org/xml/sax/helpers/NewInstance.java \ +org/xml/sax/helpers/ParserAdapter.java \ +org/xml/sax/helpers/ParserFactory.java \ +org/xml/sax/helpers/XMLFilterImpl.java \ +org/xml/sax/helpers/XMLReaderAdapter.java \ +org/xml/sax/helpers/XMLReaderFactory.java \ +org/xml/sax/AttributeList.java \ +org/xml/sax/Attributes.java \ +org/xml/sax/ContentHandler.java \ +org/xml/sax/DTDHandler.java \ +org/xml/sax/DocumentHandler.java \ +org/xml/sax/EntityResolver.java \ +org/xml/sax/ErrorHandler.java \ +org/xml/sax/HandlerBase.java \ +org/xml/sax/InputSource.java \ +org/xml/sax/Locator.java \ +org/xml/sax/Parser.java \ +org/xml/sax/SAXException.java \ +org/xml/sax/SAXNotRecognizedException.java \ +org/xml/sax/SAXNotSupportedException.java \ +org/xml/sax/SAXParseException.java \ +org/xml/sax/XMLFilter.java \ +org/xml/sax/XMLReader.java + + libgcjx_la_SOURCES = $(x_nat_source_files) EXTRA_libgcjx_la_SOURCES = $(x_java_source_files) libgcjx_la_DEPENDENCIES = libgcj-@gcc_version@.jar $(x_javao_files) @@ -231,6 +292,8 @@ libgcjx_la_LINK = $(LIBLINK) all_java_source_files = \ $(java_source_files) \ $(built_java_source_files) \ + $(lib_org_xml_sax_la_SOURCES) \ + $(lib_org_w3c_dom_la_SOURCES) \ $(x_java_source_files) @@ -1035,6 +1098,7 @@ java/rmi/server/LogStream.java \ java/rmi/server/ObjID.java \ java/rmi/server/Operation.java \ java/rmi/server/RMIClassLoader.java \ +java/rmi/server/RMIClassLoaderSpi.java \ java/rmi/server/RMIClientSocketFactory.java \ java/rmi/server/RMIFailureHandler.java \ java/rmi/server/RMIServerSocketFactory.java \ @@ -1385,6 +1449,7 @@ java/io/StringWriter.java \ java/io/SyncFailedException.java \ java/io/UTFDataFormatException.java \ java/io/UnsupportedEncodingException.java \ +java/io/VMObjectStreamClass.java \ java/io/WriteAbortedException.java \ java/io/Writer.java \ java/util/AbstractCollection.java \ @@ -1970,60 +2035,6 @@ java/util/zip/ZipException.java \ java/util/zip/ZipFile.java \ java/util/zip/ZipInputStream.java \ java/util/zip/ZipOutputStream.java \ -org/w3c/dom/Attr.java \ -org/w3c/dom/CDATASection.java \ -org/w3c/dom/CharacterData.java \ -org/w3c/dom/Comment.java \ -org/w3c/dom/DOMException.java \ -org/w3c/dom/DOMImplementation.java \ -org/w3c/dom/Document.java \ -org/w3c/dom/DocumentFragment.java \ -org/w3c/dom/DocumentType.java \ -org/w3c/dom/Element.java \ -org/w3c/dom/Entity.java \ -org/w3c/dom/EntityReference.java \ -org/w3c/dom/NamedNodeMap.java \ -org/w3c/dom/Node.java \ -org/w3c/dom/NodeList.java \ -org/w3c/dom/Notation.java \ -org/w3c/dom/ProcessingInstruction.java \ -org/w3c/dom/Text.java \ -org/w3c/dom/ranges/DocumentRange.java \ -org/w3c/dom/ranges/Range.java \ -org/w3c/dom/ranges/RangeException.java \ -org/w3c/dom/traversal/DocumentTraversal.java \ -org/w3c/dom/traversal/NodeFilter.java \ -org/w3c/dom/traversal/NodeIterator.java \ -org/w3c/dom/traversal/TreeWalker.java \ -org/xml/sax/ext/DeclHandler.java \ -org/xml/sax/ext/LexicalHandler.java \ -org/xml/sax/helpers/AttributeListImpl.java \ -org/xml/sax/helpers/AttributesImpl.java \ -org/xml/sax/helpers/DefaultHandler.java \ -org/xml/sax/helpers/LocatorImpl.java \ -org/xml/sax/helpers/NamespaceSupport.java \ -org/xml/sax/helpers/ParserAdapter.java \ -org/xml/sax/helpers/ParserFactory.java \ -org/xml/sax/helpers/XMLFilterImpl.java \ -org/xml/sax/helpers/XMLReaderAdapter.java \ -org/xml/sax/helpers/XMLReaderFactory.java \ -org/xml/sax/AttributeList.java \ -org/xml/sax/Attributes.java \ -org/xml/sax/ContentHandler.java \ -org/xml/sax/DTDHandler.java \ -org/xml/sax/DocumentHandler.java \ -org/xml/sax/EntityResolver.java \ -org/xml/sax/ErrorHandler.java \ -org/xml/sax/HandlerBase.java \ -org/xml/sax/InputSource.java \ -org/xml/sax/Locator.java \ -org/xml/sax/Parser.java \ -org/xml/sax/SAXException.java \ -org/xml/sax/SAXNotRecognizedException.java \ -org/xml/sax/SAXNotSupportedException.java \ -org/xml/sax/SAXParseException.java \ -org/xml/sax/XMLFilter.java \ -org/xml/sax/XMLReader.java \ $(rmi_java_source_files) \ $(awt_java_source_files) \ $(convert_source_files) \ @@ -2074,6 +2085,7 @@ java/io/natFile.cc \ java/io/natFileDescriptor.cc \ java/io/natObjectInputStream.cc \ java/io/natObjectOutputStream.cc \ +java/io/natVMObjectStreamClass.cc \ java/lang/natCharacter.cc \ java/lang/natClass.cc \ java/lang/natClassLoader.cc \ @@ -2242,11 +2254,11 @@ gnu/gcj/runtime/natNameFinder.lo gnu/gcj/runtime/natSharedLibLoader.lo \ gnu/gcj/runtime/natStackTrace.lo gnu/gcj/runtime/natStringBuffer.lo \ gnu/gcj/runtime/natVMClassLoader.lo java/io/natFile.lo \ java/io/natFileDescriptor.lo java/io/natObjectInputStream.lo \ -java/io/natObjectOutputStream.lo java/lang/natCharacter.lo \ -java/lang/natClass.lo java/lang/natClassLoader.lo \ -java/lang/natConcreteProcess.lo java/lang/natDouble.lo \ -java/lang/natFloat.lo java/lang/natMath.lo java/lang/natObject.lo \ -java/lang/natRuntime.lo java/lang/natString.lo \ +java/io/natObjectOutputStream.lo java/io/natVMObjectStreamClass.lo \ +java/lang/natCharacter.lo java/lang/natClass.lo \ +java/lang/natClassLoader.lo java/lang/natConcreteProcess.lo \ +java/lang/natDouble.lo java/lang/natFloat.lo java/lang/natMath.lo \ +java/lang/natObject.lo java/lang/natRuntime.lo java/lang/natString.lo \ java/lang/natStringBuffer.lo java/lang/natSystem.lo \ java/lang/natThread.lo java/lang/natVMSecurityManager.lo \ java/lang/ref/natReference.lo java/lang/reflect/natArray.lo \ @@ -2257,6 +2269,46 @@ java/net/natPlainDatagramSocketImpl.lo java/net/natPlainSocketImpl.lo \ java/text/natCollator.lo java/util/natResourceBundle.lo \ java/util/natTimeZone.lo java/util/zip/natDeflater.lo \ java/util/zip/natInflater.lo +lib_org_xml_sax_la_LDFLAGS = +lib_org_xml_sax_la_LIBADD = +lib_org_xml_sax_la_OBJECTS = org/xml/sax/ext/DeclHandler.lo \ +org/xml/sax/ext/LexicalHandler.lo \ +org/xml/sax/helpers/AttributeListImpl.lo \ +org/xml/sax/helpers/AttributesImpl.lo \ +org/xml/sax/helpers/DefaultHandler.lo \ +org/xml/sax/helpers/LocatorImpl.lo \ +org/xml/sax/helpers/NamespaceSupport.lo \ +org/xml/sax/helpers/NewInstance.lo org/xml/sax/helpers/ParserAdapter.lo \ +org/xml/sax/helpers/ParserFactory.lo \ +org/xml/sax/helpers/XMLFilterImpl.lo \ +org/xml/sax/helpers/XMLReaderAdapter.lo \ +org/xml/sax/helpers/XMLReaderFactory.lo org/xml/sax/AttributeList.lo \ +org/xml/sax/Attributes.lo org/xml/sax/ContentHandler.lo \ +org/xml/sax/DTDHandler.lo org/xml/sax/DocumentHandler.lo \ +org/xml/sax/EntityResolver.lo org/xml/sax/ErrorHandler.lo \ +org/xml/sax/HandlerBase.lo org/xml/sax/InputSource.lo \ +org/xml/sax/Locator.lo org/xml/sax/Parser.lo \ +org/xml/sax/SAXException.lo org/xml/sax/SAXNotRecognizedException.lo \ +org/xml/sax/SAXNotSupportedException.lo \ +org/xml/sax/SAXParseException.lo org/xml/sax/XMLFilter.lo \ +org/xml/sax/XMLReader.lo +lib_org_w3c_dom_la_LDFLAGS = +lib_org_w3c_dom_la_LIBADD = +lib_org_w3c_dom_la_OBJECTS = org/w3c/dom/Attr.lo \ +org/w3c/dom/CDATASection.lo org/w3c/dom/CharacterData.lo \ +org/w3c/dom/Comment.lo org/w3c/dom/DOMException.lo \ +org/w3c/dom/DOMImplementation.lo org/w3c/dom/Document.lo \ +org/w3c/dom/DocumentFragment.lo org/w3c/dom/DocumentType.lo \ +org/w3c/dom/Element.lo org/w3c/dom/Entity.lo \ +org/w3c/dom/EntityReference.lo org/w3c/dom/NamedNodeMap.lo \ +org/w3c/dom/Node.lo org/w3c/dom/NodeList.lo org/w3c/dom/Notation.lo \ +org/w3c/dom/ProcessingInstruction.lo org/w3c/dom/Text.lo \ +org/w3c/dom/ranges/DocumentRange.lo org/w3c/dom/ranges/Range.lo \ +org/w3c/dom/ranges/RangeException.lo \ +org/w3c/dom/traversal/DocumentTraversal.lo \ +org/w3c/dom/traversal/NodeFilter.lo \ +org/w3c/dom/traversal/NodeIterator.lo \ +org/w3c/dom/traversal/TreeWalker.lo libgcjx_la_OBJECTS = gnu/gcj/xlib/natClip.lo \ gnu/gcj/xlib/natColormap.lo gnu/gcj/xlib/natDisplay.lo \ gnu/gcj/xlib/natDrawable.lo gnu/gcj/xlib/natFont.lo \ @@ -2291,11 +2343,12 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CF LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DATA = $(jar_DATA) $(toolexeclib_DATA) +DATA = $(jar_DATA) $(toolexecmainlib_DATA) DIST_COMMON = README COPYING ChangeLog Makefile.am Makefile.in NEWS \ -THANKS acinclude.m4 aclocal.m4 configure configure.in \ -libgcj-test.spec.in libgcj.spec.in +THANKS acconfig.h acinclude.m4 aclocal.m4 configure configure.in \ +gcj/libgcj-config.h.in gcj/stamp-h2.in include/config.h.in \ +include/stamp-h1.in libgcj-test.spec.in libgcj.spec.in DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) @@ -2892,10 +2945,12 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/io/SyncFailedException.P \ .deps/java/io/UTFDataFormatException.P \ .deps/java/io/UnsupportedEncodingException.P \ +.deps/java/io/VMObjectStreamClass.P \ .deps/java/io/WriteAbortedException.P .deps/java/io/Writer.P \ .deps/java/io/natFile.P .deps/java/io/natFileDescriptor.P \ .deps/java/io/natObjectInputStream.P \ .deps/java/io/natObjectOutputStream.P \ +.deps/java/io/natVMObjectStreamClass.P \ .deps/java/lang/AbstractMethodError.P \ .deps/java/lang/ArithmeticException.P \ .deps/java/lang/ArrayIndexOutOfBoundsException.P \ @@ -3117,6 +3172,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/java/rmi/server/LoaderHandler.P .deps/java/rmi/server/LogStream.P \ .deps/java/rmi/server/ObjID.P .deps/java/rmi/server/Operation.P \ .deps/java/rmi/server/RMIClassLoader.P \ +.deps/java/rmi/server/RMIClassLoaderSpi.P \ .deps/java/rmi/server/RMIClientSocketFactory.P \ .deps/java/rmi/server/RMIFailureHandler.P \ .deps/java/rmi/server/RMIServerSocketFactory.P \ @@ -3701,6 +3757,7 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/org/xml/sax/helpers/DefaultHandler.P \ .deps/org/xml/sax/helpers/LocatorImpl.P \ .deps/org/xml/sax/helpers/NamespaceSupport.P \ +.deps/org/xml/sax/helpers/NewInstance.P \ .deps/org/xml/sax/helpers/ParserAdapter.P \ .deps/org/xml/sax/helpers/ParserFactory.P \ .deps/org/xml/sax/helpers/XMLFilterImpl.P \ @@ -3708,8 +3765,8 @@ DEP_FILES = .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \ .deps/org/xml/sax/helpers/XMLReaderFactory.P .deps/posix-threads.P \ .deps/posix.P .deps/prims.P .deps/resolve.P .deps/verify.P \ .deps/win32-threads.P .deps/win32.P -SOURCES = $(libgcj_la_SOURCES) $(EXTRA_libgcj_la_SOURCES) $(libgcjx_la_SOURCES) $(EXTRA_libgcjx_la_SOURCES) $(jv_convert_SOURCES) $(EXTRA_jv_convert_SOURCES) $(gij_SOURCES) $(rmic_SOURCES) $(EXTRA_rmic_SOURCES) $(rmiregistry_SOURCES) $(EXTRA_rmiregistry_SOURCES) $(gen_from_JIS_SOURCES) $(EXTRA_gen_from_JIS_SOURCES) -OBJECTS = $(libgcj_la_OBJECTS) $(libgcjx_la_OBJECTS) $(jv_convert_OBJECTS) $(gij_OBJECTS) $(rmic_OBJECTS) $(rmiregistry_OBJECTS) $(gen_from_JIS_OBJECTS) +SOURCES = $(libgcj_la_SOURCES) $(EXTRA_libgcj_la_SOURCES) $(lib_org_xml_sax_la_SOURCES) $(lib_org_w3c_dom_la_SOURCES) $(libgcjx_la_SOURCES) $(EXTRA_libgcjx_la_SOURCES) $(jv_convert_SOURCES) $(EXTRA_jv_convert_SOURCES) $(gij_SOURCES) $(rmic_SOURCES) $(EXTRA_rmic_SOURCES) $(rmiregistry_SOURCES) $(EXTRA_rmiregistry_SOURCES) $(gen_from_JIS_SOURCES) $(EXTRA_gen_from_JIS_SOURCES) +OBJECTS = $(libgcj_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS) $(lib_org_w3c_dom_la_OBJECTS) $(libgcjx_la_OBJECTS) $(jv_convert_OBJECTS) $(gij_OBJECTS) $(rmic_OBJECTS) $(rmiregistry_OBJECTS) $(gen_from_JIS_OBJECTS) all: all-redirect .SUFFIXES: @@ -3728,6 +3785,53 @@ config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) $(SHELL) ./config.status --recheck $(srcdir)/configure: @MAINTAINER_MODE_TRUE@$(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) cd $(srcdir) && $(AUTOCONF) + +include/config.h: include/stamp-h1 + @if test ! -f $@; then \ + rm -f include/stamp-h1; \ + $(MAKE) include/stamp-h1; \ + else :; fi +include/stamp-h1: $(srcdir)/include/config.h.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES= CONFIG_HEADERS=include/config.h \ + $(SHELL) ./config.status + @echo timestamp > include/stamp-h1 2> /dev/null +$(srcdir)/include/config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/include/stamp-h1.in + @if test ! -f $@; then \ + rm -f $(srcdir)/include/stamp-h1.in; \ + $(MAKE) $(srcdir)/include/stamp-h1.in; \ + else :; fi +$(srcdir)/include/stamp-h1.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h + cd $(top_srcdir) && $(AUTOHEADER) + @echo timestamp > $(srcdir)/include/stamp-h1.in 2> /dev/null + +gcj/libgcj-config.h: gcj/stamp-h2 + @if test ! -f $@; then \ + rm -f gcj/stamp-h2; \ + $(MAKE) gcj/stamp-h2; \ + else :; fi +gcj/stamp-h2: $(srcdir)/gcj/libgcj-config.h.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES= CONFIG_HEADERS=gcj/libgcj-config.h \ + $(SHELL) ./config.status + @echo timestamp > gcj/stamp-h2 2> /dev/null +$(srcdir)/gcj/libgcj-config.h.in: @MAINTAINER_MODE_TRUE@$(srcdir)/gcj/stamp-h2.in + @if test ! -f $@; then \ + rm -f $(srcdir)/gcj/stamp-h2.in; \ + $(MAKE) $(srcdir)/gcj/stamp-h2.in; \ + else :; fi +$(srcdir)/gcj/stamp-h2.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h + cd $(top_srcdir) && $(AUTOHEADER) + @echo timestamp > $(srcdir)/gcj/stamp-h2.in 2> /dev/null + +mostlyclean-hdr: + +clean-hdr: + +distclean-hdr: + -rm -f include/config.h gcj/libgcj-config.h + +maintainer-clean-hdr: libgcj.spec: $(top_builddir)/config.status libgcj.spec.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status libgcj-test.spec: $(top_builddir)/config.status libgcj-test.spec.in @@ -3796,6 +3900,12 @@ distclean-libtool: maintainer-clean-libtool: +lib-org-xml-sax.la: $(lib_org_xml_sax_la_OBJECTS) $(lib_org_xml_sax_la_DEPENDENCIES) + $(LINK) -rpath $(toolexeclibdir) $(lib_org_xml_sax_la_LDFLAGS) $(lib_org_xml_sax_la_OBJECTS) $(lib_org_xml_sax_la_LIBADD) $(LIBS) + +lib-org-w3c-dom.la: $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_w3c_dom_la_DEPENDENCIES) + $(LINK) -rpath $(toolexeclibdir) $(lib_org_w3c_dom_la_LDFLAGS) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_w3c_dom_la_LIBADD) $(LIBS) + mostlyclean-binPROGRAMS: clean-binPROGRAMS: @@ -3894,23 +4004,23 @@ uninstall-jarDATA: rm -f $(DESTDIR)$(jardir)/$$p; \ done -install-toolexeclibDATA: $(toolexeclib_DATA) +install-toolexecmainlibDATA: $(toolexecmainlib_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(toolexeclibdir) - @list='$(toolexeclib_DATA)'; for p in $$list; do \ + $(mkinstalldirs) $(DESTDIR)$(toolexecmainlibdir) + @list='$(toolexecmainlib_DATA)'; for p in $$list; do \ if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(toolexeclibdir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(toolexeclibdir)/$$p; \ + echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(toolexecmainlibdir)/$$p"; \ + $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(toolexecmainlibdir)/$$p; \ else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(toolexeclibdir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(toolexeclibdir)/$$p; \ + echo " $(INSTALL_DATA) $$p $(DESTDIR)$(toolexecmainlibdir)/$$p"; \ + $(INSTALL_DATA) $$p $(DESTDIR)$(toolexecmainlibdir)/$$p; \ fi; fi; \ done -uninstall-toolexeclibDATA: +uninstall-toolexecmainlibDATA: @$(NORMAL_UNINSTALL) - list='$(toolexeclib_DATA)'; for p in $$list; do \ - rm -f $(DESTDIR)$(toolexeclibdir)/$$p; \ + list='$(toolexecmainlib_DATA)'; for p in $$list; do \ + rm -f $(DESTDIR)$(toolexecmainlibdir)/$$p; \ done # This directory's subdirectories are mostly independent; you can cd @@ -4125,7 +4235,7 @@ check: check-recursive installcheck-am: installcheck: installcheck-recursive install-exec-am: install-toolexeclibLTLIBRARIES install-binPROGRAMS \ - install-binSCRIPTS install-toolexeclibDATA + install-binSCRIPTS install-toolexecmainlibDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-exec-hook install-exec: install-exec-recursive @@ -4138,7 +4248,7 @@ install-am: all-am install: install-recursive uninstall-am: uninstall-toolexeclibLTLIBRARIES uninstall-binPROGRAMS \ uninstall-binSCRIPTS uninstall-jarDATA \ - uninstall-toolexeclibDATA + uninstall-toolexecmainlibDATA uninstall: uninstall-recursive all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) all-redirect: all-recursive @@ -4148,7 +4258,7 @@ installdirs: installdirs-recursive installdirs-am: $(mkinstalldirs) $(DESTDIR)$(toolexeclibdir) $(DESTDIR)$(bindir) \ $(DESTDIR)$(bindir) $(DESTDIR)$(jardir) \ - $(DESTDIR)$(toolexeclibdir) + $(DESTDIR)$(toolexecmainlibdir) mostlyclean-generic: @@ -4162,29 +4272,32 @@ distclean-generic: -rm -f config.cache config.log stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-toolexeclibLTLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-binPROGRAMS \ - mostlyclean-noinstPROGRAMS mostlyclean-tags \ - mostlyclean-depend mostlyclean-generic +mostlyclean-am: mostlyclean-hdr mostlyclean-toolexeclibLTLIBRARIES \ + mostlyclean-compile mostlyclean-libtool \ + mostlyclean-binPROGRAMS mostlyclean-noinstPROGRAMS \ + mostlyclean-tags mostlyclean-depend mostlyclean-generic mostlyclean: mostlyclean-recursive -clean-am: clean-toolexeclibLTLIBRARIES clean-compile clean-libtool \ - clean-binPROGRAMS clean-noinstPROGRAMS clean-tags \ - clean-depend clean-generic mostlyclean-am clean-local +clean-am: clean-hdr clean-toolexeclibLTLIBRARIES clean-compile \ + clean-libtool clean-binPROGRAMS clean-noinstPROGRAMS \ + clean-tags clean-depend clean-generic mostlyclean-am \ + clean-local clean: clean-recursive -distclean-am: distclean-toolexeclibLTLIBRARIES distclean-compile \ - distclean-libtool distclean-binPROGRAMS \ - distclean-noinstPROGRAMS distclean-tags \ - distclean-depend distclean-generic clean-am +distclean-am: distclean-hdr distclean-toolexeclibLTLIBRARIES \ + distclean-compile distclean-libtool \ + distclean-binPROGRAMS distclean-noinstPROGRAMS \ + distclean-tags distclean-depend distclean-generic \ + clean-am -rm -f libtool distclean: distclean-recursive -rm -f config.status -maintainer-clean-am: maintainer-clean-toolexeclibLTLIBRARIES \ +maintainer-clean-am: maintainer-clean-hdr \ + maintainer-clean-toolexeclibLTLIBRARIES \ maintainer-clean-compile maintainer-clean-libtool \ maintainer-clean-binPROGRAMS \ maintainer-clean-noinstPROGRAMS maintainer-clean-tags \ @@ -4196,9 +4309,9 @@ maintainer-clean-am: maintainer-clean-toolexeclibLTLIBRARIES \ maintainer-clean: maintainer-clean-recursive -rm -f config.status -.PHONY: mostlyclean-toolexeclibLTLIBRARIES \ -distclean-toolexeclibLTLIBRARIES clean-toolexeclibLTLIBRARIES \ -maintainer-clean-toolexeclibLTLIBRARIES \ +.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ +mostlyclean-toolexeclibLTLIBRARIES distclean-toolexeclibLTLIBRARIES \ +clean-toolexeclibLTLIBRARIES maintainer-clean-toolexeclibLTLIBRARIES \ uninstall-toolexeclibLTLIBRARIES install-toolexeclibLTLIBRARIES \ mostlyclean-compile distclean-compile clean-compile \ maintainer-clean-compile mostlyclean-libtool distclean-libtool \ @@ -4207,12 +4320,12 @@ distclean-binPROGRAMS clean-binPROGRAMS maintainer-clean-binPROGRAMS \ uninstall-binPROGRAMS install-binPROGRAMS mostlyclean-noinstPROGRAMS \ distclean-noinstPROGRAMS clean-noinstPROGRAMS \ maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \ -uninstall-jarDATA install-jarDATA uninstall-toolexeclibDATA \ -install-toolexeclibDATA install-data-recursive uninstall-data-recursive \ -install-exec-recursive uninstall-exec-recursive installdirs-recursive \ -uninstalldirs-recursive all-recursive check-recursive \ -installcheck-recursive info-recursive dvi-recursive \ -mostlyclean-recursive distclean-recursive clean-recursive \ +uninstall-jarDATA install-jarDATA uninstall-toolexecmainlibDATA \ +install-toolexecmainlibDATA install-data-recursive \ +uninstall-data-recursive install-exec-recursive \ +uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ +all-recursive check-recursive installcheck-recursive info-recursive \ +dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ distclean-tags clean-tags maintainer-clean-tags distdir \ mostlyclean-depend distclean-depend clean-depend \ @@ -4264,7 +4377,7 @@ $(c_files): %.lo: %.c $(c_files): java/lang/fdlibm.h java/lang/ieeefp.h java/lang/mprec.h -$(javao_files) $(x_javao_files): %.lo: %.java +$(javao_files) $(x_javao_files) $(lib_org_w3c_dom_la_OBJECTS) $(lib_org_xml_sax_la_OBJECTS): %.lo: %.java $(GCJCOMPILE) -o $@ $< libgcj.la: $(libgcj_la_OBJECTS) $(libgcj_la_DEPENDENCIES) diff --git a/libjava/acinclude.m4 b/libjava/acinclude.m4 index d205aa029dd..ab3b2f1dd27 100644 --- a/libjava/acinclude.m4 +++ b/libjava/acinclude.m4 @@ -273,3 +273,27 @@ AC_DEFUN([AM_LC_MESSAGES], [Define if your <locale.h> file defines LC_MESSAGES.]) fi fi]) + +AC_DEFUN([CHECK_FOR_BROKEN_MINGW_LD], +[ +AC_MSG_CHECKING(whether 'ld' is at least 2.13) +LD_PROG=`$CC --print-prog-name=ld` +LD_VERSION=`$LD_PROG --version` +LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4` +LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2` +if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then + LD_OK="ok" +else + if expr "$LD_VERSION_MAJOR" = 2 && expr "$LD_VERSION_MINOR" \>= 13 > /dev/null; then + LD_OK="ok" + fi +fi +if test "x$LD_OK" != x; then + AC_MSG_RESULT([yes; major=$LD_VERSION_MAJOR, minor=$LD_VERSION_MINOR]) +else + AC_MSG_RESULT([no; major=$LD_VERSION_MAJOR, minor=$LD_VERSION_MINOR]) + AC_MSG_WARN([ld <2.13 detected; enabling JV_LINKER_CANNOT_8BYTE_ALIGN_STATICS hack...]) + AC_DEFINE(JV_LINKER_CANNOT_8BYTE_ALIGN_STATICS, 1, + [Indicate that linker is not able to 8-byte align static data]) +fi[]dnl +])# CHECK_FOR_BROKEN_MINGW_LD diff --git a/libjava/aclocal.m4 b/libjava/aclocal.m4 index 26e735711b9..5748ebada1f 100644 --- a/libjava/aclocal.m4 +++ b/libjava/aclocal.m4 @@ -286,6 +286,30 @@ AC_DEFUN([AM_LC_MESSAGES], fi fi]) +AC_DEFUN([CHECK_FOR_BROKEN_MINGW_LD], +[ +AC_MSG_CHECKING(whether 'ld' is at least 2.13) +LD_PROG=`$CC --print-prog-name=ld` +LD_VERSION=`$LD_PROG --version` +LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4` +LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2` +if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then + LD_OK="ok" +else + if expr "$LD_VERSION_MAJOR" = 2 && expr "$LD_VERSION_MINOR" \>= 13 > /dev/null; then + LD_OK="ok" + fi +fi +if test "x$LD_OK" != x; then + AC_MSG_RESULT([yes; major=$LD_VERSION_MAJOR, minor=$LD_VERSION_MINOR]) +else + AC_MSG_RESULT([no; major=$LD_VERSION_MAJOR, minor=$LD_VERSION_MINOR]) + AC_MSG_WARN([ld <2.13 detected; enabling JV_LINKER_CANNOT_8BYTE_ALIGN_STATICS hack...]) + AC_DEFINE(JV_LINKER_CANNOT_8BYTE_ALIGN_STATICS, 1, + [Indicate that linker is not able to 8-byte align static data]) +fi[]dnl +])# CHECK_FOR_BROKEN_MINGW_LD + # Do all the work for Automake. This macro actually does too much -- # some checks are only needed if your package does certain things. # But this isn't really a big deal. @@ -434,26 +458,3 @@ for am_file in <<$1>>; do done<<>>dnl>>) changequote([,]))]) -AC_DEFUN([CHECK_FOR_BROKEN_MINGW_LD], -[ -AC_MSG_CHECKING(whether 'ld' is at least 2.13) -LD_PROG=`$CC --print-prog-name=ld` -LD_VERSION=`$LD_PROG --version` -LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4` -LD_VERSION_MINOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 2` -if expr "$LD_VERSION_MAJOR" \> 2 > /dev/null; then - LD_OK="ok" -else - if expr "$LD_VERSION_MAJOR" = 2 && expr "$LD_VERSION_MINOR" \>= 13 > /dev/null; then - LD_OK="ok" - fi -fi -if test "x$LD_OK" != x; then - AC_MSG_RESULT([yes; major=$LD_VERSION_MAJOR, minor=$LD_VERSION_MINOR]) -else - AC_MSG_RESULT([no; major=$LD_VERSION_MAJOR, minor=$LD_VERSION_MINOR]) - AC_MSG_WARN([ld <2.13 detected; enabling JV_LINKER_CANNOT_8BYTE_ALIGN_STATICS hack...]) - AC_DEFINE(JV_LINKER_CANNOT_8BYTE_ALIGN_STATICS, 1, - [Indicate that linker is not able to 8-byte align static data]) -fi[]dnl -])# CHECK_FOR_BROKEN_MINGW_LD diff --git a/libjava/boehm.cc b/libjava/boehm.cc index 90796f2ddf0..5006059dabd 100644 --- a/libjava/boehm.cc +++ b/libjava/boehm.cc @@ -203,6 +203,8 @@ _Jv_MarkObj (void *addr, void *msp, void *msl, void * /* env */) MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, cBlabel); p = (ptr_t) c->arrayclass; MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, cDlabel); + p = (ptr_t) c->protectionDomain; + MAYBE_MARK (p, mark_stack_ptr, mark_stack_limit, c, cPlabel); #ifdef INTERPRETER if (_Jv_IsInterpretedClass (c)) diff --git a/libjava/configure b/libjava/configure index 4160fef7d68..853b9401049 100755 --- a/libjava/configure +++ b/libjava/configure @@ -82,6 +82,7 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= +sitefile= srcdir= target=NONE verbose= @@ -196,6 +197,7 @@ Configuration: --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages + --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -366,6 +368,11 @@ EOF -site=* | --site=* | --sit=*) site="$ac_optarg" ;; + -site-file | --site-file | --site-fil | --site-fi | --site-f) + ac_prev=sitefile ;; + -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) + sitefile="$ac_optarg" ;; + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -531,12 +538,16 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" +if test -z "$sitefile"; then + if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + fi fi +else + CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -583,7 +594,7 @@ fi ORIGINAL_LD_FOR_MULTILIBS=$LD echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:587: checking whether ln -s works" >&5 +echo "configure:598: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -636,7 +647,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:640: checking for a BSD compatible install" >&5 +echo "configure:651: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -689,7 +700,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:693: checking whether build environment is sane" >&5 +echo "configure:704: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -746,7 +757,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:750: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:761: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -779,12 +790,12 @@ else fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:783: checking for Cygwin environment" >&5 +echo "configure:794: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 788 "configure" +#line 799 "configure" #include "confdefs.h" int main() { @@ -795,7 +806,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:799: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -812,19 +823,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:816: checking for mingw32 environment" >&5 +echo "configure:827: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 821 "configure" +#line 832 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:839: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -951,7 +962,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:955: checking host system type" >&5 +echo "configure:966: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -972,7 +983,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:976: checking target system type" >&5 +echo "configure:987: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -990,7 +1001,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:994: checking build system type" >&5 +echo "configure:1005: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1019,7 +1030,7 @@ test "$host_alias" != "$target_alias" && # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1023: checking for $ac_word" >&5 +echo "configure:1034: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1049,7 +1060,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1053: checking for $ac_word" >&5 +echo "configure:1064: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1100,7 +1111,7 @@ fi # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1104: checking for $ac_word" >&5 +echo "configure:1115: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1133,7 +1144,7 @@ fi echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1137: checking whether we are using GNU C" >&5 +echo "configure:1148: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1142,7 +1153,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1146: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1157: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1161,7 +1172,7 @@ ac_test_CFLAGS="${CFLAGS+set}" ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1165: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1176: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1210,7 +1221,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1214: checking for $ac_word" >&5 +echo "configure:1225: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_glibjava_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1245,7 +1256,7 @@ CXX=$glibjava_CXX test -z "$glibjava_CXX" && { echo "configure: error: no acceptable c++ found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1249: checking whether we are using GNU C++" >&5 +echo "configure:1260: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1254,7 +1265,7 @@ else yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1258: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1269: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1269,7 +1280,7 @@ if test $ac_cv_prog_gxx = yes; then ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1273: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1284: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1318,7 +1329,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:1322: checking for working aclocal" >&5 +echo "configure:1333: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1331,7 +1342,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1335: checking for working autoconf" >&5 +echo "configure:1346: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1344,7 +1355,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1348: checking for working automake" >&5 +echo "configure:1359: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1357,7 +1368,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1361: checking for working autoheader" >&5 +echo "configure:1372: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1370,7 +1381,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1374: checking for working makeinfo" >&5 +echo "configure:1385: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1389,7 +1400,7 @@ fi # LIBGCJ_CONFIGURE, which doesn't work because that means that it will # be run before AC_CANONICAL_HOST. echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:1393: checking build system type" >&5 +echo "configure:1404: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1410,7 +1421,7 @@ echo "$ac_t""$build" 1>&6 # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1414: checking for $ac_word" >&5 +echo "configure:1425: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1442,7 +1453,7 @@ fi # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1446: checking for $ac_word" >&5 +echo "configure:1457: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1474,7 +1485,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1478: checking for $ac_word" >&5 +echo "configure:1489: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1506,7 +1517,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1510: checking for $ac_word" >&5 +echo "configure:1521: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1551,7 +1562,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1555: checking for a BSD compatible install" >&5 +echo "configure:1566: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1605,7 +1616,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:1609: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:1620: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1631,7 +1642,7 @@ fi echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1635: checking for executable suffix" >&5 +echo "configure:1646: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1641,10 +1652,10 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.c | *.o | *.obj) ;; + *.c | *.o | *.obj | *.ilk | *.pdb) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -1791,7 +1802,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1795: checking for ld used by GCC" >&5 +echo "configure:1806: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1821,10 +1832,10 @@ echo "configure:1795: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1825: checking for GNU ld" >&5 +echo "configure:1836: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1828: checking for non-GNU ld" >&5 +echo "configure:1839: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1859,7 +1870,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1863: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1874: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1876,7 +1887,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1880: checking for $LD option to reload object files" >&5 +echo "configure:1891: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1888,7 +1899,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1892: checking for BSD-compatible nm" >&5 +echo "configure:1903: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1926,7 +1937,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:1930: checking how to recognise dependant libraries" >&5 +echo "configure:1941: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2099,13 +2110,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2103: checking for object suffix" >&5 +echo "configure:2114: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2109: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2120: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2129,7 +2140,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2133: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2144: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2191,7 +2202,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2195: checking for file" >&5 +echo "configure:2206: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2262,7 +2273,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2266: checking for $ac_word" >&5 +echo "configure:2277: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2294,7 +2305,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2298: checking for $ac_word" >&5 +echo "configure:2309: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2329,7 +2340,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2333: checking for $ac_word" >&5 +echo "configure:2344: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2361,7 +2372,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2365: checking for $ac_word" >&5 +echo "configure:2376: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2428,8 +2439,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2432 "configure"' > conftest.$ac_ext - if { (eval echo configure:2433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2443 "configure"' > conftest.$ac_ext + if { (eval echo configure:2444: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2448,7 +2459,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2452: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2463: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2464,7 +2475,7 @@ ia64-*-hpux*) x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2468: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) case $host in @@ -2508,7 +2519,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2512: checking whether the C compiler needs -belf" >&5 +echo "configure:2523: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2521,14 +2532,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2525 "configure" +#line 2536 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2558,12 +2569,12 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 esac echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2562: checking how to run the C++ preprocessor" >&5 +echo "configure:2573: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - ac_ext=C + ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='${CXX-g++} -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' @@ -2571,12 +2582,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext <<EOF -#line 2575 "configure" +#line 2586 "configure" #include "confdefs.h" #include <stdlib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2591: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2589,18 +2600,15 @@ else fi rm -f conftest* ac_cv_prog_CXXCPP="$CXXCPP" - ac_ext=c +ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross - fi - CXXCPP="$ac_cv_prog_CXXCPP" -else - ac_cv_prog_CXXCPP=$CXXCPP fi +CXXCPP="$ac_cv_prog_CXXCPP" echo "$ac_t""$CXXCPP" 1>&6 @@ -2815,7 +2823,7 @@ INTERPRETER="$libgcj_interpreter" echo $ac_n "checking for exception model to use""... $ac_c" 1>&6 -echo "configure:2819: checking for exception model to use" >&5 +echo "configure:2827: checking for exception model to use" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2830,7 +2838,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : else cat > conftest.$ac_ext << EOF -#line 2834 "configure" +#line 2842 "configure" struct S { ~S(); }; void bar(); void foo() @@ -2841,7 +2849,7 @@ void foo() EOF old_CXXFLAGS="$CXXFLAGS" CXXFLAGS=-S -if { (eval echo configure:2845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if grep _Unwind_SjLj_Resume conftest.s >/dev/null 2>&1 ; then enable_sjlj_exceptions=yes elif grep _Unwind_Resume conftest.s >/dev/null 2>&1 ; then @@ -2951,7 +2959,7 @@ case "$TARGET_ECOS" in PLATFORMH=win32.h echo $ac_n "checking whether 'ld' is at least 2.13""... $ac_c" 1>&6 -echo "configure:2955: checking whether 'ld' is at least 2.13" >&5 +echo "configure:2963: checking whether 'ld' is at least 2.13" >&5 LD_PROG=`$CC --print-prog-name=ld` LD_VERSION=`$LD_PROG --version` LD_VERSION_MAJOR=`echo "$LD_VERSION" | head -1 | cut -d '.' -f 1 | cut -d ' ' -f 4` @@ -2995,7 +3003,7 @@ esac echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2999: checking how to run the C preprocessor" >&5 +echo "configure:3007: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -3010,13 +3018,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 3014 "configure" +#line 3022 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3020: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3027,13 +3035,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 3031 "configure" +#line 3039 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3037: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3044,13 +3052,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 3048 "configure" +#line 3056 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3062: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3075,7 +3083,7 @@ fi echo "$ac_t""$CPP" 1>&6 cat > conftest.$ac_ext <<EOF -#line 3079 "configure" +#line 3087 "configure" #include "confdefs.h" #include <stdint.h> EOF @@ -3090,7 +3098,7 @@ fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3094 "configure" +#line 3102 "configure" #include "confdefs.h" #include <inttypes.h> EOF @@ -3105,7 +3113,7 @@ fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3109 "configure" +#line 3117 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -3120,7 +3128,7 @@ fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3124 "configure" +#line 3132 "configure" #include "confdefs.h" #include <sys/config.h> EOF @@ -3137,7 +3145,7 @@ rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3141 "configure" +#line 3149 "configure" #include "confdefs.h" #include <time.h> EOF @@ -3152,7 +3160,7 @@ fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3156 "configure" +#line 3164 "configure" #include "confdefs.h" #include <time.h> EOF @@ -3204,7 +3212,7 @@ ZLIBTESTSPEC= libsubdir=.libs echo $ac_n "checking for garbage collector to use""... $ac_c" 1>&6 -echo "configure:3208: checking for garbage collector to use" >&5 +echo "configure:3216: checking for garbage collector to use" >&5 # Check whether --enable-java-gc or --disable-java-gc was given. if test "${enable_java_gc+set}" = set; then enableval="$enable_java_gc" @@ -3257,7 +3265,7 @@ esac echo $ac_n "checking for thread model used by GCC""... $ac_c" 1>&6 -echo "configure:3261: checking for thread model used by GCC" >&5 +echo "configure:3269: checking for thread model used by GCC" >&5 THREADS=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'` echo "$ac_t""$THREADS" 1>&6 @@ -3465,12 +3473,12 @@ else for ac_func in strerror ioctl select fstat open fsync sleep opendir do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3469: checking for $ac_func" >&5 +echo "configure:3477: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3474 "configure" +#line 3482 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3493,7 +3501,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3520,12 +3528,12 @@ done for ac_func in gmtime_r localtime_r readdir_r getpwuid_r getcwd do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3524: checking for $ac_func" >&5 +echo "configure:3532: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3529 "configure" +#line 3537 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3548,7 +3556,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3575,12 +3583,12 @@ done for ac_func in access stat mkdir rename rmdir unlink realpath utime chmod do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3579: checking for $ac_func" >&5 +echo "configure:3587: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3584 "configure" +#line 3592 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3603,7 +3611,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3630,12 +3638,12 @@ done for ac_func in nl_langinfo setlocale do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3634: checking for $ac_func" >&5 +echo "configure:3642: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3639 "configure" +#line 3647 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3658,7 +3666,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3685,12 +3693,12 @@ done for ac_func in inet_aton inet_addr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3689: checking for $ac_func" >&5 +echo "configure:3697: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3694 "configure" +#line 3702 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3713,7 +3721,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3740,12 +3748,12 @@ done for ac_func in inet_pton uname inet_ntoa do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3744: checking for $ac_func" >&5 +echo "configure:3752: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3749 "configure" +#line 3757 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3768,7 +3776,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3780: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3795,12 +3803,12 @@ done for ac_func in fork execvp pipe sigaction ftruncate do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3799: checking for $ac_func" >&5 +echo "configure:3807: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3804 "configure" +#line 3812 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -3823,7 +3831,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:3827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -3851,17 +3859,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3855: checking for $ac_hdr" >&5 +echo "configure:3863: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3860 "configure" +#line 3868 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3888,12 +3896,12 @@ fi done echo $ac_n "checking for backtrace""... $ac_c" 1>&6 -echo "configure:3892: checking for backtrace" >&5 +echo "configure:3900: checking for backtrace" >&5 if eval "test \"`echo '$''{'ac_cv_func_backtrace'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3897 "configure" +#line 3905 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char backtrace(); below. */ @@ -3916,7 +3924,7 @@ backtrace(); ; return 0; } EOF -if { (eval echo configure:3920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_backtrace=yes" else @@ -3948,11 +3956,22 @@ EOF else echo "$ac_t""no" 1>&6 + + case "$host" in + *mingw*) + # Has backtrace() defined in libgcj itself + cat >> confdefs.h <<\EOF +#define HAVE_BACKTRACE 1 +EOF + + ;; + esac + fi echo $ac_n "checking for dladdr in -ldl""... $ac_c" 1>&6 -echo "configure:3956: checking for dladdr in -ldl" >&5 +echo "configure:3975: checking for dladdr in -ldl" >&5 ac_lib_var=`echo dl'_'dladdr | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3960,7 +3979,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 3964 "configure" +#line 3983 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3971,7 +3990,7 @@ int main() { dladdr() ; return 0; } EOF -if { (eval echo configure:3975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4001,7 +4020,7 @@ do ac_safe=`echo "$ac_file" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_file""... $ac_c" 1>&6 -echo "configure:4005: checking for $ac_file" >&5 +echo "configure:4024: checking for $ac_file" >&5 if eval "test \"`echo '$''{'ac_cv_file_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4059,7 +4078,7 @@ fi echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:4063: checking for iconv" >&5 +echo "configure:4082: checking for iconv" >&5 if eval "test \"`echo '$''{'am_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4067,7 +4086,7 @@ else am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no cat > conftest.$ac_ext <<EOF -#line 4071 "configure" +#line 4090 "configure" #include "confdefs.h" #include <stdlib.h> #include <iconv.h> @@ -4077,7 +4096,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:4081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_func_iconv=yes else @@ -4089,7 +4108,7 @@ rm -f conftest* am_save_LIBS="$LIBS" LIBS="$LIBS $am_cv_libiconv_ldpath -liconv" cat > conftest.$ac_ext <<EOF -#line 4093 "configure" +#line 4112 "configure" #include "confdefs.h" #include <stdlib.h> #include <iconv.h> @@ -4099,7 +4118,7 @@ iconv_t cd = iconv_open("",""); iconv_close(cd); ; return 0; } EOF -if { (eval echo configure:4103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_lib_iconv=yes am_cv_func_iconv=yes @@ -4120,13 +4139,13 @@ echo "$ac_t""$am_cv_func_iconv" 1>&6 EOF echo $ac_n "checking for iconv declaration""... $ac_c" 1>&6 -echo "configure:4124: checking for iconv declaration" >&5 +echo "configure:4143: checking for iconv declaration" >&5 if eval "test \"`echo '$''{'am_cv_proto_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4130 "configure" +#line 4149 "configure" #include "confdefs.h" #include <stdlib.h> @@ -4145,7 +4164,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4168: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* am_cv_proto_iconv_arg1="" else @@ -4174,19 +4193,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:4178: checking for LC_MESSAGES" >&5 +echo "configure:4197: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'am_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4183 "configure" +#line 4202 "configure" #include "confdefs.h" #include <locale.h> int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:4190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_val_LC_MESSAGES=yes else @@ -4207,12 +4226,12 @@ EOF fi fi echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:4211: checking whether struct tm is in sys/time.h or time.h" >&5 +echo "configure:4230: checking whether struct tm is in sys/time.h or time.h" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4216 "configure" +#line 4235 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -4220,7 +4239,7 @@ int main() { struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:4224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -4241,12 +4260,12 @@ EOF fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:4245: checking for tm_zone in struct tm" >&5 +echo "configure:4264: checking for tm_zone in struct tm" >&5 if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4250 "configure" +#line 4269 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -4254,7 +4273,7 @@ int main() { struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:4258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -4274,12 +4293,12 @@ EOF else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:4278: checking for tzname" >&5 +echo "configure:4297: checking for tzname" >&5 if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4283 "configure" +#line 4302 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -4289,7 +4308,7 @@ int main() { atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:4293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -4314,12 +4333,12 @@ fi for ac_func in gethostbyname_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4318: checking for $ac_func" >&5 +echo "configure:4337: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4323 "configure" +#line 4342 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4342,7 +4361,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4369,7 +4388,7 @@ EOF # We look for the one that returns `int'. # Hopefully this check is robust enough. cat > conftest.$ac_ext <<EOF -#line 4373 "configure" +#line 4392 "configure" #include "confdefs.h" #include <netdb.h> EOF @@ -4389,7 +4408,7 @@ rm -f conftest* *" -D_REENTRANT "*) ;; *) echo $ac_n "checking whether gethostbyname_r declaration requires -D_REENTRANT""... $ac_c" 1>&6 -echo "configure:4393: checking whether gethostbyname_r declaration requires -D_REENTRANT" >&5 +echo "configure:4412: checking whether gethostbyname_r declaration requires -D_REENTRANT" >&5 if eval "test \"`echo '$''{'libjava_cv_gethostbyname_r_needs_reentrant'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4402,14 +4421,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 4406 "configure" +#line 4425 "configure" #include "confdefs.h" #include <netdb.h> int main() { gethostbyname_r("", 0, 0); ; return 0; } EOF -if { (eval echo configure:4413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libjava_cv_gethostbyname_r_needs_reentrant=no else @@ -4419,14 +4438,14 @@ else CPPFLAGS_SAVE="$CPPFLAGS" CPPFLAGS="$CPPFLAGS -D_REENTRANT" cat > conftest.$ac_ext <<EOF -#line 4423 "configure" +#line 4442 "configure" #include "confdefs.h" #include <netdb.h> int main() { gethostbyname_r("", 0, 0); ; return 0; } EOF -if { (eval echo configure:4430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libjava_cv_gethostbyname_r_needs_reentrant=yes else @@ -4461,12 +4480,12 @@ EOF esac echo $ac_n "checking for struct hostent_data""... $ac_c" 1>&6 -echo "configure:4465: checking for struct hostent_data" >&5 +echo "configure:4484: checking for struct hostent_data" >&5 if eval "test \"`echo '$''{'libjava_cv_struct_hostent_data'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4470 "configure" +#line 4489 "configure" #include "confdefs.h" #if GETHOSTBYNAME_R_NEEDS_REENTRANT && !defined(_REENTRANT) @@ -4477,7 +4496,7 @@ int main() { struct hostent_data data; ; return 0; } EOF -if { (eval echo configure:4481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4500: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* libjava_cv_struct_hostent_data=yes else @@ -4509,7 +4528,7 @@ done # to exist where expected. (The root issue: AC_CHECK_FUNCS assumes C # linkage check is enough, yet C++ code requires proper prototypes.) cat > conftest.$ac_ext <<EOF -#line 4513 "configure" +#line 4532 "configure" #include "confdefs.h" #include <netdb.h> EOF @@ -4520,12 +4539,12 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | for ac_func in gethostbyaddr_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4524: checking for $ac_func" >&5 +echo "configure:4543: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4529 "configure" +#line 4548 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4548,7 +4567,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4575,7 +4594,7 @@ EOF # We look for the one that returns `int'. # Hopefully this check is robust enough. cat > conftest.$ac_ext <<EOF -#line 4579 "configure" +#line 4598 "configure" #include "confdefs.h" #include <netdb.h> EOF @@ -4602,12 +4621,12 @@ rm -f conftest* for ac_func in gethostname do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4606: checking for $ac_func" >&5 +echo "configure:4625: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4611 "configure" +#line 4630 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4630,7 +4649,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4654,7 +4673,7 @@ EOF EOF cat > conftest.$ac_ext <<EOF -#line 4658 "configure" +#line 4677 "configure" #include "confdefs.h" #include <unistd.h> EOF @@ -4685,12 +4704,12 @@ done for ac_func in pthread_mutexattr_settype pthread_mutexattr_setkind_np do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4689: checking for $ac_func" >&5 +echo "configure:4708: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4694 "configure" +#line 4713 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4713,7 +4732,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4743,12 +4762,12 @@ done for ac_func in sched_yield do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4747: checking for $ac_func" >&5 +echo "configure:4766: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4752 "configure" +#line 4771 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4771,7 +4790,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4794: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4793,7 +4812,7 @@ EOF else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sched_yield in -lrt""... $ac_c" 1>&6 -echo "configure:4797: checking for sched_yield in -lrt" >&5 +echo "configure:4816: checking for sched_yield in -lrt" >&5 ac_lib_var=`echo rt'_'sched_yield | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4801,7 +4820,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <<EOF -#line 4805 "configure" +#line 4824 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4812,7 +4831,7 @@ int main() { sched_yield() ; return 0; } EOF -if { (eval echo configure:4816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4838,7 +4857,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for sched_yield in -lposix4""... $ac_c" 1>&6 -echo "configure:4842: checking for sched_yield in -lposix4" >&5 +echo "configure:4861: checking for sched_yield in -lposix4" >&5 ac_lib_var=`echo posix4'_'sched_yield | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4846,7 +4865,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix4 $LIBS" cat > conftest.$ac_ext <<EOF -#line 4850 "configure" +#line 4869 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4857,7 +4876,7 @@ int main() { sched_yield() ; return 0; } EOF -if { (eval echo configure:4861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4893,7 +4912,7 @@ done # We can save a little space at runtime if the mutex has m_count # or __m_count. This is a nice hack for Linux. cat > conftest.$ac_ext <<EOF -#line 4897 "configure" +#line 4916 "configure" #include "confdefs.h" #include <pthread.h> int main() { @@ -4902,7 +4921,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4906: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4925: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define PTHREAD_MUTEX_HAVE_M_COUNT 1 @@ -4914,7 +4933,7 @@ else rm -rf conftest* cat > conftest.$ac_ext <<EOF -#line 4918 "configure" +#line 4937 "configure" #include "confdefs.h" #include <pthread.h> int main() { @@ -4923,7 +4942,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:4927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define PTHREAD_MUTEX_HAVE___M_COUNT 1 @@ -4943,12 +4962,12 @@ rm -f conftest* for ac_func in gettimeofday time ftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4947: checking for $ac_func" >&5 +echo "configure:4966: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4952 "configure" +#line 4971 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4971,7 +4990,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5002,12 +5021,12 @@ done for ac_func in memmove do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5006: checking for $ac_func" >&5 +echo "configure:5025: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5011 "configure" +#line 5030 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5030,7 +5049,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5060,12 +5079,12 @@ done for ac_func in memcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5064: checking for $ac_func" >&5 +echo "configure:5083: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5069 "configure" +#line 5088 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5088,7 +5107,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5117,7 +5136,7 @@ done fi echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:5121: checking for dlopen in -ldl" >&5 +echo "configure:5140: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5125,7 +5144,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 5129 "configure" +#line 5148 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5136,7 +5155,7 @@ int main() { dlopen() ; return 0; } EOF -if { (eval echo configure:5140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5181,7 +5200,7 @@ fi #-------------------------------------------------------------------- echo $ac_n "checking for socket libraries""... $ac_c" 1>&6 -echo "configure:5185: checking for socket libraries" >&5 +echo "configure:5204: checking for socket libraries" >&5 if eval "test \"`echo '$''{'gcj_cv_lib_sockets'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5189,12 +5208,12 @@ else gcj_checkBoth=0 unset ac_cv_func_connect echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:5193: checking for connect" >&5 +echo "configure:5212: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5198 "configure" +#line 5217 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -5217,7 +5236,7 @@ connect(); ; return 0; } EOF -if { (eval echo configure:5221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -5240,7 +5259,7 @@ fi if test "$gcj_checkSocket" = 1; then unset ac_cv_func_connect echo $ac_n "checking for main in -lsocket""... $ac_c" 1>&6 -echo "configure:5244: checking for main in -lsocket" >&5 +echo "configure:5263: checking for main in -lsocket" >&5 ac_lib_var=`echo socket'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5248,14 +5267,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <<EOF -#line 5252 "configure" +#line 5271 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5282,12 +5301,12 @@ fi LIBS="$LIBS -lsocket -lnsl" unset ac_cv_func_accept echo $ac_n "checking for accept""... $ac_c" 1>&6 -echo "configure:5286: checking for accept" >&5 +echo "configure:5305: checking for accept" >&5 if eval "test \"`echo '$''{'ac_cv_func_accept'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5291 "configure" +#line 5310 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char accept(); below. */ @@ -5310,7 +5329,7 @@ accept(); ; return 0; } EOF -if { (eval echo configure:5314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_accept=yes" else @@ -5337,12 +5356,12 @@ fi gcj_oldLibs=$LIBS LIBS="$LIBS $gcj_cv_lib_sockets" echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:5341: checking for gethostbyname" >&5 +echo "configure:5360: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5346 "configure" +#line 5365 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -5365,7 +5384,7 @@ gethostbyname(); ; return 0; } EOF -if { (eval echo configure:5369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -5383,7 +5402,7 @@ if eval "test \"`echo '$ac_cv_func_'gethostbyname`\" = yes"; then else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lnsl""... $ac_c" 1>&6 -echo "configure:5387: checking for main in -lnsl" >&5 +echo "configure:5406: checking for main in -lnsl" >&5 ac_lib_var=`echo nsl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5391,14 +5410,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 5395 "configure" +#line 5414 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5402: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5430,7 +5449,7 @@ echo "$ac_t""$gcj_cv_lib_sockets" 1>&6 if test "$with_system_zlib" = yes; then echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 -echo "configure:5434: checking for deflate in -lz" >&5 +echo "configure:5453: checking for deflate in -lz" >&5 ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5438,7 +5457,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 5442 "configure" +#line 5461 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5449,7 +5468,7 @@ int main() { deflate() ; return 0; } EOF -if { (eval echo configure:5453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5476,7 +5495,7 @@ fi # requires -ldl. if test "$GC" = boehm; then echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6 -echo "configure:5480: checking for main in -ldl" >&5 +echo "configure:5499: checking for main in -ldl" >&5 ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5484,14 +5503,14 @@ else ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <<EOF -#line 5488 "configure" +#line 5507 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5557,7 +5576,7 @@ fi # Extract the first word of "${ac_tool_prefix}gcj", so it can be a program name with args. set dummy ${ac_tool_prefix}gcj; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5561: checking for $ac_word" >&5 +echo "configure:5580: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_GCJ'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5589,7 +5608,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "gcj", so it can be a program name with args. set dummy gcj; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:5593: checking for $ac_word" >&5 +echo "configure:5612: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_GCJ'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5651,13 +5670,13 @@ exec 5>>./config.log CPPFLAGS=$GCJ_SAVE_CPPFLAGS echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:5655: checking size of void *" >&5 +echo "configure:5674: checking size of void *" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_void_p'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else for ac_size in 4 8 1 2 16 12 ; do # List sizes in rough order of prevalence. cat > conftest.$ac_ext <<EOF -#line 5661 "configure" +#line 5680 "configure" #include "confdefs.h" #include "confdefs.h" #include <sys/types.h> @@ -5667,7 +5686,7 @@ int main() { switch (0) case 0: case (sizeof (void *) == $ac_size):; ; return 0; } EOF -if { (eval echo configure:5671: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5690: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sizeof_void_p=$ac_size else @@ -5738,15 +5757,6 @@ else fi -if test -z "$with_cross_host"; then - USE_LIBDIR_TRUE= - USE_LIBDIR_FALSE='#' -else - USE_LIBDIR_TRUE='#' - USE_LIBDIR_FALSE= -fi - - if test "$NEEDS_DATA_START" = yes && test "$NATIVE" = yes; then NEEDS_DATA_START_TRUE= NEEDS_DATA_START_FALSE='#' @@ -5756,6 +5766,19 @@ else fi +if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + toolexecdir='$(exec_prefix)/$(target_alias)' + toolexecmainlibdir='$(toolexecdir)/lib' +else + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexecmainlibdir='$(libdir)' +fi +toolexeclibdir=$toolexecmainlibdir/`$CC -print-multi-os-directory` + + + + # Determine gcj version number. gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([^ ]*\).*$/\1/p'` @@ -5768,18 +5791,18 @@ EOF echo $ac_n "checking for g++ -ffloat-store bug""... $ac_c" 1>&6 -echo "configure:5772: checking for g++ -ffloat-store bug" >&5 +echo "configure:5795: checking for g++ -ffloat-store bug" >&5 save_CFLAGS="$CFLAGS" CFLAGS="-x c++ -O2 -ffloat-store" cat > conftest.$ac_ext <<EOF -#line 5776 "configure" +#line 5799 "configure" #include "confdefs.h" #include <math.h> int main() { ; return 0; } EOF -if { (eval echo configure:5783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -5799,17 +5822,17 @@ for ac_hdr in unistd.h bstring.h sys/time.h sys/types.h fcntl.h sys/ioctl.h sys/ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5803: checking for $ac_hdr" >&5 +echo "configure:5826: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5808 "configure" +#line 5831 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5813: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5839,17 +5862,17 @@ for ac_hdr in dirent.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5843: checking for $ac_hdr" >&5 +echo "configure:5866: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5848 "configure" +#line 5871 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5853: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5879,17 +5902,17 @@ for ac_hdr in inttypes.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5883: checking for $ac_hdr" >&5 +echo "configure:5906: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5888 "configure" +#line 5911 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5916: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5925,12 +5948,12 @@ fi done echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:5929: checking for sys/wait.h that is POSIX.1 compatible" >&5 +echo "configure:5952: checking for sys/wait.h that is POSIX.1 compatible" >&5 if eval "test \"`echo '$''{'ac_cv_header_sys_wait_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5934 "configure" +#line 5957 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -5946,7 +5969,7 @@ wait (&s); s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:5950: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5973: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -5968,12 +5991,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:5972: checking for ANSI C header files" >&5 +echo "configure:5995: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5977 "configure" +#line 6000 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -5981,7 +6004,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5998,7 +6021,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 6002 "configure" +#line 6025 "configure" #include "confdefs.h" #include <string.h> EOF @@ -6016,7 +6039,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 6020 "configure" +#line 6043 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -6037,7 +6060,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 6041 "configure" +#line 6064 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -6048,7 +6071,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:6052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -6072,12 +6095,12 @@ EOF fi echo $ac_n "checking for ssize_t""... $ac_c" 1>&6 -echo "configure:6076: checking for ssize_t" >&5 +echo "configure:6099: checking for ssize_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_ssize_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6081 "configure" +#line 6104 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -6106,9 +6129,9 @@ fi echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6 -echo "configure:6110: checking for in_addr_t" >&5 +echo "configure:6133: checking for in_addr_t" >&5 cat > conftest.$ac_ext <<EOF -#line 6112 "configure" +#line 6135 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -6122,7 +6145,7 @@ int main() { in_addr_t foo; ; return 0; } EOF -if { (eval echo configure:6126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6149: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_IN_ADDR_T 1 @@ -6138,16 +6161,16 @@ fi rm -f conftest* echo $ac_n "checking whether struct ip_mreq is in netinet/in.h""... $ac_c" 1>&6 -echo "configure:6142: checking whether struct ip_mreq is in netinet/in.h" >&5 +echo "configure:6165: checking whether struct ip_mreq is in netinet/in.h" >&5 cat > conftest.$ac_ext <<EOF -#line 6144 "configure" +#line 6167 "configure" #include "confdefs.h" #include <netinet/in.h> int main() { struct ip_mreq mreq; ; return 0; } EOF -if { (eval echo configure:6151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6174: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_IP_MREQ 1 @@ -6163,16 +6186,16 @@ fi rm -f conftest* echo $ac_n "checking whether struct ipv6_mreq is in netinet/in.h""... $ac_c" 1>&6 -echo "configure:6167: checking whether struct ipv6_mreq is in netinet/in.h" >&5 +echo "configure:6190: checking whether struct ipv6_mreq is in netinet/in.h" >&5 cat > conftest.$ac_ext <<EOF -#line 6169 "configure" +#line 6192 "configure" #include "confdefs.h" #include <netinet/in.h> int main() { struct ipv6_mreq mreq6; ; return 0; } EOF -if { (eval echo configure:6176: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6199: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_STRUCT_IPV6_MREQ 1 @@ -6188,16 +6211,16 @@ fi rm -f conftest* echo $ac_n "checking whether struct sockaddr_in6 is in netinet/in.h""... $ac_c" 1>&6 -echo "configure:6192: checking whether struct sockaddr_in6 is in netinet/in.h" >&5 +echo "configure:6215: checking whether struct sockaddr_in6 is in netinet/in.h" >&5 cat > conftest.$ac_ext <<EOF -#line 6194 "configure" +#line 6217 "configure" #include "confdefs.h" #include <netinet/in.h> int main() { struct sockaddr_in6 addr6; ; return 0; } EOF -if { (eval echo configure:6201: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_INET6 1 @@ -6213,9 +6236,9 @@ fi rm -f conftest* echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6 -echo "configure:6217: checking for socklen_t in sys/socket.h" >&5 +echo "configure:6240: checking for socklen_t in sys/socket.h" >&5 cat > conftest.$ac_ext <<EOF -#line 6219 "configure" +#line 6242 "configure" #include "confdefs.h" #define _POSIX_PII_SOCKET #include <sys/types.h> @@ -6224,7 +6247,7 @@ int main() { socklen_t x = 5; ; return 0; } EOF -if { (eval echo configure:6228: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6251: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_SOCKLEN_T 1 @@ -6240,16 +6263,16 @@ fi rm -f conftest* echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 -echo "configure:6244: checking for tm_gmtoff in struct tm" >&5 +echo "configure:6267: checking for tm_gmtoff in struct tm" >&5 cat > conftest.$ac_ext <<EOF -#line 6246 "configure" +#line 6269 "configure" #include "confdefs.h" #include <time.h> int main() { struct tm tim; tim.tm_gmtoff = 0; ; return 0; } EOF -if { (eval echo configure:6253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6276: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define STRUCT_TM_HAS_GMTOFF 1 @@ -6262,16 +6285,16 @@ else rm -rf conftest* echo "$ac_t""no" 1>&6 echo $ac_n "checking for global timezone variable""... $ac_c" 1>&6 -echo "configure:6266: checking for global timezone variable" >&5 +echo "configure:6289: checking for global timezone variable" >&5 cat > conftest.$ac_ext <<EOF -#line 6268 "configure" +#line 6291 "configure" #include "confdefs.h" #include <time.h> int main() { void i(){long z2 = 2*timezone;} ; return 0; } EOF -if { (eval echo configure:6275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_TIMEZONE 1 @@ -6284,16 +6307,16 @@ else rm -rf conftest* echo "$ac_t""no" 1>&6 echo $ac_n "checking for global _timezone variable""... $ac_c" 1>&6 -echo "configure:6288: checking for global _timezone variable" >&5 +echo "configure:6311: checking for global _timezone variable" >&5 cat > conftest.$ac_ext <<EOF -#line 6290 "configure" +#line 6313 "configure" #include "confdefs.h" #include <time.h> int main() { long z2 = _timezone; ; return 0; } EOF -if { (eval echo configure:6297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_UNDERSCORE_TIMEZONE 1 @@ -6315,19 +6338,19 @@ rm -f conftest* # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:6319: checking for working alloca.h" >&5 +echo "configure:6342: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6324 "configure" +#line 6347 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:6331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -6348,12 +6371,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:6352: checking for alloca" >&5 +echo "configure:6375: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6357 "configure" +#line 6380 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -6381,7 +6404,7 @@ int main() { char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:6385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6408: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -6413,12 +6436,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:6417: checking whether alloca needs Cray hooks" >&5 +echo "configure:6440: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6422 "configure" +#line 6445 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -6443,12 +6466,12 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6 if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6447: checking for $ac_func" >&5 +echo "configure:6470: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6452 "configure" +#line 6475 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6471,7 +6494,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6498,7 +6521,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:6502: checking stack direction for C alloca" >&5 +echo "configure:6525: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6506,7 +6529,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <<EOF -#line 6510 "configure" +#line 6533 "configure" #include "confdefs.h" find_stack_direction () { @@ -6525,7 +6548,7 @@ main () exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:6529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -6552,7 +6575,7 @@ do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:6556: checking for $ac_word" >&5 +echo "configure:6579: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6609,7 +6632,7 @@ case "${host}" in SIGNAL_HANDLER=include/s390-signal.h ;; x86_64*-*-linux*) - SIGNAL_HANDLER=include/dwarf2-signal.h + SIGNAL_HANDLER=include/x86_64-signal.h ;; sparc*-*-linux*) SIGNAL_HANDLER=include/dwarf2-signal.h @@ -6642,7 +6665,7 @@ fi # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:6646: checking for X" >&5 +echo "configure:6669: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -6704,12 +6727,12 @@ if test "$ac_x_includes" = NO; then # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 6708 "configure" +#line 6731 "configure" #include "confdefs.h" #include <$x_direct_test_include> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6736: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6778,14 +6801,14 @@ if test "$ac_x_libraries" = NO; then ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 6782 "configure" +#line 6805 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:6789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6812: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -6891,17 +6914,17 @@ else case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:6895: checking whether -R must be followed by a space" >&5 +echo "configure:6918: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <<EOF -#line 6898 "configure" +#line 6921 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:6905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -6917,14 +6940,14 @@ rm -f conftest* else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 6921 "configure" +#line 6944 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:6928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -6956,7 +6979,7 @@ rm -f conftest* # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:6960: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:6983: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6964,7 +6987,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <<EOF -#line 6968 "configure" +#line 6991 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6975,7 +6998,7 @@ int main() { dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:6979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6997,7 +7020,7 @@ fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:7001: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:7024: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7005,7 +7028,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <<EOF -#line 7009 "configure" +#line 7032 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7016,7 +7039,7 @@ int main() { dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:7020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7045,12 +7068,12 @@ fi # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:7049: checking for gethostbyname" >&5 +echo "configure:7072: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7054 "configure" +#line 7077 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -7073,7 +7096,7 @@ gethostbyname(); ; return 0; } EOF -if { (eval echo configure:7077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7100: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -7094,7 +7117,7 @@ fi if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:7098: checking for gethostbyname in -lnsl" >&5 +echo "configure:7121: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7102,7 +7125,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <<EOF -#line 7106 "configure" +#line 7129 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7113,7 +7136,7 @@ int main() { gethostbyname() ; return 0; } EOF -if { (eval echo configure:7117: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7143,12 +7166,12 @@ fi # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:7147: checking for connect" >&5 +echo "configure:7170: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7152 "configure" +#line 7175 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -7171,7 +7194,7 @@ connect(); ; return 0; } EOF -if { (eval echo configure:7175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -7192,7 +7215,7 @@ fi if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:7196: checking for connect in -lsocket" >&5 +echo "configure:7219: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7200,7 +7223,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 7204 "configure" +#line 7227 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7211,7 +7234,7 @@ int main() { connect() ; return 0; } EOF -if { (eval echo configure:7215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7235,12 +7258,12 @@ fi # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:7239: checking for remove" >&5 +echo "configure:7262: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7244 "configure" +#line 7267 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ @@ -7263,7 +7286,7 @@ remove(); ; return 0; } EOF -if { (eval echo configure:7267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -7284,7 +7307,7 @@ fi if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:7288: checking for remove in -lposix" >&5 +echo "configure:7311: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7292,7 +7315,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <<EOF -#line 7296 "configure" +#line 7319 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7303,7 +7326,7 @@ int main() { remove() ; return 0; } EOF -if { (eval echo configure:7307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7327,12 +7350,12 @@ fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:7331: checking for shmat" >&5 +echo "configure:7354: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7336 "configure" +#line 7359 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ @@ -7355,7 +7378,7 @@ shmat(); ; return 0; } EOF -if { (eval echo configure:7359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -7376,7 +7399,7 @@ fi if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:7380: checking for shmat in -lipc" >&5 +echo "configure:7403: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7384,7 +7407,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <<EOF -#line 7388 "configure" +#line 7411 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7395,7 +7418,7 @@ int main() { shmat() ; return 0; } EOF -if { (eval echo configure:7399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7428,7 +7451,7 @@ fi # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:7432: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:7455: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7436,7 +7459,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <<EOF -#line 7440 "configure" +#line 7463 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7447,7 +7470,7 @@ int main() { IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:7451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7762,11 +7785,12 @@ s%@NULL_TARGET_TRUE@%$NULL_TARGET_TRUE%g s%@NULL_TARGET_FALSE@%$NULL_TARGET_FALSE%g s%@NATIVE_TRUE@%$NATIVE_TRUE%g s%@NATIVE_FALSE@%$NATIVE_FALSE%g -s%@USE_LIBDIR_TRUE@%$USE_LIBDIR_TRUE%g -s%@USE_LIBDIR_FALSE@%$USE_LIBDIR_FALSE%g s%@NEEDS_DATA_START_TRUE@%$NEEDS_DATA_START_TRUE%g s%@NEEDS_DATA_START_FALSE@%$NEEDS_DATA_START_FALSE%g s%@GCC_UNWIND_INCLUDE@%$GCC_UNWIND_INCLUDE%g +s%@toolexecdir@%$toolexecdir%g +s%@toolexecmainlibdir@%$toolexecmainlibdir%g +s%@toolexeclibdir@%$toolexeclibdir%g s%@GCJVERSION@%$GCJVERSION%g s%@ALLOCA@%$ALLOCA%g s%@PERL@%$PERL%g @@ -7788,7 +7812,7 @@ cat >> $CONFIG_STATUS <<\EOF # Split the substitutions into bite-sized pieces for seds with # small command number limits, like on Digital OSF/1 and HP-UX. -ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. +ac_max_sed_cmds=60 # Maximum number of lines to put in a sed script. ac_file=1 # Number of current file. ac_beg=1 # First line for current file. ac_end=$ac_max_sed_cmds # Line after last line for current file. diff --git a/libjava/configure.host b/libjava/configure.host index f5d1ef07cda..9f1cbec2779 100644 --- a/libjava/configure.host +++ b/libjava/configure.host @@ -96,12 +96,12 @@ case "${host}" in slow_pthread_self=yes ;; x86_64-*) + CHECKREFSPEC="%{m32:-fcheck-references}" sysdeps_dir=x86-64 libgcj_flags="${libgcj_flags} -ffloat-store" libgcj_interpreter=no libgcj_cxxflags="-D__NO_MATH_INLINES" libgcj_cflags="-D__NO_MATH_INLINES" - DIVIDESPEC=-fno-use-divide-subroutine enable_hash_synchronization_default=yes slow_pthread_self=yes ;; @@ -132,7 +132,8 @@ case "${host}" in libgcj_interpreter=yes enable_hash_synchronization_default=yes ;; - sparc-*) + sparc*-*) + libgcj_interpreter=yes ;; ia64-*) sysdeps_dir=ia64 @@ -167,6 +168,7 @@ case "${host}" in *-*-darwin*) enable_hash_synchronization_default=no slow_pthread_self= + can_unwind_signal=no ;; *-*-freebsd*) slow_pthread_self= diff --git a/libjava/configure.in b/libjava/configure.in index 59f821accce..8f86b489f3a 100644 --- a/libjava/configure.in +++ b/libjava/configure.in @@ -522,6 +522,13 @@ else AC_DEFINE(HAVE_BACKTRACE) ;; esac + ], [ + case "$host" in + *mingw*) + # Has backtrace() defined in libgcj itself + AC_DEFINE(HAVE_BACKTRACE) + ;; + esac ]) AC_CHECK_LIB(dl, dladdr, [ @@ -789,10 +796,22 @@ AC_SUBST(EXCEPTIONSPEC) AM_CONDITIONAL(CANADIAN, test "$CANADIAN" = yes) AM_CONDITIONAL(NULL_TARGET, test "$NULL_TARGET" = yes) AM_CONDITIONAL(NATIVE, test "$NATIVE" = yes || test "$NULL_TARGET" = yes) -AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host") AM_CONDITIONAL(NEEDS_DATA_START, test "$NEEDS_DATA_START" = yes && test "$NATIVE" = yes) AC_SUBST(GCC_UNWIND_INCLUDE) +if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + toolexecdir='$(exec_prefix)/$(target_alias)' + toolexecmainlibdir='$(toolexecdir)/lib' +else + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexecmainlibdir='$(libdir)' +fi +toolexeclibdir=$toolexecmainlibdir/`$CC -print-multi-os-directory` +AC_SUBST(toolexecdir) +AC_SUBST(toolexecmainlibdir) +AC_SUBST(toolexeclibdir) + # Determine gcj version number. changequote(<<,>>) gcjversion=`$GCJ -v 2>&1 | sed -n 's/^.*version \([^ ]*\).*$/\1/p'` @@ -916,7 +935,7 @@ case "${host}" in SIGNAL_HANDLER=include/s390-signal.h ;; x86_64*-*-linux*) - SIGNAL_HANDLER=include/dwarf2-signal.h + SIGNAL_HANDLER=include/x86_64-signal.h ;; sparc*-*-linux*) SIGNAL_HANDLER=include/dwarf2-signal.h diff --git a/libjava/defineclass.cc b/libjava/defineclass.cc index dc350028cdd..81de5ad7da2 100644 --- a/libjava/defineclass.cc +++ b/libjava/defineclass.cc @@ -890,7 +890,7 @@ _Jv_ClassReader::handleClassBegin throw_no_class_def_found_error (msg); } - def->accflags = access_flags; + def->accflags = access_flags | java::lang::reflect::Modifier::INTERPRETED; pool_data[this_class].clazz = def; pool_tags[this_class] = JV_CONSTANT_ResolvedClass; diff --git a/libjava/gcj/javaprims.h b/libjava/gcj/javaprims.h index 8ed649432a2..e2840731ed0 100644 --- a/libjava/gcj/javaprims.h +++ b/libjava/gcj/javaprims.h @@ -120,6 +120,7 @@ extern "Java" class SyncFailedException; class UTFDataFormatException; class UnsupportedEncodingException; + class VMObjectStreamClass; class ValidatorAndPriority; class WriteAbortedException; class Writer; @@ -230,16 +231,18 @@ extern "Java" class Array; class Constructor; class Field; - class InvocationHandler; + class InvocationHandler; class InvocationTargetException; class Member; class Method; class Modifier; - class Proxy; - class Proxy$ProxyData; - class Proxy$ProxyType; + class Proxy; + class Proxy$ClassFactory; + class Proxy$ProxyData; + class Proxy$ProxySignature; + class Proxy$ProxyType; class ReflectPermission; - class UndeclaredThrowableException; + class UndeclaredThrowableException; }; }; @@ -334,7 +337,6 @@ extern "Java" class RandomAccess; class RandomAccessSubList; class ResourceBundle; - class ResourceBundle$Security; class Set; class SimpleTimeZone; class SortedMap; @@ -371,6 +373,13 @@ extern "Java" class Manifest; }; + namespace regex + { + class Matcher; + class Pattern; + class PatternSyntaxException; + }; + namespace zip { class Adler32; diff --git a/libjava/gnu/awt/j2d/DirectRasterGraphics.java b/libjava/gnu/awt/j2d/DirectRasterGraphics.java index 8d25b88d018..28aad9b0404 100644 --- a/libjava/gnu/awt/j2d/DirectRasterGraphics.java +++ b/libjava/gnu/awt/j2d/DirectRasterGraphics.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 Free Software Foundation +/* Copyright (C) 2000, 2003 Free Software Foundation This file is part of libgcj. @@ -61,7 +61,8 @@ public interface DirectRasterGraphics extends Cloneable public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints); - public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints); + public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints, + int translateX, int translateY); public void drawString(String str, int x, int y); diff --git a/libjava/gnu/awt/j2d/Graphics2DImpl.java b/libjava/gnu/awt/j2d/Graphics2DImpl.java index ef4d742c056..5af41bfc9cb 100644 --- a/libjava/gnu/awt/j2d/Graphics2DImpl.java +++ b/libjava/gnu/awt/j2d/Graphics2DImpl.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2002 Free Software Foundation +/* Copyright (C) 2000, 2002, 2003 Free Software Foundation This file is part of libgcj. @@ -24,6 +24,7 @@ import java.awt.Stroke; import java.awt.geom.AffineTransform; import java.awt.image.ImageObserver; import java.awt.image.BufferedImage; +import java.awt.image.BufferedImageOp; import java.awt.image.RenderedImage; import java.awt.image.renderable.RenderableImage; import java.text.AttributedCharacterIterator; @@ -459,7 +460,7 @@ public class Graphics2DImpl extends Graphics2D implements Cloneable throw new UnsupportedOperationException(msg); } - public void drawImage(BufferedImage image, BufferedImage op, int x, int y) + public void drawImage(BufferedImage image, BufferedImageOp op, int x, int y) { throw new UnsupportedOperationException("not implemented yet"); } diff --git a/libjava/gnu/awt/j2d/IntegerGraphicsState.java b/libjava/gnu/awt/j2d/IntegerGraphicsState.java index 90a1a4d2ab5..bfea6611ca5 100644 --- a/libjava/gnu/awt/j2d/IntegerGraphicsState.java +++ b/libjava/gnu/awt/j2d/IntegerGraphicsState.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 Free Software Foundation +/* Copyright (C) 2000, 2003 Free Software Foundation This file is part of libgcj. @@ -212,7 +212,7 @@ public class IntegerGraphicsState extends AbstractGraphicsState public void drawPolyline(int[] xPoints, int[] yPoints, int nPoints) { - if ((tx == 0) || (ty == 0)) + if ((tx == 0) && (ty == 0)) { directGfx.drawPolyline(xPoints, yPoints, nPoints); return; @@ -223,7 +223,7 @@ public class IntegerGraphicsState extends AbstractGraphicsState public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints) { - if ((tx == 0) || (ty == 0)) + if ((tx == 0) && (ty == 0)) { directGfx.drawPolygon(xPoints, yPoints, nPoints); return; @@ -232,15 +232,11 @@ public class IntegerGraphicsState extends AbstractGraphicsState throw new UnsupportedOperationException("translate not implemented"); } - public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints) + public void fillPolygon (int[] xPoints, int[] yPoints, int nPoints) { - if ((tx == 0) || (ty == 0)) - { - directGfx.fillPolygon(xPoints, yPoints, nPoints); - return; - } - - throw new UnsupportedOperationException("translate not implemented"); + // FIXME: remove tx & ty args once translation via AffineTransform + // is implemented. + directGfx.fillPolygon (xPoints, yPoints, nPoints, tx, ty); } public boolean drawImage(Image image, int x, int y, diff --git a/libjava/gnu/awt/xlib/XGraphics.java b/libjava/gnu/awt/xlib/XGraphics.java index 27b07a2369a..90f53880e85 100644 --- a/libjava/gnu/awt/xlib/XGraphics.java +++ b/libjava/gnu/awt/xlib/XGraphics.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 Free Software Foundation +/* Copyright (C) 2000, 2003 Free Software Foundation This file is part of libgcj. @@ -176,10 +176,10 @@ public class XGraphics implements Cloneable, DirectRasterGraphics throw new UnsupportedOperationException("not implemented"); } - public void fillPolygon(int[] xPoints, int[] yPoints, int - nPoints) + public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints, + int translateX, int translateY) { - throw new UnsupportedOperationException("not implemented"); + context.fillPolygon(xPoints, yPoints, nPoints, translateX, translateY); } public void drawString(String str, int x, int y) diff --git a/libjava/gnu/awt/xlib/XGraphicsConfiguration.java b/libjava/gnu/awt/xlib/XGraphicsConfiguration.java index 9ae12d6f8b9..7d7d5159fe0 100644 --- a/libjava/gnu/awt/xlib/XGraphicsConfiguration.java +++ b/libjava/gnu/awt/xlib/XGraphicsConfiguration.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 Free Software Foundation +/* Copyright (C) 2000, 2003 Free Software Foundation This file is part of libgcj. @@ -389,15 +389,32 @@ public class XGraphicsConfiguration extends GraphicsConfiguration int getPixel(Color color) { + /* FIXME: consider an integer technique whenever + * the ColorModel is 8 bits per color. + * The problem with using integers is that it doesn't work unless + * the colors are 8 bits each (as in the array), since ColorModel.getDataElement(int[],int) + * expects non-normalized values. For example, in a 16-bit display mode, you + * would typically have 5 bits each for red and blue, and 6 bits for green. int[] components = - { - color.getRed(), - color.getGreen(), - color.getBlue(), - 0xff - }; - - ColorModel cm = getColorModel(); - return cm.getDataElement(components, 0); + { + color.getRed (), + color.getGreen (), + color.getBlue (), + 0xff + }; + */ + + float[] normalizedComponents = + { + ((float)color.getRed ()) / 255F, + ((float)color.getGreen ()) / 255F, + ((float)color.getBlue ()) / 255F, + 1 + }; + int[] unnormalizedComponents = { 0, 0, 0, 0xff }; + ColorModel cm = getColorModel (); + cm.getUnnormalizedComponents(normalizedComponents, 0, + unnormalizedComponents, 0); + return cm.getDataElement (unnormalizedComponents, 0); } } diff --git a/libjava/gnu/awt/xlib/XToolkit.java b/libjava/gnu/awt/xlib/XToolkit.java index 0c199b2b7f7..c71b39d0f80 100644 --- a/libjava/gnu/awt/xlib/XToolkit.java +++ b/libjava/gnu/awt/xlib/XToolkit.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2000, 2002 Free Software Foundation +/* Copyright (C) 2000, 2002, 2003 Free Software Foundation This file is part of libgcj. @@ -173,7 +173,7 @@ public class XToolkit extends Toolkit public java.awt.image.ColorModel getColorModel() { - throw new UnsupportedOperationException("not implemented yet"); + return getDefaultXGraphicsConfiguration().getColorModel(); } public String[] getFontList() diff --git a/libjava/gnu/gcj/protocol/http/Connection.java b/libjava/gnu/gcj/protocol/http/Connection.java index caababa6823..1a6fc0105f9 100644 --- a/libjava/gnu/gcj/protocol/http/Connection.java +++ b/libjava/gnu/gcj/protocol/http/Connection.java @@ -1,6 +1,6 @@ // Connection.java - Implementation of HttpURLConnection for http protocol. -/* Copyright (C) 1999, 2000 Free Software Foundation +/* Copyright (C) 1999, 2000, 2003 Free Software Foundation This file is part of libgcj. @@ -25,10 +25,11 @@ import java.util.Enumeration; /** * Written using on-line Java Platform 1.2 API Specification, as well * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998). - * Status: Minimal subset of functionality. Proxies and Redirects - * not yet handled. FileNameMap handling needs to be considered. - * useCaches, ifModifiedSince, and allowUserInteraction need - * consideration as well as doInput and doOutput. + * Status: Minimal subset of functionality. Proxies only partially + * handled; Redirects not yet handled. FileNameMap handling needs to + * be considered. useCaches, ifModifiedSince, and + * allowUserInteraction need consideration as well as doInput and + * doOutput. */ class Connection extends HttpURLConnection @@ -40,6 +41,33 @@ class Connection extends HttpURLConnection private Vector hdrVec = new Vector(); private BufferedInputStream bufferedIn; + private static int proxyPort = 80; + private static boolean proxyInUse = false; + private static String proxyHost = null; + + static + { + // Recognize some networking properties listed at + // http://java.sun.com/j2se/1.4/docs/guide/net/properties.html. + String port = null; + proxyHost = System.getProperty("http.proxyHost"); + if (proxyHost != null) + { + proxyInUse = true; + if ((port = System.getProperty("http.proxyPort")) != null) + { + try + { + proxyPort = Integer.parseInt(port); + } + catch (Throwable t) + { + // Nothing. + } + } + } + } + public Connection(URL url) { super(url); @@ -85,12 +113,20 @@ class Connection extends HttpURLConnection // Get address and port number. int port; - InetAddress destAddr = InetAddress.getByName(url.getHost()); - if ((port = url.getPort()) == -1) - port = 80; + if (proxyInUse) + { + port = proxyPort; + sock = new Socket(proxyHost, port); + } + else + { + InetAddress destAddr = InetAddress.getByName(url.getHost()); + if ((port = url.getPort()) == -1) + port = 80; + // Open socket and output stream. + sock = new Socket(destAddr, port); + } - // Open socket and output stream. - sock = new Socket(destAddr, port); PrintWriter out = new PrintWriter(sock.getOutputStream()); // Send request including any request properties that were set. @@ -123,10 +159,9 @@ class Connection extends HttpURLConnection } } - // TODO: public boolean usingProxy() public boolean usingProxy() { - return false; + return proxyInUse; } // Override default method in URLConnection. diff --git a/libjava/gnu/gcj/runtime/natStackTrace.cc b/libjava/gnu/gcj/runtime/natStackTrace.cc index e977f356638..937f8dd3470 100644 --- a/libjava/gnu/gcj/runtime/natStackTrace.cc +++ b/libjava/gnu/gcj/runtime/natStackTrace.cc @@ -31,6 +31,8 @@ details. */ #include <java/util/IdentityHashMap.h> #include <java/lang/ArrayIndexOutOfBoundsException.h> +#include "platform.h" + #include <sys/types.h> #include <stdlib.h> diff --git a/libjava/gnu/gcj/xlib/GC.java b/libjava/gnu/gcj/xlib/GC.java index 6b33715cf6c..1806c2ae569 100644 --- a/libjava/gnu/gcj/xlib/GC.java +++ b/libjava/gnu/gcj/xlib/GC.java @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 Free Software Foundation +/* Copyright (C) 2000, 2003 Free Software Foundation This file is part of libgcj. @@ -84,6 +84,8 @@ public class GC implements Cloneable public native void drawRectangle(int x, int y, int w, int h); public native void fillRectangle(int x, int y, int w, int h); + public native void fillPolygon(int[] xPoints, int[] yPoints, int nPoints, + int translateX, int translateY); /** * diff --git a/libjava/gnu/gcj/xlib/natGC.cc b/libjava/gnu/gcj/xlib/natGC.cc index 66de35f868b..1a1bd586d8e 100644 --- a/libjava/gnu/gcj/xlib/natGC.cc +++ b/libjava/gnu/gcj/xlib/natGC.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2000 Free Software Foundation +/* Copyright (C) 2000, 2003 Free Software Foundation This file is part of libgcj. @@ -11,6 +11,7 @@ details. */ #include <X11/Xlib.h> #include <gcj/cni.h> +#include <gcj/array.h> #include <gnu/gcj/RawData.h> #include <java/lang/String.h> #include <java/awt/Rectangle.h> @@ -154,6 +155,27 @@ void gnu::gcj::xlib::GC::fillRectangle(jint x, jint y, jint w, jint h) // no fast fail } +void gnu::gcj::xlib::GC::fillPolygon(jintArray xPoints, jintArray yPoints, + jint nPoints, + jint translateX, jint translateY) +{ + Display* display = target->getDisplay(); + ::Display* dpy = (::Display*) (display->display); + ::Drawable drawableXID = target->getXID(); + ::GC gc = (::GC) structure; + typedef ::XPoint xpoint; + std::vector<xpoint> points(nPoints+1); + for (int i=0; i<nPoints; i++) + { + points[i].x = elements(xPoints)[i] + translateX; + points[i].y = elements(yPoints)[i] + translateY; + } + points[nPoints] = points[0]; + XFillPolygon(dpy, drawableXID, gc, &(points.front()), nPoints, + Complex, CoordModeOrigin); + // no fast fail +} + void gnu::gcj::xlib::GC::clearArea(jint x, jint y, jint w, jint h, jboolean exposures) { diff --git a/libjava/gnu/java/rmi/server/UnicastServerRef.java b/libjava/gnu/java/rmi/server/UnicastServerRef.java index 4f64452b124..a3a999f2e9f 100644 --- a/libjava/gnu/java/rmi/server/UnicastServerRef.java +++ b/libjava/gnu/java/rmi/server/UnicastServerRef.java @@ -1,5 +1,5 @@ /* - Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -129,7 +129,7 @@ public RemoteStub getStub(){ } -public boolean unexportObject(Remote obj, boolean force) throws RemoteException { +public boolean unexportObject(Remote obj, boolean force) { // Remove all hashes of methods which may be called. buildMethodHash(obj.getClass(), false); return UnicastServer.unexportObject(this, force); diff --git a/libjava/include/config.h.in b/libjava/include/config.h.in index cd770f93ac6..5fb650327b6 100644 --- a/libjava/include/config.h.in +++ b/libjava/include/config.h.in @@ -1,4 +1,4 @@ -/* include/config.h.in. Generated automatically from configure.in by autoheader 2.13. */ +/* include/config.h.in. Generated automatically from configure.in by autoheader. */ /* Define if using alloca.c. */ #undef C_ALLOCA diff --git a/libjava/include/dwarf2-signal.h b/libjava/include/dwarf2-signal.h index b996732b743..7dbcd9dfd2d 100644 --- a/libjava/include/dwarf2-signal.h +++ b/libjava/include/dwarf2-signal.h @@ -209,9 +209,6 @@ do \ while (0) #endif #elif !defined(__ia64__) -#if defined(__x86_64__) -#define SYS_sigaction SYS_rt_sigaction -#endif #define INIT_SEGV \ do \ { \ diff --git a/libjava/include/java-interp.h b/libjava/include/java-interp.h index a44db38ca85..a00f4db0a1d 100644 --- a/libjava/include/java-interp.h +++ b/libjava/include/java-interp.h @@ -21,6 +21,7 @@ details. */ #include <java/lang/Class.h> #include <java/lang/ClassLoader.h> +#include <java/lang/reflect/Modifier.h> #include <gnu/gcj/runtime/StackTrace.h> extern "C" { @@ -30,7 +31,7 @@ extern "C" { extern inline jboolean _Jv_IsInterpretedClass (jclass c) { - return (c->loader != 0); + return (c->accflags & java::lang::reflect::Modifier::INTERPRETED) != 0; } struct _Jv_ResolvedMethod; @@ -158,6 +159,7 @@ class _Jv_InterpClass : public java::lang::Class friend class _Jv_ClassReader; friend class _Jv_InterpMethod; friend void _Jv_PrepareClass(jclass); + friend void _Jv_PrepareMissingMethods (jclass base2, jclass iface_class); friend void _Jv_InitField (jobject, jclass, int); #ifdef JV_MARKOBJ_DECL friend JV_MARKOBJ_DECL; diff --git a/libjava/include/posix.h b/libjava/include/posix.h index cdcdb5d45ac..0e1220a10b3 100644 --- a/libjava/include/posix.h +++ b/libjava/include/posix.h @@ -1,6 +1,6 @@ // posix.h -- Helper functions for POSIX-flavored OSs. -/* Copyright (C) 2000, 2002 Free Software Foundation +/* Copyright (C) 2000, 2002, 2003 Free Software Foundation This file is part of libgcj. @@ -60,6 +60,14 @@ _Jv_platform_close_on_exec (jint fd) ::fcntl (fd, F_SETFD, FD_CLOEXEC); } +#ifdef JV_HASH_SYNCHRONIZATION +inline void +_Jv_platform_usleep (unsigned long usecs) +{ + usleep (usecs); +} +#endif /* JV_HASH_SYNCHRONIZATION */ + #ifndef DISABLE_JAVA_NET #ifndef HAVE_SOCKLEN_T diff --git a/libjava/include/win32-threads.h b/libjava/include/win32-threads.h index e8cf80598c2..5e40ae24b87 100644 --- a/libjava/include/win32-threads.h +++ b/libjava/include/win32-threads.h @@ -1,7 +1,8 @@ // -*- c++ -*- // win32-threads.h - Defines for using Win32 threads. -/* Copyright (C) 1998, 1999, 2000 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software + Foundation This file is part of libgcj. @@ -18,13 +19,32 @@ details. */ // Typedefs. // -typedef struct _Jv_ConditionVariable_t { +typedef struct +{ + // ev[0] (signal) is a Win32 auto-reset event for _Jv_CondNotify + // ev[1] (broadcast) is a Win32 manual-reset event for _Jv_CondNotifyAll HANDLE ev[2]; - CRITICAL_SECTION count_mutex; + + // Number of threads waiting on this condition variable int blocked_count; -}; -typedef CRITICAL_SECTION _Jv_Mutex_t; + // Protects access to the blocked_count variable + CRITICAL_SECTION count_mutex; + +} _Jv_ConditionVariable_t; + +typedef struct +{ + // The thread-id of the owner thread if any, 0 otherwise + DWORD owner; + + // Track nested mutex acquisitions by the same thread + int refcount; + + // The actual Windows construct used to implement this mutex + CRITICAL_SECTION cs; + +} _Jv_Mutex_t; typedef struct { @@ -60,25 +80,39 @@ int _Jv_CondNotifyAll (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *); inline void _Jv_MutexInit (_Jv_Mutex_t *mu) { - InitializeCriticalSection(mu); + mu->owner = 0UL; + mu->refcount = 0; + InitializeCriticalSection (&(mu->cs)); } #define _Jv_HaveMutexDestroy inline void _Jv_MutexDestroy (_Jv_Mutex_t *mu) { - DeleteCriticalSection(mu); + mu->owner = 0UL; + mu->refcount = 0; + DeleteCriticalSection (&(mu->cs)); mu = NULL; } inline int _Jv_MutexUnlock (_Jv_Mutex_t *mu) { - LeaveCriticalSection(mu); - return 0; + if (mu->owner == GetCurrentThreadId ( )) + { + mu->refcount--; + if (mu->refcount == 0) + mu->owner = 0UL; + LeaveCriticalSection (&(mu->cs)); + return 0; + } + else + return 1; } inline int _Jv_MutexLock (_Jv_Mutex_t *mu) { - EnterCriticalSection(mu); + EnterCriticalSection (&(mu->cs)); + mu->owner = GetCurrentThreadId ( ); + mu->refcount++; return 0; } @@ -104,9 +138,7 @@ inline _Jv_Thread_t *_Jv_ThreadCurrentData(void) inline void _Jv_ThreadYield (void) { - // FIXME: win98 freezes hard (OS hang) when we use this -- - // for now, we simply don't yield - // Sleep (0); + Sleep (0); } void _Jv_ThreadRegister (_Jv_Thread_t *data); diff --git a/libjava/include/win32.h b/libjava/include/win32.h index d4c0ab6c18d..1d06df0663c 100644 --- a/libjava/include/win32.h +++ b/libjava/include/win32.h @@ -48,6 +48,21 @@ _Jv_platform_close_on_exec (jint) // Ignore. } +#ifdef JV_HASH_SYNCHRONIZATION +/* Suspends the execution of the current thread for the specified + number of microseconds. Tries to emulate the behaviour of usleep() + on UNIX and provides a granularity of 1 millisecond. */ +inline void +_Jv_platform_usleep (unsigned long usecs) +{ + if (usecs > 0UL) + { + unsigned long millis = ((usecs + 999UL) / 1000UL); + Sleep (millis); + } +} +#endif /* JV_HASH_SYNCHRONIZATION */ + #ifndef DISABLE_JAVA_NET static inline int @@ -100,8 +115,6 @@ _Jv_read(int s, void *buf, int len) #endif /* DISABLE_JAVA_NET */ -#define HAVE_BACKTRACE - /* Store up to SIZE return address of the current program state in ARRAY and return the exact number of values stored. */ extern int backtrace (void **__array, int __size); diff --git a/libjava/include/x86_64-signal.h b/libjava/include/x86_64-signal.h new file mode 100644 index 00000000000..b5bb8236f10 --- /dev/null +++ b/libjava/include/x86_64-signal.h @@ -0,0 +1,96 @@ +// x86_64-signal.h - Catch runtime signals and turn them into exceptions +// on an x86_64 based GNU/Linux system. + +/* Copyright (C) 2003 Free Software Foundation + + This file is part of libgcj. + +This software is copyrighted work licensed under the terms of the +Libgcj License. Please consult the file "LIBGCJ_LICENSE" for +details. */ + + +#ifndef JAVA_SIGNAL_H +#define JAVA_SIGNAL_H 1 + +#include <signal.h> +#include <sys/syscall.h> + +#ifdef __x86_64__ + +#define HANDLE_SEGV 1 + +#define SIGNAL_HANDLER(_name) \ +static void _Jv_##_name (int, siginfo_t *_sip, void *_p) + +extern "C" +{ + struct kernel_sigaction + { + void (*k_sa_sigaction)(int,siginfo_t *,void *); + unsigned long k_sa_flags; + void (*k_sa_restorer) (void); + sigset_t k_sa_mask; + }; +} + +#define MAKE_THROW_FRAME(_exception) \ +do \ +{ \ + /* Advance the program counter so that it is after the start of the \ + instruction: the x86_64 exception handler expects \ + the PC to point to the instruction after a call. */ \ + struct ucontext *_uc = (struct ucontext *)_p; \ + struct sigcontext *_sc = (struct sigcontext *) &_uc->uc_mcontext; \ + _sc->rip += 2; \ +} \ +while (0) + +#define RESTORE(name, syscall) RESTORE2 (name, syscall) +#define RESTORE2(name, syscall) \ +asm \ + ( \ + ".byte 0 # Yes, this really is necessary\n" \ + ".align 16\n" \ + "__" #name ":\n" \ + " movq $" #syscall ", %rax\n" \ + " syscall\n" \ + ); + +/* The return code for realtime-signals. */ +RESTORE (restore_rt, __NR_rt_sigreturn) +static void restore_rt (void) asm ("__restore_rt"); + +#define INIT_SEGV \ +do \ + { \ + nullp = new java::lang::NullPointerException (); \ + struct kernel_sigaction act; \ + act.k_sa_sigaction = _Jv_catch_segv; \ + sigemptyset (&act.k_sa_mask); \ + act.k_sa_flags = SA_SIGINFO|0x4000000; \ + act.k_sa_restorer = restore_rt; \ + syscall (SYS_rt_sigaction, SIGSEGV, &act, NULL, _NSIG / 8); \ + } \ +while (0) + +/* We use syscall(SYS_rt_sigaction) in INIT_SEGV instead of + * sigaction() because on some systems the pthreads wrappers for + * signal handlers are not compiled with unwind information, so it's + * not possible to unwind through them. This is a problem that will + * go away if all systems ever have pthreads libraries that are + * compiled with unwind info. */ + +#else /* __x86_64__ */ + +/* This is for the 32-bit subsystem on on x86-64. Catching signals + doesn't yet work on that target. */ + +#undef HANDLE_SEGV +#undef HANDLE_FPE + +#define INIT_SEGV do {} while (0) +#define INIT_FPE do {} while (0) + +#endif /* __x86_64__ */ +#endif /* JAVA_SIGNAL_H */ diff --git a/libjava/java/awt/AlphaComposite.java b/libjava/java/awt/AlphaComposite.java index 14649fc74a3..f0795a96010 100644 --- a/libjava/java/awt/AlphaComposite.java +++ b/libjava/java/awt/AlphaComposite.java @@ -64,6 +64,7 @@ public final class AlphaComposite implements Composite return size() > MAX_CACHE_SIZE; } }; + public static final int CLEAR = 1; public static final int SRC = 2; public static final int DST = 9; @@ -88,6 +89,7 @@ public final class AlphaComposite implements Composite public static final AlphaComposite SrcAtop = getInstance(SRC_ATOP); public static final AlphaComposite DstAtop = getInstance(DST_ATOP); public static final AlphaComposite Xor = getInstance(XOR); + private final int rule; private final float alpha; private AlphaComposite(int rule, float alpha) @@ -95,10 +97,32 @@ public final class AlphaComposite implements Composite this.rule = rule; this.alpha = alpha; } + + /** + * Creates an AlphaComposite object with the specified rule. + * + * @param rule The compositing rule. + * + * @exception IllegalArgumentException If rule is not one of the following: + * CLEAR, SRC, DST, SRC_OVER, DST_OVER, SRC_IN, DST_IN, SRC_OUT, DST_OUT, + * SRC_ATOP, DST_ATOP, or XOR. + */ public static AlphaComposite getInstance(int rule) { return getInstance(rule, 1); } + + /** + * Creates an AlphaComposite object with the specified rule and the constant + * alpha to multiply with the alpha of the source. The source is multiplied + * with the specified alpha before being composited with the destination. + * + * @param rule The compositing rule. + * + * @exception IllegalArgumentException If rule is not one of the following: + * CLEAR, SRC, DST, SRC_OVER, DST_OVER, SRC_IN, DST_IN, SRC_OUT, DST_OUT, + * SRC_ATOP, DST_ATOP, or XOR. + */ public static AlphaComposite getInstance(int rule, float alpha) { if (rule < CLEAR || rule > XOR || ! (alpha >= 0 && alpha <= 1)) diff --git a/libjava/java/awt/BasicStroke.java b/libjava/java/awt/BasicStroke.java index c3290336cd9..3d0a2e74506 100644 --- a/libjava/java/awt/BasicStroke.java +++ b/libjava/java/awt/BasicStroke.java @@ -1,5 +1,5 @@ /* BasicStroke.java -- - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -59,12 +59,31 @@ public class BasicStroke implements Stroke private final float[] dash; private final float phase; + /** + * Creates a basic stroke. + * + * @param width May not be negative . + * @param cap May be either CAP_BUTT, CAP_ROUND or CAP_SQUARE. + * @param join May be either JOIN_ROUND, JOIN_BEVEL, or JOIN_MITER. + * @param miterlimit the limit to trim the miter join. The miterlimit must be + * greater than or equal to 1.0f. + * @param dash The array representing the dashing pattern. + * @param dash_phase is negative and dash is not null. + * + * @exception IllegalArgumentException If one input parameter doesn't meet + * its needs. + */ public BasicStroke(float width, int cap, int join, float miterlimit, float[] dash, float dashPhase) { - if (width < 0 || miterlimit < 1 || cap < CAP_BUTT || cap > CAP_SQUARE - || join < JOIN_MITER || join > JOIN_BEVEL) + if (width < 0 || + miterlimit < 1.0f || + cap < CAP_BUTT || + cap > CAP_SQUARE || + join < JOIN_MITER || + join > JOIN_BEVEL) throw new IllegalArgumentException(); + this.width = width; this.cap = cap; this.join = join; @@ -73,21 +92,54 @@ public class BasicStroke implements Stroke phase = dashPhase; } + /** + * Creates a basic stroke. + * + * @param width The width of the BasicStroke. May not be negative . + * @param cap May be either CAP_BUTT, CAP_ROUND or CAP_SQUARE. + * @param join May be either JOIN_ROUND, JOIN_BEVEL, or JOIN_MITER. + * @param miterlimit the limit to trim the miter join. The miterlimit must be + * greater than or equal to 1.0f. + * + * @exception IllegalArgumentException If one input parameter doesn't meet + * its needs. + */ public BasicStroke(float width, int cap, int join, float miterlimit) { this(width, cap, join, miterlimit, null, 0); } + /** + * Creates a basic stroke. + * + * @param width The width of the BasicStroke. May not be nehative. + * @param cap May be either CAP_BUTT, CAP_ROUND or CAP_SQUARE. + * @param join May be either JOIN_ROUND, JOIN_BEVEL, or JOIN_MITER. + * + * @exception IllegalArgumentException If one input parameter doesn't meet + * its needs. + * @exception IllegalArgumentException FIXME + */ public BasicStroke(float width, int cap, int join) { this(width, cap, join, 10, null, 0); } + /** + * Creates a basic stroke. + * + * @param width The width of the BasicStroke. + * + * @exception IllegalArgumentException If width is negative. + */ public BasicStroke(float width) { this(width, CAP_SQUARE, JOIN_MITER, 10, null, 0); } + /** + * Creates a basic stroke. + */ public BasicStroke() { this(1, CAP_SQUARE, JOIN_MITER, 10, null, 0); diff --git a/libjava/java/awt/BufferCapabilities.java b/libjava/java/awt/BufferCapabilities.java index 389594b76b5..871529e6e93 100644 --- a/libjava/java/awt/BufferCapabilities.java +++ b/libjava/java/awt/BufferCapabilities.java @@ -67,6 +67,11 @@ public class BufferCapabilities implements Cloneable private final ImageCapabilities back; private final FlipContents flip; + /** + * Creates a buffer capabilities object. + * + * @exception IllegalArgumentException If frontCaps or backCaps are null. + */ public BufferCapabilities(ImageCapabilities front, ImageCapabilities back, FlipContents flip) { diff --git a/libjava/java/awt/Button.java b/libjava/java/awt/Button.java index ed954ddcfda..989fbc95173 100644 --- a/libjava/java/awt/Button.java +++ b/libjava/java/awt/Button.java @@ -90,6 +90,9 @@ private transient ActionListener action_listeners; /** * Initializes a new instance of <code>Button</code> with no label. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() + * returns true */ public Button() @@ -104,12 +107,18 @@ Button() * label. The action command name is also initialized to this value. * * @param label The label to display on the button. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() + * returns true */ public Button(String label) { this.label = label; actionCommand = label; + + if (GraphicsEnvironment.isHeadless ()) + throw new HeadlessException (); } /*************************************************************************/ @@ -211,6 +220,10 @@ removeActionListener(ActionListener listener) /** Returns all registered EventListers of the given listenerType. * listenerType must be a subclass of EventListener, or a * ClassClassException is thrown. + * + * @exception ClassCastException If listenerType doesn't specify a class or + * interface that implements @see java.util.EventListener. + * * @since 1.3 */ public EventListener[] getListeners(Class listenerType) diff --git a/libjava/java/awt/CardLayout.java b/libjava/java/awt/CardLayout.java index 10ffa2ec6c2..1900a6094e2 100644 --- a/libjava/java/awt/CardLayout.java +++ b/libjava/java/awt/CardLayout.java @@ -1,6 +1,6 @@ // CardLayout.java - Card-based layout engine -/* Copyright (C) 1999, 2000, 2002 Free Software Foundation +/* Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation This file is part of GNU Classpath. @@ -110,7 +110,7 @@ public class CardLayout implements LayoutManager2, Serializable */ public void first (Container parent) { - gotoComponent (parent, FIRST, null); + gotoComponent (parent, FIRST); } /** Return this layout manager's horizontal gap. */ @@ -154,7 +154,7 @@ public class CardLayout implements LayoutManager2, Serializable */ public void last (Container parent) { - gotoComponent (parent, LAST, null); + gotoComponent (parent, LAST); } /** @@ -210,7 +210,7 @@ public class CardLayout implements LayoutManager2, Serializable */ public void next (Container parent) { - gotoComponent (parent, NEXT, null); + gotoComponent (parent, NEXT); } /** Get the preferred layout size of the container. @@ -228,7 +228,7 @@ public class CardLayout implements LayoutManager2, Serializable */ public void previous (Container parent) { - gotoComponent (parent, PREV, null); + gotoComponent (parent, PREV); } /** Remove the indicated component from this layout manager. @@ -273,7 +273,21 @@ public class CardLayout implements LayoutManager2, Serializable { Object target = tab.get (name); if (target != null) - gotoComponent (parent, NONE, (Component) target); + { + int num = parent.ncomponents; + // This is more efficient than calling getComponents(). + Component[] comps = parent.component; + for (int i = 0; i < num; ++i) + { + if (comps[i].isVisible()) + { + if (target == comps[i]) + return; + comps[i].setVisible (false); + } + } + ((Component) target).setVisible (true); + } } /** @@ -286,9 +300,11 @@ public class CardLayout implements LayoutManager2, Serializable return getClass ().getName () + "[" + hgap + "," + vgap + "]"; } - // This implements first(), last(), next(), and previous(). - private void gotoComponent (Container parent, int what, - Component target) + /** This implements first(), last(), next(), and previous(). + * @param parent The parent container + * @param what The type of goto: FIRST, LAST, NEXT or PREV + */ + private void gotoComponent (Container parent, int what) { synchronized (parent.getTreeLock ()) { @@ -301,19 +317,9 @@ public class CardLayout implements LayoutManager2, Serializable choice = 0; else if (what == LAST) choice = num - 1; - else if (what >= 0) - choice = what; for (int i = 0; i < num; ++i) { - // If TARGET is set then we are looking for a specific - // component. - if (target != null) - { - if (target == comps[i]) - choice = i; - } - if (comps[i].isVisible ()) { if (what == NEXT) @@ -335,7 +341,7 @@ public class CardLayout implements LayoutManager2, Serializable return; } comps[i].setVisible (false); - + if (choice >= 0) break; } @@ -403,7 +409,6 @@ public class CardLayout implements LayoutManager2, Serializable private int LAST = 1; private int NEXT = 2; private int PREV = 3; - private int NONE = 4; // These constants are used by the private getSize method. private int MIN = 0; diff --git a/libjava/java/awt/CheckboxMenuItem.java b/libjava/java/awt/CheckboxMenuItem.java index 2f7ecd79fc5..88218397c3c 100644 --- a/libjava/java/awt/CheckboxMenuItem.java +++ b/libjava/java/awt/CheckboxMenuItem.java @@ -84,6 +84,9 @@ private transient ItemListener item_listeners; /** * Initializes a new instance of <code>CheckboxMenuItem</code> with no * label and an initial state of off. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() + * returns true. */ public CheckboxMenuItem() @@ -98,6 +101,9 @@ CheckboxMenuItem() * specified label and an initial state of off. * * @param label The label of the menu item. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() + * returns true. */ public CheckboxMenuItem(String label) @@ -114,12 +120,18 @@ CheckboxMenuItem(String label) * @param label The label of the menu item. * @param state The initial state of the menu item, where <code>true</code> * is on, and <code>false</code> is off. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() + * returns true. */ public CheckboxMenuItem(String label, boolean state) { super(label); this.state = state; + + if (GraphicsEnvironment.isHeadless()) + throw new HeadlessException (); } /*************************************************************************/ diff --git a/libjava/java/awt/Choice.java b/libjava/java/awt/Choice.java index 81a2a31c932..4c7b505535c 100644 --- a/libjava/java/awt/Choice.java +++ b/libjava/java/awt/Choice.java @@ -85,13 +85,17 @@ private ItemListener item_listeners; * Constructors */ -/** - * Initializes a new instance of <code>Choice</code>. - */ -public -Choice() -{ -} + /** + * Initializes a new instance of <code>Choice</code>. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() + * returns true + */ + public Choice() + { + if (GraphicsEnvironment.isHeadless()) + throw new HeadlessException (); + } /*************************************************************************/ @@ -146,12 +150,16 @@ getItem(int index) * Adds the specified item to this choice box. * * @param item The item to add. + * + * @exception NullPointerException If the item's value is null + * + * @since 1.1 */ public synchronized void add(String item) { if (item == null) - throw new IllegalArgumentException ("item must be non-null"); + throw new NullPointerException ("item must be non-null"); pItems.addElement(item); @@ -171,7 +179,12 @@ add(String item) /** * Adds the specified item to this choice box. * + * This method is oboslete since Java 2 platform 1.1. Please use @see add + * instead. + * * @param item The item to add. + * + * @exception NullPointerException If the item's value is equal to null */ public synchronized void addItem(String item) @@ -189,10 +202,15 @@ addItem(String item) * * @param item The item to add. * @param index The index at which the item should be inserted. + * + * @exception IllegalArgumentException If index is less than 0 */ public synchronized void insert(String item, int index) { + if (index < 0) + throw new IllegalArgumentException ("index may not be less then 0"); + if (index > getItemCount ()) index = getItemCount (); diff --git a/libjava/java/awt/Component.java b/libjava/java/awt/Component.java index fd039116bb8..d61db055f56 100644 --- a/libjava/java/awt/Component.java +++ b/libjava/java/awt/Component.java @@ -1,5 +1,5 @@ /* Component.java -- a graphics component - Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation + Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation This file is part of GNU Classpath. @@ -4168,19 +4168,26 @@ p * <li>the set of backward traversal keys return; Graphics gfx = getGraphics(); - Shape clip = event.getUpdateRect(); - gfx.setClip(clip); - - switch (event.id) + try { - case PaintEvent.PAINT: - paint(gfx); - break; - case PaintEvent.UPDATE: - update(gfx); - break; - default: - throw new IllegalArgumentException("unknown paint event"); + Shape clip = event.getUpdateRect(); + gfx.setClip(clip); + + switch (event.id) + { + case PaintEvent.PAINT: + paint(gfx); + break; + case PaintEvent.UPDATE: + update(gfx); + break; + default: + throw new IllegalArgumentException("unknown paint event"); + } + } + finally + { + gfx.dispose(); } } diff --git a/libjava/java/awt/Container.java b/libjava/java/awt/Container.java index dd2390d35ba..9494d8c56ac 100644 --- a/libjava/java/awt/Container.java +++ b/libjava/java/awt/Container.java @@ -59,7 +59,9 @@ import javax.accessibility.Accessible; * * @author original author unknown * @author Eric Blake <ebb9@email.byu.edu> + * * @since 1.0 + * * @status still missing 1.4 support */ public class Container extends Component @@ -78,7 +80,9 @@ public class Container extends Component Dimension maxSize; - /** @since 1.4 */ + /** + * @since 1.4 + */ boolean focusCycleRoot; int containerSerializedDataVersion; @@ -107,6 +111,7 @@ public class Container extends Component * Returns the number of components in this container. * * @return The number of components in this container. + * * @deprecated use {@link #getComponentCount()} instead */ public int countComponents() @@ -118,16 +123,19 @@ public class Container extends Component * Returns the component at the specified index. * * @param index The index of the component to retrieve. + * * @return The requested component. + * * @throws ArrayIndexOutOfBoundsException If the specified index is invalid */ public Component getComponent(int n) { synchronized (getTreeLock ()) { - if (n < 0 || n >= ncomponents) - throw new ArrayIndexOutOfBoundsException("no such component"); - return component[n]; + if (n < 0 || n >= ncomponents) + throw new ArrayIndexOutOfBoundsException("no such component"); + + return component[n]; } } @@ -140,10 +148,12 @@ public class Container extends Component { synchronized (getTreeLock ()) { - Component[] result = new Component[ncomponents]; - if (ncomponents > 0) - System.arraycopy(component, 0, result, 0, ncomponents); - return result; + Component[] result = new Component[ncomponents]; + + if (ncomponents > 0) + System.arraycopy(component, 0, result, 0, ncomponents); + + return result; } } @@ -157,6 +167,7 @@ public class Container extends Component { if (peer == null) return new Insets(0, 0, 0, 0); + return ((ContainerPeer) peer).getInsets(); } @@ -177,6 +188,7 @@ public class Container extends Component * component list. * * @param component The component to add to the container. + * * @return The same component that was added. */ public Component add(Component comp) @@ -190,7 +202,7 @@ public class Container extends Component * component list. This method should not be used. Instead, use * <code>add(Component, Object</code>. * - * @param name FIXME + * @param name The name of the component to be added. * @param component The component to be added. * * @return The same component that was added. @@ -268,69 +280,70 @@ public class Container extends Component { synchronized (getTreeLock ()) { - if (index > ncomponents - || (index < 0 && index != -1) - || comp instanceof Window - || (comp instanceof Container - && ((Container) comp).isAncestorOf(this))) - throw new IllegalArgumentException(); - - // Reparent component, and make sure component is instantiated if - // we are. - if (comp.parent != null) - comp.parent.remove(comp); - comp.parent = this; - if (peer != null) - { - comp.addNotify(); - - if (comp.isLightweight()) - enableEvents(comp.eventMask); - } + if (index > ncomponents + || (index < 0 && index != -1) + || comp instanceof Window + || (comp instanceof Container + && ((Container) comp).isAncestorOf(this))) + throw new IllegalArgumentException(); + + // Reparent component, and make sure component is instantiated if + // we are. + if (comp.parent != null) + comp.parent.remove(comp); + comp.parent = this; + if (peer != null) + { + comp.addNotify(); - invalidate(); + if (comp.isLightweight()) + enableEvents(comp.eventMask); + } - if (component == null) - component = new Component[4]; // FIXME, better initial size? + invalidate(); - // This isn't the most efficient implementation. We could do less - // copying when growing the array. It probably doesn't matter. - if (ncomponents >= component.length) - { - int nl = component.length * 2; - Component[] c = new Component[nl]; - System.arraycopy(component, 0, c, 0, ncomponents); - component = c; - } - if (index == -1) - component[ncomponents++] = comp; - else - { - System.arraycopy(component, index, component, index + 1, - ncomponents - index); - component[index] = comp; - ++ncomponents; - } + if (component == null) + component = new Component[4]; // FIXME, better initial size? - // Notify the layout manager. - if (layoutMgr != null) - { - if (layoutMgr instanceof LayoutManager2) - { - LayoutManager2 lm2 = (LayoutManager2) layoutMgr; - lm2.addLayoutComponent(comp, constraints); - } - else if (constraints instanceof String) - layoutMgr.addLayoutComponent((String) constraints, comp); - else - layoutMgr.addLayoutComponent(null, comp); - } + // This isn't the most efficient implementation. We could do less + // copying when growing the array. It probably doesn't matter. + if (ncomponents >= component.length) + { + int nl = component.length * 2; + Component[] c = new Component[nl]; + System.arraycopy(component, 0, c, 0, ncomponents); + component = c; + } + + if (index == -1) + component[ncomponents++] = comp; + else + { + System.arraycopy(component, index, component, index + 1, + ncomponents - index); + component[index] = comp; + ++ncomponents; + } - // Post event to notify of adding the container. - ContainerEvent ce = new ContainerEvent(this, - ContainerEvent.COMPONENT_ADDED, - comp); - getToolkit().getSystemEventQueue().postEvent(ce); + // Notify the layout manager. + if (layoutMgr != null) + { + if (layoutMgr instanceof LayoutManager2) + { + LayoutManager2 lm2 = (LayoutManager2) layoutMgr; + lm2.addLayoutComponent(comp, constraints); + } + else if (constraints instanceof String) + layoutMgr.addLayoutComponent((String) constraints, comp); + else + layoutMgr.addLayoutComponent(null, comp); + } + + // Post event to notify of adding the container. + ContainerEvent ce = new ContainerEvent(this, + ContainerEvent.COMPONENT_ADDED, + comp); + getToolkit().getSystemEventQueue().postEvent(ce); } } @@ -343,24 +356,24 @@ public class Container extends Component { synchronized (getTreeLock ()) { - Component r = component[index]; + Component r = component[index]; - r.removeNotify(); + r.removeNotify(); - System.arraycopy(component, index + 1, component, index, - ncomponents - index - 1); - component[--ncomponents] = null; + System.arraycopy(component, index + 1, component, index, + ncomponents - index - 1); + component[--ncomponents] = null; - invalidate(); + invalidate(); - if (layoutMgr != null) - layoutMgr.removeLayoutComponent(r); + if (layoutMgr != null) + layoutMgr.removeLayoutComponent(r); - // Post event to notify of adding the container. - ContainerEvent ce = new ContainerEvent(this, - ContainerEvent.COMPONENT_REMOVED, - r); - getToolkit().getSystemEventQueue().postEvent(ce); + // Post event to notify of adding the container. + ContainerEvent ce = new ContainerEvent(this, + ContainerEvent.COMPONENT_REMOVED, + r); + getToolkit().getSystemEventQueue().postEvent(ce); } } @@ -373,14 +386,14 @@ public class Container extends Component { synchronized (getTreeLock ()) { - for (int i = 0; i < ncomponents; ++i) - { - if (component[i] == comp) - { - remove(i); - break; - } - } + for (int i = 0; i < ncomponents; ++i) + { + if (component[i] == comp) + { + remove(i); + break; + } + } } } @@ -391,8 +404,8 @@ public class Container extends Component { synchronized (getTreeLock ()) { - while (ncomponents > 0) - remove(0); + while (ncomponents > 0) + remove(0); } } @@ -525,6 +538,7 @@ public class Container extends Component * Returns the preferred size of this container. * * @return The preferred size of this container. + * * @deprecated use {@link #getPreferredSize()} instead */ public Dimension preferredSize() @@ -549,6 +563,7 @@ public class Container extends Component * Returns the minimum size of this container. * * @return The minimum size of this container. + * * @deprecated use {@link #getMinimumSize()} instead */ public Dimension minimumSize() @@ -709,6 +724,10 @@ public class Container extends Component } /** + * Returns an array of all the objects currently registered as FooListeners + * upon this Container. FooListeners are registered using the addFooListener + * method. + * * @since 1.3 */ public EventListener[] getListeners(Class listenerType) @@ -760,6 +779,7 @@ public class Container extends Component * AWT 1.0 event processor. * * @param event The event that occurred. + * * @deprecated use {@link #dispatchEvent(AWTEvent)} instead */ public void deliverEvent(Event e) @@ -784,20 +804,20 @@ public class Container extends Component { synchronized (getTreeLock ()) { - if (! contains(x, y)) - return null; - for (int i = 0; i < ncomponents; ++i) - { - // Ignore invisible children... - if (!component[i].isVisible()) - continue; - - int x2 = x - component[i].x; - int y2 = y - component[i].y; - if (component[i].contains(x2, y2)) - return component[i]; - } - return this; + if (! contains(x, y)) + return null; + for (int i = 0; i < ncomponents; ++i) + { + // Ignore invisible children... + if (!component[i].isVisible()) + continue; + + int x2 = x - component[i].x; + int y2 = y - component[i].y; + if (component[i].contains(x2, y2)) + return component[i]; + } + return this; } } @@ -813,6 +833,7 @@ public class Container extends Component * * @return The component containing the specified point, or <code>null</code> * if there is no such point. + * * @deprecated use {@link #getComponentAt(int, int)} instead */ public Component locate(int x, int y) @@ -841,31 +862,31 @@ public class Container extends Component { synchronized (getTreeLock ()) { - if (! contains(x, y)) - return null; - - for (int i = 0; i < ncomponents; ++i) - { - // Ignore invisible children... - if (!component[i].isVisible()) - continue; - - int x2 = x - component[i].x; - int y2 = y - component[i].y; - // We don't do the contains() check right away because - // findComponentAt would redundantly do it first thing. - if (component[i] instanceof Container) - { - Container k = (Container) component[i]; - Component r = k.findComponentAt(x2, y2); - if (r != null) - return r; - } - else if (component[i].contains(x2, y2)) - return component[i]; - } + if (! contains(x, y)) + return null; - return this; + for (int i = 0; i < ncomponents; ++i) + { + // Ignore invisible children... + if (!component[i].isVisible()) + continue; + + int x2 = x - component[i].x; + int y2 = y - component[i].y; + // We don't do the contains() check right away because + // findComponentAt would redundantly do it first thing. + if (component[i] instanceof Container) + { + Container k = (Container) component[i]; + Component r = k.findComponentAt(x2, y2); + if (r != null) + return r; + } + else if (component[i].contains(x2, y2)) + return component[i]; + } + + return this; } } @@ -894,9 +915,9 @@ public class Container extends Component { synchronized (getTreeLock ()) { - for (int i = 0; i < ncomponents; ++i) - component[i].removeNotify(); - super.removeNotify(); + for (int i = 0; i < ncomponents; ++i) + component[i].removeNotify(); + super.removeNotify(); } } @@ -913,14 +934,14 @@ public class Container extends Component { synchronized (getTreeLock ()) { - while (true) - { - if (comp == null) - return false; - if (comp == this) - return true; - comp = comp.getParent(); - } + while (true) + { + if (comp == null) + return false; + if (comp == this) + return true; + comp = comp.getParent(); + } } } @@ -950,9 +971,9 @@ public class Container extends Component { synchronized (getTreeLock ()) { - super.list(out, indent); - for (int i = 0; i < ncomponents; ++i) - component[i].list(out, indent + 2); + super.list(out, indent); + for (int i = 0; i < ncomponents; ++i) + component[i].list(out, indent + 2); } } @@ -967,62 +988,93 @@ public class Container extends Component { synchronized (getTreeLock ()) { - super.list(out, indent); - for (int i = 0; i < ncomponents; ++i) - component[i].list(out, indent + 2); + super.list(out, indent); + for (int i = 0; i < ncomponents; ++i) + component[i].list(out, indent + 2); } } public void setFocusTraversalKeys(int id, Set keys) { + if (id != KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS && + id != KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS && + id != KeyboardFocusManager.UP_CYCLE_TRAVERSAL_KEYS && + id != KeyboardFocusManager.DOWN_CYCLE_TRAVERSAL_KEYS) + throw new IllegalArgumentException (); } + public Set getFocusTraversalKeys(int id) { + if (id != KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS && + id != KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS && + id != KeyboardFocusManager.UP_CYCLE_TRAVERSAL_KEYS && + id != KeyboardFocusManager.DOWN_CYCLE_TRAVERSAL_KEYS) + throw new IllegalArgumentException (); + return null; } + public boolean areFocusTraversalKeysSet(int id) { + if (id != KeyboardFocusManager.FORWARD_TRAVERSAL_KEYS && + id != KeyboardFocusManager.BACKWARD_TRAVERSAL_KEYS && + id != KeyboardFocusManager.UP_CYCLE_TRAVERSAL_KEYS && + id != KeyboardFocusManager.DOWN_CYCLE_TRAVERSAL_KEYS) + throw new IllegalArgumentException (); + return false; } + public boolean isFocusCycleRoot(Container c) { return false; } + public void transferFocusBackward() { } + public void setFocusTraversalPolicy(FocusTraversalPolicy policy) { } + public FocusTraversalPolicy getFocusTraversalPolicy() { return null; } + public boolean isFocusTraversalPolicySet() { return false; } + public void setFocusCycleRoot(boolean focusCycleRoot) { } + public boolean isFocusCycleRoot() { return false; } + public void transferFocusDownCycle() { } + public void applyComponentOrientation(ComponentOrientation o) { + if (orientation == null) + throw new NullPointerException (); } + public void addPropertyChangeListener(PropertyChangeListener l) { } + public void addPropertyChangeListener(String name, PropertyChangeListener l) { } - // Hidden helper methods. /** @@ -1044,14 +1096,14 @@ public class Container extends Component { synchronized (getTreeLock ()) { - for (int i = 0; i < ncomponents; ++i) - { - Component comp = component[i]; - boolean applicable = comp.isVisible() - && (comp.isLightweight() || !lightweightOnly); - - if (applicable) - visitChild(gfx, visitor, comp); + for (int i = 0; i < ncomponents; ++i) + { + Component comp = component[i]; + boolean applicable = comp.isVisible() + && (comp.isLightweight() || !lightweightOnly); + + if (applicable) + visitChild(gfx, visitor, comp); } } } @@ -1100,50 +1152,50 @@ public class Container extends Component { synchronized (getTreeLock ()) { - int start, end; - if (child != null) - { - for (start = 0; start < ncomponents; ++start) - { - if (component[start] == child) - break; - } - end = start; - // This special case lets us be sure to terminate. - if (end == 0) - end = ncomponents; - ++start; - } - else - { - start = 0; - end = ncomponents; - } + int start, end; + if (child != null) + { + for (start = 0; start < ncomponents; ++start) + { + if (component[start] == child) + break; + } + end = start; + // This special case lets us be sure to terminate. + if (end == 0) + end = ncomponents; + ++start; + } + else + { + start = 0; + end = ncomponents; + } - for (int j = start; j != end; ++j) - { - if (j >= ncomponents) - { - // The JCL says that we should wrap here. However, that - // seems wrong. To me it seems that focus order should be - // global within in given window. So instead if we reach - // the end we try to look in our parent, if we have one. - if (parent != null) - return parent.findNextFocusComponent(this); - j -= ncomponents; - } - if (component[j] instanceof Container) - { - Component c = component[j]; - c = c.findNextFocusComponent(null); - if (c != null) - return c; - } - else if (component[j].isFocusTraversable()) - return component[j]; - } + for (int j = start; j != end; ++j) + { + if (j >= ncomponents) + { + // The JCL says that we should wrap here. However, that + // seems wrong. To me it seems that focus order should be + // global within in given window. So instead if we reach + // the end we try to look in our parent, if we have one. + if (parent != null) + return parent.findNextFocusComponent(this); + j -= ncomponents; + } + if (component[j] instanceof Container) + { + Component c = component[j]; + c = c.findNextFocusComponent(null); + if (c != null) + return c; + } + else if (component[j].isFocusTraversable()) + return component[j]; + } - return null; + return null; } } @@ -1151,16 +1203,15 @@ public class Container extends Component { synchronized (getTreeLock ()) { - for (int i = ncomponents; --i >= 0; ) - { - component[i].addNotify(); - if (component[i].isLightweight()) - enableEvents(component[i].eventMask); - } + for (int i = ncomponents; --i >= 0; ) + { + component[i].addNotify(); + if (component[i].isLightweight()) + enableEvents(component[i].eventMask); + } } } - // Nested classes. /* The following classes are used in concert with the @@ -1200,6 +1251,7 @@ public class Container extends Component * This class provides accessibility support for subclasses of container. * * @author Eric Blake <ebb9@email.byu.edu> + * * @since 1.3 */ protected class AccessibleAWTContainer extends AccessibleAWTComponent @@ -1234,14 +1286,14 @@ public class Container extends Component public int getAccessibleChildrenCount() { synchronized (getTreeLock ()) - { - int count = 0; - int i = component == null ? 0 : component.length; - while (--i >= 0) - if (component[i] instanceof Accessible) - count++; - return count; - } + { + int count = 0; + int i = component == null ? 0 : component.length; + while (--i >= 0) + if (component[i] instanceof Accessible) + count++; + return count; + } } /** @@ -1253,17 +1305,17 @@ public class Container extends Component public Accessible getAccessibleChild(int i) { synchronized (getTreeLock ()) - { - if (component == null) - return null; - int index = -1; - while (i >= 0 && ++index < component.length) - if (component[index] instanceof Accessible) - i--; - if (i < 0) - return (Accessible) component[index]; - return null; - } + { + if (component == null) + return null; + int index = -1; + while (i >= 0 && ++index < component.length) + if (component[index] instanceof Accessible) + i--; + if (i < 0) + return (Accessible) component[index]; + return null; + } } /** @@ -1271,7 +1323,9 @@ public class Container extends Component * coordinates), if one exists. * * @param p the point to look at + * * @return an accessible object at that point, or null + * * @throws NullPointerException if p is null */ public Accessible getAccessibleAt(Point p) @@ -1286,6 +1340,7 @@ public class Container extends Component * when children are added or removed from the enclosing accessible object. * * @author Eric Blake <ebb9@email.byu.edu> + * * @since 1.3 */ protected class AccessibleContainerHandler implements ContainerListener @@ -1324,7 +1379,6 @@ public class Container extends Component } // class AccessibleAWTPanel } // class Container - /** * Undocumented helper class. * STUBBED @@ -1339,39 +1393,50 @@ class LightweightDispatcher implements Serializable, AWTEventListener private transient boolean isMouseInNativeContainer; private Cursor nativeCursor; private long eventMask; + LightweightDispatcher(Container c) { } + void dispose() { } + void enableEvents(long l) { } + boolean dispatchEvent(AWTEvent e) { return true; } + boolean isMouseGrab(MouseEvent e) { return true; } + boolean processMouseEvent(MouseEvent e) { return true; } + void trackMouseEnterExit(Component c, MouseEvent e) { } + void startListeningForOtherDrags() { } + void stopListeningForOtherDrags() { } + public void eventDispatched(AWTEvent e) { } + void retargetMouseEvent(Component c, int i, MouseEvent e) { } diff --git a/libjava/java/awt/Cursor.java b/libjava/java/awt/Cursor.java index 5852b8bbf85..8652a1e5ebe 100644 --- a/libjava/java/awt/Cursor.java +++ b/libjava/java/awt/Cursor.java @@ -133,11 +133,14 @@ public class Cursor implements java.io.Serializable * type. * * @param type The cursor type. + * + * @exception IllegalArgumentException If the specified cursor type is invalid */ public Cursor(int type) { if (type < 0 || type >= PREDEFINED_COUNT) throw new IllegalArgumentException ("invalid cursor " + type); + this.type = type; // FIXME: lookup and set name? } @@ -171,9 +174,20 @@ public class Cursor implements java.io.Serializable return predefined[type]; } + /** + * Retrieves the system specific custom Cursor named Cursor names are, + * for example: "Invalid.16x16". + * + * @exception AWTException + * @exception HeadlessException If GraphicsEnvironment.isHeadless() + * returns true. + */ public static Cursor getSystemCustomCursor(String name) throws AWTException { + if (GraphicsEnvironment.isHeadless()) + throw new HeadlessException (); + // FIXME return null; } diff --git a/libjava/java/awt/DisplayMode.java b/libjava/java/awt/DisplayMode.java index b988e20be5e..533ab5ef482 100644 --- a/libjava/java/awt/DisplayMode.java +++ b/libjava/java/awt/DisplayMode.java @@ -1,5 +1,5 @@ /* DisplayMode.java -- a description of display mode configurations - Copyright (C) 2002 Free Software Foundation, Inc. + Copyright (C) 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -140,16 +140,16 @@ public final class DisplayMode * Test for equality. This returns true for two modes with identical * parameters. * - * @param o the object to compare to + * @param dm The display mode to compare to + * * @return true if it is equal */ - public boolean equals(Object o) + public boolean equals (DisplayMode dm) { - if (! (o instanceof DisplayMode)) - return false; - DisplayMode m = (DisplayMode) o; - return width == m.width && height == m.height && bitDepth == m.bitDepth - && refreshRate == m.refreshRate; + return (width == dm.width + && height == dm.height + && bitDepth == dm.bitDepth + && refreshRate == dm.refreshRate); } /** diff --git a/libjava/java/awt/EventQueue.java b/libjava/java/awt/EventQueue.java index 1ce3d163181..6b64fb7ee3b 100644 --- a/libjava/java/awt/EventQueue.java +++ b/libjava/java/awt/EventQueue.java @@ -151,6 +151,8 @@ public class EventQueue * Posts a new event to the queue. * * @param event The event to post to the queue. + * + * @exception NullPointerException If event is null. */ public synchronized void postEvent(AWTEvent evt) { @@ -209,7 +211,19 @@ public class EventQueue notify(); } - /** @since JDK1.2 */ + /** + * Causes runnable to have its run method called in the dispatch thread of the + * EventQueue. This will happen after all pending events are processed. The + * call blocks until this has happened. This method will throw an Error if + * called from the event dispatcher thread. + * + * @exception InterruptedException If another thread has interrupted + * this thread. + * @exception InvocationTargetException If an exception is thrown when running + * runnable. + * + * @since 1.2 + */ public static void invokeAndWait(Runnable runnable) throws InterruptedException, InvocationTargetException { @@ -254,6 +268,8 @@ public class EventQueue * All pending events are transferred to the new queue. Calls to postEvent, * getNextEvent, and peekEvent are forwarded to the pushed queue until it * is removed with a pop(). + * + * @exception NullPointerException if newEventQueue is null. */ public synchronized void push(EventQueue newEventQueue) { @@ -271,7 +287,11 @@ public class EventQueue } /** Transfer any pending events from this queue back to the parent queue that - * was previously push()ed. Event dispatch from this queue is suspended. */ + * was previously push()ed. Event dispatch from this queue is suspended. + * + * @exception EmptyStackException If no previous push was made on this + * EventQueue. + */ protected void pop() throws EmptyStackException { if (prev == null) @@ -297,6 +317,12 @@ public class EventQueue } } + /** + * Dispatches an event. The manner in which the event is dispatched depends + * upon the type of the event and the type of the event's source object. + * + * @exception NullPointerException If event is null. + */ protected void dispatchEvent(AWTEvent evt) { if (evt instanceof ActiveEvent) diff --git a/libjava/java/awt/FileDialog.java b/libjava/java/awt/FileDialog.java index 2019572d5f6..764424c82c3 100644 --- a/libjava/java/awt/FileDialog.java +++ b/libjava/java/awt/FileDialog.java @@ -142,16 +142,15 @@ FileDialog(Frame parent, String title) * @param title The title for this dialog. * @param mode The mode of the dialog, either <code>LOAD</code> or * <code>SAVE</code>. + * + * @exception IllegalArgumentException If an illegal file dialog mode + * is supplied. */ public FileDialog(Frame parent, String title, int mode) { super(parent, title, true); - - if ((mode != LOAD) && (mode != SAVE)) - throw new IllegalArgumentException("Bad mode: " + mode); - - this.mode = mode; + setMode (mode); } /*************************************************************************/ @@ -180,6 +179,9 @@ getMode() * peer is created. * * @param mode The new mode of this file dialog. + * + * @exception IllegalArgumentException If an illegal file dialog mode + * is supplied. */ public void setMode(int mode) diff --git a/libjava/java/awt/Graphics2D.java b/libjava/java/awt/Graphics2D.java index 879fae5ad51..ed80936bfcb 100644 --- a/libjava/java/awt/Graphics2D.java +++ b/libjava/java/awt/Graphics2D.java @@ -38,6 +38,7 @@ package java.awt; import java.awt.geom.AffineTransform; import java.awt.image.BufferedImage; +import java.awt.image.BufferedImageOp; import java.awt.image.RenderedImage; import java.awt.image.ImageObserver; import java.awt.image.renderable.RenderableImage; @@ -74,7 +75,7 @@ public abstract class Graphics2D extends Graphics ImageObserver obs); public abstract void drawImage(BufferedImage image, - BufferedImage op, + BufferedImageOp op, int x, int y); diff --git a/libjava/java/awt/Label.java b/libjava/java/awt/Label.java index 36ea45b944a..4f248c30bb9 100644 --- a/libjava/java/awt/Label.java +++ b/libjava/java/awt/Label.java @@ -40,6 +40,8 @@ package java.awt; import java.awt.peer.LabelPeer; import java.awt.peer.ComponentPeer; +import java.io.Serializable; +import javax.accessibility.Accessible; /** * This component is used for displaying simple text strings that cannot @@ -48,7 +50,7 @@ import java.awt.peer.ComponentPeer; * @author Aaron M. Renn (arenn@urbanophile.com) * @author Tom Tromey <tromey@cygnus.com> */ -public class Label extends Component implements java.io.Serializable +public class Label extends Component implements Serializable, Accessible { /* @@ -99,6 +101,8 @@ private String text; /** * Initializes a new instance of <code>Label</code> with no text. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ public Label() @@ -113,6 +117,8 @@ Label() * text that is aligned to the left. * * @param text The text of the label. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ public Label(String text) @@ -130,12 +136,17 @@ Label(String text) * @param alignment The desired alignment for the text in this label, * which must be one of <code>LEFT</code>, <code>CENTER</code>, or * <code>RIGHT</code>. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ public Label(String text, int alignment) { setAlignment (alignment); setText (text); + + if (GraphicsEnvironment.isHeadless()) + throw new HeadlessException (); } /*************************************************************************/ diff --git a/libjava/java/awt/List.java b/libjava/java/awt/List.java index f2c6d078832..561a30d4dab 100644 --- a/libjava/java/awt/List.java +++ b/libjava/java/awt/List.java @@ -46,13 +46,15 @@ import java.awt.event.ItemListener; import java.awt.peer.ListPeer; import java.awt.peer.ComponentPeer; import java.util.Vector; +import javax.accessibility.Accessible; /** * Class that implements a listbox widget * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public class List extends Component implements ItemSelectable, Serializable +public class List extends Component + implements ItemSelectable, Serializable, Accessible { /* @@ -113,6 +115,8 @@ private ActionListener action_listeners; /** * Initializes a new instance of <code>List</code> with no visible lines * and multi-select disabled. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ public List() @@ -127,6 +131,8 @@ List() * number of visible lines and multi-select disabled. * * @param lines The number of visible lines in the list. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ public List(int rows) @@ -143,12 +149,17 @@ List(int rows) * @param lines The number of visible lines in the list. * @param multipleMode <code>true</code> if multiple lines can be selected * simultaneously, <code>false</code> otherwise. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ public List(int rows, boolean multipleMode) { this.rows = rows; this.multipleMode = multipleMode; + + if (GraphicsEnvironment.isHeadless()) + throw new HeadlessException (); } /*************************************************************************/ diff --git a/libjava/java/awt/Menu.java b/libjava/java/awt/Menu.java index 18d63be7490..326101b76e5 100644 --- a/libjava/java/awt/Menu.java +++ b/libjava/java/awt/Menu.java @@ -95,6 +95,8 @@ static final MenuItem separator = new MenuItem("-"); /** * Initializes a new instance of <code>Menu</code> with no label and that * is not a tearoff; + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ public Menu() @@ -108,6 +110,8 @@ Menu() * that has the specified label. * * @param label The menu label. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ public Menu(String label) @@ -124,6 +128,8 @@ Menu(String label) * @param label The label for this menu * @param isTearOff <code>true</code> if this menu is a tear off menu, * <code>false</code> otherwise. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ public Menu(String label, boolean isTearOff) @@ -134,6 +140,9 @@ Menu(String label, boolean isTearOff) if (label.equals("Help")) isHelpMenu = true; + + if (GraphicsEnvironment.isHeadless()) + throw new HeadlessException (); } /*************************************************************************/ diff --git a/libjava/java/awt/MenuBar.java b/libjava/java/awt/MenuBar.java index 2e1a9636155..b9ddef9aa1b 100644 --- a/libjava/java/awt/MenuBar.java +++ b/libjava/java/awt/MenuBar.java @@ -86,10 +86,14 @@ private Vector menus = new Vector(); /** * Initializes a new instance of <code>MenuBar</code>. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ public MenuBar() { + if (GraphicsEnvironment.isHeadless()) + throw new HeadlessException (); } /*************************************************************************/ diff --git a/libjava/java/awt/MenuComponent.java b/libjava/java/awt/MenuComponent.java index b9c6ea020f1..548aa77937a 100644 --- a/libjava/java/awt/MenuComponent.java +++ b/libjava/java/awt/MenuComponent.java @@ -92,10 +92,14 @@ private static transient Toolkit toolkit = Toolkit.getDefaultToolkit(); /** * Default constructor for subclasses. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ protected MenuComponent() { + if (GraphicsEnvironment.isHeadless()) + throw new HeadlessException (); } /*************************************************************************/ diff --git a/libjava/java/awt/PopupMenu.java b/libjava/java/awt/PopupMenu.java index 9553b87f10a..d0f1980472b 100644 --- a/libjava/java/awt/PopupMenu.java +++ b/libjava/java/awt/PopupMenu.java @@ -65,6 +65,9 @@ private static final long serialVersionUID = -4620452533522760060L; /** * Initializes a new instance of <code>PopupMenu</code>. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() + * returns true. */ public PopupMenu() @@ -78,11 +81,17 @@ PopupMenu() * label. * * @param label The label for this popup menu. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() + * returns true. */ public PopupMenu(String label) { super(label); + + if (GraphicsEnvironment.isHeadless()) + throw new HeadlessException (); } /*************************************************************************/ diff --git a/libjava/java/awt/ScrollPane.java b/libjava/java/awt/ScrollPane.java index e558d0bc23f..045600cddf2 100644 --- a/libjava/java/awt/ScrollPane.java +++ b/libjava/java/awt/ScrollPane.java @@ -41,6 +41,8 @@ package java.awt; import java.awt.peer.ScrollPanePeer; import java.awt.peer.ContainerPeer; import java.awt.peer.ComponentPeer; +import java.io.Serializable; +import javax.accessibility.Accessible; /** * This widget provides a scrollable region that allows a single @@ -48,7 +50,7 @@ import java.awt.peer.ComponentPeer; * * @author Aaron M. Renn (arenn@urbanophile.com) */ -public class ScrollPane extends Container implements java.io.Serializable +public class ScrollPane extends Container implements Accessible, Serializable { /* @@ -113,6 +115,8 @@ private Point scrollPosition = new Point(0, 0); /** * Initializes a new instance of <code>ScrollPane</code> with a default * scrollbar policy of <code>SCROLLBARS_AS_NEEDED</code>. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ public ScrollPane() @@ -128,10 +132,15 @@ ScrollPane() * * @param scrollbarDisplayPolicy When to display scrollbars, which must * be one of the constants defined in this class. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ public ScrollPane(int scrollbarDisplayPolicy) { + if (GraphicsEnvironment.isHeadless ()) + throw new HeadlessException (); + this.scrollbarDisplayPolicy = scrollbarDisplayPolicy; if (scrollbarDisplayPolicy != SCROLLBARS_ALWAYS diff --git a/libjava/java/awt/Scrollbar.java b/libjava/java/awt/Scrollbar.java index 1f1875955bf..4bdc3166ad9 100644 --- a/libjava/java/awt/Scrollbar.java +++ b/libjava/java/awt/Scrollbar.java @@ -1,5 +1,5 @@ /* Scrollbar.java -- AWT Scrollbar widget - Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -40,9 +40,10 @@ package java.awt; import java.awt.peer.ScrollbarPeer; import java.awt.peer.ComponentPeer; - import java.awt.event.AdjustmentListener; import java.awt.event.AdjustmentEvent; +import java.io.Serializable; +import javax.accessibility.Accessible; /** * This class implements a scrollbar widget. @@ -50,8 +51,9 @@ import java.awt.event.AdjustmentEvent; * @author Aaron M. Renn (arenn@urbanophile.com) * @author Tom Tromey <tromey@cygnus.com> */ -public class Scrollbar extends Component implements Adjustable, - java.io.Serializable +public class Scrollbar extends Component implements Accessible, + Adjustable, + Serializable { // FIXME: Serialization readObject/writeObject @@ -126,7 +128,9 @@ private AdjustmentListener adjustment_listeners; /** * Initializes a new instance of <code>Scrollbar</code> with a - * veritical orientation and default values for all other parameters. + * vertical orientation and default values for all other parameters. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true, */ public Scrollbar() @@ -145,6 +149,7 @@ Scrollbar() * * @param orientation The orientation of this scrollbar. * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true, * @exception IllegalArgumentException If the orientation value is not valid. */ public @@ -168,12 +173,16 @@ Scrollbar(int orientation) throws IllegalArgumentException * @param minimum The minimum value of the scrollbar. * @param maximum The maximum value of the scrollbar. * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true, * @exception IllegalArgumentException If the orientation value is not valid. */ public Scrollbar(int orientation, int value, int visibleAmount, int minimum, int maximum) throws IllegalArgumentException { + if (GraphicsEnvironment.isHeadless()) + throw new HeadlessException (); + if ((orientation != HORIZONTAL) && (orientation != VERTICAL)) throw new IllegalArgumentException("Bad orientation value: " + orientation); diff --git a/libjava/java/awt/TextArea.java b/libjava/java/awt/TextArea.java index 799656ec554..f164add49a1 100644 --- a/libjava/java/awt/TextArea.java +++ b/libjava/java/awt/TextArea.java @@ -109,6 +109,8 @@ private int scrollbarVisibility; * Initialize a new instance of <code>TextArea</code> that is empty * and is one row and one column. Both horizontal and vertical * scrollbars will be used. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true, */ public TextArea() @@ -124,6 +126,8 @@ TextArea() * scrollbars will be used. * * @param text The text to display in this text area. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true, */ public TextArea(String text) @@ -140,6 +144,8 @@ TextArea(String text) * * @param rows The number of rows in this text area. * @param columns The number of columns in this text area. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true, */ public TextArea(int rows, int columns) @@ -156,6 +162,8 @@ TextArea(int rows, int columns) * @param text The text to display in this text area. * @param rows The number of rows in this text area. * @param columns The number of columns in this text area. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true, */ public TextArea(String text, int rows, int columns) @@ -174,12 +182,17 @@ TextArea(String text, int rows, int columns) * @param rows The number of rows in this text area. * @param columns The number of columns in this text area. * @param scrollbarVisibility Which scrollbars to display. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true, */ public TextArea(String text, int rows, int columns, int scrollbarVisibility) { super(text); + if (GraphicsEnvironment.isHeadless()) + throw new HeadlessException (); + if ((rows < 1) || (columns < 0)) throw new IllegalArgumentException("Bad row or column value"); diff --git a/libjava/java/awt/TextComponent.java b/libjava/java/awt/TextComponent.java index 5ba80edc1da..6dc904cc8b1 100644 --- a/libjava/java/awt/TextComponent.java +++ b/libjava/java/awt/TextComponent.java @@ -291,10 +291,18 @@ getCaretPosition() * Sets the caret position to the specified value. * * @param caretPosition The new caret position. + * + * @exception IllegalArgumentException If the value supplied for position + * is less than zero. + * + * @since 1.1 */ public synchronized void setCaretPosition(int caretPosition) { + if (caretPosition < 0) + throw new IllegalArgumentException (); + TextComponentPeer tcp = (TextComponentPeer)getPeer(); if (tcp != null) tcp.setCaretPosition(caretPosition); diff --git a/libjava/java/awt/TextField.java b/libjava/java/awt/TextField.java index 28d444ce95f..0106d77e3ad 100644 --- a/libjava/java/awt/TextField.java +++ b/libjava/java/awt/TextField.java @@ -84,9 +84,11 @@ private ActionListener action_listeners; * Constructors */ -/* +/** * Initializes a new instance of <code>TextField</code> that is empty * and has one column. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true, */ public TextField() @@ -102,6 +104,8 @@ TextField() * length of the text string. * * @param text The text to display in the field. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true, */ public TextField(String text) @@ -116,6 +120,8 @@ TextField(String text) * and has the specified number of columns. * * @param columns The number of columns in the text field. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true, */ public TextField(int columns) @@ -131,12 +137,17 @@ TextField(int columns) * * @param text The text to display in the field. * @param columns The number of columns in the field. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true, */ public TextField(String text, int columns) { super(text); this.columns = columns; + + if (GraphicsEnvironment.isHeadless()) + throw new HeadlessException (); } /*************************************************************************/ diff --git a/libjava/java/awt/Toolkit.java b/libjava/java/awt/Toolkit.java index fb5e020a29e..da9bc0e4e4b 100644 --- a/libjava/java/awt/Toolkit.java +++ b/libjava/java/awt/Toolkit.java @@ -123,7 +123,10 @@ public abstract class Toolkit * Creates a peer object for the specified <code>Button</code>. * * @param target The <code>Button</code> to create the peer for. + * * @return The peer for the specified <code>Button</code> object. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ protected abstract ButtonPeer createButton(Button target); @@ -132,6 +135,8 @@ public abstract class Toolkit * * @param target The <code>TextField</code> to create the peer for. * @return The peer for the specified <code>TextField</code> object. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ protected abstract TextFieldPeer createTextField(TextField target); @@ -140,6 +145,8 @@ public abstract class Toolkit * * @param target The <code>Label</code> to create the peer for. * @return The peer for the specified <code>Label</code> object. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ protected abstract LabelPeer createLabel(Label target); @@ -148,6 +155,8 @@ public abstract class Toolkit * * @param target The <code>List</code> to create the peer for. * @return The peer for the specified <code>List</code> object. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ protected abstract ListPeer createList(List target); @@ -156,6 +165,8 @@ public abstract class Toolkit * * @param target The <code>Checkbox</code> to create the peer for. * @return The peer for the specified <code>Checkbox</code> object. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ protected abstract CheckboxPeer createCheckbox(Checkbox target); @@ -164,6 +175,8 @@ public abstract class Toolkit * * @param target The <code>Scrollbar</code> to create the peer for. * @return The peer for the specified <code>Scrollbar</code> object. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ protected abstract ScrollbarPeer createScrollbar(Scrollbar target); @@ -172,6 +185,8 @@ public abstract class Toolkit * * @param target The <code>ScrollPane</code> to create the peer for. * @return The peer for the specified <code>ScrollPane</code> object. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ protected abstract ScrollPanePeer createScrollPane(ScrollPane target); @@ -180,6 +195,8 @@ public abstract class Toolkit * * @param target The <code>TextArea</code> to create the peer for. * @return The peer for the specified <code>TextArea</code> object. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ protected abstract TextAreaPeer createTextArea(TextArea target); @@ -188,6 +205,8 @@ public abstract class Toolkit * * @param target The <code>Choice</code> to create the peer for. * @return The peer for the specified <code>Choice</code> object. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ protected abstract ChoicePeer createChoice(Choice target); @@ -196,6 +215,8 @@ public abstract class Toolkit * * @param target The <code>Frame</code> to create the peer for. * @return The peer for the specified <code>Frame</code> object. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ protected abstract FramePeer createFrame(Frame target); @@ -220,6 +241,8 @@ public abstract class Toolkit * * @param target The <code>Window</code> to create the peer for. * @return The peer for the specified <code>Window</code> object. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ protected abstract WindowPeer createWindow(Window target); @@ -228,6 +251,8 @@ public abstract class Toolkit * * @param target The dialog to create the peer for * @return The peer for the specified font name. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ protected abstract DialogPeer createDialog(Dialog target); @@ -236,6 +261,8 @@ public abstract class Toolkit * * @param target The <code>MenuBar</code> to create the peer for. * @return The peer for the specified <code>MenuBar</code> object. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ protected abstract MenuBarPeer createMenuBar(MenuBar target); @@ -244,6 +271,8 @@ public abstract class Toolkit * * @param target The <code>Menu</code> to create the peer for. * @return The peer for the specified <code>Menu</code> object. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ protected abstract MenuPeer createMenu(Menu target); @@ -252,6 +281,8 @@ public abstract class Toolkit * * @param target The <code>PopupMenu</code> to create the peer for. * @return The peer for the specified <code>PopupMenu</code> object. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ protected abstract PopupMenuPeer createPopupMenu(PopupMenu target); @@ -260,6 +291,8 @@ public abstract class Toolkit * * @param target The <code>MenuItem</code> to create the peer for. * @return The peer for the specified <code>MenuItem</code> object. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ protected abstract MenuItemPeer createMenuItem(MenuItem target); @@ -268,6 +301,8 @@ public abstract class Toolkit * * @param target The <code>FileDialog</code> to create the peer for. * @return The peer for the specified <code>FileDialog</code> object. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ protected abstract FileDialogPeer createFileDialog(FileDialog target); @@ -276,6 +311,8 @@ public abstract class Toolkit * * @param target The <code>CheckboxMenuItem</code> to create the peer for. * @return The peer for the specified <code>CheckboxMenuItem</code> object. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ protected abstract CheckboxMenuItemPeer createCheckboxMenuItem(CheckboxMenuItem target); @@ -310,6 +347,8 @@ public abstract class Toolkit * the interface used by the <code>SystemColors</code> class. * * @param colors The array to copy the system colors into. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ protected void loadSystemColors(int systemColors[]) { @@ -318,6 +357,8 @@ public abstract class Toolkit /** * @since 1.4 + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ public void setDynamicLayout(boolean dynamic) { @@ -325,6 +366,8 @@ public abstract class Toolkit /** * @since 1.4 + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ protected boolean isDynamicLayoutSet() { @@ -333,6 +376,8 @@ public abstract class Toolkit /** * @since 1.4 + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ public boolean isDynamicLayoutActive() { @@ -343,6 +388,8 @@ public abstract class Toolkit * Returns the dimensions of the screen in pixels. * * @return The dimensions of the screen in pixels. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ public abstract Dimension getScreenSize(); @@ -350,10 +397,14 @@ public abstract class Toolkit * Returns the screen resolution in dots per square inch. * * @return The screen resolution in dots per square inch. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ public abstract int getScreenResolution(); /** + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. + * * @since 1.4 */ public Insets getScreenInsets(GraphicsConfiguration gc) @@ -396,6 +447,7 @@ public abstract class Toolkit * if the property is not set. * * @return An instance of the system default toolkit. + * * @throws AWTError If the toolkit cannot be loaded. */ public static Toolkit getDefaultToolkit() @@ -450,6 +502,7 @@ public abstract class Toolkit * @param height The height of the image. * @param observer The observer to receive events about the preparation * process. + * * @return <code>true</code> if the image is already prepared for rendering, * <code>false</code> otherwise. */ @@ -465,6 +518,7 @@ public abstract class Toolkit * @param height The height of the image. * @param observer The observer to receive events about the preparation * process. + * * @return A union of the bitmasks from * <code>java.awt.image.ImageObserver</code> that indicates the current * state of the imaging readying process. @@ -476,6 +530,7 @@ public abstract class Toolkit * Creates an image using the specified <code>ImageProducer</code> * * @param producer The <code>ImageProducer</code> to create the image from. + * * @return The created image. */ public abstract Image createImage(ImageProducer producer); @@ -485,6 +540,7 @@ public abstract class Toolkit * a recognized format. Supported formats vary from toolkit to toolkit. * * @param data The raw image data. + * * @return The created image. */ public Image createImage(byte[] data) @@ -500,6 +556,7 @@ public abstract class Toolkit * @param data The raw image data. * @param offset The offset into the data where the image data starts. * @param len The length of the image data. + * * @return The created image. */ public abstract Image createImage(byte[] data, int offset, int len); @@ -511,6 +568,7 @@ public abstract class Toolkit * @param frame The window initiating the print job. * @param title The print job title. * @param props The print job properties. + * * @return The requested print job, or <code>null</code> if the job * was cancelled. */ @@ -536,10 +594,14 @@ public abstract class Toolkit * Returns the system clipboard. * * @return THe system clipboard. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ public abstract Clipboard getSystemClipboard(); /** + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. + * * @since 1.4 */ public Clipboard getSystemSelection() @@ -553,6 +615,8 @@ public abstract class Toolkit * to change the default. * * @return The key mask for the menu accelerator key. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. */ public int getMenuShortcutKeyMask() { diff --git a/libjava/java/awt/Window.java b/libjava/java/awt/Window.java index b8befaf0507..31e6b573f53 100644 --- a/libjava/java/awt/Window.java +++ b/libjava/java/awt/Window.java @@ -86,32 +86,56 @@ public class Window extends Container * parent. The window will initially be invisible. * * @param parent The owning <code>Frame</code> of this window. + * + * @exception IllegalArgumentException If the owner's GraphicsConfiguration + * is not from a screen device, or if owner is null; this exception is always + * thrown when GraphicsEnvironment.isHeadless returns true. */ public Window(Frame owner) { - this((Window) owner); + this (owner, owner.getGraphicsConfiguration ()); } - /** @since 1.2 */ + /** + * Initializes a new instance of <code>Window</code> with the specified + * parent. The window will initially be invisible. + * + * @exception IllegalArgumentException If the owner's GraphicsConfiguration + * is not from a screen device, or if owner is null; this exception is always + * thrown when GraphicsEnvironment.isHeadless returns true. + * + * @since 1.2 + */ public Window(Window owner) { - this(); - if (owner == null) - throw new IllegalArgumentException("owner must not be null"); - - this.parent = owner; - - // FIXME: add to owner's "owned window" list - //owner.owned.add(this); // this should be a weak reference + this (owner, owner.getGraphicsConfiguration ()); } - /** @since 1.3 */ + /** + * Initializes a new instance of <code>Window</code> with the specified + * parent. The window will initially be invisible. + * + * @exception IllegalArgumentException If owner is null or if gc is not from a + * screen device; this exception is always thrown when + * GraphicsEnvironment.isHeadless returns true. + * + * @since 1.3 + */ public Window(Window owner, GraphicsConfiguration gc) { - this(owner); + this (); + + if (owner == null) + throw new IllegalArgumentException ("owner must not be null"); + this.parent = owner; + + // FIXME: add to owner's "owned window" list + //owner.owned.add(this); // this should be a weak reference + /* FIXME: Security check SecurityManager.checkTopLevelWindow(...) + */ if (gc != null && gc.getDevice().getType() != GraphicsDevice.TYPE_RASTER_SCREEN) @@ -119,11 +143,10 @@ public class Window extends Container if (gc == null) graphicsConfiguration = GraphicsEnvironment.getLocalGraphicsEnvironment() - .getDefaultScreenDevice() - .getDefaultConfiguration(); + .getDefaultScreenDevice() + .getDefaultConfiguration(); else - */ - graphicsConfiguration = gc; + graphicsConfiguration = gc; } GraphicsConfiguration getGraphicsConfigurationImpl() @@ -134,6 +157,12 @@ public class Window extends Container return super.getGraphicsConfigurationImpl(); } + /** + * Disposes of the input methods and context, and removes the WeakReference + * which formerly pointed to this Window from the parent's owned Window list. + * + * @exception Throwable The Exception raised by this method. + */ protected void finalize() throws Throwable { // FIXME: remove from owner's "owned window" list (Weak References) @@ -185,7 +214,7 @@ public class Window extends Container public void hide() { - // FIXME: call hide() on amy "owned" children here. + // FIXME: call hide() on any "owned" children here. super.hide(); } @@ -233,8 +262,8 @@ public class Window extends Container { if (peer != null) { - WindowPeer wp = (WindowPeer) peer; - wp.toFront(); + WindowPeer wp = (WindowPeer) peer; + wp.toFront(); } } @@ -265,12 +294,12 @@ public class Window extends Container if (!secure) { if (warningString != null) - return warningString; - else - { - String warning = System.getProperty("awt.appletWarning"); - return warning; - } + return warningString; + else + { + String warning = System.getProperty("awt.appletWarning"); + return warning; + } } return null; } @@ -338,6 +367,11 @@ public class Window extends Container windowListener = AWTEventMulticaster.remove(windowListener, listener); } + /** + * Returns an array of all the window listeners registered on this window. + * + * @since 1.4 + */ public synchronized WindowListener[] getWindowListeners() { return (WindowListener[]) @@ -345,7 +379,16 @@ public class Window extends Container WindowListener.class); } - /** @since 1.3 */ + /** + * Returns an array of all the objects currently registered as FooListeners + * upon this Window. FooListeners are registered using the addFooListener + * method. + * + * @exception ClassCastException If listenerType doesn't specify a class or + * interface that implements java.util.EventListener. + * + * @since 1.3 + */ public EventListener[] getListeners(Class listenerType) { if (listenerType == WindowListener.class) diff --git a/libjava/java/awt/color/CMMException.java b/libjava/java/awt/color/CMMException.java index 0d146e6c6eb..a0948ef27eb 100644 --- a/libjava/java/awt/color/CMMException.java +++ b/libjava/java/awt/color/CMMException.java @@ -44,7 +44,7 @@ package java.awt.color; * @author Eric Blake <ebb9@email.byu.edu> * @status updated to 1.4 */ -public class CMMException extends Exception +public class CMMException extends RuntimeException { /** * Compatible with JDK 1.2+. diff --git a/libjava/java/awt/color/ColorSpace.java b/libjava/java/awt/color/ColorSpace.java index 4f68fabcb7b..8bf0a8196c0 100644 --- a/libjava/java/awt/color/ColorSpace.java +++ b/libjava/java/awt/color/ColorSpace.java @@ -46,7 +46,7 @@ import java.io.Serializable; * @author Rolf W. Rasmussen <rolfwr@ii.uib.no> * @since 1.2 */ -public abstract class ColorSpace +public abstract class ColorSpace implements Serializable { /** * Compatible with JDK 1.2+. @@ -131,6 +131,13 @@ public abstract class ColorSpace return false; } + /** + * Transforms a color value assumed to be in this ColorSpace into a value in + * the default CS_sRGB color space. + * + * @exception ArrayIndexOutOfBoundsException If array length is not at least + * the number of components in this ColorSpace. + */ public abstract float[] toRGB(float[] colorvalue); public abstract float[] fromRGB(float[] rgbvalue); diff --git a/libjava/java/awt/color/ICC_ColorSpace.java b/libjava/java/awt/color/ICC_ColorSpace.java index 1a144dbfbd2..2b7016742c9 100644 --- a/libjava/java/awt/color/ICC_ColorSpace.java +++ b/libjava/java/awt/color/ICC_ColorSpace.java @@ -81,6 +81,12 @@ public class ICC_ColorSpace extends ColorSpace */ private boolean needScaleInit; + /** + * Constructs a new ICC_ColorSpace from an ICC_Profile object. + * + * @exception IllegalArgumentException If profile is inappropriate for + * representing a ColorSpace. + */ public ICC_ColorSpace(ICC_Profile profile) { super(CS_sRGB, profile.getNumComponents()); @@ -92,18 +98,45 @@ public class ICC_ColorSpace extends ColorSpace return thisProfile; } + /** + * Transforms a color value assumed to be in this ColorSpace into a value in + * the default CS_sRGB color space. + * + * @exception ArrayIndexOutOfBoundsException If array length is not at least + * the number of components in this ColorSpace. + */ public float[] toRGB(float[] colorvalue) { + if (colorvalue.length < numComponents) + throw new IllegalArgumentException (); + // FIXME: Always assumes sRGB: return colorvalue; } + /** + * Transforms a color value assumed to be in the default CS_sRGB color space + * into this ColorSpace. + * + * @exception ArrayIndexOutOfBoundsException If array length is not at + * least 3. + */ public float[] fromRGB(float[] rgbvalue) { + if (rgbvalue.length < 3) + throw new IllegalArgumentException (); + // FIXME: Always assumes sRGB: return rgbvalue; } + /** + * Transforms a color value assumed to be in this ColorSpace into the + * CS_CIEXYZ conversion color space. + * + * @exception ArrayIndexOutOfBoundsException If array length is not at + * least the number of components in this ColorSpace. + */ public float[] toCIEXYZ(float[] colorvalue) { // FIXME: Not implemented diff --git a/libjava/java/awt/color/ICC_Profile.java b/libjava/java/awt/color/ICC_Profile.java index 7adaac06472..eb534ebffca 100644 --- a/libjava/java/awt/color/ICC_Profile.java +++ b/libjava/java/awt/color/ICC_Profile.java @@ -245,7 +245,7 @@ public class ICC_Profile implements Serializable write(new FileOutputStream(filename)); } - public void write(OutputStream out) + public void write(OutputStream out) throws IOException { throw new Error("not implemented"); } diff --git a/libjava/java/awt/color/ProfileDataException.java b/libjava/java/awt/color/ProfileDataException.java index 130781faf9b..89f47a207e1 100644 --- a/libjava/java/awt/color/ProfileDataException.java +++ b/libjava/java/awt/color/ProfileDataException.java @@ -45,7 +45,7 @@ package java.awt.color; * @author Eric Blake <ebb9@email.byu.edu> * @status updated to 1.4 */ -public class ProfileDataException extends Exception +public class ProfileDataException extends RuntimeException { /** * Compatible with JDK 1.2+. diff --git a/libjava/java/awt/datatransfer/Clipboard.java b/libjava/java/awt/datatransfer/Clipboard.java index 6ef9e70b6aa..93bba7c1a3d 100644 --- a/libjava/java/awt/datatransfer/Clipboard.java +++ b/libjava/java/awt/datatransfer/Clipboard.java @@ -103,6 +103,8 @@ getName() * Returns the contents of the clipboard. * * @param requestor The object requesting the contents. + * + * @exception IllegalStateException If the clipboard is currently unavailable */ public synchronized Transferable getContents(Object requestor) @@ -120,6 +122,8 @@ getContents(Object requestor) * * @param contents The new clipboard contents. * @param owner The new clipboard owner + * + * @exception IllegalStateException If the clipboard is currently unavailable */ public synchronized void setContents(Transferable contents, ClipboardOwner owner) diff --git a/libjava/java/awt/datatransfer/DataFlavor.java b/libjava/java/awt/datatransfer/DataFlavor.java index 85f6ae5d455..e1500a7926c 100644 --- a/libjava/java/awt/datatransfer/DataFlavor.java +++ b/libjava/java/awt/datatransfer/DataFlavor.java @@ -281,6 +281,7 @@ DataFlavor(Class representationClass, String humanPresentableName) * * @exception IllegalArgumentException If the representation class * specified cannot be loaded. + * @exception ClassNotFoundException If the class is not loaded. */ public DataFlavor(String mimeType, String humanPresentableName, @@ -504,6 +505,8 @@ setHumanPresentableName(String humanPresentableName) * * @return <code>true</code> if the MIME type is equal to this object's * MIME type, <code>false</code> otherwise. + * + * @exception NullPointerException If mimeType is null. */ public final boolean isMimeTypeEqual(String mimeType) @@ -652,6 +655,10 @@ isFlavorJavaFileListType() * Returns a copy of this object. * * @return A copy of this object. + * + * @exception CloneNotSupportedException If the object's class does not support + * the Cloneable interface. Subclasses that override the clone method can also + * throw this exception to indicate that an instance cannot be cloned. */ public Object clone() @@ -813,6 +820,8 @@ normalizeMimeType(String type) * Serialize this class. * * @param stream The <code>ObjectOutput</code> stream to serialize to. + * + * @exception IOException If an error occurs. */ public void writeExternal(ObjectOutput stream) throws IOException @@ -826,6 +835,10 @@ writeExternal(ObjectOutput stream) throws IOException * De-serialize this class. * * @param stream The <code>ObjectInput</code> stream to deserialize from. + * + * @exception IOException If an error ocurs. + * @exception ClassNotFoundException If the class for an object being restored + * cannot be found. */ public void readExternal(ObjectInput stream) throws IOException, ClassNotFoundException @@ -950,6 +963,10 @@ selectBestTextFlavor(DataFlavor[] availableFlavors) * * @param transferable The <code>Transferable</code> for which a text * <code>Reader</code> is requested. + * + * @exception IllegalArgumentException If the representation class is not one + * of the seven listed above or the Transferable has null data. + * @exception NullPointerException If the Transferable is null. * @exception UnsupportedFlavorException when the transferable doesn't * support this <code>DataFlavor</code>. Or if the representable class * isn't a (subclass of) <code>Reader</code>, <code>String</code>, diff --git a/libjava/java/awt/datatransfer/FlavorMap.java b/libjava/java/awt/datatransfer/FlavorMap.java index 96b160842d9..a3926150631 100644 --- a/libjava/java/awt/datatransfer/FlavorMap.java +++ b/libjava/java/awt/datatransfer/FlavorMap.java @@ -41,42 +41,35 @@ package java.awt.datatransfer; import java.util.Map; /** - * This interface maps between native platform type names and DataFlavors. - * - * @author Aaron M. Renn (arenn@urbanophile.com) - */ + * This interface maps between native platform type names and DataFlavors. + * + * @author Aaron M. Renn (arenn@urbanophile.com) + */ public interface FlavorMap { + /** + * Maps the specified <code>DataFlavor</code> objects to the native + * data type name. The returned <code>Map</code> has keys that are + * the data flavors and values that are strings. The returned map + * may be modified. This can be useful for implementing nested mappings. + * + * @param flavors An array of data flavors to map + * or null for all data flavors. + * + * @return A <code>Map</code> of native data types. + */ + public abstract Map getNativesForFlavors (DataFlavor[] flavors); -/** - * Maps the specified <code>DataFlavor</code> objects to the native - * data type name. The returned <code>Map</code> has keys that are - * the data flavors and values that are strings. The returned map - * may be modified. This can be useful for implementing nested mappings. - * - * @param flavors An array of data flavors to map - * or null for all data flavors. - * - * @return A <code>Map</code> of native data types. - */ -public abstract Map -getNativesForFlavors(DataFlavor[] flavors); - -/*************************************************************************/ - -/** - * Maps the specified native type names to <code>DataFlavor</code>'s. - * The returned <code>Map</code> has keys that are strings and values - * that are <code>DataFlavor</code>'s. The returned map may be - * modified. This can be useful for implementing nested mappings. - * - * @param natives An array of native types to map - * or null for all native types. - * - * @return A <code>Map</code> of data flavors. - */ -public abstract Map -getFlavorsForNatives(String[] natives); - -} // interface FlavorMap - + /** + * Maps the specified native type names to <code>DataFlavor</code>'s. + * The returned <code>Map</code> has keys that are strings and values + * that are <code>DataFlavor</code>'s. The returned map may be + * modified. This can be useful for implementing nested mappings. + * + * @param natives An array of native types to map + * or null for all native types. + * + * @return A <code>Map</code> of data flavors. + */ + public abstract Map getFlavorsForNatives (String[] natives); +} diff --git a/libjava/java/awt/datatransfer/SystemFlavorMap.java b/libjava/java/awt/datatransfer/SystemFlavorMap.java index 50064db4c92..7d914120e8f 100644 --- a/libjava/java/awt/datatransfer/SystemFlavorMap.java +++ b/libjava/java/awt/datatransfer/SystemFlavorMap.java @@ -40,6 +40,7 @@ package java.awt.datatransfer; import java.util.HashMap; import java.util.Map; +import java.util.List; /** * This class maps between native platform type names and DataFlavors. @@ -47,134 +48,122 @@ import java.util.Map; * XXX - The current implementation does no mapping at all. * * @author Mark Wielaard (mark@klomp.org) - */ -public final class SystemFlavorMap implements FlavorMap -{ - -/** - * The default (instance) flavor map. - */ -private static FlavorMap defaultFlavorMap; - -/** - * Private constructor. - */ -private SystemFlavorMap() -{ -} - -/*************************************************************************/ - -/** - * Maps the specified <code>DataFlavor</code> objects to the native - * data type name. The returned <code>Map</code> has keys that are - * the data flavors and values that are strings. The returned map - * may be modified. This can be useful for implementing nested mappings. - * - * @param flavors An array of data flavors to map - * or null for all data flavors. * - * @return A <code>Map</code> of native data types to data flavors. - */ -public Map -getNativesForFlavors(DataFlavor[] flavors) -{ - return(new HashMap()); -} - -/*************************************************************************/ - -/** - * Maps the specified native type names to <code>DataFlavor</code>'s. - * The returned <code>Map</code> has keys that are strings and values - * that are <code>DataFlavor</code>'s. The returned map may be - * modified. This can be useful for implementing nested mappings. - * - * @param natives An array of native types to map - * or null for all native types. - * - * @return A <code>Map</code> of data flavors to native type names. - */ -public Map -getFlavorsForNatives(String[] natives) -{ - return(new HashMap()); -} - -/*************************************************************************/ - -/** - * Returns the default (instance) (System)FlavorMap. - */ -public static FlavorMap -getDefaultFlavorMap() -{ - if (defaultFlavorMap == null) - defaultFlavorMap = new SystemFlavorMap(); - - return(defaultFlavorMap); -} - -/*************************************************************************/ - -/** - * Returns the native type name for the given java mime type. - */ -public static String -encodeJavaMIMEType(String mime) -{ - return null; -} - -/*************************************************************************/ - -/** - * Returns the native type name for the given data flavor. - */ -public static String -encodeDataFlavor(DataFlavor df) -{ - return null; -} - -/*************************************************************************/ - -/** - * Returns true if the native type name can be represented as - * a java mime type. - */ -public static boolean -isJavaMIMEType(String name) -{ - return(false); -} - -/*************************************************************************/ - -/** - * Returns the java mime type for the given the native type name. + * @since 1.2 */ -public static String -decodeJavaMIMEType(String name) +public final class SystemFlavorMap implements FlavorMap, FlavorTable { - return null; -} - -/*************************************************************************/ - -/** - * Returns the data flavor given the native type name - * or null when no such data flavor exists. - */ -public static DataFlavor -decodeDataFlavor(String name) throws ClassNotFoundException -{ - String javaMIMEType = decodeJavaMIMEType(name); - if (javaMIMEType != null) - return(new DataFlavor(javaMIMEType)); - else - return(null); -} + /** + * The default (instance) flavor map. + */ + private static FlavorMap defaultFlavorMap; + + /** + * Private constructor. + */ + private SystemFlavorMap () + { + } + + /** + * Maps the specified <code>DataFlavor</code> objects to the native + * data type name. The returned <code>Map</code> has keys that are + * the data flavors and values that are strings. The returned map + * may be modified. This can be useful for implementing nested mappings. + * + * @param flavors An array of data flavors to map + * or null for all data flavors. + * + * @return A <code>Map</code> of native data types to data flavors. + */ + public Map getNativesForFlavors (DataFlavor[] flavors) + { + return new HashMap(); + } + + /** + * Maps the specified native type names to <code>DataFlavor</code>'s. + * The returned <code>Map</code> has keys that are strings and values + * that are <code>DataFlavor</code>'s. The returned map may be + * modified. This can be useful for implementing nested mappings. + * + * @param natives An array of native types to map + * or null for all native types. + * + * @return A <code>Map</code> of data flavors to native type names. + */ + public Map getFlavorsForNatives (String[] natives) + { + return new HashMap(); + } + + /** + * Returns the default (instance) (System)FlavorMap. + */ + public static FlavorMap getDefaultFlavorMap () + { + if (defaultFlavorMap == null) + defaultFlavorMap = new SystemFlavorMap (); + + return defaultFlavorMap; + } + + /** + * Returns the native type name for the given java mime type. + */ + public static String encodeJavaMIMEType (String mime) + { + return null; + } + + /** + * Returns the native type name for the given data flavor. + */ + public static String encodeDataFlavor (DataFlavor df) + { + return null; + } + + /** + * Returns true if the native type name can be represented as + * a java mime type. + */ + public static boolean isJavaMIMEType (String name) + { + return false; + } + + /** + * Returns the java mime type for the given the native type name. + */ + public static String decodeJavaMIMEType (String name) + { + return null; + } + + /** + * Returns the data flavor given the native type name + * or null when no such data flavor exists. + */ + public static DataFlavor decodeDataFlavor (String name) + throws ClassNotFoundException + { + String javaMIMEType = decodeJavaMIMEType (name); + + if (javaMIMEType != null) + return new DataFlavor (javaMIMEType); + else + return null; + } + + public List getFlavorsForNative (String nat) + { + throw new Error ("Not implemented"); + } + + public List getNativesForFlavor (DataFlavor flav) + { + throw new Error ("Not implemented"); + } } // class SystemFlavorMap - diff --git a/libjava/java/awt/dnd/DragGestureEvent.java b/libjava/java/awt/dnd/DragGestureEvent.java index 84fa1cbb901..3d268820ba7 100644 --- a/libjava/java/awt/dnd/DragGestureEvent.java +++ b/libjava/java/awt/dnd/DragGestureEvent.java @@ -113,15 +113,42 @@ public class DragGestureEvent extends EventObject { return null; } + + /** + * Starts the drag given the initial Cursor to display, the Transferable + * object, and the DragSourceListener to use. + * + * @exception InvalidDnDOperationException If the Drag and Drop system is + * unable to initiate a drag operation, or if the user attempts to start + * a drag while an existing drag operation is still executing. + */ public void startDrag(Cursor dragCursor, Transferable trans) { startDrag(dragCursor, null, null, trans, null); } + + /** + * Starts the drag given the initial Cursor to display, the Transferable + * object, and the DragSourceListener to use. + * + * @exception InvalidDnDOperationException If the Drag and Drop system is + * unable to initiate a drag operation, or if the user attempts to start + * a drag while an existing drag operation is still executing. + */ public void startDrag(Cursor dragCursor, Transferable trans, DragSourceListener l) { startDrag(dragCursor, null, null, trans, l); } + + /** + * Starts the drag given the initial Cursor to display, the Transferable + * object, and the DragSourceListener to use. + * + * @exception InvalidDnDOperationException If the Drag and Drop system is + * unable to initiate a drag operation, or if the user attempts to start + * a drag while an existing drag operation is still executing. + */ public void startDrag(Cursor dragCursor, Image dragImage, Point imageOffset, Transferable trans, DragSourceListener l) { diff --git a/libjava/java/awt/dnd/DragGestureRecognizer.java b/libjava/java/awt/dnd/DragGestureRecognizer.java index 674e26e8a3b..cd204b6fe93 100644 --- a/libjava/java/awt/dnd/DragGestureRecognizer.java +++ b/libjava/java/awt/dnd/DragGestureRecognizer.java @@ -130,6 +130,12 @@ public abstract class DragGestureRecognizer implements Serializable throw new Error("not implemented"); } + /** + * Register a new DragGestureListener. + * + * @exception TooManyListenersException If a DragGestureListener has already + * been added. + */ public void addDragGestureListener(DragGestureListener dgl) throws TooManyListenersException { diff --git a/libjava/java/awt/dnd/DragSource.java b/libjava/java/awt/dnd/DragSource.java index 01cae00a3cf..740235ac83c 100644 --- a/libjava/java/awt/dnd/DragSource.java +++ b/libjava/java/awt/dnd/DragSource.java @@ -40,6 +40,8 @@ package java.awt.dnd; import java.awt.Component; import java.awt.Cursor; +import java.awt.GraphicsEnvironment; +import java.awt.HeadlessException; import java.awt.Image; import java.awt.Point; import java.awt.datatransfer.FlavorMap; @@ -62,10 +64,20 @@ public class DragSource implements Serializable public static final Cursor DefaultMoveNoDrop = null; public static final Cursor DefaultLinkNoDrop = null; + /** + * Initializes the drag source. + * + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. + */ public DragSource() { + if (GraphicsEnvironment.isHeadless()) + throw new HeadlessException (); } + /** + * @exception HeadlessException If GraphicsEnvironment.isHeadless() is true. + */ public static DragSource getDefaultDragSource() { return null; @@ -76,6 +88,13 @@ public class DragSource implements Serializable return false; } + /** + * Start a drag, given the DragGestureEvent that initiated the drag. + * + * @exception InvalidDnDOperationException If the Drag and Drop system is + * unable to initiate a drag operation, or if the user attempts to start + * a drag while an existing drag operation is still executing. + */ public void startDrag(DragGestureEvent trigger, Cursor dragCursor, Image dragImage, Point imageOffset, Transferable trans, DragSourceListener dsl, @@ -83,6 +102,13 @@ public class DragSource implements Serializable { } + /** + * Start a drag, given the DragGestureEvent that initiated the drag. + * + * @exception InvalidDnDOperationException If the Drag and Drop system is + * unable to initiate a drag operation, or if the user attempts to start + * a drag while an existing drag operation is still executing. + */ public void startDrag(DragGestureEvent trigger, Cursor dragCursor, Transferable trans, DragSourceListener dsl, FlavorMap map) @@ -90,6 +116,13 @@ public class DragSource implements Serializable startDrag(trigger, dragCursor, null, null, trans, dsl, map); } + /** + * Start a drag, given the DragGestureEvent that initiated the drag. + * + * @exception InvalidDnDOperationException If the Drag and Drop system is + * unable to initiate a drag operation, or if the user attempts to start + * a drag while an existing drag operation is still executing. + */ public void startDrag(DragGestureEvent trigger, Cursor dragCursor, Image dragImage, Point imageOffset, Transferable trans, DragSourceListener dsl) @@ -97,12 +130,25 @@ public class DragSource implements Serializable startDrag(trigger, dragCursor, dragImage, imageOffset, trans, dsl, null); } + /** + * Start a drag, given the DragGestureEvent that initiated the drag. + * + * @exception InvalidDnDOperationException If the Drag and Drop system is + * unable to initiate a drag operation, or if the user attempts to start + * a drag while an existing drag operation is still executing. + */ public void startDrag(DragGestureEvent trigger, Cursor dragCursor, Transferable trans, DragSourceListener dsl) { startDrag(trigger, dragCursor, null, null, trans, dsl, null); } + /** + * Creates the DragSourceContext to handle this drag. + * + * @exception IllegalArgumentException FIXME + * @exception NullPointerException If dscp, dgl, dragImage or t is null. + */ protected DragSourceContext createDragSourceContext(DragSourceContextPeer peer, DragGestureEvent dge, Cursor cursor, Image image, Point offset, diff --git a/libjava/java/awt/dnd/DropTarget.java b/libjava/java/awt/dnd/DropTarget.java index c469605b8b4..53c09178d32 100644 --- a/libjava/java/awt/dnd/DropTarget.java +++ b/libjava/java/awt/dnd/DropTarget.java @@ -42,10 +42,13 @@ import java.awt.Component; import java.awt.datatransfer.FlavorMap; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.io.Serializable; +import java.util.EventListener; import java.util.TooManyListenersException; /** STUB CLASS ONLY */ public class DropTarget + implements DropTargetListener, EventListener, Serializable { protected static class DropTargetAutoScroller implements ActionListener @@ -67,6 +70,9 @@ public class DropTarget } } + // FIXME: check the correctness of default value. + private boolean isActive = false; + /** * FIXME * @@ -133,11 +139,12 @@ public class DropTarget public void setActive(boolean isActive) { + this.isActive = isActive; } public boolean isActive() { - return false; + return this.isActive; } /** diff --git a/libjava/java/awt/event/WindowEvent.java b/libjava/java/awt/event/WindowEvent.java index ca51ba545b4..6e40d5165b8 100644 --- a/libjava/java/awt/event/WindowEvent.java +++ b/libjava/java/awt/event/WindowEvent.java @@ -109,7 +109,7 @@ public class WindowEvent extends ComponentEvent public static final int WINDOW_STATE_CHANGED = 209; /** This is the last id in the range of event ids used by this class. */ - public static final int WINDOW_LAST = 207; + public static final int WINDOW_LAST = 209; /** * The other Window involved in a focus or activation change. For diff --git a/libjava/java/awt/geom/Dimension2D.java b/libjava/java/awt/geom/Dimension2D.java index e111e5434cf..dbbdf6b25b3 100644 --- a/libjava/java/awt/geom/Dimension2D.java +++ b/libjava/java/awt/geom/Dimension2D.java @@ -86,6 +86,7 @@ public abstract class Dimension2D implements Cloneable * may occur. * * @param d the dimension containing the new values + * * @throws NullPointerException if d is null */ public void setSize(Dimension2D d) @@ -98,6 +99,10 @@ public abstract class Dimension2D implements Cloneable * as this one. * * @return the clone + * + * @exception OutOfMemoryError If there is not enough memory available. + * + * @since 1.2 */ public Object clone() { diff --git a/libjava/java/awt/geom/GeneralPath.java b/libjava/java/awt/geom/GeneralPath.java index 267db6ca0e3..6c1b578fc19 100644 --- a/libjava/java/awt/geom/GeneralPath.java +++ b/libjava/java/awt/geom/GeneralPath.java @@ -338,6 +338,10 @@ public final class GeneralPath implements Shape, Cloneable * this one. * * @return the clone + * + * @exception OutOfMemoryError If there is not enough memory available. + * + * @since 1.2 */ public Object clone() { diff --git a/libjava/java/awt/geom/Line2D.java b/libjava/java/awt/geom/Line2D.java index 9e551103332..d2dd65c4341 100644 --- a/libjava/java/awt/geom/Line2D.java +++ b/libjava/java/awt/geom/Line2D.java @@ -752,6 +752,10 @@ public abstract class Line2D implements Shape, Cloneable * this one. * * @return the clone + * + * @exception OutOfMemoryError If there is not enough memory available. + * + * @since 1.2 */ public Object clone() { diff --git a/libjava/java/awt/geom/PathIterator.java b/libjava/java/awt/geom/PathIterator.java index 6cf77d74df2..c23eb351306 100644 --- a/libjava/java/awt/geom/PathIterator.java +++ b/libjava/java/awt/geom/PathIterator.java @@ -84,7 +84,7 @@ public interface PathIterator * (P1), and final interpolated control point (P2): * <pre> * P(t) = B(2,0)*CP + B(2,1)*P1 + B(2,2)*P2 - * 0 <= t <= 1 + * 0 <= t <= 1 * B(n,m) = mth coefficient of nth degree Bernstein polynomial * = C(n,m) * t^(m) * (1 - t)^(n-m) * C(n,m) = Combinations of n things, taken m at a time @@ -100,7 +100,7 @@ public interface PathIterator * (P2), and final interpolated control point (P3): * <pre> * P(t) = B(3,0)*CP + B(3,1)*P1 + B(3,2)*P2 + B(3,3)*P3 - * 0 <= t <= 1 + * 0 <= t <= 1 * B(n,m) = mth coefficient of nth degree Bernstein polynomial * = C(n,m) * t^(m) * (1 - t)^(n-m) * C(n,m) = Combinations of n things, taken m at a time diff --git a/libjava/java/awt/geom/QuadCurve2D.java b/libjava/java/awt/geom/QuadCurve2D.java index 2f1aafad21b..05748fc979d 100644 --- a/libjava/java/awt/geom/QuadCurve2D.java +++ b/libjava/java/awt/geom/QuadCurve2D.java @@ -289,6 +289,10 @@ public abstract class QuadCurve2D implements Shape, Cloneable * this one. * * @return the clone + * + * @exception OutOfMemoryError If there is not enough memory available. + * + * @since 1.2 */ public Object clone() { diff --git a/libjava/java/awt/im/InputMethodHighlight.java b/libjava/java/awt/im/InputMethodHighlight.java index 5398fc5de77..2946d259b91 100644 --- a/libjava/java/awt/im/InputMethodHighlight.java +++ b/libjava/java/awt/im/InputMethodHighlight.java @@ -178,7 +178,7 @@ public class InputMethodHighlight * @return the style map * @since 1.3 */ - public Map getSytle() + public Map getStyle() { return style; } diff --git a/libjava/java/awt/image/ColorModel.java b/libjava/java/awt/image/ColorModel.java index 14a1b2e73b9..fab51667edb 100644 --- a/libjava/java/awt/image/ColorModel.java +++ b/libjava/java/awt/image/ColorModel.java @@ -120,10 +120,32 @@ public abstract class ColorModel implements Transparency Buffers.smallestAppropriateTransferType(bits * 4)); } + /** + * Constructs a ColorModel that translates pixel values to + * color/alpha components. + * + * @exception IllegalArgumentException If the length of the bit array is less + * than the number of color or alpha components in this ColorModel, or if the + * transparency is not a valid value, or if the sum of the number of bits in + * bits is less than 1 or if any of the elements in bits is less than 0. + */ protected ColorModel(int pixel_bits, int[] bits, ColorSpace cspace, boolean hasAlpha, boolean isAlphaPremultiplied, int transparency, int transferType) { + int bits_sum = 0; + for (int i = 0; i < bits.length; i++) + { + if (bits [i] < 0) + throw new IllegalArgumentException (); + + bits_sum |= bits [i]; + } + + if ((bits.length < cspace.numComponents) + || (bits_sum < 1)) + throw new IllegalArgumentException (); + this.pixel_bits = pixel_bits; this.bits = bits; this.cspace = cspace; diff --git a/libjava/java/awt/image/ImageFilter.java b/libjava/java/awt/image/ImageFilter.java index b34bb7d9cd3..86bc0210a4b 100644 --- a/libjava/java/awt/image/ImageFilter.java +++ b/libjava/java/awt/image/ImageFilter.java @@ -81,9 +81,18 @@ public class ImageFilter implements ImageConsumer, Cloneable * * @see java.lang.Object#clone () */ - public Object clone() throws CloneNotSupportedException + public Object clone() { - return (super.clone()); + try + { + return super.clone(); + } + catch (CloneNotSupportedException e) + { + // This should never happen as this class implements the + // Cloneable interface. + throw new InternalError (); + } } /** diff --git a/libjava/java/io/FileDescriptor.java b/libjava/java/io/FileDescriptor.java index 08f8edfaa0d..f105c6f8ab0 100644 --- a/libjava/java/io/FileDescriptor.java +++ b/libjava/java/io/FileDescriptor.java @@ -1,6 +1,6 @@ // FileDescriptor.java - Open file or device -/* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation This file is part of libgcj. @@ -101,4 +101,6 @@ public final class FileDescriptor // we want to make sure this has the value -1. This is the most // efficient way to accomplish that. private int fd = -1; + + private long position = 0; } diff --git a/libjava/java/io/FileInputStream.java b/libjava/java/io/FileInputStream.java index d7efc26db87..85d7bbe0879 100644 --- a/libjava/java/io/FileInputStream.java +++ b/libjava/java/io/FileInputStream.java @@ -1,4 +1,4 @@ -/* Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation +/* Copyright (C) 1998, 1999, 2001, 2002, 2003 Free Software Foundation This file is part of libgcj. @@ -61,8 +61,8 @@ public class FileInputStream extends InputStream protected void finalize() throws IOException { - if (fd != null) - fd.finalize(); + // We don't actually need this, but we include it because it is + // mentioned in the JCL. } public final FileDescriptor getFD() throws IOException diff --git a/libjava/java/io/ObjectStreamClass.java b/libjava/java/io/ObjectStreamClass.java index ecdd91d00c6..2111635525a 100644 --- a/libjava/java/io/ObjectStreamClass.java +++ b/libjava/java/io/ObjectStreamClass.java @@ -1,6 +1,6 @@ /* ObjectStreamClass.java -- Class used to write class information about serialized objects. - Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -44,6 +44,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Member; import java.lang.reflect.Method; import java.lang.reflect.Modifier; +import java.lang.reflect.Proxy; import java.security.DigestOutputStream; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -76,6 +77,19 @@ public class ObjectStreamClass implements Serializable if (! (Serializable.class).isAssignableFrom (cl)) return null; + return lookupForClassObject (cl); + } + + /** + * This lookup for internal use by ObjectOutputStream. Suppose + * we have a java.lang.Class object C for class A, though A is not + * serializable, but it's okay to serialize C. + */ + static ObjectStreamClass lookupForClassObject (Class cl) + { + if (cl == null) + return null; + ObjectStreamClass osc = (ObjectStreamClass)classLookupTable.get (cl); if (osc != null) @@ -260,22 +274,29 @@ public class ObjectStreamClass implements Serializable void setClass (Class cl) throws InvalidClassException { this.clazz = cl; + long class_uid = getClassUID (cl); if (uid == 0) + uid = class_uid; + else { - uid = class_uid; - return; - } - - // Check that the actual UID of the resolved class matches the UID from - // the stream. - if (uid != class_uid) - { - String msg = cl + - ": Local class not compatible: stream serialVersionUID=" - + uid + ", local serialVersionUID=" + class_uid; - throw new InvalidClassException (msg); + // Check that the actual UID of the resolved class matches the UID from + // the stream. + if (uid != class_uid) + { + String msg = cl + + ": Local class not compatible: stream serialVersionUID=" + + uid + ", local serialVersionUID=" + class_uid; + throw new InvalidClassException (msg); + } } + + isProxyClass = clazz != null && Proxy.isProxyClass (clazz); + ObjectStreamClass osc = (ObjectStreamClass)classLookupTable.get (clazz); + if (osc == null) + classLookupTable.put (clazz, this); + superClass = lookupForClassObject (clazz.getSuperclass ()); + calculateOffsets (); } void setSuperclass (ObjectStreamClass osc) @@ -328,12 +349,15 @@ public class ObjectStreamClass implements Serializable { uid = 0; flags = 0; + isProxyClass = Proxy.isProxyClass (cl); clazz = cl; name = cl.getName (); setFlags (cl); setFields (cl); - uid = getClassUID (cl); + // to those class nonserializable, its uid field is 0 + if ( (Serializable.class).isAssignableFrom (cl) && !isProxyClass) + uid = getClassUID (cl); superClass = lookup (cl.getSuperclass ()); } @@ -377,6 +401,7 @@ public class ObjectStreamClass implements Serializable { Field serialPersistentFields = cl.getDeclaredField ("serialPersistentFields"); + serialPersistentFields.setAccessible(true); int modifiers = serialPersistentFields.getModifiers (); if (Modifier.isStatic (modifiers) @@ -427,26 +452,27 @@ public class ObjectStreamClass implements Serializable { try { + // Use getDeclaredField rather than getField, since serialVersionUID + // may not be public AND we only want the serialVersionUID of this + // class, not a superclass or interface. Field suid = cl.getDeclaredField ("serialVersionUID"); + suid.setAccessible(true); int modifiers = suid.getModifiers (); - if (Modifier.isStatic (modifiers) && Modifier.isFinal (modifiers)) - return suid.getLong (null); + if (Modifier.isStatic (modifiers) + && Modifier.isFinal (modifiers) + && suid.getType() == Long.TYPE) + return suid.getLong (null); } catch (NoSuchFieldException ignore) - { - } + {} catch (IllegalAccessException ignore) - { - } + {} // cl didn't define serialVersionUID, so we have to compute it try { - MessageDigest md = null; - DigestOutputStream digest_out = null; - DataOutputStream data_out = null; - + MessageDigest md; try { md = MessageDigest.getInstance ("SHA"); @@ -459,8 +485,10 @@ public class ObjectStreamClass implements Serializable md = MessageDigest.getInstance ("SHA"); } - digest_out = new DigestOutputStream (nullOutputStream, md); - data_out = new DataOutputStream (digest_out); + DigestOutputStream digest_out = + new DigestOutputStream (nullOutputStream, md); + DataOutputStream data_out = new DataOutputStream (digest_out); + data_out.writeUTF (cl.getName ()); int modifiers = cl.getModifiers (); @@ -497,17 +525,7 @@ public class ObjectStreamClass implements Serializable } // write class initializer method if present - boolean has_init; - try - { - has_init = hasClassInitializer (cl); - } - catch (NoSuchMethodError e) - { - has_init = false; - } - - if (has_init) + if (VMObjectStreamClass.hasClassInitializer (cl)) { data_out.writeUTF ("<clinit>"); data_out.writeInt (Modifier.STATIC); @@ -564,11 +582,11 @@ public class ObjectStreamClass implements Serializable catch (NoSuchAlgorithmException e) { throw new RuntimeException ("The SHA algorithm was not found to use in computing the Serial Version UID for class " - + cl.getName ()); + + cl.getName (), e); } catch (IOException ioe) { - throw new RuntimeException (ioe.getMessage ()); + throw new RuntimeException (ioe); } } @@ -582,6 +600,7 @@ public class ObjectStreamClass implements Serializable // Use getDeclaredField rather than getField for the same reason // as above in getDefinedSUID. Field f = clazz.getDeclaredField ("getSerialPersistentFields"); + f.setAccessible(true); o = (ObjectStreamField[])f.get (null); } catch (java.lang.NoSuchFieldException e) @@ -594,29 +613,6 @@ public class ObjectStreamClass implements Serializable return o; } - - // Returns true if CLAZZ has a static class initializer - // (a.k.a. <clinit>). - // - // A NoSuchMethodError is raised if CLAZZ has no such method. - private static boolean hasClassInitializer (Class clazz) - throws java.lang.NoSuchMethodError - { - Method m = null; - - try - { - Class classArgs[] = {}; - m = clazz.getDeclaredMethod ("<clinit>", classArgs); - } - catch (java.lang.NoSuchMethodException e) - { - throw new java.lang.NoSuchMethodError (); - } - - return m != null; - } - public static final ObjectStreamField[] NO_FIELDS = {}; private static Hashtable classLookupTable = new Hashtable (); @@ -640,9 +636,12 @@ public class ObjectStreamClass implements Serializable int primFieldSize = -1; // -1 if not yet calculated int objectFieldCount; + boolean isProxyClass = false; + // This is probably not necessary because this class is special cased already // but it will avoid showing up as a discrepancy when comparing SUIDs. private static final long serialVersionUID = -6120832682080437368L; + } diff --git a/libjava/java/io/PipedOutputStream.java b/libjava/java/io/PipedOutputStream.java index b819f309c2a..68b656b1925 100644 --- a/libjava/java/io/PipedOutputStream.java +++ b/libjava/java/io/PipedOutputStream.java @@ -97,7 +97,7 @@ public class PipedOutputStream extends OutputStream */ public void connect(PipedInputStream sink) throws IOException { - if (sink != null) + if (this.sink != null || sink.source != null) throw new IOException ("Already connected"); sink.connect(this); } diff --git a/libjava/java/io/PipedWriter.java b/libjava/java/io/PipedWriter.java index a8844d746f2..0ab3c0b8e12 100644 --- a/libjava/java/io/PipedWriter.java +++ b/libjava/java/io/PipedWriter.java @@ -100,7 +100,7 @@ public class PipedWriter extends Writer */ public void connect(PipedReader sink) throws IOException { - if (sink != null) + if (this.sink != null || sink.source != null) throw new IOException ("Already connected"); sink.connect(this); } diff --git a/libjava/java/io/VMObjectStreamClass.java b/libjava/java/io/VMObjectStreamClass.java new file mode 100644 index 00000000000..fd4023e402b --- /dev/null +++ b/libjava/java/io/VMObjectStreamClass.java @@ -0,0 +1,50 @@ +/* VMObjectStreamClass.java -- VM helper functions for ObjectStreamClass + Copyright (C) 2003 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + + +package java.io; + +import java.lang.reflect.Method; + +final class VMObjectStreamClass +{ + /** + * Returns true if CLAZZ has a static class initializer + * (a.k.a. <clinit>). + */ + static native boolean hasClassInitializer (Class clazz); +} diff --git a/libjava/java/io/natFileDescriptorPosix.cc b/libjava/java/io/natFileDescriptorPosix.cc index 80e6bad97ae..e8ec9a7e733 100644 --- a/libjava/java/io/natFileDescriptorPosix.cc +++ b/libjava/java/io/natFileDescriptorPosix.cc @@ -1,6 +1,6 @@ // natFileDescriptor.cc - Native part of FileDescriptor class. -/* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation This file is part of libgcj. @@ -147,6 +147,7 @@ java::io::FileDescriptor::write (jint b) throw new IOException (JvNewStringLatin1 (strerror (errno))); } } + position++; } void @@ -177,6 +178,7 @@ java::io::FileDescriptor::write (jbyteArray b, jint offset, jint len) written += r; len -= r; bytes += r; + position += r; } } @@ -193,7 +195,6 @@ void java::io::FileDescriptor::setLength (jlong pos) { struct stat sb; - off_t orig; #ifdef HAVE_FTRUNCATE if (::fstat (fd, &sb)) @@ -202,10 +203,6 @@ java::io::FileDescriptor::setLength (jlong pos) if ((jlong) sb.st_size == pos) return; - orig = ::lseek (fd, (off_t) 0, SEEK_CUR); - if (orig == -1) - throw new IOException (JvNewStringLatin1 (strerror (errno))); - // If the file is too short, we extend it. We can't rely on // ftruncate() extending the file. So we lseek() to 1 byte less // than we want, and then we write a single byte at the end. @@ -215,11 +212,15 @@ java::io::FileDescriptor::setLength (jlong pos) throw new IOException (JvNewStringLatin1 (strerror (errno))); char out = '\0'; int r = ::write (fd, &out, 1); - if (r <= 0 || ::lseek (fd, orig, SEEK_SET) == -1) + if (r <= 0 || ::lseek (fd, position, SEEK_SET) == -1) throw new IOException (JvNewStringLatin1 (strerror (errno))); } - else if (::ftruncate (fd, (off_t) pos)) - throw new IOException (JvNewStringLatin1 (strerror (errno))); + else + { + if (::ftruncate (fd, (off_t) pos)) + throw new IOException (JvNewStringLatin1 (strerror (errno))); + position = pos; + } #else /* HAVE_FTRUNCATE */ throw new IOException (JvNewStringLatin1 ("FileDescriptor.setLength not implemented")); #endif /* HAVE_FTRUNCATE */ @@ -230,19 +231,29 @@ java::io::FileDescriptor::seek (jlong pos, jint whence, jboolean eof_trunc) { JvAssert (whence == SET || whence == CUR); - jlong len = length (); - jlong here = getFilePointer (); - - if (eof_trunc - && ((whence == SET && pos > len) || (whence == CUR && here + pos > len))) + if (eof_trunc) { - whence = SET; - pos = len; + jlong len = length (); + if (whence == SET) + { + if (pos > len) + pos = len; + } + else + { + jlong here = getFilePointer (); + if (here + pos > len) + { + pos = len; + whence = SET; + } + } } off_t r = ::lseek (fd, (off_t) pos, whence == SET ? SEEK_SET : SEEK_CUR); if (r == -1) throw new IOException (JvNewStringLatin1 (strerror (errno))); + position = r; return r; } @@ -258,10 +269,7 @@ java::io::FileDescriptor::length (void) jlong java::io::FileDescriptor::getFilePointer (void) { - off_t r = ::lseek (fd, 0, SEEK_CUR); - if (r == -1) - throw new IOException (JvNewStringLatin1 (strerror (errno))); - return r; + return position; } jint @@ -282,6 +290,7 @@ java::io::FileDescriptor::read (void) } throw new IOException (JvNewStringLatin1 (strerror (errno))); } + position++; return b & 0xFF; } @@ -313,6 +322,7 @@ java::io::FileDescriptor::read (jbyteArray buffer, jint offset, jint count) } throw new IOException (JvNewStringLatin1 (strerror (errno))); } + position += r; return r; } diff --git a/libjava/java/io/natFilePosix.cc b/libjava/java/io/natFilePosix.cc index f9fe78ef203..4946cfccae8 100644 --- a/libjava/java/io/natFilePosix.cc +++ b/libjava/java/io/natFilePosix.cc @@ -1,6 +1,6 @@ // natFile.cc - Native part of File class for POSIX. -/* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation This file is part of libgcj. @@ -60,14 +60,14 @@ java::io::File::_access (jint query) jboolean java::io::File::_stat (jint query) { + if (query == ISHIDDEN) + return getName()->charAt(0) == '.'; + +#ifdef HAVE_STAT char *buf = (char *) __builtin_alloca (JvGetStringUTFLength (path) + 1); jsize total = JvGetStringUTFRegion (path, 0, path->length(), buf); buf[total] = '\0'; - if (query == ISHIDDEN) - return (getName()->charAt(0) == '.'); - -#ifdef HAVE_STAT struct stat sb; if (::stat (buf, &sb)) return false; @@ -131,7 +131,7 @@ java::io::File::getCanonicalPath (void) jboolean java::io::File::isAbsolute (void) { - return path->charAt(0) == '/'; + return path->length() > 0 && path->charAt(0) == '/'; } jobjectArray diff --git a/libjava/java/io/natFileWin32.cc b/libjava/java/io/natFileWin32.cc index ebdaeab1d78..5245feb5a1e 100644 --- a/libjava/java/io/natFileWin32.cc +++ b/libjava/java/io/natFileWin32.cc @@ -1,6 +1,6 @@ // natFileWin32.cc - Native part of File class. -/* Copyright (C) 1998, 1999, 2002 Red Hat, Inc. +/* Copyright (C) 1998, 1999, 2002, 2003 Red Hat, Inc. This file is part of libgcj. @@ -119,7 +119,8 @@ java::io::File::getCanonicalPath (void) jboolean java::io::File::isAbsolute (void) { - if (path->charAt(0) == '/' || path->charAt(0) == '\\') + if (path->length() > 0 + && (path->charAt(0) == '/' || path->charAt(0) == '\\')) return true; if (path->length() < 3) return false; @@ -145,8 +146,10 @@ java::io::File::performList (java::io::FilenameFilter *filter, return NULL; char *buf = (char *) __builtin_alloca (JvGetStringUTFLength (canon) + 5); jsize total = JvGetStringUTFRegion (canon, 0, canon->length(), buf); - // FIXME? - strcpy(&buf[total], "\\*.*"); + if (buf[total-1] == '\\') + strcpy (&buf[total], "*.*"); + else + strcpy (&buf[total], "\\*.*"); WIN32_FIND_DATA data; HANDLE handle = FindFirstFile (buf, &data); diff --git a/libjava/java/io/natVMObjectStreamClass.cc b/libjava/java/io/natVMObjectStreamClass.cc new file mode 100644 index 00000000000..b7a056c457f --- /dev/null +++ b/libjava/java/io/natVMObjectStreamClass.cc @@ -0,0 +1,23 @@ +// natVMObjectStreamClass.cc - Native part of VMObjectStreamClass class. + +/* Copyright (C) 2003 Free Software Foundation + + This VMObjectStreamClass is part of libgcj. + +This software is copyrighted work licensed under the terms of the +Libgcj License. Please consult the ObjectInputStream "LIBGCJ_LICENSE" for +details. */ + +#include <gcj/cni.h> +#include <jvm.h> + +#include <java/io/VMObjectStreamClass.h> +#include <java/lang/Class.h> + +jboolean +java::io::VMObjectStreamClass::hasClassInitializer (jclass klass) +{ + _Jv_Method *meth = _Jv_GetMethodLocal(klass, gcj::clinit_name, + gcj::void_signature); + return (meth != NULL); +} diff --git a/libjava/java/lang/Class.h b/libjava/java/lang/Class.h index 4ccf3886431..0012fc24365 100644 --- a/libjava/java/lang/Class.h +++ b/libjava/java/lang/Class.h @@ -1,6 +1,6 @@ // Class.h - Header file for java.lang.Class. -*- c++ -*- -/* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation This file is part of libgcj. @@ -182,9 +182,9 @@ public: JArray<java::lang::reflect::Method *> *getMethods (void); inline jint getModifiers (void) - { - return accflags; - } + { + return accflags & java::lang::reflect::Modifier::ALL_FLAGS; + } jstring getName (void); @@ -348,6 +348,7 @@ private: _Jv_Utf8Const *method_signature); friend void _Jv_PrepareClass (jclass); + friend void _Jv_PrepareMissingMethods (jclass base, jclass iface_class); friend class _Jv_ClassReader; friend class _Jv_InterpClass; @@ -360,6 +361,7 @@ private: friend class _Jv_BytecodeVerifier; friend class gnu::gcj::runtime::StackTrace; + friend class java::io::VMObjectStreamClass; // Chain for class pool. jclass next; diff --git a/libjava/java/lang/ClassLoader.java b/libjava/java/lang/ClassLoader.java index 033b2cc4a6e..5d564dce747 100644 --- a/libjava/java/lang/ClassLoader.java +++ b/libjava/java/lang/ClassLoader.java @@ -1,6 +1,6 @@ // ClassLoader.java - Define policies for loading Java classes. -/* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation This file is part of libgcj. @@ -468,17 +468,18 @@ public abstract class ClassLoader { throw x; // rethrow } - catch (java.lang.VirtualMachineError x) + catch (VirtualMachineError x) { throw x; // rethrow } - catch (java.lang.Throwable x) + catch (Throwable x) { // This should never happen, or we are beyond spec. - throw new InternalError ("Unexpected exception " - + "while defining class " - + name + ": " - + x.toString ()); + InternalError r = new InternalError ("Unexpected exception " + + "while defining class " + + name); + r.initCause(x); + throw r; } } @@ -732,8 +733,7 @@ public abstract class ClassLoader /** * If a class named <code>name</code> was previously loaded using * this <code>ClassLoader</code>, then it is returned. Otherwise - * it returns <code>null</code>. (Unlike the JDK this is native, - * since we implement the class table internally.) + * it returns <code>null</code>. * @param name class to find. * @return the class loaded, or null. */ diff --git a/libjava/java/lang/StringBuffer.java b/libjava/java/lang/StringBuffer.java index bfaaaf92f23..922d6bb6d24 100644 --- a/libjava/java/lang/StringBuffer.java +++ b/libjava/java/lang/StringBuffer.java @@ -308,26 +308,27 @@ public final class StringBuffer implements Serializable, CharSequence } } - /** Get the specified array of characters. - * The characters will be copied into the array you pass in. - * @param srcOffset the index to start copying from in the - * <code>StringBuffer</code>. - * @param srcEnd the number of characters to copy. - * @param dst the array to copy into. - * @param dstOffset the index to start copying into <code>dst</code>. - * @exception NullPointerException if dst is null. - * @exception IndexOutOfBoundsException if any source or target - * indices are out of range. - * @see java.lang.System#arraycopy(java.lang.Object,int,java.lang.Object,int,int) - */ - public synchronized void getChars (int srcOffset, int srcEnd, - char[] dst, int dstOffset) - { - if (srcOffset < 0 || srcOffset > srcEnd) - throw new StringIndexOutOfBoundsException (srcOffset); + /** + * Get the specified array of characters. <code>srcOffset - srcEnd</code> + * characters will be copied into the array you pass in. + * + * @param srcOffset the index to start copying from (inclusive) + * @param srcEnd the index to stop copying from (exclusive) + * @param dst the array to copy into + * @param dstOffset the index to start copying into + * @throws NullPointerException if dst is null + * @throws IndexOutOfBoundsException if any source or target indices are + * out of range (while unspecified, source problems cause a + * StringIndexOutOfBoundsException, and dest problems cause an + * ArrayIndexOutOfBoundsException) + * @see System#arraycopy(Object, int, Object, int, int) + */ + public synchronized void getChars(int srcOffset, int srcEnd, + char[] dst, int dstOffset) + { int todo = srcEnd - srcOffset; - if (srcEnd > count || dstOffset + todo > count) - throw new StringIndexOutOfBoundsException (srcEnd); + if (srcOffset < 0 || srcEnd > count || todo < 0) + throw new StringIndexOutOfBoundsException(); System.arraycopy(value, srcOffset, dst, dstOffset, todo); } diff --git a/libjava/java/lang/System.java b/libjava/java/lang/System.java index edc818fb181..ab584250749 100644 --- a/libjava/java/lang/System.java +++ b/libjava/java/lang/System.java @@ -73,15 +73,32 @@ public final class System loadLibrary("javalang"); Properties defaultProperties = Runtime.defaultProperties; - defaultProperties.put("gnu.cpu.endian", - isWordsBigEndian() ? "big" : "little"); + // Set base URL if not already set. + if (defaultProperties.get("gnu.classpath.home.url") == null) + defaultProperties.put("gnu.classpath.home.url", + "file://" + + defaultProperties.get("gnu.classpath.home") + + "/lib"); + + // Set short name if not already set. + if (defaultProperties.get("gnu.classpath.vm.shortname") == null) + { + String value = defaultProperties.getProperty("java.vm.name"); + int index = value.lastIndexOf(' '); + if (index != -1) + value = value.substring(index + 1); + defaultProperties.put("gnu.classpath.vm.shortname", value); + } + + defaultProperties.put("gnu.cpu.endian", + isWordsBigEndian() ? "big" : "little"); // XXX FIXME - Temp hack for old systems that set the wrong property if (defaultProperties.get("java.io.tmpdir") == null) defaultProperties.put("java.io.tmpdir", defaultProperties.get("java.tmpdir")); } - + /** * Stores the current system properties. This can be modified by * {@link #setProperties(Properties)}, but will never be null, because @@ -101,7 +118,7 @@ public final class System * however. */ public static final InputStream in - = new BufferedInputStream (new FileInputStream(FileDescriptor.in)); + = new BufferedInputStream(new FileInputStream(FileDescriptor.in)); /** * The standard output PrintStream. This is assigned at startup and * starts its life perfectly valid. Although it is marked final, you can @@ -113,7 +130,7 @@ public final class System * you, however. */ public static final PrintStream out - = new PrintStream(new BufferedOutputStream (new FileOutputStream(FileDescriptor.out)), true); + = new PrintStream(new BufferedOutputStream(new FileOutputStream(FileDescriptor.out)), true); /** * The standard output PrintStream. This is assigned at startup and * starts its life perfectly valid. Although it is marked final, you can @@ -125,7 +142,7 @@ public final class System * you, however. */ public static final PrintStream err - = new PrintStream(new BufferedOutputStream (new FileOutputStream(FileDescriptor.err)), true); + = new PrintStream(new BufferedOutputStream(new FileOutputStream(FileDescriptor.err)), true); /** * This class is uninstantiable. @@ -312,6 +329,10 @@ public final class System * In addition, gnu defines several other properties, where ? stands for * each character in '0' through '9': * <dl> + * <dl> gnu.classpath.vm.shortname <dd> Succinct version of the VM name; + * used for finding property files in file system + * <dl> gnu.classpath.home.url <dd> Base URL; used for finding + * property files in file system * <dt> gnu.cpu.endian <dd>big or little * <dt> gnu.java.io.encoding_scheme_alias.ISO-8859-? <dd>8859_? * <dt> gnu.java.io.encoding_scheme_alias.iso-8859-? <dd>8859_? diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc index bafac789b0d..768ced611ac 100644 --- a/libjava/java/lang/natClass.cc +++ b/libjava/java/lang/natClass.cc @@ -343,7 +343,9 @@ java::lang::Class::_getDeclaredMethod (jstring name, while (--i >= 0) { if (_Jv_equalUtf8Consts (methods[i].name, utf_name) - && _Jv_equaln (methods[i].signature, partial_sig, p_len)) + && _Jv_equaln (methods[i].signature, partial_sig, p_len) + && (methods[i].accflags + & java::lang::reflect::Modifier::INVISIBLE) == 0) { // Found it. using namespace java::lang::reflect; @@ -368,7 +370,9 @@ java::lang::Class::getDeclaredMethods (void) if (method->name == NULL || _Jv_equalUtf8Consts (method->name, clinit_name) || _Jv_equalUtf8Consts (method->name, init_name) - || _Jv_equalUtf8Consts (method->name, finit_name)) + || _Jv_equalUtf8Consts (method->name, finit_name) + || (methods[i].accflags + & java::lang::reflect::Modifier::INVISIBLE) != 0) continue; numMethods++; } @@ -382,7 +386,9 @@ java::lang::Class::getDeclaredMethods (void) if (method->name == NULL || _Jv_equalUtf8Consts (method->name, clinit_name) || _Jv_equalUtf8Consts (method->name, init_name) - || _Jv_equalUtf8Consts (method->name, finit_name)) + || _Jv_equalUtf8Consts (method->name, finit_name) + || (methods[i].accflags + & java::lang::reflect::Modifier::INVISIBLE) != 0) continue; java::lang::reflect::Method* rmethod = new java::lang::reflect::Method (); @@ -514,7 +520,9 @@ java::lang::Class::_getMethod (jstring name, JArray<jclass> *param_types) { // FIXME: access checks. if (_Jv_equalUtf8Consts (klass->methods[i].name, utf_name) - && _Jv_equaln (klass->methods[i].signature, partial_sig, p_len)) + && _Jv_equaln (klass->methods[i].signature, partial_sig, p_len) + && (klass->methods[i].accflags + & java::lang::reflect::Modifier::INVISIBLE) == 0) { // Found it. using namespace java::lang::reflect; @@ -565,7 +573,9 @@ java::lang::Class::_getMethods (JArray<java::lang::reflect::Method *> *result, if (method->name == NULL || _Jv_equalUtf8Consts (method->name, clinit_name) || _Jv_equalUtf8Consts (method->name, init_name) - || _Jv_equalUtf8Consts (method->name, finit_name)) + || _Jv_equalUtf8Consts (method->name, finit_name) + || (method->accflags + & java::lang::reflect::Modifier::INVISIBLE) != 0) continue; // Only want public methods. if (! java::lang::reflect::Modifier::isPublic (method->accflags)) @@ -1564,6 +1574,13 @@ isVirtualMethod (_Jv_Method *meth) && meth->name->data[0] != '<'); } +// This is put in empty vtable slots. +static void +_Jv_abstractMethodError (void) +{ + throw new java::lang::AbstractMethodError(); +} + // Prepare virtual method declarations in KLASS, and any superclasses as // required, by determining their vtable index, setting method->index, and // finally setting the class's vtable_method_count. Must be called with the @@ -1594,13 +1611,16 @@ _Jv_LayoutVTableMethods (jclass klass) continue; if (superclass != NULL) - super_meth = _Jv_LookupDeclaredMethod (superclass, meth->name, - meth->signature); + { + super_meth = _Jv_LookupDeclaredMethod (superclass, meth->name, + meth->signature); + } if (super_meth) meth->index = super_meth->index; - else if (! (meth->accflags & java::lang::reflect::Modifier::FINAL)) - meth->index = index++; + else if (! (meth->accflags & java::lang::reflect::Modifier::FINAL) + && ! (klass->accflags & java::lang::reflect::Modifier::FINAL)) + meth->index = index++; } klass->vtable_method_count = index; @@ -1626,8 +1646,7 @@ _Jv_SetVTableEntries (jclass klass, _Jv_VTable *vtable, jboolean *flags) continue; if ((meth->accflags & Modifier::ABSTRACT)) { - // FIXME: we should set abstract slots to a function that - // throws AbstractMethodError. How can we do that on IA-64? + vtable->set_method(meth->index, (void *) &_Jv_abstractMethodError); flags[meth->index] = false; } else diff --git a/libjava/java/lang/natClassLoader.cc b/libjava/java/lang/natClassLoader.cc index aeee08a6265..96a81812219 100644 --- a/libjava/java/lang/natClassLoader.cc +++ b/libjava/java/lang/natClassLoader.cc @@ -56,17 +56,18 @@ java::lang::ClassLoader::defineClass0 (jstring name, sizeof (_Jv_InterpClass)); _Jv_InitNewClassFields (klass); - // synchronize on the class, so that it is not - // attempted initialized until we're done loading. - _Jv_MonitorEnter (klass); + // Synchronize on the class, so that it is not attempted initialized + // until we're done loading. + JvSynchronize sync (klass); - // record which is the defining loader - klass->loader = this; + // Record the defining loader. For the system class loader, we + // record NULL. + if (this != java::lang::ClassLoader::getSystemClassLoader()) + klass->loader = this; - // register that we are the initiating loader... if (name != 0) { - _Jv_Utf8Const * name2 = _Jv_makeUtf8Const (name); + _Jv_Utf8Const *name2 = _Jv_makeUtf8Const (name); if (! _Jv_VerifyClassName (name2)) throw new java::lang::ClassFormatError @@ -86,16 +87,8 @@ java::lang::ClassLoader::defineClass0 (jstring name, _Jv_UnregisterClass (klass); - _Jv_MonitorExit (klass); - - // FIXME: Here we may want to test that EX does - // indeed represent a valid exception. That is, - // anything but ClassNotFoundException, - // or some kind of Error. - - // FIXME: Rewrite this as a cleanup instead of - // as a catch handler. - + // If EX is not a ClassNotFoundException, that's ok, because we + // account for the possibility in defineClass(). throw ex; } @@ -104,10 +97,6 @@ java::lang::ClassLoader::defineClass0 (jstring name, // if everything proceeded sucessfully, we're loaded. JvAssert (klass->state == JV_STATE_LOADED); - // if an exception is generated, this is initially missed. - // however, we come back here in handleException0 below... - _Jv_MonitorExit (klass); - return klass; #else // INTERPRETER @@ -293,10 +282,11 @@ _Jv_PrepareCompiledClass (jclass klass) // Hash function for Utf8Consts. #define HASH_UTF(Utf) (((Utf)->hash) % HASH_LEN) -struct _Jv_LoaderInfo { - _Jv_LoaderInfo *next; - java::lang::Class *klass; - java::lang::ClassLoader *loader; +struct _Jv_LoaderInfo +{ + _Jv_LoaderInfo *next; + java::lang::Class *klass; + java::lang::ClassLoader *loader; }; static _Jv_LoaderInfo *initiated_classes[HASH_LEN]; @@ -309,9 +299,12 @@ static jclass loaded_classes[HASH_LEN]; jclass _Jv_FindClassInCache (_Jv_Utf8Const *name, java::lang::ClassLoader *loader) { - _Jv_MonitorEnter (&java::lang::Class::class$); + JvSynchronize sync (&java::lang::Class::class$); jint hash = HASH_UTF (name); + if (loader && loader == java::lang::ClassLoader::getSystemClassLoader()) + loader = NULL; + // first, if LOADER is a defining loader, then it is also initiating jclass klass; for (klass = loaded_classes[hash]; klass; klass = klass->next) @@ -337,15 +330,13 @@ _Jv_FindClassInCache (_Jv_Utf8Const *name, java::lang::ClassLoader *loader) } } - _Jv_MonitorExit (&java::lang::Class::class$); - return klass; } void _Jv_UnregisterClass (jclass the_class) { - _Jv_MonitorEnter (&java::lang::Class::class$); + JvSynchronize sync (&java::lang::Class::class$); jint hash = HASH_UTF(the_class->name); jclass *klass = &(loaded_classes[hash]); @@ -363,29 +354,32 @@ _Jv_UnregisterClass (jclass the_class) { while (*info && (*info)->klass == the_class) { + _Jv_LoaderInfo *old = *info; *info = (*info)->next; + _Jv_Free (old); } if (*info == NULL) break; } - - _Jv_MonitorExit (&java::lang::Class::class$); } void _Jv_RegisterInitiatingLoader (jclass klass, java::lang::ClassLoader *loader) { - // non-gc alloc! - _Jv_LoaderInfo *info = (_Jv_LoaderInfo *) _Jv_Malloc (sizeof(_Jv_LoaderInfo)); + if (loader && loader == java::lang::ClassLoader::getSystemClassLoader()) + loader = NULL; + + // This information can't be visible to the GC. + _Jv_LoaderInfo *info + = (_Jv_LoaderInfo *) _Jv_Malloc (sizeof(_Jv_LoaderInfo)); jint hash = HASH_UTF(klass->name); - _Jv_MonitorEnter (&java::lang::Class::class$); + JvSynchronize sync (&java::lang::Class::class$); info->loader = loader; info->klass = klass; info->next = initiated_classes[hash]; initiated_classes[hash] = info; - _Jv_MonitorExit (&java::lang::Class::class$); } // This function is called many times during startup, before main() is @@ -471,6 +465,9 @@ _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader) { jstring sname = _Jv_NewStringUTF (name->data); + java::lang::ClassLoader *sys + = java::lang::ClassLoader::getSystemClassLoader (); + if (loader) { // Load using a user-defined loader, jvmspec 5.3.2 @@ -479,14 +476,14 @@ _Jv_FindClass (_Jv_Utf8Const *name, java::lang::ClassLoader *loader) // If "loader" delegated the loadClass operation to another // loader, explicitly register that it is also an initiating // loader of the given class. - if (klass && (klass->getClassLoader () != loader)) + java::lang::ClassLoader *delegate = (loader == sys + ? NULL + : loader); + if (klass && klass->getClassLoaderInternal () != delegate) _Jv_RegisterInitiatingLoader (klass, loader); } else { - java::lang::ClassLoader *sys - = java::lang::ClassLoader::getSystemClassLoader (); - // Load using the bootstrap loader jvmspec 5.3.1. klass = sys->loadClass (sname, false); diff --git a/libjava/java/lang/natObject.cc b/libjava/java/lang/natObject.cc index 4c2fd6cab03..a050baa3f66 100644 --- a/libjava/java/lang/natObject.cc +++ b/libjava/java/lang/natObject.cc @@ -1,6 +1,6 @@ // natObject.cc - Implementation of the Object class. -/* Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation +/* Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation This file is part of libgcj. @@ -28,6 +28,8 @@ details. */ #include <java/lang/Cloneable.h> #include <java/lang/Thread.h> +#include "platform.h" + #ifdef LOCK_DEBUG # include <stdio.h> #endif @@ -532,7 +534,7 @@ spin(unsigned n) unsigned duration = MIN_SLEEP_USECS << (n - yield_limit); if (n >= 15 + yield_limit || duration > MAX_SLEEP_USECS) duration = MAX_SLEEP_USECS; - java::lang::Thread::sleep(0, duration); + _Jv_platform_usleep(duration); } } diff --git a/libjava/java/lang/natRuntime.cc b/libjava/java/lang/natRuntime.cc index f5177b0aa35..f74a1e76bcf 100644 --- a/libjava/java/lang/natRuntime.cc +++ b/libjava/java/lang/natRuntime.cc @@ -29,6 +29,7 @@ details. */ #include <java/lang/ConcreteProcess.h> #include <java/lang/ClassLoader.h> #include <gnu/gcj/runtime/StackTrace.h> +#include <java/lang/ArrayIndexOutOfBoundsException.h> #include <jni.h> @@ -181,19 +182,26 @@ java::lang::Runtime::_load (jstring path, jboolean do_search) ClassLoader *sys = ClassLoader::getSystemClassLoader(); ClassLoader *look = NULL; gnu::gcj::runtime::StackTrace *t = new gnu::gcj::runtime::StackTrace(10); - for (int i = 0; i < 10; ++i) - { - jclass klass = t->classAt(i); - if (klass != NULL) + try + { + for (int i = 0; i < 10; ++i) { - ClassLoader *loader = klass->getClassLoaderInternal(); - if (loader != NULL && loader != sys) + jclass klass = t->classAt(i); + if (klass != NULL) { - look = loader; - break; + ClassLoader *loader = klass->getClassLoaderInternal(); + if (loader != NULL && loader != sys) + { + look = loader; + break; + } } } } + catch (::java::lang::ArrayIndexOutOfBoundsException *e) + { + } + if (look != NULL) { // Don't include solib prefix in string passed to diff --git a/libjava/java/lang/reflect/Modifier.java b/libjava/java/lang/reflect/Modifier.java index 75d0c9b47f5..8171a88feb5 100644 --- a/libjava/java/lang/reflect/Modifier.java +++ b/libjava/java/lang/reflect/Modifier.java @@ -1,5 +1,5 @@ /* java.lang.reflect.Modifier - Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2001, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -158,6 +158,17 @@ public class Modifier static final int ALL_FLAGS = 0xfff; /** + * GCJ-LOCAL: This access flag is set on methods we declare + * internally but which must not be visible to reflection. + */ + static final int INVISIBLE = 0x1000; + + /** + * GCJ-LOCAL: This access flag is set on interpreted classes. + */ + static final int INTERPRETED = 0x1000; + + /** * Check whether the given modifier is abstract. * @param mod the modifier. * @return <code>true</code> if abstract, <code>false</code> otherwise. diff --git a/libjava/java/math/BigInteger.java b/libjava/java/math/BigInteger.java index e8c6b1dfdc9..ac21eccc518 100644 --- a/libjava/java/math/BigInteger.java +++ b/libjava/java/math/BigInteger.java @@ -1113,6 +1113,9 @@ public class BigInteger extends Number implements Comparable BigInteger rem = new BigInteger(); BigInteger quot = new BigInteger(); divide(a, b, quot, rem, FLOOR); + // quot and rem may not be in canonical form. ensure + rem.canonicalize(); + quot.canonicalize(); xy = euclidInv(b, rem, quot); } @@ -1192,6 +1195,9 @@ public class BigInteger extends Number implements Comparable BigInteger rem = new BigInteger(); BigInteger quot = new BigInteger(); divide(x, y, quot, rem, FLOOR); + // quot and rem may not be in canonical form. ensure + rem.canonicalize(); + quot.canonicalize(); result = euclidInv(y, rem, quot)[swapped ? 0 : 1]; // Result can't be negative, so make it positive by adding the diff --git a/libjava/java/net/DatagramSocket.java b/libjava/java/net/DatagramSocket.java index b2f2ca11ce3..c286d650b73 100644 --- a/libjava/java/net/DatagramSocket.java +++ b/libjava/java/net/DatagramSocket.java @@ -1,12 +1,39 @@ -// DatagramSocket.java - -/* Copyright (C) 1999, 2000, 2002 Free Software Foundation - - This file is part of libgcj. - -This software is copyrighted work licensed under the terms of the -Libgcj License. Please consult the file "LIBGCJ_LICENSE" for -details. */ +/* DatagramSocket.java -- A class to model UDP sockets + Copyright (C) 1998, 1999, 2000, 2002 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ package java.net; @@ -15,16 +42,23 @@ import java.nio.channels.DatagramChannel; import java.nio.channels.IllegalBlockingModeException; /** - * @author Warren Levy <warrenl@cygnus.com> - * @date May 3, 1999. - */ - -/** * Written using on-line Java Platform 1.2 API Specification, as well * as "The Java Class Libraries", 2nd edition (Addison-Wesley, 1998). * Status: Believed complete and correct. */ +/** + * This class models a connectionless datagram socket that sends + * individual packets of data across the network. In the TCP/IP world, + * this means UDP. Datagram packets do not have guaranteed delivery, + * or any guarantee about the order the data will be received on the + * remote host. + * + * @author Aaron M. Renn (arenn@urbanophile.com) + * @author Warren Levy (warrenl@cygnus.com) + * @date May 3, 1999. + */ + public class DatagramSocket { /** @@ -33,24 +67,26 @@ public class DatagramSocket */ static DatagramSocketImplFactory factory; + /** + * This is the implementation object used by this socket. + */ DatagramSocketImpl impl; + /** + * The unique DatagramChannel object associated with this datagram socket, + * or null. + */ DatagramChannel ch; + /** + * This is the address we are "connected" to + */ private InetAddress remoteAddress; - private int remotePort; /** - * Creates a DatagramSocket - * - * @exception SocketException If an error occurs - * @exception SecurityException If a security manager exists and - * its checkListen method doesn't allow the operation + * This is the port we are "connected" to */ - public DatagramSocket() throws SocketException - { - this(0, null); - } + private int remotePort = -1; /** * Creates a DatagramSocket from a specified DatagramSocketImpl instance @@ -67,31 +103,27 @@ public class DatagramSocket } /** - * Creates a datagram socket that is bound to a given socket address - * - * @param bindaddr The socket address to bind to + * Initializes a new instance of <code>DatagramSocket</code> that binds to + * a random port and every address on the local machine. * - * @exception SocketException If an error occurs + * @exception SocketException If an error occurs. * @exception SecurityException If a security manager exists and - * its checkListen method doesn't allow the operation - * - * @since 1.4 + * its checkListen method doesn't allow the operation. */ - public DatagramSocket (SocketAddress bindaddr) - throws SocketException + public DatagramSocket() throws SocketException { - this (((InetSocketAddress) bindaddr).getPort (), - ((InetSocketAddress) bindaddr).getAddress ()); + this(0, null); } /** - * Creates a datagram socket that is bound to a specific port + * Initializes a new instance of <code>DatagramSocket</code> that binds to + * the specified port and every address on the local machine. * - * @param port The port number to bind to + * @param port The local port number to bind to. * - * @exception SocketException If an error occurs - * @exception SecurityException If a security manager exists and - * its checkListen method doesn't allow the operation + * @exception SecurityException If a security manager exists and its + * checkListen method doesn't allow the operation. + * @exception SocketException If an error occurs. */ public DatagramSocket(int port) throws SocketException { @@ -99,14 +131,15 @@ public class DatagramSocket } /** - * Creates a datagram socket that is bound to a specific port/inet address + * Initializes a new instance of <code>DatagramSocket</code> that binds to + * the specified local port and address. * - * @param port The port number to bind to - * @param laddr The local address to bind to + * @param port The local port number to bind to. + * @param laddr The local address to bind to. * - * @exception SocketException If an error occurs - * @exception SecurityException If a security manager exists and - * its checkListen method doesn't allow the operation + * @exception SecurityException If a security manager exists and its + * checkListen method doesn't allow the operation. + * @exception SocketException If an error occurs. */ public DatagramSocket(int port, InetAddress laddr) throws SocketException { @@ -123,8 +156,8 @@ public class DatagramSocket else try { - impl = (DatagramSocketImpl) Class.forName("java.net." + propVal + - "DatagramSocketImpl").newInstance(); + impl = (DatagramSocketImpl) Class.forName + ("java.net." + propVal + "DatagramSocketImpl").newInstance(); } catch (Exception e) { @@ -145,34 +178,26 @@ public class DatagramSocket } /** - * Binds the socket to the given socket addres + * Initializes a new instance of <code>DatagramSocket</code> that binds to + * the specified local port and address. * - * @param address The socket address to bind to + * @param port The local port number to bind to. + * @param laddr The local address to bind to. * - * @exception SocketException If an error occurs - * @exception SecurityException If a security manager exists and - * its checkListen method doesn't allow the operation - * @exception IllegalArgumentException If address type is not supported + * @exception SecurityException If a security manager exists and its + * checkListen method doesn't allow the operation. + * @exception SocketException If an error occurs. * * @since 1.4 */ - public void bind (SocketAddress address) - throws SocketException + public DatagramSocket (SocketAddress address) throws SocketException { - if (! (address instanceof InetSocketAddress)) - throw new IllegalArgumentException (); - - InetSocketAddress tmp = (InetSocketAddress) address; - - SecurityManager s = System.getSecurityManager (); - if (s != null) - s.checkListen(tmp.getPort ()); - - impl.bind (tmp.getPort (), tmp.getAddress ()); + this (((InetSocketAddress) address).getPort (), + ((InetSocketAddress) address).getAddress ()); } /** - * Closes the datagram socket + * Closes this datagram socket. */ public void close() { @@ -182,27 +207,41 @@ public class DatagramSocket } /** - * Checks if the datagram socket is closed + * This method returns the remote address to which this socket is + * connected. If this socket is not connected, then this method will + * return <code>null</code>. * - * @since 1.4 + * @return The remote address. + * + * @since 1.2 */ - public boolean isClosed() + public InetAddress getInetAddress() { - return !impl.getFileDescriptor().valid(); + if (!isConnected ()) + return null; + + return remoteAddress; } /** - * Gets a datagram channel assoziated with the socket + * This method returns the remote port to which this socket is + * connected. If this socket is not connected, then this method will + * return -1. * - * @since 1.4 + * @return The remote port. + * + * @since 1.2 */ - public DatagramChannel getChannel() + public int getPort() { - return ch; + if (!isConnected ()) + return -1; + + return remotePort; } /** - * Returns the local address of the datagram socket + * Returns the local address this datagram socket is bound to. * * @since 1.1 */ @@ -244,9 +283,9 @@ public class DatagramSocket } /** - * Returns the local port this socket uses + * Returns the local port this socket is bound to. * - * @return The local port number + * @return The local port number. */ public int getLocalPort() { @@ -257,11 +296,12 @@ public class DatagramSocket } /** - * Gets the SO_TIMEOUT value + * Returns the value of the socket's SO_TIMEOUT setting. If this method + * returns 0 then SO_TIMEOUT is disabled. * - * @return The current timeout in milliseconds + * @return The current timeout in milliseconds. * - * @exception SocketException If an error occurs + * @exception SocketException If an error occurs. * * @since 1.1 */ @@ -271,6 +311,7 @@ public class DatagramSocket throw new SocketException ("Cannot initialize Socket implementation"); Object timeout = impl.getOption(SocketOptions.SO_TIMEOUT); + if (timeout instanceof Integer) return ((Integer)timeout).intValue(); else @@ -278,20 +319,177 @@ public class DatagramSocket } /** - * Receive a datagram packet + * Sets the value of the socket's SO_TIMEOUT value. A value of 0 will + * disable SO_TIMEOUT. Any other value is the number of milliseconds + * a socket read/write will block before timing out. + * + * @param timeout The new SO_TIMEOUT value in milliseconds. + * + * @exception SocketException If an error occurs. + * + * @since 1.1 + */ + public synchronized void setSoTimeout(int timeout) throws SocketException + { + if (timeout < 0) + throw new IllegalArgumentException("Invalid timeout: " + timeout); + + impl.setOption(SocketOptions.SO_TIMEOUT, new Integer(timeout)); + } + + /** + * This method returns the value of the system level socket option + * SO_SNDBUF, which is used by the operating system to tune buffer + * sizes for data transfers. + * + * @return The send buffer size. + * + * @exception SocketException If an error occurs. + * + * @since 1.2 + */ + public int getSendBufferSize() throws SocketException + { + if (impl == null) + throw new SocketException ("Cannot initialize Socket implementation"); + + Object obj = impl.getOption(SocketOptions.SO_SNDBUF); + + if (obj instanceof Integer) + return(((Integer)obj).intValue()); + else + throw new SocketException("Unexpected type"); + } + + /** + * This method sets the value for the system level socket option + * SO_SNDBUF to the specified value. Note that valid values for this + * option are specific to a given operating system. + * + * @param size The new send buffer size. + * + * @exception SocketException If an error occurs. + * @exception IllegalArgumentException If size is 0 or negative. + * + * @since 1.2 + */ + public void setSendBufferSize(int size) throws SocketException + { + if (size < 0) + throw new IllegalArgumentException("Buffer size is less than 0"); + + impl.setOption(SocketOptions.SO_SNDBUF, new Integer(size)); + } + + /** + * This method returns the value of the system level socket option + * SO_RCVBUF, which is used by the operating system to tune buffer + * sizes for data transfers. + * + * @return The receive buffer size. + * + * @exception SocketException If an error occurs. + * + * @since 1.2 + */ + public int getReceiveBufferSize() throws SocketException + { + if (impl == null) + throw new SocketException ("Cannot initialize Socket implementation"); + + Object obj = impl.getOption(SocketOptions.SO_RCVBUF); + + if (obj instanceof Integer) + return(((Integer)obj).intValue()); + else + throw new SocketException("Unexpected type"); + } + + /** + * This method sets the value for the system level socket option + * SO_RCVBUF to the specified value. Note that valid values for this + * option are specific to a given operating system. + * + * @param size The new receive buffer size. * - * @param p The datagram packet to put the incoming data into + * @exception SocketException If an error occurs. + * @exception IllegalArgumentException If size is 0 or negative. * - * @exception IOException If an error occurs + * @since 1.2 + */ + public void setReceiveBufferSize(int size) throws SocketException + { + if (impl == null) + throw new SocketException ("Cannot initialize Socket implementation"); + + if (size < 0) + throw new IllegalArgumentException("Buffer size is less than 0"); + + impl.setOption(SocketOptions.SO_RCVBUF, new Integer(size)); + } + + /** + * Connects the datagram socket to a specified address/port. + * + * @param address The address to connect to. + * @param port The port to connect to. + * + * @exception SocketException If an error occurs. + * @exception IllegalArgumentException If address is null + * or the port number is illegal. + * @exception SecurityException If the caller is not allowed to send + * datagrams to and receive datagrams from the address and port. + * + * @since 1.2 + */ + public void connect(InetAddress address, int port) + { + if (address == null) + throw new IllegalArgumentException ("Address may not be null"); + + if ((port < 1) || (port > 65535)) + throw new IllegalArgumentException ("Port number is illegal"); + + SecurityManager sm = System.getSecurityManager(); + if (sm != null) + sm.checkAccept(address.getHostName (), port); + + try + { + impl.connect (address, port); + remoteAddress = address; + remotePort = port; + } + catch (SocketException e) + { + } + } + + /** + * Disconnects the datagram socket. + * + * @since 1.2 + */ + public void disconnect() + { + impl.disconnect(); + } + + /** + * Receive a datagram packet. + * + * @param p The datagram packet to put the incoming data into. + * + * @exception IOException If an error occurs. * @exception SocketTimeoutException If setSoTimeout was previously called - * and the timeout has expired + * and the timeout has expired. * @exception PortUnreachableException If the socket is connected to a * currently unreachable destination. Note, there is no guarantee that the - * exception will be thrown + * exception will be thrown. * @exception IllegalBlockingModeException If this socket has an associated - * channel, and the channel is in non-blocking mode + * channel, and the channel is in non-blocking mode. * @exception SecurityException If a security manager exists and its - * checkAccept ethod doesn't allow the receive + * checkAccept ethod doesn't allow the receive. */ public synchronized void receive(DatagramPacket p) throws IOException { @@ -313,18 +511,18 @@ public class DatagramSocket } /** - * Sends a datagram packet + * Sends a datagram packet. * - * @param p The datagram packet to send + * @param p The datagram packet to send. * - * @exception IOException If an error occurs + * @exception IOException If an error occurs. * @exception SecurityException If a security manager exists and its - * checkMulticast or checkConnect method doesn't allow the send + * checkMulticast or checkConnect method doesn't allow the send. * @exception PortUnreachableException If the socket is connected to a * currently unreachable destination. Note, there is no guarantee that the - * exception will be thrown + * exception will be thrown. * @exception IllegalBlockingModeException If this socket has an associated - * channel, and the channel is in non-blocking mode + * channel, and the channel is in non-blocking mode. */ public void send(DatagramPacket p) throws IOException { @@ -357,62 +555,59 @@ public class DatagramSocket } /** - * Sets a new value for SO_TIMEOUT + * Binds the socket to the given socket address. * - * @param timeout The timeout in milliseconds + * @param address The socket address to bind to. * - * @exception SocketException If an error occurs + * @exception SocketException If an error occurs. + * @exception SecurityException If a security manager exists and + * its checkListen method doesn't allow the operation. + * @exception IllegalArgumentException If address type is not supported. * - * @since 1.1 + * @since 1.4 */ - public synchronized void setSoTimeout(int timeout) throws SocketException + public void bind (SocketAddress address) + throws SocketException { - if (timeout < 0) - throw new IllegalArgumentException("Invalid timeout: " + timeout); + if (! (address instanceof InetSocketAddress)) + throw new IllegalArgumentException (); - impl.setOption(SocketOptions.SO_TIMEOUT, new Integer(timeout)); + InetSocketAddress tmp = (InetSocketAddress) address; + + SecurityManager s = System.getSecurityManager (); + if (s != null) + s.checkListen(tmp.getPort ()); + + impl.bind (tmp.getPort (), tmp.getAddress ()); } /** - * Connects the datagrem socket to a specified address/port + * Checks if the datagram socket is closed. * - * @param address The address to connect to - * @param port The port to connect to - * - * @exception SocketException If an error occurs - * @exception IllegalArgumentException If address is null - * or the port number is illegal - * @exception SecurityException If the caller is not allowed to send - * datagrams to and receive datagrams from the address and port - * - * @since 1.2 + * @since 1.4 */ - public void connect(InetAddress address, int port) - throws SocketException + public boolean isClosed() { - if (address == null) - throw new IllegalArgumentException ("Address may not be null"); - - if (port < 1 || port > 65535) - throw new IllegalArgumentException ("Port number is illegal"); - - SecurityManager s = System.getSecurityManager(); - if (s != null) - s.checkAccept(address.getHostName (), port); - - impl.connect (address, port); + return !impl.getFileDescriptor().valid(); + } - remoteAddress = address; - remotePort = port; + /** + * Returns the datagram channel assoziated with this datagram socket. + * + * @since 1.4 + */ + public DatagramChannel getChannel() + { + return ch; } /** * Connects the datagram socket to a specified socket address. * - * @param address The socket address to connect to + * @param address The socket address to connect to. * - * @exception SocketException If an error occurs - * @exception IllegalArgumentException If address type is not supported + * @exception SocketException If an error occurs. + * @exception IllegalArgumentException If address type is not supported. * * @since 1.4 */ @@ -427,17 +622,7 @@ public class DatagramSocket } /** - * Disconnects the datagram socket - * - * @since 1.2 - */ - public void disconnect() - { - impl.disconnect(); - } - - /** - * Returns the binding state of the socket + * Returns the binding state of the socket. * * @since 1.4 */ @@ -456,7 +641,7 @@ public class DatagramSocket } /** - * Returns the connection state of the socket + * Returns the connection state of the socket. * * @since 1.4 */ @@ -466,35 +651,8 @@ public class DatagramSocket } /** - * Returns the InetAddress the socket is connected to - * or null if the socket is not connected - * - * @since 1.2 - */ - public InetAddress getInetAddress() - { - if (!isConnected ()) - return null; - - return remoteAddress; - } - - /** - * Returns the port number the socket is connected to or -1 if not connected - * - * @since 1.2 - */ - public int getPort() - { - if (!isConnected ()) - return -1; - - return remotePort; - } - - /** * Returns the SocketAddress of the host this socket is conneted to - * or null if this socket is not connected + * or null if this socket is not connected. * * @since 1.4 */ @@ -508,7 +666,7 @@ public class DatagramSocket /** * Returns the local SocketAddress this socket is bound to - * or null if it is not bound + * or null if it is not bound. * * @since 1.4 */ @@ -529,36 +687,12 @@ public class DatagramSocket } /** - * This method returns the value of the system level socket option - * SO_RCVBUF, which is used by the operating system to tune buffer - * sizes for data transfers. + * Enables/Disables SO_REUSEADDR. * - * @return The receive buffer size. + * @param on Whether or not to have SO_REUSEADDR turned on. * * @exception SocketException If an error occurs. * - * @since 1.2 - */ - public int getReceiveBufferSize() throws SocketException - { - if (impl == null) - throw new SocketException ("Cannot initialize Socket implementation"); - - Object obj = impl.getOption(SocketOptions.SO_RCVBUF); - - if (obj instanceof Integer) - return(((Integer)obj).intValue()); - else - throw new SocketException("Unexpected type"); - } - - /** - * Enables/Disables SO_REUSEADDR - * - * @param on Whether or not to have SO_REUSEADDR turned on - * - * @exception SocketException If an error occurs - * * @since 1.4 */ public void setReuseAddress(boolean on) throws SocketException @@ -570,9 +704,9 @@ public class DatagramSocket } /** - * Checks if SO_REUSEADDR is enabled + * Checks if SO_REUSEADDR is enabled. * - * @exception SocketException If an error occurs + * @exception SocketException If an error occurs. * * @since 1.4 */ @@ -673,73 +807,6 @@ public class DatagramSocket } /** - * This method returns the value of the system level socket option - * SO_SNDBUF, which is used by the operating system to tune buffer - * sizes for data transfers. - * - * @return The send buffer size. - * - * @exception SocketException If an error occurs. - * - * @since 1.2 - */ - public int getSendBufferSize() throws SocketException - { - if (impl == null) - throw new SocketException ("Cannot initialize Socket implementation"); - - Object obj = impl.getOption(SocketOptions.SO_SNDBUF); - - if (obj instanceof Integer) - return(((Integer)obj).intValue()); - else - throw new SocketException("Unexpected type"); - } - - /** - * This method sets the value for the system level socket option - * SO_RCVBUF to the specified value. Note that valid values for this - * option are specific to a given operating system. - * - * @param size The new receive buffer size. - * - * @exception SocketException If an error occurs. - * @exception IllegalArgumentException If size is 0 or negative - * - * @since 1.2 - */ - public void setReceiveBufferSize(int size) throws SocketException - { - if (impl == null) - throw new SocketException ("Cannot initialize Socket implementation"); - - if (size < 0) - throw new IllegalArgumentException("Buffer size is less than 0"); - - impl.setOption(SocketOptions.SO_RCVBUF, new Integer(size)); - } - - /** - * This method sets the value for the system level socket option - * SO_SNDBUF to the specified value. Note that valid values for this - * option are specific to a given operating system. - * - * @param size The new send buffer size. - * - * @exception SocketException If an error occurs. - * @exception IllegalArgumentException If size is 0 or negative - * - * @since 1.2 - */ - public void setSendBufferSize(int size) throws SocketException - { - if (size < 0) - throw new IllegalArgumentException("Buffer size is less than 0"); - - impl.setOption(SocketOptions.SO_SNDBUF, new Integer(size)); - } - - /** * Sets the datagram socket implementation factory for the application * * @param fac The factory to set diff --git a/libjava/java/net/HttpURLConnection.java b/libjava/java/net/HttpURLConnection.java index e914b190203..ebc0f8175f4 100644 --- a/libjava/java/net/HttpURLConnection.java +++ b/libjava/java/net/HttpURLConnection.java @@ -142,6 +142,11 @@ public abstract class HttpURLConnection extends URLConnection * a conditional GET. */ public static final int HTTP_NOT_MODIFIED = 304; + + /** + * The requested resource needs to be accessed through a proxy. + */ + public static final int HTTP_USE_PROXY = 305; /* HTTP Client Error Response Codes */ @@ -250,7 +255,7 @@ public abstract class HttpURLConnection extends URLConnection * The server does not support the requested functionality. * @since 1.3 */ - static final int HTTP_NOT_IMPLEMENTED = 501; + public static final int HTTP_NOT_IMPLEMENTED = 501; /** * The proxy encountered a bad response from the server it was proxy-ing for @@ -459,31 +464,36 @@ public abstract class HttpURLConnection extends URLConnection connect(); gotResponseVals = true; - // Response is the first header received from the connection. - String respField = getHeaderField(0); - - if (respField == null || ! respField.startsWith("HTTP/")) - { - // Set to default values on failure. - responseCode = -1; - responseMessage = null; - return; - } - int firstSpc, nextSpc; - firstSpc = respField.indexOf(' '); - nextSpc = respField.indexOf(' ', firstSpc + 1); - responseMessage = respField.substring(nextSpc + 1); - String codeStr = respField.substring(firstSpc + 1, nextSpc); - try + // If responseCode not yet explicitly set by subclass + if (responseCode == -1) { - responseCode = Integer.parseInt(codeStr); - } - catch (NumberFormatException e) - { - // Set to default values on failure. - responseCode = -1; - responseMessage = null; + // Response is the first header received from the connection. + String respField = getHeaderField(0); + + if (respField == null || ! respField.startsWith("HTTP/")) + { + // Set to default values on failure. + responseCode = -1; + responseMessage = null; + return; + } + + int firstSpc, nextSpc; + firstSpc = respField.indexOf(' '); + nextSpc = respField.indexOf(' ', firstSpc + 1); + responseMessage = respField.substring(nextSpc + 1); + String codeStr = respField.substring(firstSpc + 1, nextSpc); + try + { + responseCode = Integer.parseInt(codeStr); + } + catch (NumberFormatException e) + { + // Set to default values on failure. + responseCode = -1; + responseMessage = null; + } } } diff --git a/libjava/java/net/InetSocketAddress.java b/libjava/java/net/InetSocketAddress.java index 1b740dcc507..3c54b51a0f0 100644 --- a/libjava/java/net/InetSocketAddress.java +++ b/libjava/java/net/InetSocketAddress.java @@ -47,6 +47,11 @@ package java.net; public class InetSocketAddress extends SocketAddress { + /** + * Compatible with JDK 1.4+ + */ + private static final long serialVersionUID = 5076001401234631237L; + String hostname; InetAddress addr; int port; diff --git a/libjava/java/net/MulticastSocket.java b/libjava/java/net/MulticastSocket.java index 2700ebee511..dca1a85678b 100644 --- a/libjava/java/net/MulticastSocket.java +++ b/libjava/java/net/MulticastSocket.java @@ -1,5 +1,6 @@ /* MulticastSocket.java -- Class for using multicast sockets - Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 + Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -160,16 +161,18 @@ public class MulticastSocket extends DatagramSocket return impl.getTimeToLive(); } - /** - * Sets the interface to use for sending multicast packets. - * - * @param inf The new interface to use - * - * @exception SocketException If an error occurs - */ - public void setInterface(InetAddress inf) throws SocketException + /** + * Sets the interface to use for sending multicast packets. + * + * @param addr The new interface to use. + * + * @exception SocketException If an error occurs. + * + * @since 1.4 + */ + public void setInterface(InetAddress addr) throws SocketException { - impl.setOption(SocketOptions.IP_MULTICAST_IF, inf); + impl.setOption(SocketOptions.IP_MULTICAST_IF, addr); } /** diff --git a/libjava/java/net/NetPermission.java b/libjava/java/net/NetPermission.java index f5b625a0d6f..5b9502b7abe 100644 --- a/libjava/java/net/NetPermission.java +++ b/libjava/java/net/NetPermission.java @@ -48,7 +48,6 @@ import java.security.BasicPermission; * @author Aaron M. Renn (arenn@urbanophile.com) */ public final class NetPermission extends BasicPermission - implements java.io.Serializable { static final long serialVersionUID = -8343910153355041693L; diff --git a/libjava/java/net/ServerSocket.java b/libjava/java/net/ServerSocket.java index 62917b6a8a5..e2f8e637d09 100644 --- a/libjava/java/net/ServerSocket.java +++ b/libjava/java/net/ServerSocket.java @@ -77,6 +77,8 @@ public class ServerSocket */ private ServerSocketChannel ch; + private boolean closed = false; + /** * Constructor that simply sets the implementation. * @@ -200,6 +202,9 @@ public class ServerSocket */ public void bind (SocketAddress endpoint, int backlog) throws IOException { + if (closed) + throw new SocketException ("ServerSocket is closed"); + if (impl == null) throw new IOException ("Cannot initialize Socket implementation"); @@ -315,7 +320,13 @@ public class ServerSocket */ public void close () throws IOException { - impl.close(); + if (impl != null) + impl.close (); + + if (ch != null) + ch.close (); + + closed = true; } /** @@ -358,8 +369,7 @@ public class ServerSocket */ public boolean isClosed() { - // FIXME: implement this - return false; + return closed; } /** diff --git a/libjava/java/net/Socket.java b/libjava/java/net/Socket.java index 592f39a3dd3..e57c1ed5381 100644 --- a/libjava/java/net/Socket.java +++ b/libjava/java/net/Socket.java @@ -85,6 +85,8 @@ public class Socket SocketChannel ch; // this field must have been set if created by SocketChannel + private boolean closed = false; + // Constructors /** @@ -308,6 +310,9 @@ public class Socket */ public void bind (SocketAddress bindpoint) throws IOException { + if (closed) + throw new SocketException ("Socket is closed"); + if ( !(bindpoint instanceof InetSocketAddress)) throw new IllegalArgumentException (); @@ -330,6 +335,9 @@ public class Socket public void connect (SocketAddress endpoint) throws IOException { + if (closed) + throw new SocketException ("Socket is closed"); + if (! (endpoint instanceof InetSocketAddress)) throw new IllegalArgumentException ("Address type not supported"); @@ -357,6 +365,9 @@ public class Socket public void connect (SocketAddress endpoint, int timeout) throws IOException { + if (closed) + throw new SocketException ("Socket is closed"); + if (! (endpoint instanceof InetSocketAddress)) throw new IllegalArgumentException ("Address type not supported"); @@ -853,6 +864,11 @@ public class Socket { if (impl != null) impl.close(); + + if (ch != null) + ch.close(); + + closed = true; } /** @@ -1035,8 +1051,7 @@ public class Socket */ public boolean isClosed () { - // FIXME: implement this. - return false; + return closed; } /** diff --git a/libjava/java/net/SocketAddress.java b/libjava/java/net/SocketAddress.java index 370049d6fdc..f3e67d84cc0 100644 --- a/libjava/java/net/SocketAddress.java +++ b/libjava/java/net/SocketAddress.java @@ -48,6 +48,9 @@ import java.io.Serializable; */ public abstract class SocketAddress implements Serializable { + /** + * Compatible with JDK 1.4+ + */ static final long serialVersionUID = 5215720748342549866L; /** diff --git a/libjava/java/net/SocketImpl.java b/libjava/java/net/SocketImpl.java index 795e7139bee..f0f1a3c87bc 100644 --- a/libjava/java/net/SocketImpl.java +++ b/libjava/java/net/SocketImpl.java @@ -271,8 +271,9 @@ public abstract class SocketImpl implements SocketOptions */ public String toString() { - return "[addr=" + address.toString() + ",port=" + Integer.toString(port) - + ",localport=" + Integer.toString(localport) + "]"; + return "[addr=" + address + + ",port=" + port + + ",localport=" + localport + "]"; } /** diff --git a/libjava/java/net/URLClassLoader.java b/libjava/java/net/URLClassLoader.java index c6dc4b1d44d..d7fc77f8ab4 100644 --- a/libjava/java/net/URLClassLoader.java +++ b/libjava/java/net/URLClassLoader.java @@ -238,7 +238,7 @@ public class URLClassLoader extends SecureClassLoader CodeSource getCodeSource() { Certificate[] certs = getCertificates(); - if (certs != null) + if (certs == null) return loader.noCertCodeSource; else return new CodeSource(loader.baseURL, certs); @@ -271,34 +271,18 @@ public class URLClassLoader extends SecureClassLoader abstract InputStream getInputStream() throws IOException; } - static URL getCanonicalFileURL(URL url) - { - if ("file".equals(url.getProtocol())) - { - try - { - File f = new File(url.getFile()).getCanonicalFile(); - url = new URL("file", "", f.toString()); - } - catch (IOException ignore) - { - } - } - return url; - } - /** * A <code>JarURLLoader</code> is a type of <code>URLLoader</code> * only loading from jar url. */ final static class JarURLLoader extends URLLoader { - final JarFile jarfile; // The canonical jar file for this url + final JarFile jarfile; // The jar file for this url final URL baseJarURL; // Base jar: url for all resources loaded from jar public JarURLLoader(URLClassLoader classloader, URL baseURL) { - super(classloader, getCanonicalFileURL(baseURL)); + super(classloader, baseURL); // cache url prefix for all resources in this jar url String external = baseURL.toExternalForm(); @@ -481,11 +465,11 @@ public class URLClassLoader extends SecureClassLoader */ final static class FileURLLoader extends URLLoader { - File dir; //the canonical file for this file url + File dir; //the file for this file url FileURLLoader(URLClassLoader classloader, URL url) { - super(classloader, getCanonicalFileURL(url)); + super(classloader, url); dir = new File(baseURL.getFile()); } @@ -493,13 +477,6 @@ public class URLClassLoader extends SecureClassLoader Resource getResource(String name) { File file = new File(dir, name); - try - { - file = file.getCanonicalFile(); - } - catch (IOException ignore) - { - } if (file.exists() && !file.isDirectory()) return new FileResource(this, name, file); return null; diff --git a/libjava/java/net/URLStreamHandler.java b/libjava/java/net/URLStreamHandler.java index 128a0d2d3da..7f866440f2f 100644 --- a/libjava/java/net/URLStreamHandler.java +++ b/libjava/java/net/URLStreamHandler.java @@ -436,7 +436,7 @@ public abstract class URLStreamHandler // ignores a non-default port if host is null or "". That is inconsistent // with the spec since the result of this method is spec'ed so it can be // used to construct a new URL that is equivalent to the original. - boolean port_needed = port >= 0 && port != getDefaultPort(); + boolean port_needed = port > 0 && port != getDefaultPort(); if (port_needed) sb.append(':').append(port); diff --git a/libjava/java/rmi/server/RMIClassLoader.java b/libjava/java/rmi/server/RMIClassLoader.java index 1b00970e441..057ca0fd402 100644 --- a/libjava/java/rmi/server/RMIClassLoader.java +++ b/libjava/java/rmi/server/RMIClassLoader.java @@ -172,7 +172,7 @@ public class RMIClassLoader } } - return loader != null ? loader.loadClass(name) : Class.forName(name); + return loader.loadClass(name); } public static String getClassAnnotation(Class cl) diff --git a/libjava/java/rmi/server/RMIClassLoaderSpi.java b/libjava/java/rmi/server/RMIClassLoaderSpi.java new file mode 100644 index 00000000000..2dbb3849c27 --- /dev/null +++ b/libjava/java/rmi/server/RMIClassLoaderSpi.java @@ -0,0 +1,64 @@ +/* RMIClassLoaderSpi.java + Copyright (c) 2002 Free Software Foundation, Inc. + +This file is part of GNU Classpath. + +GNU Classpath is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2, or (at your option) +any later version. + +GNU Classpath is distributed in the hope that it will be useful, but +WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Classpath; see the file COPYING. If not, write to the +Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA +02111-1307 USA. + +Linking this library statically or dynamically with other modules is +making a combined work based on this library. Thus, the terms and +conditions of the GNU General Public License cover the whole +combination. + +As a special exception, the copyright holders of this library give you +permission to link this library with independent modules to produce an +executable, regardless of the license terms of these independent +modules, and to copy and distribute the resulting executable under +terms of your choice, provided that you also meet, for each linked +independent module, the terms and conditions of the license of that +module. An independent module is a module which is not derived from +or based on this library. If you modify this library, you may extend +this exception to your version of the library, but you are not +obligated to do so. If you do not wish to do so, delete this +exception statement from your version. */ + +package java.rmi.server; + +import java.net.MalformedURLException; + +/** + * @author Michael Koch + * @since 1.4 + */ +public abstract class RMIClassLoaderSpi +{ + public RMIClassLoaderSpi() + { + } + + public abstract Class loadClass (String codeBase, String name, + ClassLoader defaultLoader) + throws MalformedURLException, ClassNotFoundException; + + public abstract Class loadProxyClass (String codeBase, String[] interfaces, + ClassLoader defaultLoader) + throws MalformedURLException, ClassNotFoundException; + + public abstract ClassLoader getClassLoader (String codebase) + throws MalformedURLException; + + public abstract String getClassAnnotation (Class cl); +} diff --git a/libjava/java/rmi/server/UnicastRemoteObject.java b/libjava/java/rmi/server/UnicastRemoteObject.java index aefe9701ecd..4e2f06ae64b 100644 --- a/libjava/java/rmi/server/UnicastRemoteObject.java +++ b/libjava/java/rmi/server/UnicastRemoteObject.java @@ -1,5 +1,5 @@ /* - Copyright (c) 1996, 1997, 1998, 1999, 2002 Free Software Foundation, Inc. + Copyright (c) 1996, 1997, 1998, 1999, 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -113,7 +113,7 @@ public static RemoteStub exportObject(Remote obj) throws RemoteException { } public static boolean unexportObject(Remote obj, boolean force) - throws RemoteException, NoSuchObjectException + throws NoSuchObjectException { if (obj instanceof RemoteObject) { diff --git a/libjava/java/security/Security.java b/libjava/java/security/Security.java index bf7a993ad47..39d75eef00c 100644 --- a/libjava/java/security/Security.java +++ b/libjava/java/security/Security.java @@ -37,9 +37,10 @@ exception statement from your version. */ package java.security; import java.io.File; -import java.io.FileInputStream; +import java.io.InputStream; import java.io.IOException; import java.io.FileNotFoundException; +import java.net.URL; import java.security.Provider; import java.util.Vector; import java.util.Enumeration; @@ -59,9 +60,9 @@ public final class Security extends Object static { - loadProviders(System.getProperty("java.home"), - System.getProperty("java.vm.name")); - loadProviders(System.getProperty("gnu.classpath.home"), "classpath"); + String base = System.getProperty("gnu.classpath.home.url"); + loadProviders(base, System.getProperty("gnu.classpath.vm.shortname")); + loadProviders(base, "classpath"); } // This class can't be instantiated. @@ -69,20 +70,16 @@ public final class Security extends Object { } - private static void loadProviders(String dir, String vendor) + private static void loadProviders(String baseUrl, String vendor) { - if (dir == null || vendor == null) + if (baseUrl == null || vendor == null) return; - String separator = System.getProperty("file.separator"); - String secfilestr = (dir + - separator + "lib" + - separator + "security" + - separator + vendor + ".security"); + String secfilestr = baseUrl + "/security/" + vendor + ".security"; try { - FileInputStream fin = new FileInputStream(secfilestr); + InputStream fin = new URL(secfilestr).openStream(); secprops = new Properties(); secprops.load(fin); diff --git a/libjava/java/util/Properties.java b/libjava/java/util/Properties.java index adad25055ac..907ec2c4d7a 100644 --- a/libjava/java/util/Properties.java +++ b/libjava/java/util/Properties.java @@ -1,5 +1,5 @@ /* Properties.java -- a set of persistent properties - Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -271,6 +271,13 @@ label = Name:\\u0020</pre> { // The line continues on the next line. line = reader.readLine(); + + // We might have seen a backslash at the end of + // the file. The JDK ignores the backslash in + // this case, so we follow for compatibility. + if (line == null) + break; + pos = 0; while (pos < line.length() && Character.isWhitespace(c = line.charAt(pos))) @@ -540,6 +547,7 @@ label = Name:\\u0020</pre> case '=': case ':': buffer.append('\\').append(c); + break; default: if (c < ' ' || c > '~') { diff --git a/libjava/java/util/TreeMap.java b/libjava/java/util/TreeMap.java index dfa9bc63881..e0cff28e02c 100644 --- a/libjava/java/util/TreeMap.java +++ b/libjava/java/util/TreeMap.java @@ -865,7 +865,7 @@ public class TreeMap extends AbstractMap int rowsize; // Fill each row that is completely full of nodes. - for (rowsize = 2; rowsize + rowsize < count; rowsize <<= 1) + for (rowsize = 2; rowsize + rowsize <= count; rowsize <<= 1) { Node parent = row; Node last = null; @@ -1468,10 +1468,10 @@ public class TreeMap extends AbstractMap */ public void remove() { - if (knownMod != modCount) - throw new ConcurrentModificationException(); if (last == null) throw new IllegalStateException(); + if (knownMod != modCount) + throw new ConcurrentModificationException(); removeNode(last); last = null; diff --git a/libjava/java/util/natResourceBundle.cc b/libjava/java/util/natResourceBundle.cc index 21a9565c996..35e90ee23d3 100644 --- a/libjava/java/util/natResourceBundle.cc +++ b/libjava/java/util/natResourceBundle.cc @@ -1,4 +1,4 @@ -/* Copyright (C) 2002 Free Software Foundation +/* Copyright (C) 2002, 2003 Free Software Foundation This file is part of libgcj. @@ -16,17 +16,27 @@ details. */ #include <java/lang/SecurityManager.h> #include <java/lang/ClassLoader.h> #include <java/lang/Class.h> +#include <java/lang/ArrayIndexOutOfBoundsException.h> #include <gnu/gcj/runtime/StackTrace.h> java::lang::ClassLoader * java::util::ResourceBundle::getCallingClassLoader () { gnu::gcj::runtime::StackTrace *t = new gnu::gcj::runtime::StackTrace(6); - for (int i = 3; i < 6; ++i) + try + { + /* Frame 0 is this method, frame 1 is getBundle, so starting at + frame 2 we might see the user's class. FIXME: should account + for reflection, JNI, etc, here. */ + for (int i = 2; ; ++i) + { + jclass klass = t->classAt(i); + if (klass != NULL) + return klass->getClassLoaderInternal(); + } + } + catch (::java::lang::ArrayIndexOutOfBoundsException *e) { - jclass klass = t->classAt(i); - if (klass != NULL) - return klass->getClassLoaderInternal(); } return NULL; } diff --git a/libjava/java/util/zip/ZipFile.java b/libjava/java/util/zip/ZipFile.java index eb79d03e594..4b027b088a9 100644 --- a/libjava/java/util/zip/ZipFile.java +++ b/libjava/java/util/zip/ZipFile.java @@ -1,5 +1,5 @@ /* java.util.zip.ZipFile - Copyright (C) 2001, 2002 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -37,6 +37,7 @@ exception statement from your version. */ package java.util.zip; +import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.DataInput; import java.io.DataInputStream; @@ -46,7 +47,8 @@ import java.io.IOException; import java.io.EOFException; import java.io.RandomAccessFile; import java.util.Enumeration; -import java.util.Hashtable; +import java.util.HashMap; +import java.util.Iterator; import java.util.NoSuchElementException; /** @@ -58,6 +60,7 @@ import java.util.NoSuchElementException; * entries in different threads. * * @author Jochen Hoenicke + * @author Artur Biesiadowski */ public class ZipFile implements ZipConstants { @@ -79,7 +82,7 @@ public class ZipFile implements ZipConstants private final RandomAccessFile raf; // The entries of this zip file when initialized and not yet closed. - private Hashtable entries; + private HashMap entries; private boolean closed = false; @@ -137,33 +140,74 @@ public class ZipFile implements ZipConstants } /** - * Read an unsigned short in little endian byte order. + * Read an unsigned short in little endian byte order from the given + * DataInput stream using the given byte buffer. + * + * @param di DataInput stream to read from. + * @param b the byte buffer to read in (must be at least 2 bytes long). + * @return The value read. + * * @exception IOException if a i/o error occured. * @exception EOFException if the file ends prematurely */ - private final int readLeShort(DataInput di) throws IOException + private final int readLeShort(DataInput di, byte[] b) throws IOException { - byte[] b = new byte[2]; - di.readFully(b); + di.readFully(b, 0, 2); return (b[0] & 0xff) | (b[1] & 0xff) << 8; } /** - * Read an int in little endian byte order. + * Read an int in little endian byte order from the given + * DataInput stream using the given byte buffer. + * + * @param di DataInput stream to read from. + * @param b the byte buffer to read in (must be at least 4 bytes long). + * @return The value read. + * * @exception IOException if a i/o error occured. * @exception EOFException if the file ends prematurely */ - private final int readLeInt(DataInput di) throws IOException + private final int readLeInt(DataInput di, byte[] b) throws IOException { - byte[] b = new byte[4]; - di.readFully(b); + di.readFully(b, 0, 4); return ((b[0] & 0xff) | (b[1] & 0xff) << 8) | ((b[2] & 0xff) | (b[3] & 0xff) << 8) << 16; } + + /** + * Read an unsigned short in little endian byte order from the given + * byte buffer at the given offset. + * + * @param b the byte array to read from. + * @param off the offset to read from. + * @return The value read. + */ + private final int readLeShort(byte[] b, int off) + { + return (b[off] & 0xff) | (b[off+1] & 0xff) << 8; + } + + /** + * Read an int in little endian byte order from the given + * byte buffer at the given offset. + * + * @param b the byte array to read from. + * @param off the offset to read from. + * @return The value read. + */ + private final int readLeInt(byte[] b, int off) + { + return ((b[off] & 0xff) | (b[off+1] & 0xff) << 8) + | ((b[off+2] & 0xff) | (b[off+3] & 0xff) << 8) << 16; + } + + /** * Read the central directory of a zip file and fill the entries - * array. This is called exactly once when first needed. + * array. This is called exactly once when first needed. It is called + * while holding the lock on <code>raf</code>. + * * @exception IOException if a i/o error occured. * @exception ZipException if the central directory is malformed */ @@ -175,6 +219,8 @@ public class ZipFile implements ZipConstants * file isn't a zip file. */ long pos = raf.length() - ENDHDR; + byte[] ebs = new byte[CENHDR]; + do { if (pos < 0) @@ -182,45 +228,42 @@ public class ZipFile implements ZipConstants ("central directory not found, probably not a zip file: " + name); raf.seek(pos--); } - while (readLeInt(raf) != ENDSIG); + while (readLeInt(raf, ebs) != ENDSIG); + if (raf.skipBytes(ENDTOT - ENDNRD) != ENDTOT - ENDNRD) throw new EOFException(name); - int count = readLeShort(raf); + int count = readLeShort(raf, ebs); if (raf.skipBytes(ENDOFF - ENDSIZ) != ENDOFF - ENDSIZ) throw new EOFException(name); - int centralOffset = readLeInt(raf); + int centralOffset = readLeInt(raf, ebs); - entries = new Hashtable(count); + entries = new HashMap(count+count/2); raf.seek(centralOffset); - byte[] ebs = new byte[24]; - ByteArrayInputStream ebais = new ByteArrayInputStream(ebs); - DataInputStream edip = new DataInputStream(ebais); + + byte[] buffer = new byte[16]; for (int i = 0; i < count; i++) { - if (readLeInt(raf) != CENSIG) + raf.readFully(ebs); + if (readLeInt(ebs, 0) != CENSIG) throw new ZipException("Wrong Central Directory signature: " + name); - if (raf.skipBytes(CENHOW - CENVEM) != CENHOW - CENVEM) - throw new EOFException(name); - - raf.readFully(ebs); - ebais.reset(); - int method = readLeShort(edip); - int dostime = readLeInt(edip); - int crc = readLeInt(edip); - int csize = readLeInt(edip); - int size = readLeInt(edip); - int nameLen = readLeShort(edip); - int extraLen = readLeShort(edip); - int commentLen = readLeShort(edip); - - if (raf.skipBytes(CENOFF - CENDSK) != CENOFF - CENDSK) - throw new EOFException(name); - int offset = readLeInt(raf); - - byte[] buffer = new byte[Math.max(nameLen, commentLen)]; + + int method = readLeShort(ebs, CENHOW); + int dostime = readLeInt(ebs, CENTIM); + int crc = readLeInt(ebs, CENCRC); + int csize = readLeInt(ebs, CENSIZ); + int size = readLeInt(ebs, CENLEN); + int nameLen = readLeShort(ebs, CENNAM); + int extraLen = readLeShort(ebs, CENEXT); + int commentLen = readLeShort(ebs, CENCOM); + + int offset = readLeInt(ebs, CENOFF); + + int needBuffer = Math.max(nameLen, commentLen); + if (buffer.length < needBuffer) + buffer = new byte[needBuffer]; raf.readFully(buffer, 0, nameLen); - String name = new String(buffer, 0, nameLen); + String name = new String(buffer, 0, 0, nameLen); ZipEntry entry = new ZipEntry(name); entry.setMethod(method); @@ -248,6 +291,7 @@ public class ZipFile implements ZipConstants * Closes the ZipFile. This also closes all input streams given by * this class. After this is called, no further method should be * called. + * * @exception IOException if a i/o error occured. */ public void close() throws IOException @@ -267,7 +311,7 @@ public class ZipFile implements ZipConstants { try { - return new ZipEntryEnumeration(getEntries().elements()); + return new ZipEntryEnumeration(getEntries().values().iterator()); } catch (IOException ioe) { @@ -281,7 +325,7 @@ public class ZipFile implements ZipConstants * @exception IllegalStateException when the ZipFile has already been closed. * @exception IOEexception when the entries could not be read. */ - private Hashtable getEntries() throws IOException + private HashMap getEntries() throws IOException { synchronized(raf) { @@ -297,15 +341,16 @@ public class ZipFile implements ZipConstants /** * Searches for a zip entry in this archive with the given name. + * * @param the name. May contain directory components separated by * slashes ('/'). * @return the zip entry, or null if no entry with that name exists. - * @see #entries */ + */ public ZipEntry getEntry(String name) { try { - Hashtable entries = getEntries(); + HashMap entries = getEntries(); ZipEntry entry = (ZipEntry) entries.get(name); return entry != null ? (ZipEntry) entry.clone() : null; } @@ -315,10 +360,17 @@ public class ZipFile implements ZipConstants } } + + //access should be protected by synchronized(raf) + private byte[] locBuf = new byte[LOCHDR]; + /** * Checks, if the local header of the entry at index i matches the * central directory, and returns the offset to the data. + * + * @param entry to check. * @return the start offset of the (compressed) data. + * * @exception IOException if a i/o error occured. * @exception ZipException if the local header doesn't match the * central directory header @@ -328,24 +380,18 @@ public class ZipFile implements ZipConstants synchronized (raf) { raf.seek(entry.offset); - if (readLeInt(raf) != LOCSIG) + raf.readFully(locBuf); + + if (readLeInt(locBuf, 0) != LOCSIG) throw new ZipException("Wrong Local header signature: " + name); - /* skip version and flags */ - if (raf.skipBytes(LOCHOW - LOCVER) != LOCHOW - LOCVER) - throw new EOFException(name); - - if (entry.getMethod() != readLeShort(raf)) + if (entry.getMethod() != readLeShort(locBuf, LOCHOW)) throw new ZipException("Compression method mismatch: " + name); - /* Skip time, crc, size and csize */ - if (raf.skipBytes(LOCNAM - LOCTIM) != LOCNAM - LOCTIM) - throw new EOFException(name); - - if (entry.getName().length() != readLeShort(raf)) + if (entry.getName().length() != readLeShort(locBuf, LOCNAM)) throw new ZipException("file name length mismatch: " + name); - int extraLen = entry.getName().length() + readLeShort(raf); + int extraLen = entry.getName().length() + readLeShort(locBuf, LOCEXT); return entry.offset + LOCHDR + extraLen; } } @@ -354,13 +400,16 @@ public class ZipFile implements ZipConstants * Creates an input stream reading the given zip entry as * uncompressed data. Normally zip entry should be an entry * returned by getEntry() or entries(). + * + * @param entry the entry to create an InputStream for. * @return the input stream. + * * @exception IOException if a i/o error occured. * @exception ZipException if the Zip archive is malformed. */ public InputStream getInputStream(ZipEntry entry) throws IOException { - Hashtable entries = getEntries(); + HashMap entries = getEntries(); String name = entry.getName(); ZipEntry zipEntry = (ZipEntry) entries.get(name); if (zipEntry == null) @@ -368,8 +417,8 @@ public class ZipFile implements ZipConstants long start = checkLocalHeader(zipEntry); int method = zipEntry.getMethod(); - InputStream is = new PartialInputStream - (raf, start, zipEntry.getCompressedSize()); + InputStream is = new BufferedInputStream(new PartialInputStream + (raf, start, zipEntry.getCompressedSize())); switch (method) { case ZipOutputStream.STORED: @@ -406,16 +455,16 @@ public class ZipFile implements ZipConstants private static class ZipEntryEnumeration implements Enumeration { - private final Enumeration elements; + private final Iterator elements; - public ZipEntryEnumeration(Enumeration elements) + public ZipEntryEnumeration(Iterator elements) { this.elements = elements; } public boolean hasMoreElements() { - return elements.hasMoreElements(); + return elements.hasNext(); } public Object nextElement() @@ -423,13 +472,13 @@ public class ZipFile implements ZipConstants /* We return a clone, just to be safe that the user doesn't * change the entry. */ - return ((ZipEntry)elements.nextElement()).clone(); + return ((ZipEntry)elements.next()).clone(); } } private static class PartialInputStream extends InputStream { - RandomAccessFile raf; + private final RandomAccessFile raf; long filepos, end; public PartialInputStream(RandomAccessFile raf, long start, long len) diff --git a/libjava/javax/naming/InitialContext.java b/libjava/javax/naming/InitialContext.java index 99ae426e9ab..705e24ad1eb 100644 --- a/libjava/javax/naming/InitialContext.java +++ b/libjava/javax/naming/InitialContext.java @@ -1,5 +1,5 @@ /* InitialContext.java -- - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 2002 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -126,18 +126,22 @@ public class InitialContext implements Context } catch (IOException e) {} - String home = System.getProperty("java.home"); + String home = System.getProperty("gnu.classpath.home.url"); if (home != null) { - String fileName = home + File.separator - + "lib" + File.separator + "jndi.properties"; + String url = home + "/jndi.properties"; Properties p = new Properties (); - try { - InputStream is = new FileInputStream (fileName); - p.load (is); - is.close (); - } catch (IOException e) {} + try + { + InputStream is = new URL(url).openStream(); + p.load (is); + is.close (); + } + catch (IOException e) + { + // Ignore. + } merge (myProps, p); } diff --git a/libjava/libtool-version b/libjava/libtool-version index 318fd04b258..8c0164a94a0 100644 --- a/libjava/libtool-version +++ b/libjava/libtool-version @@ -3,4 +3,4 @@ # a separate file so that version updates don't involve re-running # automake. # CURRENT:REVISION:AGE -3:0:0 +4:0:0 diff --git a/libjava/org/xml/sax/AttributeList.java b/libjava/org/xml/sax/AttributeList.java index 9ea9295e191..b1a647aa16e 100644 --- a/libjava/org/xml/sax/AttributeList.java +++ b/libjava/org/xml/sax/AttributeList.java @@ -1,191 +1,193 @@ -// SAX Attribute List Interface.
-// No warranty; no copyright -- use this as you will.
-// $Id: AttributeList.java,v 1.1 2000/10/02 02:43:16 sboag Exp $
-
-package org.xml.sax;
-
-/**
- * Interface for an element's attribute specifications.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>This is the original SAX1 interface for reporting an element's
- * attributes. Unlike the new {@link org.xml.sax.Attributes Attributes}
- * interface, it does not support Namespace-related information.</p>
- *
- * <p>When an attribute list is supplied as part of a
- * {@link org.xml.sax.DocumentHandler#startElement startElement}
- * event, the list will return valid results only during the
- * scope of the event; once the event handler returns control
- * to the parser, the attribute list is invalid. To save a
- * persistent copy of the attribute list, use the SAX1
- * {@link org.xml.sax.helpers.AttributeListImpl AttributeListImpl}
- * helper class.</p>
- *
- * <p>An attribute list includes only attributes that have been
- * specified or defaulted: #IMPLIED attributes will not be included.</p>
- *
- * <p>There are two ways for the SAX application to obtain information
- * from the AttributeList. First, it can iterate through the entire
- * list:</p>
- *
- * <pre>
- * public void startElement (String name, AttributeList atts) {
- * for (int i = 0; i < atts.getLength(); i++) {
- * String name = atts.getName(i);
- * String type = atts.getType(i);
- * String value = atts.getValue(i);
- * [...]
- * }
- * }
- * </pre>
- *
- * <p>(Note that the result of getLength() will be zero if there
- * are no attributes.)
- *
- * <p>As an alternative, the application can request the value or
- * type of specific attributes:</p>
- *
- * <pre>
- * public void startElement (String name, AttributeList atts) {
- * String identifier = atts.getValue("id");
- * String label = atts.getValue("label");
- * [...]
- * }
- * </pre>
- *
- * @deprecated This interface has been replaced by the SAX2
- * {@link org.xml.sax.Attributes Attributes}
- * interface, which includes Namespace support.
- * @since SAX 1.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.DocumentHandler#startElement startElement
- * @see org.xml.sax.helpers.AttributeListImpl AttributeListImpl
- */
-public interface AttributeList {
-
-
- ////////////////////////////////////////////////////////////////////
- // Iteration methods.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Return the number of attributes in this list.
- *
- * <p>The SAX parser may provide attributes in any
- * arbitrary order, regardless of the order in which they were
- * declared or specified. The number of attributes may be
- * zero.</p>
- *
- * @return The number of attributes in the list.
- */
- public abstract int getLength ();
-
-
- /**
- * Return the name of an attribute in this list (by position).
- *
- * <p>The names must be unique: the SAX parser shall not include the
- * same attribute twice. Attributes without values (those declared
- * #IMPLIED without a value specified in the start tag) will be
- * omitted from the list.</p>
- *
- * <p>If the attribute name has a namespace prefix, the prefix
- * will still be attached.</p>
- *
- * @param i The index of the attribute in the list (starting at 0).
- * @return The name of the indexed attribute, or null
- * if the index is out of range.
- * @see #getLength
- */
- public abstract String getName (int i);
-
-
- /**
- * Return the type of an attribute in the list (by position).
- *
- * <p>The attribute type is one of the strings "CDATA", "ID",
- * "IDREF", "IDREFS", "NMTOKEN", "NMTOKENS", "ENTITY", "ENTITIES",
- * or "NOTATION" (always in upper case).</p>
- *
- * <p>If the parser has not read a declaration for the attribute,
- * or if the parser does not report attribute types, then it must
- * return the value "CDATA" as stated in the XML 1.0 Recommentation
- * (clause 3.3.3, "Attribute-Value Normalization").</p>
- *
- * <p>For an enumerated attribute that is not a notation, the
- * parser will report the type as "NMTOKEN".</p>
- *
- * @param i The index of the attribute in the list (starting at 0).
- * @return The attribute type as a string, or
- * null if the index is out of range.
- * @see #getLength
- * @see #getType(java.lang.String)
- */
- public abstract String getType (int i);
-
-
- /**
- * Return the value of an attribute in the list (by position).
- *
- * <p>If the attribute value is a list of tokens (IDREFS,
- * ENTITIES, or NMTOKENS), the tokens will be concatenated
- * into a single string separated by whitespace.</p>
- *
- * @param i The index of the attribute in the list (starting at 0).
- * @return The attribute value as a string, or
- * null if the index is out of range.
- * @see #getLength
- * @see #getValue(java.lang.String)
- */
- public abstract String getValue (int i);
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Lookup methods.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Return the type of an attribute in the list (by name).
- *
- * <p>The return value is the same as the return value for
- * getType(int).</p>
- *
- * <p>If the attribute name has a namespace prefix in the document,
- * the application must include the prefix here.</p>
- *
- * @param name The name of the attribute.
- * @return The attribute type as a string, or null if no
- * such attribute exists.
- * @see #getType(int)
- */
- public abstract String getType (String name);
-
-
- /**
- * Return the value of an attribute in the list (by name).
- *
- * <p>The return value is the same as the return value for
- * getValue(int).</p>
- *
- * <p>If the attribute name has a namespace prefix in the document,
- * the application must include the prefix here.</p>
- *
- * @param i The index of the attribute in the list.
- * @return The attribute value as a string, or null if
- * no such attribute exists.
- * @see #getValue(int)
- */
- public abstract String getValue (String name);
-
-}
-
-// end of AttributeList.java
+// SAX Attribute List Interface. +// http://www.saxproject.org +// No warranty; no copyright -- use this as you will. +// $Id: AttributeList.java,v 1.3.2.3 2002/01/29 21:34:14 dbrownell Exp $ + +package org.xml.sax; + +/** + * Interface for an element's attribute specifications. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>This is the original SAX1 interface for reporting an element's + * attributes. Unlike the new {@link org.xml.sax.Attributes Attributes} + * interface, it does not support Namespace-related information.</p> + * + * <p>When an attribute list is supplied as part of a + * {@link org.xml.sax.DocumentHandler#startElement startElement} + * event, the list will return valid results only during the + * scope of the event; once the event handler returns control + * to the parser, the attribute list is invalid. To save a + * persistent copy of the attribute list, use the SAX1 + * {@link org.xml.sax.helpers.AttributeListImpl AttributeListImpl} + * helper class.</p> + * + * <p>An attribute list includes only attributes that have been + * specified or defaulted: #IMPLIED attributes will not be included.</p> + * + * <p>There are two ways for the SAX application to obtain information + * from the AttributeList. First, it can iterate through the entire + * list:</p> + * + * <pre> + * public void startElement (String name, AttributeList atts) { + * for (int i = 0; i < atts.getLength(); i++) { + * String name = atts.getName(i); + * String type = atts.getType(i); + * String value = atts.getValue(i); + * [...] + * } + * } + * </pre> + * + * <p>(Note that the result of getLength() will be zero if there + * are no attributes.) + * + * <p>As an alternative, the application can request the value or + * type of specific attributes:</p> + * + * <pre> + * public void startElement (String name, AttributeList atts) { + * String identifier = atts.getValue("id"); + * String label = atts.getValue("label"); + * [...] + * } + * </pre> + * + * @deprecated This interface has been replaced by the SAX2 + * {@link org.xml.sax.Attributes Attributes} + * interface, which includes Namespace support. + * @since SAX 1.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + * @see org.xml.sax.DocumentHandler#startElement startElement + * @see org.xml.sax.helpers.AttributeListImpl AttributeListImpl + */ +public interface AttributeList { + + + //////////////////////////////////////////////////////////////////// + // Iteration methods. + //////////////////////////////////////////////////////////////////// + + + /** + * Return the number of attributes in this list. + * + * <p>The SAX parser may provide attributes in any + * arbitrary order, regardless of the order in which they were + * declared or specified. The number of attributes may be + * zero.</p> + * + * @return The number of attributes in the list. + */ + public abstract int getLength (); + + + /** + * Return the name of an attribute in this list (by position). + * + * <p>The names must be unique: the SAX parser shall not include the + * same attribute twice. Attributes without values (those declared + * #IMPLIED without a value specified in the start tag) will be + * omitted from the list.</p> + * + * <p>If the attribute name has a namespace prefix, the prefix + * will still be attached.</p> + * + * @param i The index of the attribute in the list (starting at 0). + * @return The name of the indexed attribute, or null + * if the index is out of range. + * @see #getLength + */ + public abstract String getName (int i); + + + /** + * Return the type of an attribute in the list (by position). + * + * <p>The attribute type is one of the strings "CDATA", "ID", + * "IDREF", "IDREFS", "NMTOKEN", "NMTOKENS", "ENTITY", "ENTITIES", + * or "NOTATION" (always in upper case).</p> + * + * <p>If the parser has not read a declaration for the attribute, + * or if the parser does not report attribute types, then it must + * return the value "CDATA" as stated in the XML 1.0 Recommentation + * (clause 3.3.3, "Attribute-Value Normalization").</p> + * + * <p>For an enumerated attribute that is not a notation, the + * parser will report the type as "NMTOKEN".</p> + * + * @param i The index of the attribute in the list (starting at 0). + * @return The attribute type as a string, or + * null if the index is out of range. + * @see #getLength + * @see #getType(java.lang.String) + */ + public abstract String getType (int i); + + + /** + * Return the value of an attribute in the list (by position). + * + * <p>If the attribute value is a list of tokens (IDREFS, + * ENTITIES, or NMTOKENS), the tokens will be concatenated + * into a single string separated by whitespace.</p> + * + * @param i The index of the attribute in the list (starting at 0). + * @return The attribute value as a string, or + * null if the index is out of range. + * @see #getLength + * @see #getValue(java.lang.String) + */ + public abstract String getValue (int i); + + + + //////////////////////////////////////////////////////////////////// + // Lookup methods. + //////////////////////////////////////////////////////////////////// + + + /** + * Return the type of an attribute in the list (by name). + * + * <p>The return value is the same as the return value for + * getType(int).</p> + * + * <p>If the attribute name has a namespace prefix in the document, + * the application must include the prefix here.</p> + * + * @param name The name of the attribute. + * @return The attribute type as a string, or null if no + * such attribute exists. + * @see #getType(int) + */ + public abstract String getType (String name); + + + /** + * Return the value of an attribute in the list (by name). + * + * <p>The return value is the same as the return value for + * getValue(int).</p> + * + * <p>If the attribute name has a namespace prefix in the document, + * the application must include the prefix here.</p> + * + * @param i The index of the attribute in the list. + * @return The attribute value as a string, or null if + * no such attribute exists. + * @see #getValue(int) + */ + public abstract String getValue (String name); + +} + +// end of AttributeList.java diff --git a/libjava/org/xml/sax/Attributes.java b/libjava/org/xml/sax/Attributes.java index f10067a9288..251fe206a00 100644 --- a/libjava/org/xml/sax/Attributes.java +++ b/libjava/org/xml/sax/Attributes.java @@ -1,243 +1,252 @@ -// Attributes.java - attribute list with Namespace support
-// Written by David Megginson, sax@megginson.com
-// NO WARRANTY! This class is in the public domain.
-
-// $Id: Attributes.java,v 1.1 2000/10/02 02:43:16 sboag Exp $
-
-
-package org.xml.sax;
-
-
-/**
- * Interface for a list of XML attributes.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>This interface allows access to a list of attributes in
- * three different ways:</p>
- *
- * <ol>
- * <li>by attribute index;</li>
- * <li>by Namespace-qualified name; or</li>
- * <li>by qualified (prefixed) name.</li>
- * </ol>
- *
- * <p>The list will not contain attributes that were declared
- * #IMPLIED but not specified in the start tag. It will also not
- * contain attributes used as Namespace declarations (xmlns*) unless
- * the <code>http://xml.org/sax/features/namespace-prefixes</code>
- * feature is set to <var>true</var> (it is <var>false</var> by
- * default).</p>
- *
- * <p>If the namespace-prefixes feature (see above) is <var>false</var>,
- * access by qualified name may not be available; if the
- * <code>http://xml.org/sax/features/namespaces</code>
- * feature is <var>false</var>, access by Namespace-qualified names
- * may not be available.</p>
- *
- * <p>This interface replaces the now-deprecated SAX1 {@link
- * org.xml.sax.AttributeList AttributeList} interface, which does not
- * contain Namespace support. In addition to Namespace support, it
- * adds the <var>getIndex</var> methods (below).</p>
- *
- * <p>The order of attributes in the list is unspecified, and will
- * vary from implementation to implementation.</p>
- *
- * @since SAX 2.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.helpers.AttributeListImpl
- */
-public interface Attributes
-{
-
-
- ////////////////////////////////////////////////////////////////////
- // Indexed access.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Return the number of attributes in the list.
- *
- * <p>Once you know the number of attributes, you can iterate
- * through the list.</p>
- *
- * @return The number of attributes in the list.
- * @see #getURI(int)
- * @see #getLocalName(int)
- * @see #getQName(int)
- * @see #getType(int)
- * @see #getValue(int)
- */
- public abstract int getLength ();
-
-
- /**
- * Look up an attribute's Namespace URI by index.
- *
- * @param index The attribute index (zero-based).
- * @return The Namespace URI, or the empty string if none
- * is available, or null if the index is out of
- * range.
- * @see #getLength
- */
- public abstract String getURI (int index);
-
-
- /**
- * Look up an attribute's local name by index.
- *
- * @param index The attribute index (zero-based).
- * @return The local name, or the empty string if Namespace
- * processing is not being performed, or null
- * if the index is out of range.
- * @see #getLength
- */
- public abstract String getLocalName (int index);
-
-
- /**
- * Look up an attribute's XML 1.0 qualified name by index.
- *
- * @param index The attribute index (zero-based).
- * @return The XML 1.0 qualified name, or the empty string
- * if none is available, or null if the index
- * is out of range.
- * @see #getLength
- */
- public abstract String getQName (int index);
-
-
- /**
- * Look up an attribute's type by index.
- *
- * <p>The attribute type is one of the strings "CDATA", "ID",
- * "IDREF", "IDREFS", "NMTOKEN", "NMTOKENS", "ENTITY", "ENTITIES",
- * or "NOTATION" (always in upper case).</p>
- *
- * <p>If the parser has not read a declaration for the attribute,
- * or if the parser does not report attribute types, then it must
- * return the value "CDATA" as stated in the XML 1.0 Recommentation
- * (clause 3.3.3, "Attribute-Value Normalization").</p>
- *
- * <p>For an enumerated attribute that is not a notation, the
- * parser will report the type as "NMTOKEN".</p>
- *
- * @param index The attribute index (zero-based).
- * @return The attribute's type as a string, or null if the
- * index is out of range.
- * @see #getLength
- */
- public abstract String getType (int index);
-
-
- /**
- * Look up an attribute's value by index.
- *
- * <p>If the attribute value is a list of tokens (IDREFS,
- * ENTITIES, or NMTOKENS), the tokens will be concatenated
- * into a single string with each token separated by a
- * single space.</p>
- *
- * @param index The attribute index (zero-based).
- * @return The attribute's value as a string, or null if the
- * index is out of range.
- * @see #getLength
- */
- public abstract String getValue (int index);
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Name-based query.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Look up the index of an attribute by Namespace name.
- *
- * @param uri The Namespace URI, or the empty string if
- * the name has no Namespace URI.
- * @param localName The attribute's local name.
- * @return The index of the attribute, or -1 if it does not
- * appear in the list.
- */
- public int getIndex (String uri, String localPart);
-
-
- /**
- * Look up the index of an attribute by XML 1.0 qualified name.
- *
- * @param qName The qualified (prefixed) name.
- * @return The index of the attribute, or -1 if it does not
- * appear in the list.
- */
- public int getIndex (String qName);
-
-
- /**
- * Look up an attribute's type by Namespace name.
- *
- * <p>See {@link #getType(int) getType(int)} for a description
- * of the possible types.</p>
- *
- * @param uri The Namespace URI, or the empty String if the
- * name has no Namespace URI.
- * @param localName The local name of the attribute.
- * @return The attribute type as a string, or null if the
- * attribute is not in the list or if Namespace
- * processing is not being performed.
- */
- public abstract String getType (String uri, String localName);
-
-
- /**
- * Look up an attribute's type by XML 1.0 qualified name.
- *
- * <p>See {@link #getType(int) getType(int)} for a description
- * of the possible types.</p>
- *
- * @param qName The XML 1.0 qualified name.
- * @return The attribute type as a string, or null if the
- * attribute is not in the list or if qualified names
- * are not available.
- */
- public abstract String getType (String qName);
-
-
- /**
- * Look up an attribute's value by Namespace name.
- *
- * <p>See {@link #getValue(int) getValue(int)} for a description
- * of the possible values.</p>
- *
- * @param uri The Namespace URI, or the empty String if the
- * name has no Namespace URI.
- * @param localName The local name of the attribute.
- * @return The attribute value as a string, or null if the
- * attribute is not in the list.
- */
- public abstract String getValue (String uri, String localName);
-
-
- /**
- * Look up an attribute's value by XML 1.0 qualified name.
- *
- * <p>See {@link #getValue(int) getValue(int)} for a description
- * of the possible values.</p>
- *
- * @param qName The XML 1.0 qualified name.
- * @return The attribute value as a string, or null if the
- * attribute is not in the list or if qualified names
- * are not available.
- */
- public abstract String getValue (String qName);
-
-}
-
-// end of Attributes.java
+// Attributes.java - attribute list with Namespace support +// http://www.saxproject.org +// Written by David Megginson +// NO WARRANTY! This class is in the public domain. + +// $Id: Attributes.java,v 1.5.2.4 2002/01/29 21:34:14 dbrownell Exp $ + + +package org.xml.sax; + + +/** + * Interface for a list of XML attributes. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>This interface allows access to a list of attributes in + * three different ways:</p> + * + * <ol> + * <li>by attribute index;</li> + * <li>by Namespace-qualified name; or</li> + * <li>by qualified (prefixed) name.</li> + * </ol> + * + * <p>The list will not contain attributes that were declared + * #IMPLIED but not specified in the start tag. It will also not + * contain attributes used as Namespace declarations (xmlns*) unless + * the <code>http://xml.org/sax/features/namespace-prefixes</code> + * feature is set to <var>true</var> (it is <var>false</var> by + * default). + * Because SAX2 conforms to the "Namespaces in XML" specification, + * it does not give namespace declaration attributes a namespace URI. + * Some other W3C specifications are in conflict with that, expecting + * these declarations to be in a namespace. + * Handler code may need to resolve that conflict. + * </p> + * + * <p>If the namespace-prefixes feature (see above) is <var>false</var>, + * access by qualified name may not be available; if the + * <code>http://xml.org/sax/features/namespaces</code> + * feature is <var>false</var>, access by Namespace-qualified names + * may not be available.</p> + * + * <p>This interface replaces the now-deprecated SAX1 {@link + * org.xml.sax.AttributeList AttributeList} interface, which does not + * contain Namespace support. In addition to Namespace support, it + * adds the <var>getIndex</var> methods (below).</p> + * + * <p>The order of attributes in the list is unspecified, and will + * vary from implementation to implementation.</p> + * + * @since SAX 2.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + * @see org.xml.sax.helpers.AttributesImpl + * @see org.xml.sax.ext.DeclHandler#attributeDecl + */ +public interface Attributes +{ + + + //////////////////////////////////////////////////////////////////// + // Indexed access. + //////////////////////////////////////////////////////////////////// + + + /** + * Return the number of attributes in the list. + * + * <p>Once you know the number of attributes, you can iterate + * through the list.</p> + * + * @return The number of attributes in the list. + * @see #getURI(int) + * @see #getLocalName(int) + * @see #getQName(int) + * @see #getType(int) + * @see #getValue(int) + */ + public abstract int getLength (); + + + /** + * Look up an attribute's Namespace URI by index. + * + * @param index The attribute index (zero-based). + * @return The Namespace URI, or the empty string if none + * is available, or null if the index is out of + * range. + * @see #getLength + */ + public abstract String getURI (int index); + + + /** + * Look up an attribute's local name by index. + * + * @param index The attribute index (zero-based). + * @return The local name, or the empty string if Namespace + * processing is not being performed, or null + * if the index is out of range. + * @see #getLength + */ + public abstract String getLocalName (int index); + + + /** + * Look up an attribute's XML 1.0 qualified name by index. + * + * @param index The attribute index (zero-based). + * @return The XML 1.0 qualified name, or the empty string + * if none is available, or null if the index + * is out of range. + * @see #getLength + */ + public abstract String getQName (int index); + + + /** + * Look up an attribute's type by index. + * + * <p>The attribute type is one of the strings "CDATA", "ID", + * "IDREF", "IDREFS", "NMTOKEN", "NMTOKENS", "ENTITY", "ENTITIES", + * or "NOTATION" (always in upper case).</p> + * + * <p>If the parser has not read a declaration for the attribute, + * or if the parser does not report attribute types, then it must + * return the value "CDATA" as stated in the XML 1.0 Recommentation + * (clause 3.3.3, "Attribute-Value Normalization").</p> + * + * <p>For an enumerated attribute that is not a notation, the + * parser will report the type as "NMTOKEN".</p> + * + * @param index The attribute index (zero-based). + * @return The attribute's type as a string, or null if the + * index is out of range. + * @see #getLength + */ + public abstract String getType (int index); + + + /** + * Look up an attribute's value by index. + * + * <p>If the attribute value is a list of tokens (IDREFS, + * ENTITIES, or NMTOKENS), the tokens will be concatenated + * into a single string with each token separated by a + * single space.</p> + * + * @param index The attribute index (zero-based). + * @return The attribute's value as a string, or null if the + * index is out of range. + * @see #getLength + */ + public abstract String getValue (int index); + + + + //////////////////////////////////////////////////////////////////// + // Name-based query. + //////////////////////////////////////////////////////////////////// + + + /** + * Look up the index of an attribute by Namespace name. + * + * @param uri The Namespace URI, or the empty string if + * the name has no Namespace URI. + * @param localName The attribute's local name. + * @return The index of the attribute, or -1 if it does not + * appear in the list. + */ + public int getIndex (String uri, String localName); + + + /** + * Look up the index of an attribute by XML 1.0 qualified name. + * + * @param qName The qualified (prefixed) name. + * @return The index of the attribute, or -1 if it does not + * appear in the list. + */ + public int getIndex (String qName); + + + /** + * Look up an attribute's type by Namespace name. + * + * <p>See {@link #getType(int) getType(int)} for a description + * of the possible types.</p> + * + * @param uri The Namespace URI, or the empty String if the + * name has no Namespace URI. + * @param localName The local name of the attribute. + * @return The attribute type as a string, or null if the + * attribute is not in the list or if Namespace + * processing is not being performed. + */ + public abstract String getType (String uri, String localName); + + + /** + * Look up an attribute's type by XML 1.0 qualified name. + * + * <p>See {@link #getType(int) getType(int)} for a description + * of the possible types.</p> + * + * @param qName The XML 1.0 qualified name. + * @return The attribute type as a string, or null if the + * attribute is not in the list or if qualified names + * are not available. + */ + public abstract String getType (String qName); + + + /** + * Look up an attribute's value by Namespace name. + * + * <p>See {@link #getValue(int) getValue(int)} for a description + * of the possible values.</p> + * + * @param uri The Namespace URI, or the empty String if the + * name has no Namespace URI. + * @param localName The local name of the attribute. + * @return The attribute value as a string, or null if the + * attribute is not in the list. + */ + public abstract String getValue (String uri, String localName); + + + /** + * Look up an attribute's value by XML 1.0 qualified name. + * + * <p>See {@link #getValue(int) getValue(int)} for a description + * of the possible values.</p> + * + * @param qName The XML 1.0 qualified name. + * @return The attribute value as a string, or null if the + * attribute is not in the list or if qualified names + * are not available. + */ + public abstract String getValue (String qName); + +} + +// end of Attributes.java diff --git a/libjava/org/xml/sax/ContentHandler.java b/libjava/org/xml/sax/ContentHandler.java index 0d84d0eae99..06462c51eec 100644 --- a/libjava/org/xml/sax/ContentHandler.java +++ b/libjava/org/xml/sax/ContentHandler.java @@ -1,374 +1,408 @@ -// ContentHandler.java - handle main document content.
-// Written by David Megginson, sax@megginson.com
-// NO WARRANTY! This class is in the public domain.
-
-// $Id: ContentHandler.java,v 1.1 2000/10/02 02:43:16 sboag Exp $
-
-package org.xml.sax;
-
-
-/**
- * Receive notification of the logical content of a document.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>This is the main interface that most SAX applications
- * implement: if the application needs to be informed of basic parsing
- * events, it implements this interface and registers an instance with
- * the SAX parser using the {@link org.xml.sax.XMLReader#setContentHandler
- * setContentHandler} method. The parser uses the instance to report
- * basic document-related events like the start and end of elements
- * and character data.</p>
- *
- * <p>The order of events in this interface is very important, and
- * mirrors the order of information in the document itself. For
- * example, all of an element's content (character data, processing
- * instructions, and/or subelements) will appear, in order, between
- * the startElement event and the corresponding endElement event.</p>
- *
- * <p>This interface is similar to the now-deprecated SAX 1.0
- * DocumentHandler interface, but it adds support for Namespaces
- * and for reporting skipped entities (in non-validating XML
- * processors).</p>
- *
- * <p>Implementors should note that there is also a Java class
- * {@link java.net.ContentHandler ContentHandler} in the java.net
- * package; that means that it's probably a bad idea to do</p>
- *
- * <blockquote>
- * import java.net.*;
- * import org.xml.sax.*;
- * </blockquote>
- *
- * <p>In fact, "import ...*" is usually a sign of sloppy programming
- * anyway, so the user should consider this a feature rather than a
- * bug.</p>
- *
- * @since SAX 2.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.XMLReader
- * @see org.xml.sax.DTDHandler
- * @see org.xml.sax.ErrorHandler
- */
-public interface ContentHandler
-{
-
- /**
- * Receive an object for locating the origin of SAX document events.
- *
- * <p>SAX parsers are strongly encouraged (though not absolutely
- * required) to supply a locator: if it does so, it must supply
- * the locator to the application by invoking this method before
- * invoking any of the other methods in the ContentHandler
- * interface.</p>
- *
- * <p>The locator allows the application to determine the end
- * position of any document-related event, even if the parser is
- * not reporting an error. Typically, the application will
- * use this information for reporting its own errors (such as
- * character content that does not match an application's
- * business rules). The information returned by the locator
- * is probably not sufficient for use with a search engine.</p>
- *
- * <p>Note that the locator will return correct information only
- * during the invocation of the events in this interface. The
- * application should not attempt to use it at any other time.</p>
- *
- * @param locator An object that can return the location of
- * any SAX document event.
- * @see org.xml.sax.Locator
- */
- public void setDocumentLocator (Locator locator);
-
-
- /**
- * Receive notification of the beginning of a document.
- *
- * <p>The SAX parser will invoke this method only once, before any
- * other methods in this interface or in {@link org.xml.sax.DTDHandler
- * DTDHandler} (except for {@link #setDocumentLocator
- * setDocumentLocator}).</p>
- *
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see #endDocument
- */
- public void startDocument ()
- throws SAXException;
-
-
- /**
- * Receive notification of the end of a document.
- *
- * <p>The SAX parser will invoke this method only once, and it will
- * be the last method invoked during the parse. The parser shall
- * not invoke this method until it has either abandoned parsing
- * (because of an unrecoverable error) or reached the end of
- * input.</p>
- *
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see #startDocument
- */
- public void endDocument()
- throws SAXException;
-
-
- /**
- * Begin the scope of a prefix-URI Namespace mapping.
- *
- * <p>The information from this event is not necessary for
- * normal Namespace processing: the SAX XML reader will
- * automatically replace prefixes for element and attribute
- * names when the <code>http://xml.org/sax/features/namespaces</code>
- * feature is <var>true</var> (the default).</p>
- *
- * <p>There are cases, however, when applications need to
- * use prefixes in character data or in attribute values,
- * where they cannot safely be expanded automatically; the
- * start/endPrefixMapping event supplies the information
- * to the application to expand prefixes in those contexts
- * itself, if necessary.</p>
- *
- * <p>Note that start/endPrefixMapping events are not
- * guaranteed to be properly nested relative to each-other:
- * all startPrefixMapping events will occur before the
- * corresponding {@link #startElement startElement} event,
- * and all {@link #endPrefixMapping endPrefixMapping}
- * events will occur after the corresponding {@link #endElement
- * endElement} event, but their order is not otherwise
- * guaranteed.</p>
- *
- * <p>There should never be start/endPrefixMapping events for the
- * "xml" prefix, since it is predeclared and immutable.</p>
- *
- * @param prefix The Namespace prefix being declared.
- * @param uri The Namespace URI the prefix is mapped to.
- * @exception org.xml.sax.SAXException The client may throw
- * an exception during processing.
- * @see #endPrefixMapping
- * @see #startElement
- */
- public void startPrefixMapping (String prefix, String uri)
- throws SAXException;
-
-
- /**
- * End the scope of a prefix-URI mapping.
- *
- * <p>See {@link #startPrefixMapping startPrefixMapping} for
- * details. This event will always occur after the corresponding
- * {@link #endElement endElement} event, but the order of
- * {@link #endPrefixMapping endPrefixMapping} events is not otherwise
- * guaranteed.</p>
- *
- * @param prefix The prefix that was being mapping.
- * @exception org.xml.sax.SAXException The client may throw
- * an exception during processing.
- * @see #startPrefixMapping
- * @see #endElement
- */
- public void endPrefixMapping (String prefix)
- throws SAXException;
-
-
- /**
- * Receive notification of the beginning of an element.
- *
- * <p>The Parser will invoke this method at the beginning of every
- * element in the XML document; there will be a corresponding
- * {@link #endElement endElement} event for every startElement event
- * (even when the element is empty). All of the element's content will be
- * reported, in order, before the corresponding endElement
- * event.</p>
- *
- * <p>This event allows up to three name components for each
- * element:</p>
- *
- * <ol>
- * <li>the Namespace URI;</li>
- * <li>the local name; and</li>
- * <li>the qualified (prefixed) name.</li>
- * </ol>
- *
- * <p>Any or all of these may be provided, depending on the
- * values of the <var>http://xml.org/sax/features/namespaces</var>
- * and the <var>http://xml.org/sax/features/namespace-prefixes</var>
- * properties:</p>
- *
- * <ul>
- * <li>the Namespace URI and local name are required when
- * the namespaces property is <var>true</var> (the default), and are
- * optional when the namespaces property is <var>false</var> (if one is
- * specified, both must be);</li>
- * <li>the qualified name is required when the namespace-prefixes property
- * is <var>true</var>, and is optional when the namespace-prefixes property
- * is <var>false</var> (the default).</li>
- * </ul>
- *
- * <p>Note that the attribute list provided will contain only
- * attributes with explicit values (specified or defaulted):
- * #IMPLIED attributes will be omitted. The attribute list
- * will contain attributes used for Namespace declarations
- * (xmlns* attributes) only if the
- * <code>http://xml.org/sax/features/namespace-prefixes</code>
- * property is true (it is false by default, and support for a
- * true value is optional).</p>
- *
- * @param uri The Namespace URI, or the empty string if the
- * element has no Namespace URI or if Namespace
- * processing is not being performed.
- * @param localName The local name (without prefix), or the
- * empty string if Namespace processing is not being
- * performed.
- * @param qName The qualified name (with prefix), or the
- * empty string if qualified names are not available.
- * @param atts The attributes attached to the element. If
- * there are no attributes, it shall be an empty
- * Attributes object.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see #endElement
- * @see org.xml.sax.Attributes
- */
- public void startElement (String namespaceURI, String localName,
- String qName, Attributes atts)
- throws SAXException;
-
-
- /**
- * Receive notification of the end of an element.
- *
- * <p>The SAX parser will invoke this method at the end of every
- * element in the XML document; there will be a corresponding
- * {@link #startElement startElement} event for every endElement
- * event (even when the element is empty).</p>
- *
- * <p>For information on the names, see startElement.</p>
- *
- * @param uri The Namespace URI, or the empty string if the
- * element has no Namespace URI or if Namespace
- * processing is not being performed.
- * @param localName The local name (without prefix), or the
- * empty string if Namespace processing is not being
- * performed.
- * @param qName The qualified XML 1.0 name (with prefix), or the
- * empty string if qualified names are not available.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- */
- public void endElement (String namespaceURI, String localName,
- String qName)
- throws SAXException;
-
-
- /**
- * Receive notification of character data.
- *
- * <p>The Parser will call this method to report each chunk of
- * character data. SAX parsers may return all contiguous character
- * data in a single chunk, or they may split it into several
- * chunks; however, all of the characters in any single event
- * must come from the same external entity so that the Locator
- * provides useful information.</p>
- *
- * <p>The application must not attempt to read from the array
- * outside of the specified range.</p>
- *
- * <p>Note that some parsers will report whitespace in element
- * content using the {@link #ignorableWhitespace ignorableWhitespace}
- * method rather than this one (validating parsers <em>must</em>
- * do so).</p>
- *
- * @param ch The characters from the XML document.
- * @param start The start position in the array.
- * @param length The number of characters to read from the array.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see #ignorableWhitespace
- * @see org.xml.sax.Locator
- */
- public void characters (char ch[], int start, int length)
- throws SAXException;
-
-
- /**
- * Receive notification of ignorable whitespace in element content.
- *
- * <p>Validating Parsers must use this method to report each chunk
- * of whitespace in element content (see the W3C XML 1.0 recommendation,
- * section 2.10): non-validating parsers may also use this method
- * if they are capable of parsing and using content models.</p>
- *
- * <p>SAX parsers may return all contiguous whitespace in a single
- * chunk, or they may split it into several chunks; however, all of
- * the characters in any single event must come from the same
- * external entity, so that the Locator provides useful
- * information.</p>
- *
- * <p>The application must not attempt to read from the array
- * outside of the specified range.</p>
- *
- * @param ch The characters from the XML document.
- * @param start The start position in the array.
- * @param length The number of characters to read from the array.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see #characters
- */
- public void ignorableWhitespace (char ch[], int start, int length)
- throws SAXException;
-
-
- /**
- * Receive notification of a processing instruction.
- *
- * <p>The Parser will invoke this method once for each processing
- * instruction found: note that processing instructions may occur
- * before or after the main document element.</p>
- *
- * <p>A SAX parser must never report an XML declaration (XML 1.0,
- * section 2.8) or a text declaration (XML 1.0, section 4.3.1)
- * using this method.</p>
- *
- * @param target The processing instruction target.
- * @param data The processing instruction data, or null if
- * none was supplied. The data does not include any
- * whitespace separating it from the target.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- */
- public void processingInstruction (String target, String data)
- throws SAXException;
-
-
- /**
- * Receive notification of a skipped entity.
- *
- * <p>The Parser will invoke this method once for each entity
- * skipped. Non-validating processors may skip entities if they
- * have not seen the declarations (because, for example, the
- * entity was declared in an external DTD subset). All processors
- * may skip external entities, depending on the values of the
- * <code>http://xml.org/sax/features/external-general-entities</code>
- * and the
- * <code>http://xml.org/sax/features/external-parameter-entities</code>
- * properties.</p>
- *
- * @param name The name of the skipped entity. If it is a
- * parameter entity, the name will begin with '%', and if
- * it is the external DTD subset, it will be the string
- * "[dtd]".
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- */
- public void skippedEntity (String name)
- throws SAXException;
-}
-
-// end of ContentHandler.java
+// ContentHandler.java - handle main document content. +// http://www.saxproject.org +// Written by David Megginson +// NO WARRANTY! This class is in the public domain. + +// $Id: ContentHandler.java,v 1.4.2.9 2002/01/29 21:34:14 dbrownell Exp $ + +package org.xml.sax; + + +/** + * Receive notification of the logical content of a document. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>This is the main interface that most SAX applications + * implement: if the application needs to be informed of basic parsing + * events, it implements this interface and registers an instance with + * the SAX parser using the {@link org.xml.sax.XMLReader#setContentHandler + * setContentHandler} method. The parser uses the instance to report + * basic document-related events like the start and end of elements + * and character data.</p> + * + * <p>The order of events in this interface is very important, and + * mirrors the order of information in the document itself. For + * example, all of an element's content (character data, processing + * instructions, and/or subelements) will appear, in order, between + * the startElement event and the corresponding endElement event.</p> + * + * <p>This interface is similar to the now-deprecated SAX 1.0 + * DocumentHandler interface, but it adds support for Namespaces + * and for reporting skipped entities (in non-validating XML + * processors).</p> + * + * <p>Implementors should note that there is also a Java class + * {@link java.net.ContentHandler ContentHandler} in the java.net + * package; that means that it's probably a bad idea to do</p> + * + * <blockquote> + * import java.net.*; + * import org.xml.sax.*; + * </blockquote> + * + * <p>In fact, "import ...*" is usually a sign of sloppy programming + * anyway, so the user should consider this a feature rather than a + * bug.</p> + * + * @since SAX 2.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + * @see org.xml.sax.XMLReader + * @see org.xml.sax.DTDHandler + * @see org.xml.sax.ErrorHandler + */ +public interface ContentHandler +{ + + /** + * Receive an object for locating the origin of SAX document events. + * + * <p>SAX parsers are strongly encouraged (though not absolutely + * required) to supply a locator: if it does so, it must supply + * the locator to the application by invoking this method before + * invoking any of the other methods in the ContentHandler + * interface.</p> + * + * <p>The locator allows the application to determine the end + * position of any document-related event, even if the parser is + * not reporting an error. Typically, the application will + * use this information for reporting its own errors (such as + * character content that does not match an application's + * business rules). The information returned by the locator + * is probably not sufficient for use with a search engine.</p> + * + * <p>Note that the locator will return correct information only + * during the invocation of the events in this interface. The + * application should not attempt to use it at any other time.</p> + * + * @param locator An object that can return the location of + * any SAX document event. + * @see org.xml.sax.Locator + */ + public void setDocumentLocator (Locator locator); + + + /** + * Receive notification of the beginning of a document. + * + * <p>The SAX parser will invoke this method only once, before any + * other event callbacks (except for {@link #setDocumentLocator + * setDocumentLocator}).</p> + * + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see #endDocument + */ + public void startDocument () + throws SAXException; + + + /** + * Receive notification of the end of a document. + * + * <p>The SAX parser will invoke this method only once, and it will + * be the last method invoked during the parse. The parser shall + * not invoke this method until it has either abandoned parsing + * (because of an unrecoverable error) or reached the end of + * input.</p> + * + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see #startDocument + */ + public void endDocument() + throws SAXException; + + + /** + * Begin the scope of a prefix-URI Namespace mapping. + * + * <p>The information from this event is not necessary for + * normal Namespace processing: the SAX XML reader will + * automatically replace prefixes for element and attribute + * names when the <code>http://xml.org/sax/features/namespaces</code> + * feature is <var>true</var> (the default).</p> + * + * <p>There are cases, however, when applications need to + * use prefixes in character data or in attribute values, + * where they cannot safely be expanded automatically; the + * start/endPrefixMapping event supplies the information + * to the application to expand prefixes in those contexts + * itself, if necessary.</p> + * + * <p>Note that start/endPrefixMapping events are not + * guaranteed to be properly nested relative to each other: + * all startPrefixMapping events will occur immediately before the + * corresponding {@link #startElement startElement} event, + * and all {@link #endPrefixMapping endPrefixMapping} + * events will occur immediately after the corresponding + * {@link #endElement endElement} event, + * but their order is not otherwise + * guaranteed.</p> + * + * <p>There should never be start/endPrefixMapping events for the + * "xml" prefix, since it is predeclared and immutable.</p> + * + * @param prefix The Namespace prefix being declared. + * An empty string is used for the default element namespace, + * which has no prefix. + * @param uri The Namespace URI the prefix is mapped to. + * @exception org.xml.sax.SAXException The client may throw + * an exception during processing. + * @see #endPrefixMapping + * @see #startElement + */ + public void startPrefixMapping (String prefix, String uri) + throws SAXException; + + + /** + * End the scope of a prefix-URI mapping. + * + * <p>See {@link #startPrefixMapping startPrefixMapping} for + * details. These events will always occur immediately after the + * corresponding {@link #endElement endElement} event, but the order of + * {@link #endPrefixMapping endPrefixMapping} events is not otherwise + * guaranteed.</p> + * + * @param prefix The prefix that was being mapping. + * This is the empty string when a default mapping scope ends. + * @exception org.xml.sax.SAXException The client may throw + * an exception during processing. + * @see #startPrefixMapping + * @see #endElement + */ + public void endPrefixMapping (String prefix) + throws SAXException; + + + /** + * Receive notification of the beginning of an element. + * + * <p>The Parser will invoke this method at the beginning of every + * element in the XML document; there will be a corresponding + * {@link #endElement endElement} event for every startElement event + * (even when the element is empty). All of the element's content will be + * reported, in order, before the corresponding endElement + * event.</p> + * + * <p>This event allows up to three name components for each + * element:</p> + * + * <ol> + * <li>the Namespace URI;</li> + * <li>the local name; and</li> + * <li>the qualified (prefixed) name.</li> + * </ol> + * + * <p>Any or all of these may be provided, depending on the + * values of the <var>http://xml.org/sax/features/namespaces</var> + * and the <var>http://xml.org/sax/features/namespace-prefixes</var> + * properties:</p> + * + * <ul> + * <li>the Namespace URI and local name are required when + * the namespaces property is <var>true</var> (the default), and are + * optional when the namespaces property is <var>false</var> (if one is + * specified, both must be);</li> + * <li>the qualified name is required when the namespace-prefixes property + * is <var>true</var>, and is optional when the namespace-prefixes property + * is <var>false</var> (the default).</li> + * </ul> + * + * <p>Note that the attribute list provided will contain only + * attributes with explicit values (specified or defaulted): + * #IMPLIED attributes will be omitted. The attribute list + * will contain attributes used for Namespace declarations + * (xmlns* attributes) only if the + * <code>http://xml.org/sax/features/namespace-prefixes</code> + * property is true (it is false by default, and support for a + * true value is optional).</p> + * + * <p>Like {@link #characters characters()}, attribute values may have + * characters that need more than one <code>char</code> value. </p> + * + * @param uri The Namespace URI, or the empty string if the + * element has no Namespace URI or if Namespace + * processing is not being performed. + * @param localName The local name (without prefix), or the + * empty string if Namespace processing is not being + * performed. + * @param qName The qualified name (with prefix), or the + * empty string if qualified names are not available. + * @param atts The attributes attached to the element. If + * there are no attributes, it shall be an empty + * Attributes object. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see #endElement + * @see org.xml.sax.Attributes + */ + public void startElement (String uri, String localName, + String qName, Attributes atts) + throws SAXException; + + + /** + * Receive notification of the end of an element. + * + * <p>The SAX parser will invoke this method at the end of every + * element in the XML document; there will be a corresponding + * {@link #startElement startElement} event for every endElement + * event (even when the element is empty).</p> + * + * <p>For information on the names, see startElement.</p> + * + * @param uri The Namespace URI, or the empty string if the + * element has no Namespace URI or if Namespace + * processing is not being performed. + * @param localName The local name (without prefix), or the + * empty string if Namespace processing is not being + * performed. + * @param qName The qualified XML 1.0 name (with prefix), or the + * empty string if qualified names are not available. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + */ + public void endElement (String uri, String localName, + String qName) + throws SAXException; + + + /** + * Receive notification of character data. + * + * <p>The Parser will call this method to report each chunk of + * character data. SAX parsers may return all contiguous character + * data in a single chunk, or they may split it into several + * chunks; however, all of the characters in any single event + * must come from the same external entity so that the Locator + * provides useful information.</p> + * + * <p>The application must not attempt to read from the array + * outside of the specified range.</p> + * + * <p>Individual characters may consist of more than one Java + * <code>char</code> value. There are two important cases where this + * happens, because characters can't be represented in just sixteen bits. + * In one case, characters are represented in a <em>Surrogate Pair</em>, + * using two special Unicode values. Such characters are in the so-called + * "Astral Planes", with a code point above U+FFFF. A second case involves + * composite characters, such as a base character combining with one or + * more accent characters. </p> + * + * <p> Your code should not assume that algorithms using + * <code>char</code>-at-a-time idioms will be working in character + * units; in some cases they will split characters. This is relevant + * wherever XML permits arbitrary characters, such as attribute values, + * processing instruction data, and comments as well as in data reported + * from this method. It's also generally relevant whenever Java code + * manipulates internationalized text; the issue isn't unique to XML.</p> + * + * <p>Note that some parsers will report whitespace in element + * content using the {@link #ignorableWhitespace ignorableWhitespace} + * method rather than this one (validating parsers <em>must</em> + * do so).</p> + * + * @param ch The characters from the XML document. + * @param start The start position in the array. + * @param length The number of characters to read from the array. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see #ignorableWhitespace + * @see org.xml.sax.Locator + */ + public void characters (char ch[], int start, int length) + throws SAXException; + + + /** + * Receive notification of ignorable whitespace in element content. + * + * <p>Validating Parsers must use this method to report each chunk + * of whitespace in element content (see the W3C XML 1.0 recommendation, + * section 2.10): non-validating parsers may also use this method + * if they are capable of parsing and using content models.</p> + * + * <p>SAX parsers may return all contiguous whitespace in a single + * chunk, or they may split it into several chunks; however, all of + * the characters in any single event must come from the same + * external entity, so that the Locator provides useful + * information.</p> + * + * <p>The application must not attempt to read from the array + * outside of the specified range.</p> + * + * @param ch The characters from the XML document. + * @param start The start position in the array. + * @param length The number of characters to read from the array. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see #characters + */ + public void ignorableWhitespace (char ch[], int start, int length) + throws SAXException; + + + /** + * Receive notification of a processing instruction. + * + * <p>The Parser will invoke this method once for each processing + * instruction found: note that processing instructions may occur + * before or after the main document element.</p> + * + * <p>A SAX parser must never report an XML declaration (XML 1.0, + * section 2.8) or a text declaration (XML 1.0, section 4.3.1) + * using this method.</p> + * + * <p>Like {@link #characters characters()}, processing instruction + * data may have characters that need more than one <code>char</code> + * value. </p> + * + * @param target The processing instruction target. + * @param data The processing instruction data, or null if + * none was supplied. The data does not include any + * whitespace separating it from the target. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + */ + public void processingInstruction (String target, String data) + throws SAXException; + + + /** + * Receive notification of a skipped entity. + * This is not called for entity references within markup constructs + * such as element start tags or markup declarations. (The XML + * recommendation requires reporting skipped external entities. + * SAX also reports internal entity expansion/non-expansion, except + * within markup constructs.) + * + * <p>The Parser will invoke this method each time the entity is + * skipped. Non-validating processors may skip entities if they + * have not seen the declarations (because, for example, the + * entity was declared in an external DTD subset). All processors + * may skip external entities, depending on the values of the + * <code>http://xml.org/sax/features/external-general-entities</code> + * and the + * <code>http://xml.org/sax/features/external-parameter-entities</code> + * properties.</p> + * + * @param name The name of the skipped entity. If it is a + * parameter entity, the name will begin with '%', and if + * it is the external DTD subset, it will be the string + * "[dtd]". + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + */ + public void skippedEntity (String name) + throws SAXException; +} + +// end of ContentHandler.java diff --git a/libjava/org/xml/sax/DTDHandler.java b/libjava/org/xml/sax/DTDHandler.java index 509a0069ba8..ee84bb24c45 100644 --- a/libjava/org/xml/sax/DTDHandler.java +++ b/libjava/org/xml/sax/DTDHandler.java @@ -1,108 +1,117 @@ -// SAX DTD handler.
-// No warranty; no copyright -- use this as you will.
-// $Id: DTDHandler.java,v 1.1 2000/10/02 02:43:17 sboag Exp $
-
-package org.xml.sax;
-
-/**
- * Receive notification of basic DTD-related events.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>If a SAX application needs information about notations and
- * unparsed entities, then the application implements this
- * interface and registers an instance with the SAX parser using
- * the parser's setDTDHandler method. The parser uses the
- * instance to report notation and unparsed entity declarations to
- * the application.</p>
- *
- * <p>Note that this interface includes only those DTD events that
- * the XML recommendation <em>requires</em> processors to report:
- * notation and unparsed entity declarations.</p>
- *
- * <p>The SAX parser may report these events in any order, regardless
- * of the order in which the notations and unparsed entities were
- * declared; however, all DTD events must be reported after the
- * document handler's startDocument event, and before the first
- * startElement event.</p>
- *
- * <p>It is up to the application to store the information for
- * future use (perhaps in a hash table or object tree).
- * If the application encounters attributes of type "NOTATION",
- * "ENTITY", or "ENTITIES", it can use the information that it
- * obtained through this interface to find the entity and/or
- * notation corresponding with the attribute value.</p>
- *
- * @since SAX 1.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.Parser#setDTDHandler
- * @see org.xml.sax.HandlerBase
- */
-public interface DTDHandler {
-
-
- /**
- * Receive notification of a notation declaration event.
- *
- * <p>It is up to the application to record the notation for later
- * reference, if necessary.</p>
- *
- * <p>At least one of publicId and systemId must be non-null.
- * If a system identifier is present, and it is a URL, the SAX
- * parser must resolve it fully before passing it to the
- * application through this event.</p>
- *
- * <p>There is no guarantee that the notation declaration will be
- * reported before any unparsed entities that use it.</p>
- *
- * @param name The notation name.
- * @param publicId The notation's public identifier, or null if
- * none was given.
- * @param systemId The notation's system identifier, or null if
- * none was given.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see #unparsedEntityDecl
- * @see org.xml.sax.AttributeList
- */
- public abstract void notationDecl (String name,
- String publicId,
- String systemId)
- throws SAXException;
-
-
- /**
- * Receive notification of an unparsed entity declaration event.
- *
- * <p>Note that the notation name corresponds to a notation
- * reported by the {@link #notationDecl notationDecl} event.
- * It is up to the application to record the entity for later
- * reference, if necessary.</p>
- *
- * <p>If the system identifier is a URL, the parser must resolve it
- * fully before passing it to the application.</p>
- *
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @param name The unparsed entity's name.
- * @param publicId The entity's public identifier, or null if none
- * was given.
- * @param systemId The entity's system identifier.
- * @param notation name The name of the associated notation.
- * @see #notationDecl
- * @see org.xml.sax.AttributeList
- */
- public abstract void unparsedEntityDecl (String name,
- String publicId,
- String systemId,
- String notationName)
- throws SAXException;
-
-}
-
-// end of DTDHandler.java
+// SAX DTD handler. +// http://www.saxproject.org +// No warranty; no copyright -- use this as you will. +// $Id: DTDHandler.java,v 1.5.2.4 2002/01/29 21:34:14 dbrownell Exp $ + +package org.xml.sax; + +/** + * Receive notification of basic DTD-related events. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>If a SAX application needs information about notations and + * unparsed entities, then the application implements this + * interface and registers an instance with the SAX parser using + * the parser's setDTDHandler method. The parser uses the + * instance to report notation and unparsed entity declarations to + * the application.</p> + * + * <p>Note that this interface includes only those DTD events that + * the XML recommendation <em>requires</em> processors to report: + * notation and unparsed entity declarations.</p> + * + * <p>The SAX parser may report these events in any order, regardless + * of the order in which the notations and unparsed entities were + * declared; however, all DTD events must be reported after the + * document handler's startDocument event, and before the first + * startElement event. + * (If the {@link org.xml.sax.ext.LexicalHandler LexicalHandler} is + * used, these events must also be reported before the endDTD event.) + * </p> + * + * <p>It is up to the application to store the information for + * future use (perhaps in a hash table or object tree). + * If the application encounters attributes of type "NOTATION", + * "ENTITY", or "ENTITIES", it can use the information that it + * obtained through this interface to find the entity and/or + * notation corresponding with the attribute value.</p> + * + * @since SAX 1.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + * @see org.xml.sax.XMLReader#setDTDHandler + */ +public interface DTDHandler { + + + /** + * Receive notification of a notation declaration event. + * + * <p>It is up to the application to record the notation for later + * reference, if necessary; + * notations may appear as attribute values and in unparsed entity + * declarations, and are sometime used with processing instruction + * target names.</p> + * + * <p>At least one of publicId and systemId must be non-null. + * If a system identifier is present, and it is a URL, the SAX + * parser must resolve it fully before passing it to the + * application through this event.</p> + * + * <p>There is no guarantee that the notation declaration will be + * reported before any unparsed entities that use it.</p> + * + * @param name The notation name. + * @param publicId The notation's public identifier, or null if + * none was given. + * @param systemId The notation's system identifier, or null if + * none was given. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see #unparsedEntityDecl + * @see org.xml.sax.Attributes + */ + public abstract void notationDecl (String name, + String publicId, + String systemId) + throws SAXException; + + + /** + * Receive notification of an unparsed entity declaration event. + * + * <p>Note that the notation name corresponds to a notation + * reported by the {@link #notationDecl notationDecl} event. + * It is up to the application to record the entity for later + * reference, if necessary; + * unparsed entities may appear as attribute values. + * </p> + * + * <p>If the system identifier is a URL, the parser must resolve it + * fully before passing it to the application.</p> + * + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @param name The unparsed entity's name. + * @param publicId The entity's public identifier, or null if none + * was given. + * @param systemId The entity's system identifier. + * @param notationName The name of the associated notation. + * @see #notationDecl + * @see org.xml.sax.Attributes + */ + public abstract void unparsedEntityDecl (String name, + String publicId, + String systemId, + String notationName) + throws SAXException; + +} + +// end of DTDHandler.java diff --git a/libjava/org/xml/sax/DocumentHandler.java b/libjava/org/xml/sax/DocumentHandler.java index be0a189c45b..10c07b2f627 100644 --- a/libjava/org/xml/sax/DocumentHandler.java +++ b/libjava/org/xml/sax/DocumentHandler.java @@ -1,230 +1,232 @@ -// SAX document handler.
-// No warranty; no copyright -- use this as you will.
-// $Id: DocumentHandler.java,v 1.1 2000/10/02 02:43:17 sboag Exp $
-
-package org.xml.sax;
-
-/**
- * Receive notification of general document events.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>This was the main event-handling interface for SAX1; in
- * SAX2, it has been replaced by {@link org.xml.sax.ContentHandler
- * ContentHandler}, which provides Namespace support and reporting
- * of skipped entities. This interface is included in SAX2 only
- * to support legacy SAX1 applications.</p>
- *
- * <p>The order of events in this interface is very important, and
- * mirrors the order of information in the document itself. For
- * example, all of an element's content (character data, processing
- * instructions, and/or subelements) will appear, in order, between
- * the startElement event and the corresponding endElement event.</p>
- *
- * <p>Application writers who do not want to implement the entire
- * interface can derive a class from HandlerBase, which implements
- * the default functionality; parser writers can instantiate
- * HandlerBase to obtain a default handler. The application can find
- * the location of any document event using the Locator interface
- * supplied by the Parser through the setDocumentLocator method.</p>
- *
- * @deprecated This interface has been replaced by the SAX2
- * {@link org.xml.sax.ContentHandler ContentHandler}
- * interface, which includes Namespace support.
- * @since SAX 1.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.Parser#setDocumentHandler
- * @see org.xml.sax.Locator
- * @see org.xml.sax.HandlerBase
- */
-public interface DocumentHandler {
-
-
- /**
- * Receive an object for locating the origin of SAX document events.
- *
- * <p>SAX parsers are strongly encouraged (though not absolutely
- * required) to supply a locator: if it does so, it must supply
- * the locator to the application by invoking this method before
- * invoking any of the other methods in the DocumentHandler
- * interface.</p>
- *
- * <p>The locator allows the application to determine the end
- * position of any document-related event, even if the parser is
- * not reporting an error. Typically, the application will
- * use this information for reporting its own errors (such as
- * character content that does not match an application's
- * business rules). The information returned by the locator
- * is probably not sufficient for use with a search engine.</p>
- *
- * <p>Note that the locator will return correct information only
- * during the invocation of the events in this interface. The
- * application should not attempt to use it at any other time.</p>
- *
- * @param locator An object that can return the location of
- * any SAX document event.
- * @see org.xml.sax.Locator
- */
- public abstract void setDocumentLocator (Locator locator);
-
-
- /**
- * Receive notification of the beginning of a document.
- *
- * <p>The SAX parser will invoke this method only once, before any
- * other methods in this interface or in DTDHandler (except for
- * setDocumentLocator).</p>
- *
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- */
- public abstract void startDocument ()
- throws SAXException;
-
-
- /**
- * Receive notification of the end of a document.
- *
- * <p>The SAX parser will invoke this method only once, and it will
- * be the last method invoked during the parse. The parser shall
- * not invoke this method until it has either abandoned parsing
- * (because of an unrecoverable error) or reached the end of
- * input.</p>
- *
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- */
- public abstract void endDocument ()
- throws SAXException;
-
-
- /**
- * Receive notification of the beginning of an element.
- *
- * <p>The Parser will invoke this method at the beginning of every
- * element in the XML document; there will be a corresponding
- * endElement() event for every startElement() event (even when the
- * element is empty). All of the element's content will be
- * reported, in order, before the corresponding endElement()
- * event.</p>
- *
- * <p>If the element name has a namespace prefix, the prefix will
- * still be attached. Note that the attribute list provided will
- * contain only attributes with explicit values (specified or
- * defaulted): #IMPLIED attributes will be omitted.</p>
- *
- * @param name The element type name.
- * @param atts The attributes attached to the element, if any.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see #endElement
- * @see org.xml.sax.AttributeList
- */
- public abstract void startElement (String name, AttributeList atts)
- throws SAXException;
-
-
- /**
- * Receive notification of the end of an element.
- *
- * <p>The SAX parser will invoke this method at the end of every
- * element in the XML document; there will be a corresponding
- * startElement() event for every endElement() event (even when the
- * element is empty).</p>
- *
- * <p>If the element name has a namespace prefix, the prefix will
- * still be attached to the name.</p>
- *
- * @param name The element type name
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- */
- public abstract void endElement (String name)
- throws SAXException;
-
-
- /**
- * Receive notification of character data.
- *
- * <p>The Parser will call this method to report each chunk of
- * character data. SAX parsers may return all contiguous character
- * data in a single chunk, or they may split it into several
- * chunks; however, all of the characters in any single event
- * must come from the same external entity, so that the Locator
- * provides useful information.</p>
- *
- * <p>The application must not attempt to read from the array
- * outside of the specified range.</p>
- *
- * <p>Note that some parsers will report whitespace using the
- * ignorableWhitespace() method rather than this one (validating
- * parsers must do so).</p>
- *
- * @param ch The characters from the XML document.
- * @param start The start position in the array.
- * @param length The number of characters to read from the array.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see #ignorableWhitespace
- * @see org.xml.sax.Locator
- */
- public abstract void characters (char ch[], int start, int length)
- throws SAXException;
-
-
- /**
- * Receive notification of ignorable whitespace in element content.
- *
- * <p>Validating Parsers must use this method to report each chunk
- * of ignorable whitespace (see the W3C XML 1.0 recommendation,
- * section 2.10): non-validating parsers may also use this method
- * if they are capable of parsing and using content models.</p>
- *
- * <p>SAX parsers may return all contiguous whitespace in a single
- * chunk, or they may split it into several chunks; however, all of
- * the characters in any single event must come from the same
- * external entity, so that the Locator provides useful
- * information.</p>
- *
- * <p>The application must not attempt to read from the array
- * outside of the specified range.</p>
- *
- * @param ch The characters from the XML document.
- * @param start The start position in the array.
- * @param length The number of characters to read from the array.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see #characters
- */
- public abstract void ignorableWhitespace (char ch[], int start, int length)
- throws SAXException;
-
-
- /**
- * Receive notification of a processing instruction.
- *
- * <p>The Parser will invoke this method once for each processing
- * instruction found: note that processing instructions may occur
- * before or after the main document element.</p>
- *
- * <p>A SAX parser should never report an XML declaration (XML 1.0,
- * section 2.8) or a text declaration (XML 1.0, section 4.3.1)
- * using this method.</p>
- *
- * @param target The processing instruction target.
- * @param data The processing instruction data, or null if
- * none was supplied.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- */
- public abstract void processingInstruction (String target, String data)
- throws SAXException;
-
-}
-
-// end of DocumentHandler.java
+// SAX document handler. +// http://www.saxproject.org +// No warranty; no copyright -- use this as you will. +// $Id: DocumentHandler.java,v 1.3.2.3 2002/01/29 21:34:14 dbrownell Exp $ + +package org.xml.sax; + +/** + * Receive notification of general document events. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>This was the main event-handling interface for SAX1; in + * SAX2, it has been replaced by {@link org.xml.sax.ContentHandler + * ContentHandler}, which provides Namespace support and reporting + * of skipped entities. This interface is included in SAX2 only + * to support legacy SAX1 applications.</p> + * + * <p>The order of events in this interface is very important, and + * mirrors the order of information in the document itself. For + * example, all of an element's content (character data, processing + * instructions, and/or subelements) will appear, in order, between + * the startElement event and the corresponding endElement event.</p> + * + * <p>Application writers who do not want to implement the entire + * interface can derive a class from HandlerBase, which implements + * the default functionality; parser writers can instantiate + * HandlerBase to obtain a default handler. The application can find + * the location of any document event using the Locator interface + * supplied by the Parser through the setDocumentLocator method.</p> + * + * @deprecated This interface has been replaced by the SAX2 + * {@link org.xml.sax.ContentHandler ContentHandler} + * interface, which includes Namespace support. + * @since SAX 1.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + * @see org.xml.sax.Parser#setDocumentHandler + * @see org.xml.sax.Locator + * @see org.xml.sax.HandlerBase + */ +public interface DocumentHandler { + + + /** + * Receive an object for locating the origin of SAX document events. + * + * <p>SAX parsers are strongly encouraged (though not absolutely + * required) to supply a locator: if it does so, it must supply + * the locator to the application by invoking this method before + * invoking any of the other methods in the DocumentHandler + * interface.</p> + * + * <p>The locator allows the application to determine the end + * position of any document-related event, even if the parser is + * not reporting an error. Typically, the application will + * use this information for reporting its own errors (such as + * character content that does not match an application's + * business rules). The information returned by the locator + * is probably not sufficient for use with a search engine.</p> + * + * <p>Note that the locator will return correct information only + * during the invocation of the events in this interface. The + * application should not attempt to use it at any other time.</p> + * + * @param locator An object that can return the location of + * any SAX document event. + * @see org.xml.sax.Locator + */ + public abstract void setDocumentLocator (Locator locator); + + + /** + * Receive notification of the beginning of a document. + * + * <p>The SAX parser will invoke this method only once, before any + * other methods in this interface or in DTDHandler (except for + * setDocumentLocator).</p> + * + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + */ + public abstract void startDocument () + throws SAXException; + + + /** + * Receive notification of the end of a document. + * + * <p>The SAX parser will invoke this method only once, and it will + * be the last method invoked during the parse. The parser shall + * not invoke this method until it has either abandoned parsing + * (because of an unrecoverable error) or reached the end of + * input.</p> + * + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + */ + public abstract void endDocument () + throws SAXException; + + + /** + * Receive notification of the beginning of an element. + * + * <p>The Parser will invoke this method at the beginning of every + * element in the XML document; there will be a corresponding + * endElement() event for every startElement() event (even when the + * element is empty). All of the element's content will be + * reported, in order, before the corresponding endElement() + * event.</p> + * + * <p>If the element name has a namespace prefix, the prefix will + * still be attached. Note that the attribute list provided will + * contain only attributes with explicit values (specified or + * defaulted): #IMPLIED attributes will be omitted.</p> + * + * @param name The element type name. + * @param atts The attributes attached to the element, if any. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see #endElement + * @see org.xml.sax.AttributeList + */ + public abstract void startElement (String name, AttributeList atts) + throws SAXException; + + + /** + * Receive notification of the end of an element. + * + * <p>The SAX parser will invoke this method at the end of every + * element in the XML document; there will be a corresponding + * startElement() event for every endElement() event (even when the + * element is empty).</p> + * + * <p>If the element name has a namespace prefix, the prefix will + * still be attached to the name.</p> + * + * @param name The element type name + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + */ + public abstract void endElement (String name) + throws SAXException; + + + /** + * Receive notification of character data. + * + * <p>The Parser will call this method to report each chunk of + * character data. SAX parsers may return all contiguous character + * data in a single chunk, or they may split it into several + * chunks; however, all of the characters in any single event + * must come from the same external entity, so that the Locator + * provides useful information.</p> + * + * <p>The application must not attempt to read from the array + * outside of the specified range.</p> + * + * <p>Note that some parsers will report whitespace using the + * ignorableWhitespace() method rather than this one (validating + * parsers must do so).</p> + * + * @param ch The characters from the XML document. + * @param start The start position in the array. + * @param length The number of characters to read from the array. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see #ignorableWhitespace + * @see org.xml.sax.Locator + */ + public abstract void characters (char ch[], int start, int length) + throws SAXException; + + + /** + * Receive notification of ignorable whitespace in element content. + * + * <p>Validating Parsers must use this method to report each chunk + * of ignorable whitespace (see the W3C XML 1.0 recommendation, + * section 2.10): non-validating parsers may also use this method + * if they are capable of parsing and using content models.</p> + * + * <p>SAX parsers may return all contiguous whitespace in a single + * chunk, or they may split it into several chunks; however, all of + * the characters in any single event must come from the same + * external entity, so that the Locator provides useful + * information.</p> + * + * <p>The application must not attempt to read from the array + * outside of the specified range.</p> + * + * @param ch The characters from the XML document. + * @param start The start position in the array. + * @param length The number of characters to read from the array. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see #characters + */ + public abstract void ignorableWhitespace (char ch[], int start, int length) + throws SAXException; + + + /** + * Receive notification of a processing instruction. + * + * <p>The Parser will invoke this method once for each processing + * instruction found: note that processing instructions may occur + * before or after the main document element.</p> + * + * <p>A SAX parser should never report an XML declaration (XML 1.0, + * section 2.8) or a text declaration (XML 1.0, section 4.3.1) + * using this method.</p> + * + * @param target The processing instruction target. + * @param data The processing instruction data, or null if + * none was supplied. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + */ + public abstract void processingInstruction (String target, String data) + throws SAXException; + +} + +// end of DocumentHandler.java diff --git a/libjava/org/xml/sax/EntityResolver.java b/libjava/org/xml/sax/EntityResolver.java index 3270471453a..acc365aad63 100644 --- a/libjava/org/xml/sax/EntityResolver.java +++ b/libjava/org/xml/sax/EntityResolver.java @@ -1,110 +1,119 @@ -// SAX entity resolver.
-// No warranty; no copyright -- use this as you will.
-// $Id: EntityResolver.java,v 1.1 2000/10/02 02:43:17 sboag Exp $
-
-package org.xml.sax;
-
-import java.io.IOException;
-
-
-/**
- * Basic interface for resolving entities.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>If a SAX application needs to implement customized handling
- * for external entities, it must implement this interface and
- * register an instance with the SAX driver using the
- * {@link org.xml.sax.XMLReader#setEntityResolver setEntityResolver}
- * method.</p>
- *
- * <p>The XML reader will then allow the application to intercept any
- * external entities (including the external DTD subset and external
- * parameter entities, if any) before including them.</p>
- *
- * <p>Many SAX applications will not need to implement this interface,
- * but it will be especially useful for applications that build
- * XML documents from databases or other specialised input sources,
- * or for applications that use URI types other than URLs.</p>
- *
- * <p>The following resolver would provide the application
- * with a special character stream for the entity with the system
- * identifier "http://www.myhost.com/today":</p>
- *
- * <pre>
- * import org.xml.sax.EntityResolver;
- * import org.xml.sax.InputSource;
- *
- * public class MyResolver implements EntityResolver {
- * public InputSource resolveEntity (String publicId, String systemId)
- * {
- * if (systemId.equals("http://www.myhost.com/today")) {
- * // return a special input source
- * MyReader reader = new MyReader();
- * return new InputSource(reader);
- * } else {
- * // use the default behaviour
- * return null;
- * }
- * }
- * }
- * </pre>
- *
- * <p>The application can also use this interface to redirect system
- * identifiers to local URIs or to look up replacements in a catalog
- * (possibly by using the public identifier).</p>
- *
- * @since SAX 1.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.Parser#setEntityResolver
- * @see org.xml.sax.InputSource
- */
-public interface EntityResolver {
-
-
- /**
- * Allow the application to resolve external entities.
- *
- * <p>The Parser will call this method before opening any external
- * entity except the top-level document entity (including the
- * external DTD subset, external entities referenced within the
- * DTD, and external entities referenced within the document
- * element): the application may request that the parser resolve
- * the entity itself, that it use an alternative URI, or that it
- * use an entirely different input source.</p>
- *
- * <p>Application writers can use this method to redirect external
- * system identifiers to secure and/or local URIs, to look up
- * public identifiers in a catalogue, or to read an entity from a
- * database or other input source (including, for example, a dialog
- * box).</p>
- *
- * <p>If the system identifier is a URL, the SAX parser must
- * resolve it fully before reporting it to the application.</p>
- *
- * @param publicId The public identifier of the external entity
- * being referenced, or null if none was supplied.
- * @param systemId The system identifier of the external entity
- * being referenced.
- * @return An InputSource object describing the new input source,
- * or null to request that the parser open a regular
- * URI connection to the system identifier.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @exception java.io.IOException A Java-specific IO exception,
- * possibly the result of creating a new InputStream
- * or Reader for the InputSource.
- * @see org.xml.sax.InputSource
- */
- public abstract InputSource resolveEntity (String publicId,
- String systemId)
- throws SAXException, IOException;
-
-}
-
-// end of EntityResolver.java
+// SAX entity resolver. +// http://www.saxproject.org +// No warranty; no copyright -- use this as you will. +// $Id: EntityResolver.java,v 1.7.2.3 2002/01/29 21:34:14 dbrownell Exp $ + +package org.xml.sax; + +import java.io.IOException; + + +/** + * Basic interface for resolving entities. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>If a SAX application needs to implement customized handling + * for external entities, it must implement this interface and + * register an instance with the SAX driver using the + * {@link org.xml.sax.XMLReader#setEntityResolver setEntityResolver} + * method.</p> + * + * <p>The XML reader will then allow the application to intercept any + * external entities (including the external DTD subset and external + * parameter entities, if any) before including them.</p> + * + * <p>Many SAX applications will not need to implement this interface, + * but it will be especially useful for applications that build + * XML documents from databases or other specialised input sources, + * or for applications that use URI types other than URLs.</p> + * + * <p>The following resolver would provide the application + * with a special character stream for the entity with the system + * identifier "http://www.myhost.com/today":</p> + * + * <pre> + * import org.xml.sax.EntityResolver; + * import org.xml.sax.InputSource; + * + * public class MyResolver implements EntityResolver { + * public InputSource resolveEntity (String publicId, String systemId) + * { + * if (systemId.equals("http://www.myhost.com/today")) { + * // return a special input source + * MyReader reader = new MyReader(); + * return new InputSource(reader); + * } else { + * // use the default behaviour + * return null; + * } + * } + * } + * </pre> + * + * <p>The application can also use this interface to redirect system + * identifiers to local URIs or to look up replacements in a catalog + * (possibly by using the public identifier).</p> + * + * @since SAX 1.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + * @see org.xml.sax.XMLReader#setEntityResolver + * @see org.xml.sax.InputSource + */ +public interface EntityResolver { + + + /** + * Allow the application to resolve external entities. + * + * <p>The parser will call this method before opening any external + * entity except the top-level document entity. Such entities include + * the external DTD subset and external parameter entities referenced + * within the DTD (in either case, only if the parser reads external + * parameter entities), and external general entities referenced + * within the document element (if the parser reads external general + * entities). The application may request that the parser locate + * the entity itself, that it use an alternative URI, or that it + * use data provided by the application (as a character or byte + * input stream).</p> + * + * <p>Application writers can use this method to redirect external + * system identifiers to secure and/or local URIs, to look up + * public identifiers in a catalogue, or to read an entity from a + * database or other input source (including, for example, a dialog + * box). Neither XML nor SAX specifies a preferred policy for using + * public or system IDs to resolve resources. However, SAX specifies + * how to interpret any InputSource returned by this method, and that + * if none is returned, then the system ID will be dereferenced as + * a URL. </p> + * + * <p>If the system identifier is a URL, the SAX parser must + * resolve it fully before reporting it to the application.</p> + * + * @param publicId The public identifier of the external entity + * being referenced, or null if none was supplied. + * @param systemId The system identifier of the external entity + * being referenced. + * @return An InputSource object describing the new input source, + * or null to request that the parser open a regular + * URI connection to the system identifier. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @exception java.io.IOException A Java-specific IO exception, + * possibly the result of creating a new InputStream + * or Reader for the InputSource. + * @see org.xml.sax.InputSource + */ + public abstract InputSource resolveEntity (String publicId, + String systemId) + throws SAXException, IOException; + +} + +// end of EntityResolver.java diff --git a/libjava/org/xml/sax/ErrorHandler.java b/libjava/org/xml/sax/ErrorHandler.java index 8b3e090cd6d..e82302093ad 100644 --- a/libjava/org/xml/sax/ErrorHandler.java +++ b/libjava/org/xml/sax/ErrorHandler.java @@ -1,123 +1,125 @@ -// SAX error handler.
-// No warranty; no copyright -- use this as you will.
-// $Id: ErrorHandler.java,v 1.1 2000/10/02 02:43:17 sboag Exp $
-
-package org.xml.sax;
-
-
-/**
- * Basic interface for SAX error handlers.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>If a SAX application needs to implement customized error
- * handling, it must implement this interface and then register an
- * instance with the XML reader using the
- * {@link org.xml.sax.XMLReader#setErrorHandler setErrorHandler}
- * method. The parser will then report all errors and warnings
- * through this interface.</p>
- *
- * <p><strong>WARNING:</strong> If an application does <em>not</em>
- * register an ErrorHandler, XML parsing errors will go unreported
- * and bizarre behaviour may result.</p>
- *
- * <p>For XML processing errors, a SAX driver must use this interface
- * instead of throwing an exception: it is up to the application
- * to decide whether to throw an exception for different types of
- * errors and warnings. Note, however, that there is no requirement that
- * the parser continue to provide useful information after a call to
- * {@link #fatalError fatalError} (in other words, a SAX driver class
- * could catch an exception and report a fatalError).</p>
- *
- * @since SAX 1.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.Parser#setErrorHandler
- * @see org.xml.sax.SAXParseException
- */
-public interface ErrorHandler {
-
-
- /**
- * Receive notification of a warning.
- *
- * <p>SAX parsers will use this method to report conditions that
- * are not errors or fatal errors as defined by the XML 1.0
- * recommendation. The default behaviour is to take no action.</p>
- *
- * <p>The SAX parser must continue to provide normal parsing events
- * after invoking this method: it should still be possible for the
- * application to process the document through to the end.</p>
- *
- * <p>Filters may use this method to report other, non-XML warnings
- * as well.</p>
- *
- * @param exception The warning information encapsulated in a
- * SAX parse exception.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.SAXParseException
- */
- public abstract void warning (SAXParseException exception)
- throws SAXException;
-
-
- /**
- * Receive notification of a recoverable error.
- *
- * <p>This corresponds to the definition of "error" in section 1.2
- * of the W3C XML 1.0 Recommendation. For example, a validating
- * parser would use this callback to report the violation of a
- * validity constraint. The default behaviour is to take no
- * action.</p>
- *
- * <p>The SAX parser must continue to provide normal parsing events
- * after invoking this method: it should still be possible for the
- * application to process the document through to the end. If the
- * application cannot do so, then the parser should report a fatal
- * error even if the XML 1.0 recommendation does not require it to
- * do so.</p>
- *
- * <p>Filters may use this method to report other, non-XML errors
- * as well.</p>
- *
- * @param exception The error information encapsulated in a
- * SAX parse exception.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.SAXParseException
- */
- public abstract void error (SAXParseException exception)
- throws SAXException;
-
-
- /**
- * Receive notification of a non-recoverable error.
- *
- * <p>This corresponds to the definition of "fatal error" in
- * section 1.2 of the W3C XML 1.0 Recommendation. For example, a
- * parser would use this callback to report the violation of a
- * well-formedness constraint.</p>
- *
- * <p>The application must assume that the document is unusable
- * after the parser has invoked this method, and should continue
- * (if at all) only for the sake of collecting addition error
- * messages: in fact, SAX parsers are free to stop reporting any
- * other events once this method has been invoked.</p>
- *
- * @param exception The error information encapsulated in a
- * SAX parse exception.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.SAXParseException
- */
- public abstract void fatalError (SAXParseException exception)
- throws SAXException;
-
-}
-
-// end of ErrorHandler.java
+// SAX error handler. +// http://www.saxproject.org +// No warranty; no copyright -- use this as you will. +// $Id: ErrorHandler.java,v 1.4.2.3 2002/01/29 21:34:14 dbrownell Exp $ + +package org.xml.sax; + + +/** + * Basic interface for SAX error handlers. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>If a SAX application needs to implement customized error + * handling, it must implement this interface and then register an + * instance with the XML reader using the + * {@link org.xml.sax.XMLReader#setErrorHandler setErrorHandler} + * method. The parser will then report all errors and warnings + * through this interface.</p> + * + * <p><strong>WARNING:</strong> If an application does <em>not</em> + * register an ErrorHandler, XML parsing errors will go unreported + * and bizarre behaviour may result.</p> + * + * <p>For XML processing errors, a SAX driver must use this interface + * instead of throwing an exception: it is up to the application + * to decide whether to throw an exception for different types of + * errors and warnings. Note, however, that there is no requirement that + * the parser continue to provide useful information after a call to + * {@link #fatalError fatalError} (in other words, a SAX driver class + * could catch an exception and report a fatalError).</p> + * + * @since SAX 1.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + * @see org.xml.sax.XMLReader#setErrorHandler + * @see org.xml.sax.SAXParseException + */ +public interface ErrorHandler { + + + /** + * Receive notification of a warning. + * + * <p>SAX parsers will use this method to report conditions that + * are not errors or fatal errors as defined by the XML 1.0 + * recommendation. The default behaviour is to take no action.</p> + * + * <p>The SAX parser must continue to provide normal parsing events + * after invoking this method: it should still be possible for the + * application to process the document through to the end.</p> + * + * <p>Filters may use this method to report other, non-XML warnings + * as well.</p> + * + * @param exception The warning information encapsulated in a + * SAX parse exception. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.SAXParseException + */ + public abstract void warning (SAXParseException exception) + throws SAXException; + + + /** + * Receive notification of a recoverable error. + * + * <p>This corresponds to the definition of "error" in section 1.2 + * of the W3C XML 1.0 Recommendation. For example, a validating + * parser would use this callback to report the violation of a + * validity constraint. The default behaviour is to take no + * action.</p> + * + * <p>The SAX parser must continue to provide normal parsing events + * after invoking this method: it should still be possible for the + * application to process the document through to the end. If the + * application cannot do so, then the parser should report a fatal + * error even if the XML 1.0 recommendation does not require it to + * do so.</p> + * + * <p>Filters may use this method to report other, non-XML errors + * as well.</p> + * + * @param exception The error information encapsulated in a + * SAX parse exception. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.SAXParseException + */ + public abstract void error (SAXParseException exception) + throws SAXException; + + + /** + * Receive notification of a non-recoverable error. + * + * <p>This corresponds to the definition of "fatal error" in + * section 1.2 of the W3C XML 1.0 Recommendation. For example, a + * parser would use this callback to report the violation of a + * well-formedness constraint.</p> + * + * <p>The application must assume that the document is unusable + * after the parser has invoked this method, and should continue + * (if at all) only for the sake of collecting addition error + * messages: in fact, SAX parsers are free to stop reporting any + * other events once this method has been invoked.</p> + * + * @param exception The error information encapsulated in a + * SAX parse exception. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.SAXParseException + */ + public abstract void fatalError (SAXParseException exception) + throws SAXException; + +} + +// end of ErrorHandler.java diff --git a/libjava/org/xml/sax/HandlerBase.java b/libjava/org/xml/sax/HandlerBase.java index 34a8f7675d9..42c3a07e0e8 100644 --- a/libjava/org/xml/sax/HandlerBase.java +++ b/libjava/org/xml/sax/HandlerBase.java @@ -1,368 +1,370 @@ -// SAX default handler base class.
-// No warranty; no copyright -- use this as you will.
-// $Id: HandlerBase.java,v 1.1 2000/10/02 02:43:17 sboag Exp $
-
-package org.xml.sax;
-
-/**
- * Default base class for handlers.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>This class implements the default behaviour for four SAX1
- * interfaces: EntityResolver, DTDHandler, DocumentHandler,
- * and ErrorHandler. It is now obsolete, but is included in SAX2 to
- * support legacy SAX1 applications. SAX2 applications should use
- * the {@link org.xml.sax.helpers.DefaultHandler DefaultHandler}
- * class instead.</p>
- *
- * <p>Application writers can extend this class when they need to
- * implement only part of an interface; parser writers can
- * instantiate this class to provide default handlers when the
- * application has not supplied its own.</p>
- *
- * <p>Note that the use of this class is optional.</p>
- *
- * @deprecated This class works with the deprecated
- * {@link org.xml.sax.DocumentHandler DocumentHandler}
- * interface. It has been replaced by the SAX2
- * {@link org.xml.sax.helpers.DefaultHandler DefaultHandler}
- * class.
- * @since SAX 1.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.EntityResolver
- * @see org.xml.sax.DTDHandler
- * @see org.xml.sax.DocumentHandler
- * @see org.xml.sax.ErrorHandler
- */
-public class HandlerBase
- implements EntityResolver, DTDHandler, DocumentHandler, ErrorHandler
-{
-
-
- ////////////////////////////////////////////////////////////////////
- // Default implementation of the EntityResolver interface.
- ////////////////////////////////////////////////////////////////////
-
- /**
- * Resolve an external entity.
- *
- * <p>Always return null, so that the parser will use the system
- * identifier provided in the XML document. This method implements
- * the SAX default behaviour: application writers can override it
- * in a subclass to do special translations such as catalog lookups
- * or URI redirection.</p>
- *
- * @param publicId The public identifier, or null if none is
- * available.
- * @param systemId The system identifier provided in the XML
- * document.
- * @return The new input source, or null to require the
- * default behaviour.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.EntityResolver#resolveEntity
- */
- public InputSource resolveEntity (String publicId, String systemId)
- throws SAXException
- {
- return null;
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Default implementation of DTDHandler interface.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Receive notification of a notation declaration.
- *
- * <p>By default, do nothing. Application writers may override this
- * method in a subclass if they wish to keep track of the notations
- * declared in a document.</p>
- *
- * @param name The notation name.
- * @param publicId The notation public identifier, or null if not
- * available.
- * @param systemId The notation system identifier.
- * @see org.xml.sax.DTDHandler#notationDecl
- */
- public void notationDecl (String name, String publicId, String systemId)
- {
- // no op
- }
-
-
- /**
- * Receive notification of an unparsed entity declaration.
- *
- * <p>By default, do nothing. Application writers may override this
- * method in a subclass to keep track of the unparsed entities
- * declared in a document.</p>
- *
- * @param name The entity name.
- * @param publicId The entity public identifier, or null if not
- * available.
- * @param systemId The entity system identifier.
- * @param notationName The name of the associated notation.
- * @see org.xml.sax.DTDHandler#unparsedEntityDecl
- */
- public void unparsedEntityDecl (String name, String publicId,
- String systemId, String notationName)
- {
- // no op
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Default implementation of DocumentHandler interface.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Receive a Locator object for document events.
- *
- * <p>By default, do nothing. Application writers may override this
- * method in a subclass if they wish to store the locator for use
- * with other document events.</p>
- *
- * @param locator A locator for all SAX document events.
- * @see org.xml.sax.DocumentHandler#setDocumentLocator
- * @see org.xml.sax.Locator
- */
- public void setDocumentLocator (Locator locator)
- {
- // no op
- }
-
-
- /**
- * Receive notification of the beginning of the document.
- *
- * <p>By default, do nothing. Application writers may override this
- * method in a subclass to take specific actions at the beginning
- * of a document (such as allocating the root node of a tree or
- * creating an output file).</p>
- *
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.DocumentHandler#startDocument
- */
- public void startDocument ()
- throws SAXException
- {
- // no op
- }
-
-
- /**
- * Receive notification of the end of the document.
- *
- * <p>By default, do nothing. Application writers may override this
- * method in a subclass to take specific actions at the beginning
- * of a document (such as finalising a tree or closing an output
- * file).</p>
- *
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.DocumentHandler#endDocument
- */
- public void endDocument ()
- throws SAXException
- {
- // no op
- }
-
-
- /**
- * Receive notification of the start of an element.
- *
- * <p>By default, do nothing. Application writers may override this
- * method in a subclass to take specific actions at the start of
- * each element (such as allocating a new tree node or writing
- * output to a file).</p>
- *
- * @param name The element type name.
- * @param attributes The specified or defaulted attributes.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.DocumentHandler#startElement
- */
- public void startElement (String name, AttributeList attributes)
- throws SAXException
- {
- // no op
- }
-
-
- /**
- * Receive notification of the end of an element.
- *
- * <p>By default, do nothing. Application writers may override this
- * method in a subclass to take specific actions at the end of
- * each element (such as finalising a tree node or writing
- * output to a file).</p>
- *
- * @param name The element type name.
- * @param attributes The specified or defaulted attributes.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.DocumentHandler#endElement
- */
- public void endElement (String name)
- throws SAXException
- {
- // no op
- }
-
-
- /**
- * Receive notification of character data inside an element.
- *
- * <p>By default, do nothing. Application writers may override this
- * method to take specific actions for each chunk of character data
- * (such as adding the data to a node or buffer, or printing it to
- * a file).</p>
- *
- * @param ch The characters.
- * @param start The start position in the character array.
- * @param length The number of characters to use from the
- * character array.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.DocumentHandler#characters
- */
- public void characters (char ch[], int start, int length)
- throws SAXException
- {
- // no op
- }
-
-
- /**
- * Receive notification of ignorable whitespace in element content.
- *
- * <p>By default, do nothing. Application writers may override this
- * method to take specific actions for each chunk of ignorable
- * whitespace (such as adding data to a node or buffer, or printing
- * it to a file).</p>
- *
- * @param ch The whitespace characters.
- * @param start The start position in the character array.
- * @param length The number of characters to use from the
- * character array.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.DocumentHandler#ignorableWhitespace
- */
- public void ignorableWhitespace (char ch[], int start, int length)
- throws SAXException
- {
- // no op
- }
-
-
- /**
- * Receive notification of a processing instruction.
- *
- * <p>By default, do nothing. Application writers may override this
- * method in a subclass to take specific actions for each
- * processing instruction, such as setting status variables or
- * invoking other methods.</p>
- *
- * @param target The processing instruction target.
- * @param data The processing instruction data, or null if
- * none is supplied.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.DocumentHandler#processingInstruction
- */
- public void processingInstruction (String target, String data)
- throws SAXException
- {
- // no op
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Default implementation of the ErrorHandler interface.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Receive notification of a parser warning.
- *
- * <p>The default implementation does nothing. Application writers
- * may override this method in a subclass to take specific actions
- * for each warning, such as inserting the message in a log file or
- * printing it to the console.</p>
- *
- * @param e The warning information encoded as an exception.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.ErrorHandler#warning
- * @see org.xml.sax.SAXParseException
- */
- public void warning (SAXParseException e)
- throws SAXException
- {
- // no op
- }
-
-
- /**
- * Receive notification of a recoverable parser error.
- *
- * <p>The default implementation does nothing. Application writers
- * may override this method in a subclass to take specific actions
- * for each error, such as inserting the message in a log file or
- * printing it to the console.</p>
- *
- * @param e The warning information encoded as an exception.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.ErrorHandler#warning
- * @see org.xml.sax.SAXParseException
- */
- public void error (SAXParseException e)
- throws SAXException
- {
- // no op
- }
-
-
- /**
- * Report a fatal XML parsing error.
- *
- * <p>The default implementation throws a SAXParseException.
- * Application writers may override this method in a subclass if
- * they need to take specific actions for each fatal error (such as
- * collecting all of the errors into a single report): in any case,
- * the application must stop all regular processing when this
- * method is invoked, since the document is no longer reliable, and
- * the parser may no longer report parsing events.</p>
- *
- * @param e The error information encoded as an exception.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.ErrorHandler#fatalError
- * @see org.xml.sax.SAXParseException
- */
- public void fatalError (SAXParseException e)
- throws SAXException
- {
- throw e;
- }
-
-}
-
-// end of HandlerBase.java
+// SAX default handler base class. +// http://www.saxproject.org +// No warranty; no copyright -- use this as you will. +// $Id: HandlerBase.java,v 1.3.2.3 2002/01/29 21:34:14 dbrownell Exp $ + +package org.xml.sax; + +/** + * Default base class for handlers. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>This class implements the default behaviour for four SAX1 + * interfaces: EntityResolver, DTDHandler, DocumentHandler, + * and ErrorHandler. It is now obsolete, but is included in SAX2 to + * support legacy SAX1 applications. SAX2 applications should use + * the {@link org.xml.sax.helpers.DefaultHandler DefaultHandler} + * class instead.</p> + * + * <p>Application writers can extend this class when they need to + * implement only part of an interface; parser writers can + * instantiate this class to provide default handlers when the + * application has not supplied its own.</p> + * + * <p>Note that the use of this class is optional.</p> + * + * @deprecated This class works with the deprecated + * {@link org.xml.sax.DocumentHandler DocumentHandler} + * interface. It has been replaced by the SAX2 + * {@link org.xml.sax.helpers.DefaultHandler DefaultHandler} + * class. + * @since SAX 1.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + * @see org.xml.sax.EntityResolver + * @see org.xml.sax.DTDHandler + * @see org.xml.sax.DocumentHandler + * @see org.xml.sax.ErrorHandler + */ +public class HandlerBase + implements EntityResolver, DTDHandler, DocumentHandler, ErrorHandler +{ + + + //////////////////////////////////////////////////////////////////// + // Default implementation of the EntityResolver interface. + //////////////////////////////////////////////////////////////////// + + /** + * Resolve an external entity. + * + * <p>Always return null, so that the parser will use the system + * identifier provided in the XML document. This method implements + * the SAX default behaviour: application writers can override it + * in a subclass to do special translations such as catalog lookups + * or URI redirection.</p> + * + * @param publicId The public identifer, or null if none is + * available. + * @param systemId The system identifier provided in the XML + * document. + * @return The new input source, or null to require the + * default behaviour. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.EntityResolver#resolveEntity + */ + public InputSource resolveEntity (String publicId, String systemId) + throws SAXException + { + return null; + } + + + + //////////////////////////////////////////////////////////////////// + // Default implementation of DTDHandler interface. + //////////////////////////////////////////////////////////////////// + + + /** + * Receive notification of a notation declaration. + * + * <p>By default, do nothing. Application writers may override this + * method in a subclass if they wish to keep track of the notations + * declared in a document.</p> + * + * @param name The notation name. + * @param publicId The notation public identifier, or null if not + * available. + * @param systemId The notation system identifier. + * @see org.xml.sax.DTDHandler#notationDecl + */ + public void notationDecl (String name, String publicId, String systemId) + { + // no op + } + + + /** + * Receive notification of an unparsed entity declaration. + * + * <p>By default, do nothing. Application writers may override this + * method in a subclass to keep track of the unparsed entities + * declared in a document.</p> + * + * @param name The entity name. + * @param publicId The entity public identifier, or null if not + * available. + * @param systemId The entity system identifier. + * @param notationName The name of the associated notation. + * @see org.xml.sax.DTDHandler#unparsedEntityDecl + */ + public void unparsedEntityDecl (String name, String publicId, + String systemId, String notationName) + { + // no op + } + + + + //////////////////////////////////////////////////////////////////// + // Default implementation of DocumentHandler interface. + //////////////////////////////////////////////////////////////////// + + + /** + * Receive a Locator object for document events. + * + * <p>By default, do nothing. Application writers may override this + * method in a subclass if they wish to store the locator for use + * with other document events.</p> + * + * @param locator A locator for all SAX document events. + * @see org.xml.sax.DocumentHandler#setDocumentLocator + * @see org.xml.sax.Locator + */ + public void setDocumentLocator (Locator locator) + { + // no op + } + + + /** + * Receive notification of the beginning of the document. + * + * <p>By default, do nothing. Application writers may override this + * method in a subclass to take specific actions at the beginning + * of a document (such as allocating the root node of a tree or + * creating an output file).</p> + * + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.DocumentHandler#startDocument + */ + public void startDocument () + throws SAXException + { + // no op + } + + + /** + * Receive notification of the end of the document. + * + * <p>By default, do nothing. Application writers may override this + * method in a subclass to take specific actions at the beginning + * of a document (such as finalising a tree or closing an output + * file).</p> + * + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.DocumentHandler#endDocument + */ + public void endDocument () + throws SAXException + { + // no op + } + + + /** + * Receive notification of the start of an element. + * + * <p>By default, do nothing. Application writers may override this + * method in a subclass to take specific actions at the start of + * each element (such as allocating a new tree node or writing + * output to a file).</p> + * + * @param name The element type name. + * @param attributes The specified or defaulted attributes. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.DocumentHandler#startElement + */ + public void startElement (String name, AttributeList attributes) + throws SAXException + { + // no op + } + + + /** + * Receive notification of the end of an element. + * + * <p>By default, do nothing. Application writers may override this + * method in a subclass to take specific actions at the end of + * each element (such as finalising a tree node or writing + * output to a file).</p> + * + * @param name The element type name. + * @param attributes The specified or defaulted attributes. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.DocumentHandler#endElement + */ + public void endElement (String name) + throws SAXException + { + // no op + } + + + /** + * Receive notification of character data inside an element. + * + * <p>By default, do nothing. Application writers may override this + * method to take specific actions for each chunk of character data + * (such as adding the data to a node or buffer, or printing it to + * a file).</p> + * + * @param ch The characters. + * @param start The start position in the character array. + * @param length The number of characters to use from the + * character array. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.DocumentHandler#characters + */ + public void characters (char ch[], int start, int length) + throws SAXException + { + // no op + } + + + /** + * Receive notification of ignorable whitespace in element content. + * + * <p>By default, do nothing. Application writers may override this + * method to take specific actions for each chunk of ignorable + * whitespace (such as adding data to a node or buffer, or printing + * it to a file).</p> + * + * @param ch The whitespace characters. + * @param start The start position in the character array. + * @param length The number of characters to use from the + * character array. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.DocumentHandler#ignorableWhitespace + */ + public void ignorableWhitespace (char ch[], int start, int length) + throws SAXException + { + // no op + } + + + /** + * Receive notification of a processing instruction. + * + * <p>By default, do nothing. Application writers may override this + * method in a subclass to take specific actions for each + * processing instruction, such as setting status variables or + * invoking other methods.</p> + * + * @param target The processing instruction target. + * @param data The processing instruction data, or null if + * none is supplied. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.DocumentHandler#processingInstruction + */ + public void processingInstruction (String target, String data) + throws SAXException + { + // no op + } + + + + //////////////////////////////////////////////////////////////////// + // Default implementation of the ErrorHandler interface. + //////////////////////////////////////////////////////////////////// + + + /** + * Receive notification of a parser warning. + * + * <p>The default implementation does nothing. Application writers + * may override this method in a subclass to take specific actions + * for each warning, such as inserting the message in a log file or + * printing it to the console.</p> + * + * @param e The warning information encoded as an exception. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.ErrorHandler#warning + * @see org.xml.sax.SAXParseException + */ + public void warning (SAXParseException e) + throws SAXException + { + // no op + } + + + /** + * Receive notification of a recoverable parser error. + * + * <p>The default implementation does nothing. Application writers + * may override this method in a subclass to take specific actions + * for each error, such as inserting the message in a log file or + * printing it to the console.</p> + * + * @param e The warning information encoded as an exception. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.ErrorHandler#warning + * @see org.xml.sax.SAXParseException + */ + public void error (SAXParseException e) + throws SAXException + { + // no op + } + + + /** + * Report a fatal XML parsing error. + * + * <p>The default implementation throws a SAXParseException. + * Application writers may override this method in a subclass if + * they need to take specific actions for each fatal error (such as + * collecting all of the errors into a single report): in any case, + * the application must stop all regular processing when this + * method is invoked, since the document is no longer reliable, and + * the parser may no longer report parsing events.</p> + * + * @param e The error information encoded as an exception. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.ErrorHandler#fatalError + * @see org.xml.sax.SAXParseException + */ + public void fatalError (SAXParseException e) + throws SAXException + { + throw e; + } + +} + +// end of HandlerBase.java diff --git a/libjava/org/xml/sax/InputSource.java b/libjava/org/xml/sax/InputSource.java index 985ca220387..f6c09071d47 100644 --- a/libjava/org/xml/sax/InputSource.java +++ b/libjava/org/xml/sax/InputSource.java @@ -1,321 +1,336 @@ -// SAX input source.
-// No warranty; no copyright -- use this as you will.
-// $Id: InputSource.java,v 1.1 2000/10/02 02:43:17 sboag Exp $
-
-package org.xml.sax;
-
-import java.io.Reader;
-import java.io.InputStream;
-
-/**
- * A single input source for an XML entity.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>This class allows a SAX application to encapsulate information
- * about an input source in a single object, which may include
- * a public identifier, a system identifier, a byte stream (possibly
- * with a specified encoding), and/or a character stream.</p>
- *
- * <p>There are two places that the application will deliver this
- * input source to the parser: as the argument to the Parser.parse
- * method, or as the return value of the EntityResolver.resolveEntity
- * method.</p>
- *
- * <p>The SAX parser will use the InputSource object to determine how
- * to read XML input. If there is a character stream available, the
- * parser will read that stream directly; if not, the parser will use
- * a byte stream, if available; if neither a character stream nor a
- * byte stream is available, the parser will attempt to open a URI
- * connection to the resource identified by the system
- * identifier.</p>
- *
- * <p>An InputSource object belongs to the application: the SAX parser
- * shall never modify it in any way (it may modify a copy if
- * necessary).</p>
- *
- * @since SAX 1.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.Parser#parse
- * @see org.xml.sax.EntityResolver#resolveEntity
- * @see java.io.InputStream
- * @see java.io.Reader
- */
-public class InputSource {
-
- /**
- * Zero-argument default constructor.
- *
- * @see #setPublicId
- * @see #setSystemId
- * @see #setByteStream
- * @see #setCharacterStream
- * @see #setEncoding
- */
- public InputSource ()
- {
- }
-
-
- /**
- * Create a new input source with a system identifier.
- *
- * <p>Applications may use setPublicId to include a
- * public identifier as well, or setEncoding to specify
- * the character encoding, if known.</p>
- *
- * <p>If the system identifier is a URL, it must be full resolved.</p>
- *
- * @param systemId The system identifier (URI).
- * @see #setPublicId
- * @see #setSystemId
- * @see #setByteStream
- * @see #setEncoding
- * @see #setCharacterStream
- */
- public InputSource (String systemId)
- {
- setSystemId(systemId);
- }
-
-
- /**
- * Create a new input source with a byte stream.
- *
- * <p>Application writers may use setSystemId to provide a base
- * for resolving relative URIs, setPublicId to include a
- * public identifier, and/or setEncoding to specify the object's
- * character encoding.</p>
- *
- * @param byteStream The raw byte stream containing the document.
- * @see #setPublicId
- * @see #setSystemId
- * @see #setEncoding
- * @see #setByteStream
- * @see #setCharacterStream
- */
- public InputSource (InputStream byteStream)
- {
- setByteStream(byteStream);
- }
-
-
- /**
- * Create a new input source with a character stream.
- *
- * <p>Application writers may use setSystemId() to provide a base
- * for resolving relative URIs, and setPublicId to include a
- * public identifier.</p>
- *
- * <p>The character stream shall not include a byte order mark.</p>
- *
- * @see #setPublicId
- * @see #setSystemId
- * @see #setByteStream
- * @see #setCharacterStream
- */
- public InputSource (Reader characterStream)
- {
- setCharacterStream(characterStream);
- }
-
-
- /**
- * Set the public identifier for this input source.
- *
- * <p>The public identifier is always optional: if the application
- * writer includes one, it will be provided as part of the
- * location information.</p>
- *
- * @param publicId The public identifier as a string.
- * @see #getPublicId
- * @see org.xml.sax.Locator#getPublicId
- * @see org.xml.sax.SAXParseException#getPublicId
- */
- public void setPublicId (String publicId)
- {
- this.publicId = publicId;
- }
-
-
- /**
- * Get the public identifier for this input source.
- *
- * @return The public identifier, or null if none was supplied.
- * @see #setPublicId
- */
- public String getPublicId ()
- {
- return publicId;
- }
-
-
- /**
- * Set the system identifier for this input source.
- *
- * <p>The system identifier is optional if there is a byte stream
- * or a character stream, but it is still useful to provide one,
- * since the application can use it to resolve relative URIs
- * and can include it in error messages and warnings (the parser
- * will attempt to open a connection to the URI only if
- * there is no byte stream or character stream specified).</p>
- *
- * <p>If the application knows the character encoding of the
- * object pointed to by the system identifier, it can register
- * the encoding using the setEncoding method.</p>
- *
- * <p>If the system ID is a URL, it must be fully resolved.</p>
- *
- * @param systemId The system identifier as a string.
- * @see #setEncoding
- * @see #getSystemId
- * @see org.xml.sax.Locator#getSystemId
- * @see org.xml.sax.SAXParseException#getSystemId
- */
- public void setSystemId (String systemId)
- {
- this.systemId = systemId;
- }
-
-
- /**
- * Get the system identifier for this input source.
- *
- * <p>The getEncoding method will return the character encoding
- * of the object pointed to, or null if unknown.</p>
- *
- * <p>If the system ID is a URL, it will be fully resolved.</p>
- *
- * @return The system identifier.
- * @see #setSystemId
- * @see #getEncoding
- */
- public String getSystemId ()
- {
- return systemId;
- }
-
-
- /**
- * Set the byte stream for this input source.
- *
- * <p>The SAX parser will ignore this if there is also a character
- * stream specified, but it will use a byte stream in preference
- * to opening a URI connection itself.</p>
- *
- * <p>If the application knows the character encoding of the
- * byte stream, it should set it with the setEncoding method.</p>
- *
- * @param byteStream A byte stream containing an XML document or
- * other entity.
- * @see #setEncoding
- * @see #getByteStream
- * @see #getEncoding
- * @see java.io.InputStream
- */
- public void setByteStream (InputStream byteStream)
- {
- this.byteStream = byteStream;
- }
-
-
- /**
- * Get the byte stream for this input source.
- *
- * <p>The getEncoding method will return the character
- * encoding for this byte stream, or null if unknown.</p>
- *
- * @return The byte stream, or null if none was supplied.
- * @see #getEncoding
- * @see #setByteStream
- */
- public InputStream getByteStream ()
- {
- return byteStream;
- }
-
-
- /**
- * Set the character encoding, if known.
- *
- * <p>The encoding must be a string acceptable for an
- * XML encoding declaration (see section 4.3.3 of the XML 1.0
- * recommendation).</p>
- *
- * <p>This method has no effect when the application provides a
- * character stream.</p>
- *
- * @param encoding A string describing the character encoding.
- * @see #setSystemId
- * @see #setByteStream
- * @see #getEncoding
- */
- public void setEncoding (String encoding)
- {
- this.encoding = encoding;
- }
-
-
- /**
- * Get the character encoding for a byte stream or URI.
- *
- * @return The encoding, or null if none was supplied.
- * @see #setByteStream
- * @see #getSystemId
- * @see #getByteStream
- */
- public String getEncoding ()
- {
- return encoding;
- }
-
-
- /**
- * Set the character stream for this input source.
- *
- * <p>If there is a character stream specified, the SAX parser
- * will ignore any byte stream and will not attempt to open
- * a URI connection to the system identifier.</p>
- *
- * @param characterStream The character stream containing the
- * XML document or other entity.
- * @see #getCharacterStream
- * @see java.io.Reader
- */
- public void setCharacterStream (Reader characterStream)
- {
- this.characterStream = characterStream;
- }
-
-
- /**
- * Get the character stream for this input source.
- *
- * @return The character stream, or null if none was supplied.
- * @see #setCharacterStream
- */
- public Reader getCharacterStream ()
- {
- return characterStream;
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Internal state.
- ////////////////////////////////////////////////////////////////////
-
- private String publicId;
- private String systemId;
- private InputStream byteStream;
- private String encoding;
- private Reader characterStream;
-
-}
-
-// end of InputSource.java
+// SAX input source. +// http://www.saxproject.org +// No warranty; no copyright -- use this as you will. +// $Id: InputSource.java,v 1.5.2.4 2002/01/29 21:34:14 dbrownell Exp $ + +package org.xml.sax; + +import java.io.Reader; +import java.io.InputStream; + +/** + * A single input source for an XML entity. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>This class allows a SAX application to encapsulate information + * about an input source in a single object, which may include + * a public identifier, a system identifier, a byte stream (possibly + * with a specified encoding), and/or a character stream.</p> + * + * <p>There are two places that the application can deliver an + * input source to the parser: as the argument to the Parser.parse + * method, or as the return value of the EntityResolver.resolveEntity + * method.</p> + * + * <p>The SAX parser will use the InputSource object to determine how + * to read XML input. If there is a character stream available, the + * parser will read that stream directly, disregarding any text + * encoding declaration found in that stream. + * If there is no character stream, but there is + * a byte stream, the parser will use that byte stream, using the + * encoding specified in the InputSource or else (if no encoding is + * specified) autodetecting the character encoding using an algorithm + * such as the one in the XML specification. If neither a character + * stream nor a + * byte stream is available, the parser will attempt to open a URI + * connection to the resource identified by the system + * identifier.</p> + * + * <p>An InputSource object belongs to the application: the SAX parser + * shall never modify it in any way (it may modify a copy if + * necessary). However, standard processing of both byte and + * character streams is to close them on as part of end-of-parse cleanup, + * so applications should not attempt to re-use such streams after they + * have been handed to a parser. </p> + * + * @since SAX 1.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + * @see org.xml.sax.XMLReader#parse(org.xml.sax.InputSource) + * @see org.xml.sax.EntityResolver#resolveEntity + * @see java.io.InputStream + * @see java.io.Reader + */ +public class InputSource { + + /** + * Zero-argument default constructor. + * + * @see #setPublicId + * @see #setSystemId + * @see #setByteStream + * @see #setCharacterStream + * @see #setEncoding + */ + public InputSource () + { + } + + + /** + * Create a new input source with a system identifier. + * + * <p>Applications may use setPublicId to include a + * public identifier as well, or setEncoding to specify + * the character encoding, if known.</p> + * + * <p>If the system identifier is a URL, it must be fully + * resolved (it may not be a relative URL).</p> + * + * @param systemId The system identifier (URI). + * @see #setPublicId + * @see #setSystemId + * @see #setByteStream + * @see #setEncoding + * @see #setCharacterStream + */ + public InputSource (String systemId) + { + setSystemId(systemId); + } + + + /** + * Create a new input source with a byte stream. + * + * <p>Application writers should use setSystemId() to provide a base + * for resolving relative URIs, may use setPublicId to include a + * public identifier, and may use setEncoding to specify the object's + * character encoding.</p> + * + * @param byteStream The raw byte stream containing the document. + * @see #setPublicId + * @see #setSystemId + * @see #setEncoding + * @see #setByteStream + * @see #setCharacterStream + */ + public InputSource (InputStream byteStream) + { + setByteStream(byteStream); + } + + + /** + * Create a new input source with a character stream. + * + * <p>Application writers should use setSystemId() to provide a base + * for resolving relative URIs, and may use setPublicId to include a + * public identifier.</p> + * + * <p>The character stream shall not include a byte order mark.</p> + * + * @see #setPublicId + * @see #setSystemId + * @see #setByteStream + * @see #setCharacterStream + */ + public InputSource (Reader characterStream) + { + setCharacterStream(characterStream); + } + + + /** + * Set the public identifier for this input source. + * + * <p>The public identifier is always optional: if the application + * writer includes one, it will be provided as part of the + * location information.</p> + * + * @param publicId The public identifier as a string. + * @see #getPublicId + * @see org.xml.sax.Locator#getPublicId + * @see org.xml.sax.SAXParseException#getPublicId + */ + public void setPublicId (String publicId) + { + this.publicId = publicId; + } + + + /** + * Get the public identifier for this input source. + * + * @return The public identifier, or null if none was supplied. + * @see #setPublicId + */ + public String getPublicId () + { + return publicId; + } + + + /** + * Set the system identifier for this input source. + * + * <p>The system identifier is optional if there is a byte stream + * or a character stream, but it is still useful to provide one, + * since the application can use it to resolve relative URIs + * and can include it in error messages and warnings (the parser + * will attempt to open a connection to the URI only if + * there is no byte stream or character stream specified).</p> + * + * <p>If the application knows the character encoding of the + * object pointed to by the system identifier, it can register + * the encoding using the setEncoding method.</p> + * + * <p>If the system identifier is a URL, it must be fully + * resolved (it may not be a relative URL).</p> + * + * @param systemId The system identifier as a string. + * @see #setEncoding + * @see #getSystemId + * @see org.xml.sax.Locator#getSystemId + * @see org.xml.sax.SAXParseException#getSystemId + */ + public void setSystemId (String systemId) + { + this.systemId = systemId; + } + + + /** + * Get the system identifier for this input source. + * + * <p>The getEncoding method will return the character encoding + * of the object pointed to, or null if unknown.</p> + * + * <p>If the system ID is a URL, it will be fully resolved.</p> + * + * @return The system identifier, or null if none was supplied. + * @see #setSystemId + * @see #getEncoding + */ + public String getSystemId () + { + return systemId; + } + + + /** + * Set the byte stream for this input source. + * + * <p>The SAX parser will ignore this if there is also a character + * stream specified, but it will use a byte stream in preference + * to opening a URI connection itself.</p> + * + * <p>If the application knows the character encoding of the + * byte stream, it should set it with the setEncoding method.</p> + * + * @param byteStream A byte stream containing an XML document or + * other entity. + * @see #setEncoding + * @see #getByteStream + * @see #getEncoding + * @see java.io.InputStream + */ + public void setByteStream (InputStream byteStream) + { + this.byteStream = byteStream; + } + + + /** + * Get the byte stream for this input source. + * + * <p>The getEncoding method will return the character + * encoding for this byte stream, or null if unknown.</p> + * + * @return The byte stream, or null if none was supplied. + * @see #getEncoding + * @see #setByteStream + */ + public InputStream getByteStream () + { + return byteStream; + } + + + /** + * Set the character encoding, if known. + * + * <p>The encoding must be a string acceptable for an + * XML encoding declaration (see section 4.3.3 of the XML 1.0 + * recommendation).</p> + * + * <p>This method has no effect when the application provides a + * character stream.</p> + * + * @param encoding A string describing the character encoding. + * @see #setSystemId + * @see #setByteStream + * @see #getEncoding + */ + public void setEncoding (String encoding) + { + this.encoding = encoding; + } + + + /** + * Get the character encoding for a byte stream or URI. + * This value will be ignored when the application provides a + * character stream. + * + * @return The encoding, or null if none was supplied. + * @see #setByteStream + * @see #getSystemId + * @see #getByteStream + */ + public String getEncoding () + { + return encoding; + } + + + /** + * Set the character stream for this input source. + * + * <p>If there is a character stream specified, the SAX parser + * will ignore any byte stream and will not attempt to open + * a URI connection to the system identifier.</p> + * + * @param characterStream The character stream containing the + * XML document or other entity. + * @see #getCharacterStream + * @see java.io.Reader + */ + public void setCharacterStream (Reader characterStream) + { + this.characterStream = characterStream; + } + + + /** + * Get the character stream for this input source. + * + * @return The character stream, or null if none was supplied. + * @see #setCharacterStream + */ + public Reader getCharacterStream () + { + return characterStream; + } + + + + //////////////////////////////////////////////////////////////////// + // Internal state. + //////////////////////////////////////////////////////////////////// + + private String publicId; + private String systemId; + private InputStream byteStream; + private String encoding; + private Reader characterStream; + +} + +// end of InputSource.java diff --git a/libjava/org/xml/sax/Locator.java b/libjava/org/xml/sax/Locator.java index be55656042e..d94c3ea4abd 100644 --- a/libjava/org/xml/sax/Locator.java +++ b/libjava/org/xml/sax/Locator.java @@ -1,126 +1,136 @@ -// SAX locator interface for document events.
-// No warranty; no copyright -- use this as you will.
-// $Id: Locator.java,v 1.1 2000/10/02 02:43:17 sboag Exp $
-
-package org.xml.sax;
-
-
-/**
- * Interface for associating a SAX event with a document location.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>If a SAX parser provides location information to the SAX
- * application, it does so by implementing this interface and then
- * passing an instance to the application using the content
- * handler's {@link org.xml.sax.ContentHandler#setDocumentLocator
- * setDocumentLocator} method. The application can use the
- * object to obtain the location of any other content handler event
- * in the XML source document.</p>
- *
- * <p>Note that the results returned by the object will be valid only
- * during the scope of each content handler method: the application
- * will receive unpredictable results if it attempts to use the
- * locator at any other time.</p>
- *
- * <p>SAX parsers are not required to supply a locator, but they are
- * very strongly encouraged to do so. If the parser supplies a
- * locator, it must do so before reporting any other document events.
- * If no locator has been set by the time the application receives
- * the {@link org.xml.sax.ContentHandler#startDocument startDocument}
- * event, the application should assume that a locator is not
- * available.</p>
- *
- * @since SAX 1.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.ContentHandler#setDocumentLocator
- */
-public interface Locator {
-
-
- /**
- * Return the public identifier for the current document event.
- *
- * <p>The return value is the public identifier of the document
- * entity or of the external parsed entity in which the markup
- * triggering the event appears.</p>
- *
- * @return A string containing the public identifier, or
- * null if none is available.
- * @see #getSystemId
- */
- public abstract String getPublicId ();
-
-
- /**
- * Return the system identifier for the current document event.
- *
- * <p>The return value is the system identifier of the document
- * entity or of the external parsed entity in which the markup
- * triggering the event appears.</p>
- *
- * <p>If the system identifier is a URL, the parser must resolve it
- * fully before passing it to the application.</p>
- *
- * @return A string containing the system identifier, or null
- * if none is available.
- * @see #getPublicId
- */
- public abstract String getSystemId ();
-
-
- /**
- * Return the line number where the current document event ends.
- *
- * <p><strong>Warning:</strong> The return value from the method
- * is intended only as an approximation for the sake of error
- * reporting; it is not intended to provide sufficient information
- * to edit the character content of the original XML document.</p>
- *
- * <p>The return value is an approximation of the line number
- * in the document entity or external parsed entity where the
- * markup triggering the event appears.</p>
- *
- * <p>If possible, the SAX driver should provide the line position
- * of the first character after the text associated with the document
- * event. The first line in the document is line 1.</p>
- *
- * @return The line number, or -1 if none is available.
- * @see #getColumnNumber
- */
- public abstract int getLineNumber ();
-
-
- /**
- * Return the column number where the current document event ends.
- *
- * <p><strong>Warning:</strong> The return value from the method
- * is intended only as an approximation for the sake of error
- * reporting; it is not intended to provide sufficient information
- * to edit the character content of the original XML document.</p>
- *
- * <p>The return value is an approximation of the column number
- * in the document entity or external parsed entity where the
- * markup triggering the event appears.</p>
- *
- * <p>If possible, the SAX driver should provide the line position
- * of the first character after the text associated with the document
- * event.</p>
- *
- * <p>If possible, the SAX driver should provide the line position
- * of the first character after the text associated with the document
- * event. The first column in each line is column 1.</p>
- *
- * @return The column number, or -1 if none is available.
- * @see #getLineNumber
- */
- public abstract int getColumnNumber ();
-
-}
-
-// end of Locator.java
+// SAX locator interface for document events. +// http://www.saxproject.org +// No warranty; no copyright -- use this as you will. +// $Id: Locator.java,v 1.4.2.5 2002/01/29 21:34:14 dbrownell Exp $ + +package org.xml.sax; + + +/** + * Interface for associating a SAX event with a document location. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>If a SAX parser provides location information to the SAX + * application, it does so by implementing this interface and then + * passing an instance to the application using the content + * handler's {@link org.xml.sax.ContentHandler#setDocumentLocator + * setDocumentLocator} method. The application can use the + * object to obtain the location of any other SAX event + * in the XML source document.</p> + * + * <p>Note that the results returned by the object will be valid only + * during the scope of each callback method: the application + * will receive unpredictable results if it attempts to use the + * locator at any other time, or after parsing completes.</p> + * + * <p>SAX parsers are not required to supply a locator, but they are + * very strongly encouraged to do so. If the parser supplies a + * locator, it must do so before reporting any other document events. + * If no locator has been set by the time the application receives + * the {@link org.xml.sax.ContentHandler#startDocument startDocument} + * event, the application should assume that a locator is not + * available.</p> + * + * @since SAX 1.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + * @see org.xml.sax.ContentHandler#setDocumentLocator + */ +public interface Locator { + + + /** + * Return the public identifier for the current document event. + * + * <p>The return value is the public identifier of the document + * entity or of the external parsed entity in which the markup + * triggering the event appears.</p> + * + * @return A string containing the public identifier, or + * null if none is available. + * @see #getSystemId + */ + public abstract String getPublicId (); + + + /** + * Return the system identifier for the current document event. + * + * <p>The return value is the system identifier of the document + * entity or of the external parsed entity in which the markup + * triggering the event appears.</p> + * + * <p>If the system identifier is a URL, the parser must resolve it + * fully before passing it to the application. For example, a file + * name must always be provided as a <em>file:...</em> URL, and other + * kinds of relative URI are also resolved against their bases.</p> + * + * @return A string containing the system identifier, or null + * if none is available. + * @see #getPublicId + */ + public abstract String getSystemId (); + + + /** + * Return the line number where the current document event ends. + * Lines are delimited by line ends, which are defined in + * the XML specification. + * + * <p><strong>Warning:</strong> The return value from the method + * is intended only as an approximation for the sake of diagnostics; + * it is not intended to provide sufficient information + * to edit the character content of the original XML document. + * In some cases, these "line" numbers match what would be displayed + * as columns, and in others they may not match the source text + * due to internal entity expansion. </p> + * + * <p>The return value is an approximation of the line number + * in the document entity or external parsed entity where the + * markup triggering the event appears.</p> + * + * <p>If possible, the SAX driver should provide the line position + * of the first character after the text associated with the document + * event. The first line is line 1.</p> + * + * @return The line number, or -1 if none is available. + * @see #getColumnNumber + */ + public abstract int getLineNumber (); + + + /** + * Return the column number where the current document event ends. + * This is one-based number of Java <code>char</code> values since + * the last line end. + * + * <p><strong>Warning:</strong> The return value from the method + * is intended only as an approximation for the sake of diagnostics; + * it is not intended to provide sufficient information + * to edit the character content of the original XML document. + * For example, when lines contain combining character sequences, wide + * characters, surrogate pairs, or bi-directional text, the value may + * not correspond to the column in a text editor's display. </p> + * + * <p>The return value is an approximation of the column number + * in the document entity or external parsed entity where the + * markup triggering the event appears.</p> + * + * <p>If possible, the SAX driver should provide the line position + * of the first character after the text associated with the document + * event. The first column in each line is column 1.</p> + * + * @return The column number, or -1 if none is available. + * @see #getLineNumber + */ + public abstract int getColumnNumber (); + +} + +// end of Locator.java diff --git a/libjava/org/xml/sax/Parser.java b/libjava/org/xml/sax/Parser.java index e775ca97c87..2999265c4c3 100644 --- a/libjava/org/xml/sax/Parser.java +++ b/libjava/org/xml/sax/Parser.java @@ -1,207 +1,209 @@ -// SAX parser interface.
-// No warranty; no copyright -- use this as you will.
-// $Id: Parser.java,v 1.1 2000/10/02 02:43:17 sboag Exp $
-
-package org.xml.sax;
-
-import java.io.IOException;
-import java.util.Locale;
-
-
-/**
- * Basic interface for SAX (Simple API for XML) parsers.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>This was the main event supplier interface for SAX1; it has
- * been replaced in SAX2 by {@link org.xml.sax.XMLReader XMLReader},
- * which includes Namespace support and sophisticated configurability
- * and extensibility.</p>
- *
- * <p>All SAX1 parsers must implement this basic interface: it allows
- * applications to register handlers for different types of events
- * and to initiate a parse from a URI, or a character stream.</p>
- *
- * <p>All SAX1 parsers must also implement a zero-argument constructor
- * (though other constructors are also allowed).</p>
- *
- * <p>SAX1 parsers are reusable but not re-entrant: the application
- * may reuse a parser object (possibly with a different input source)
- * once the first parse has completed successfully, but it may not
- * invoke the parse() methods recursively within a parse.</p>
- *
- * @deprecated This interface has been replaced by the SAX2
- * {@link org.xml.sax.XMLReader XMLReader}
- * interface, which includes Namespace support.
- * @since SAX 1.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.EntityResolver
- * @see org.xml.sax.DTDHandler
- * @see org.xml.sax.DocumentHandler
- * @see org.xml.sax.ErrorHandler
- * @see org.xml.sax.HandlerBase
- * @see org.xml.sax.InputSource
- */
-public interface Parser
-{
-
- /**
- * Allow an application to request a locale for errors and warnings.
- *
- * <p>SAX parsers are not required to provide localisation for errors
- * and warnings; if they cannot support the requested locale,
- * however, they must throw a SAX exception. Applications may
- * not request a locale change in the middle of a parse.</p>
- *
- * @param locale A Java Locale object.
- * @exception org.xml.sax.SAXException Throws an exception
- * (using the previous or default locale) if the
- * requested locale is not supported.
- * @see org.xml.sax.SAXException
- * @see org.xml.sax.SAXParseException
- */
- public abstract void setLocale (Locale locale)
- throws SAXException;
-
-
- /**
- * Allow an application to register a custom entity resolver.
- *
- * <p>If the application does not register an entity resolver, the
- * SAX parser will resolve system identifiers and open connections
- * to entities itself (this is the default behaviour implemented in
- * HandlerBase).</p>
- *
- * <p>Applications may register a new or different entity resolver
- * in the middle of a parse, and the SAX parser must begin using
- * the new resolver immediately.</p>
- *
- * @param resolver The object for resolving entities.
- * @see EntityResolver
- * @see HandlerBase
- */
- public abstract void setEntityResolver (EntityResolver resolver);
-
-
- /**
- * Allow an application to register a DTD event handler.
- *
- * <p>If the application does not register a DTD handler, all DTD
- * events reported by the SAX parser will be silently
- * ignored (this is the default behaviour implemented by
- * HandlerBase).</p>
- *
- * <p>Applications may register a new or different
- * handler in the middle of a parse, and the SAX parser must
- * begin using the new handler immediately.</p>
- *
- * @param handler The DTD handler.
- * @see DTDHandler
- * @see HandlerBase
- */
- public abstract void setDTDHandler (DTDHandler handler);
-
-
- /**
- * Allow an application to register a document event handler.
- *
- * <p>If the application does not register a document handler, all
- * document events reported by the SAX parser will be silently
- * ignored (this is the default behaviour implemented by
- * HandlerBase).</p>
- *
- * <p>Applications may register a new or different handler in the
- * middle of a parse, and the SAX parser must begin using the new
- * handler immediately.</p>
- *
- * @param handler The document handler.
- * @see DocumentHandler
- * @see HandlerBase
- */
- public abstract void setDocumentHandler (DocumentHandler handler);
-
-
- /**
- * Allow an application to register an error event handler.
- *
- * <p>If the application does not register an error event handler,
- * all error events reported by the SAX parser will be silently
- * ignored, except for fatalError, which will throw a SAXException
- * (this is the default behaviour implemented by HandlerBase).</p>
- *
- * <p>Applications may register a new or different handler in the
- * middle of a parse, and the SAX parser must begin using the new
- * handler immediately.</p>
- *
- * @param handler The error handler.
- * @see ErrorHandler
- * @see SAXException
- * @see HandlerBase
- */
- public abstract void setErrorHandler (ErrorHandler handler);
-
-
- /**
- * Parse an XML document.
- *
- * <p>The application can use this method to instruct the SAX parser
- * to begin parsing an XML document from any valid input
- * source (a character stream, a byte stream, or a URI).</p>
- *
- * <p>Applications may not invoke this method while a parse is in
- * progress (they should create a new Parser instead for each
- * additional XML document). Once a parse is complete, an
- * application may reuse the same Parser object, possibly with a
- * different input source.</p>
- *
- * @param source The input source for the top-level of the
- * XML document.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @exception java.io.IOException An IO exception from the parser,
- * possibly from a byte stream or character stream
- * supplied by the application.
- * @see org.xml.sax.InputSource
- * @see #parse(java.lang.String)
- * @see #setEntityResolver
- * @see #setDTDHandler
- * @see #setDocumentHandler
- * @see #setErrorHandler
- */
- public abstract void parse (InputSource source)
- throws SAXException, IOException;
-
-
- /**
- * Parse an XML document from a system identifier (URI).
- *
- * <p>This method is a shortcut for the common case of reading a
- * document from a system identifier. It is the exact
- * equivalent of the following:</p>
- *
- * <pre>
- * parse(new InputSource(systemId));
- * </pre>
- *
- * <p>If the system identifier is a URL, it must be fully resolved
- * by the application before it is passed to the parser.</p>
- *
- * @param systemId The system identifier (URI).
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @exception java.io.IOException An IO exception from the parser,
- * possibly from a byte stream or character stream
- * supplied by the application.
- * @see #parse(org.xml.sax.InputSource)
- */
- public abstract void parse (String systemId)
- throws SAXException, IOException;
-
-}
-
-// end of Parser.java
+// SAX parser interface. +// http://www.saxproject.org +// No warranty; no copyright -- use this as you will. +// $Id: Parser.java,v 1.3.2.3 2002/01/29 21:34:14 dbrownell Exp $ + +package org.xml.sax; + +import java.io.IOException; +import java.util.Locale; + + +/** + * Basic interface for SAX (Simple API for XML) parsers. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>This was the main event supplier interface for SAX1; it has + * been replaced in SAX2 by {@link org.xml.sax.XMLReader XMLReader}, + * which includes Namespace support and sophisticated configurability + * and extensibility.</p> + * + * <p>All SAX1 parsers must implement this basic interface: it allows + * applications to register handlers for different types of events + * and to initiate a parse from a URI, or a character stream.</p> + * + * <p>All SAX1 parsers must also implement a zero-argument constructor + * (though other constructors are also allowed).</p> + * + * <p>SAX1 parsers are reusable but not re-entrant: the application + * may reuse a parser object (possibly with a different input source) + * once the first parse has completed successfully, but it may not + * invoke the parse() methods recursively within a parse.</p> + * + * @deprecated This interface has been replaced by the SAX2 + * {@link org.xml.sax.XMLReader XMLReader} + * interface, which includes Namespace support. + * @since SAX 1.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + * @see org.xml.sax.EntityResolver + * @see org.xml.sax.DTDHandler + * @see org.xml.sax.DocumentHandler + * @see org.xml.sax.ErrorHandler + * @see org.xml.sax.HandlerBase + * @see org.xml.sax.InputSource + */ +public interface Parser +{ + + /** + * Allow an application to request a locale for errors and warnings. + * + * <p>SAX parsers are not required to provide localisation for errors + * and warnings; if they cannot support the requested locale, + * however, they must throw a SAX exception. Applications may + * not request a locale change in the middle of a parse.</p> + * + * @param locale A Java Locale object. + * @exception org.xml.sax.SAXException Throws an exception + * (using the previous or default locale) if the + * requested locale is not supported. + * @see org.xml.sax.SAXException + * @see org.xml.sax.SAXParseException + */ + public abstract void setLocale (Locale locale) + throws SAXException; + + + /** + * Allow an application to register a custom entity resolver. + * + * <p>If the application does not register an entity resolver, the + * SAX parser will resolve system identifiers and open connections + * to entities itself (this is the default behaviour implemented in + * HandlerBase).</p> + * + * <p>Applications may register a new or different entity resolver + * in the middle of a parse, and the SAX parser must begin using + * the new resolver immediately.</p> + * + * @param resolver The object for resolving entities. + * @see EntityResolver + * @see HandlerBase + */ + public abstract void setEntityResolver (EntityResolver resolver); + + + /** + * Allow an application to register a DTD event handler. + * + * <p>If the application does not register a DTD handler, all DTD + * events reported by the SAX parser will be silently + * ignored (this is the default behaviour implemented by + * HandlerBase).</p> + * + * <p>Applications may register a new or different + * handler in the middle of a parse, and the SAX parser must + * begin using the new handler immediately.</p> + * + * @param handler The DTD handler. + * @see DTDHandler + * @see HandlerBase + */ + public abstract void setDTDHandler (DTDHandler handler); + + + /** + * Allow an application to register a document event handler. + * + * <p>If the application does not register a document handler, all + * document events reported by the SAX parser will be silently + * ignored (this is the default behaviour implemented by + * HandlerBase).</p> + * + * <p>Applications may register a new or different handler in the + * middle of a parse, and the SAX parser must begin using the new + * handler immediately.</p> + * + * @param handler The document handler. + * @see DocumentHandler + * @see HandlerBase + */ + public abstract void setDocumentHandler (DocumentHandler handler); + + + /** + * Allow an application to register an error event handler. + * + * <p>If the application does not register an error event handler, + * all error events reported by the SAX parser will be silently + * ignored, except for fatalError, which will throw a SAXException + * (this is the default behaviour implemented by HandlerBase).</p> + * + * <p>Applications may register a new or different handler in the + * middle of a parse, and the SAX parser must begin using the new + * handler immediately.</p> + * + * @param handler The error handler. + * @see ErrorHandler + * @see SAXException + * @see HandlerBase + */ + public abstract void setErrorHandler (ErrorHandler handler); + + + /** + * Parse an XML document. + * + * <p>The application can use this method to instruct the SAX parser + * to begin parsing an XML document from any valid input + * source (a character stream, a byte stream, or a URI).</p> + * + * <p>Applications may not invoke this method while a parse is in + * progress (they should create a new Parser instead for each + * additional XML document). Once a parse is complete, an + * application may reuse the same Parser object, possibly with a + * different input source.</p> + * + * @param source The input source for the top-level of the + * XML document. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @exception java.io.IOException An IO exception from the parser, + * possibly from a byte stream or character stream + * supplied by the application. + * @see org.xml.sax.InputSource + * @see #parse(java.lang.String) + * @see #setEntityResolver + * @see #setDTDHandler + * @see #setDocumentHandler + * @see #setErrorHandler + */ + public abstract void parse (InputSource source) + throws SAXException, IOException; + + + /** + * Parse an XML document from a system identifier (URI). + * + * <p>This method is a shortcut for the common case of reading a + * document from a system identifier. It is the exact + * equivalent of the following:</p> + * + * <pre> + * parse(new InputSource(systemId)); + * </pre> + * + * <p>If the system identifier is a URL, it must be fully resolved + * by the application before it is passed to the parser.</p> + * + * @param systemId The system identifier (URI). + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @exception java.io.IOException An IO exception from the parser, + * possibly from a byte stream or character stream + * supplied by the application. + * @see #parse(org.xml.sax.InputSource) + */ + public abstract void parse (String systemId) + throws SAXException, IOException; + +} + +// end of Parser.java diff --git a/libjava/org/xml/sax/SAXException.java b/libjava/org/xml/sax/SAXException.java index 69537e91706..b11d998edad 100644 --- a/libjava/org/xml/sax/SAXException.java +++ b/libjava/org/xml/sax/SAXException.java @@ -1,144 +1,153 @@ -// SAX exception class.
-// No warranty; no copyright -- use this as you will.
-// $Id: SAXException.java,v 1.1 2000/10/02 02:43:17 sboag Exp $
-
-package org.xml.sax;
-
-/**
- * Encapsulate a general SAX error or warning.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>This class can contain basic error or warning information from
- * either the XML parser or the application: a parser writer or
- * application writer can subclass it to provide additional
- * functionality. SAX handlers may throw this exception or
- * any exception subclassed from it.</p>
- *
- * <p>If the application needs to pass through other types of
- * exceptions, it must wrap those exceptions in a SAXException
- * or an exception derived from a SAXException.</p>
- *
- * <p>If the parser or application needs to include information about a
- * specific location in an XML document, it should use the
- * {@link org.xml.sax.SAXParseException SAXParseException} subclass.</p>
- *
- * @since SAX 1.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.SAXParseException
- */
-public class SAXException extends Exception {
-
-
- /**
- * Create a new SAXException.
- *
- * @param message The error or warning message.
- * @see org.xml.sax.Parser#setLocale
- */
- public SAXException (String message) {
- super(message);
- this.exception = null;
- }
-
-
- /**
- * Create a new SAXException wrapping an existing exception.
- *
- * <p>The existing exception will be embedded in the new
- * one, and its message will become the default message for
- * the SAXException.</p>
- *
- * @param e The exception to be wrapped in a SAXException.
- */
- public SAXException (Exception e)
- {
- super();
- this.exception = e;
- }
-
-
- /**
- * Create a new SAXException from an existing exception.
- *
- * <p>The existing exception will be embedded in the new
- * one, but the new exception will have its own message.</p>
- *
- * @param message The detail message.
- * @param e The exception to be wrapped in a SAXException.
- * @see org.xml.sax.Parser#setLocale
- */
- public SAXException (String message, Exception e)
- {
- super(message);
- this.exception = e;
- }
-
-
- /**
- * Return a detail message for this exception.
- *
- * <p>If there is an embedded exception, and if the SAXException
- * has no detail message of its own, this method will return
- * the detail message from the embedded exception.</p>
- *
- * @return The error or warning message.
- * @see org.xml.sax.Parser#setLocale
- */
- public String getMessage ()
- {
- String message = super.getMessage();
-
- if (message == null && exception != null) {
- return exception.getMessage();
- } else {
- return message;
- }
- }
-
-
- /**
- * Return the embedded exception, if any.
- *
- * @return The embedded exception, or null if there is none.
- */
- public Exception getException ()
- {
- return exception;
- }
-
-
- /**
- * Override toString to pick up any embedded exception.
- *
- * @return A string representation of this exception.
- */
- public String toString ()
- {
- if (exception != null) {
- return exception.toString();
- } else {
- return super.toString();
- }
- }
-
-
-
- //////////////////////////////////////////////////////////////////////
- // Internal state.
- //////////////////////////////////////////////////////////////////////
-
-
- /**
- * @serial The embedded exception if tunnelling, or null.
- */
- private Exception exception;
-
-}
-
-// end of SAXException.java
+// SAX exception class. +// http://www.saxproject.org +// No warranty; no copyright -- use this as you will. +// $Id: SAXException.java,v 1.4.2.4 2002/01/29 21:34:14 dbrownell Exp $ + +package org.xml.sax; + +/** + * Encapsulate a general SAX error or warning. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>This class can contain basic error or warning information from + * either the XML parser or the application: a parser writer or + * application writer can subclass it to provide additional + * functionality. SAX handlers may throw this exception or + * any exception subclassed from it.</p> + * + * <p>If the application needs to pass through other types of + * exceptions, it must wrap those exceptions in a SAXException + * or an exception derived from a SAXException.</p> + * + * <p>If the parser or application needs to include information about a + * specific location in an XML document, it should use the + * {@link org.xml.sax.SAXParseException SAXParseException} subclass.</p> + * + * @since SAX 1.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + * @see org.xml.sax.SAXParseException + */ +public class SAXException extends Exception { + + + /** + * Create a new SAXException. + */ + public SAXException () + { + super(); + this.exception = null; + } + + + /** + * Create a new SAXException. + * + * @param message The error or warning message. + */ + public SAXException (String message) { + super(message); + this.exception = null; + } + + + /** + * Create a new SAXException wrapping an existing exception. + * + * <p>The existing exception will be embedded in the new + * one, and its message will become the default message for + * the SAXException.</p> + * + * @param e The exception to be wrapped in a SAXException. + */ + public SAXException (Exception e) + { + super(); + this.exception = e; + } + + + /** + * Create a new SAXException from an existing exception. + * + * <p>The existing exception will be embedded in the new + * one, but the new exception will have its own message.</p> + * + * @param message The detail message. + * @param e The exception to be wrapped in a SAXException. + */ + public SAXException (String message, Exception e) + { + super(message); + this.exception = e; + } + + + /** + * Return a detail message for this exception. + * + * <p>If there is an embedded exception, and if the SAXException + * has no detail message of its own, this method will return + * the detail message from the embedded exception.</p> + * + * @return The error or warning message. + */ + public String getMessage () + { + String message = super.getMessage(); + + if (message == null && exception != null) { + return exception.getMessage(); + } else { + return message; + } + } + + + /** + * Return the embedded exception, if any. + * + * @return The embedded exception, or null if there is none. + */ + public Exception getException () + { + return exception; + } + + + /** + * Override toString to pick up any embedded exception. + * + * @return A string representation of this exception. + */ + public String toString () + { + if (exception != null) { + return exception.toString(); + } else { + return super.toString(); + } + } + + + + ////////////////////////////////////////////////////////////////////// + // Internal state. + ////////////////////////////////////////////////////////////////////// + + + /** + * @serial The embedded exception if tunnelling, or null. + */ + private Exception exception; + +} + +// end of SAXException.java diff --git a/libjava/org/xml/sax/SAXNotRecognizedException.java b/libjava/org/xml/sax/SAXNotRecognizedException.java index 0fbc4c85ba9..83aac69a7d3 100644 --- a/libjava/org/xml/sax/SAXNotRecognizedException.java +++ b/libjava/org/xml/sax/SAXNotRecognizedException.java @@ -1,44 +1,55 @@ -// SAXNotRecognizedException.java - unrecognized feature or value.
-// Written by David Megginson, sax@megginson.com
-// NO WARRANTY! This class is in the Public Domain.
-
-// $Id: SAXNotRecognizedException.java,v 1.1 2000/10/02 02:43:17 sboag Exp $
-
-
-package org.xml.sax;
-
-
-/**
- * Exception class for an unrecognized identifier.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>An XMLReader will throw this exception when it finds an
- * unrecognized feature or property identifier; SAX applications and
- * extensions may use this class for other, similar purposes.</p>
- *
- * @since SAX 2.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.SAXNotSupportedException
- */
-public class SAXNotRecognizedException extends SAXException
-{
-
- /**
- * Construct a new exception with the given message.
- *
- * @param message The text message of the exception.
- */
- public SAXNotRecognizedException (String message)
- {
- super(message);
- }
-
-}
-
-// end of SAXNotRecognizedException.java
+// SAXNotRecognizedException.java - unrecognized feature or value. +// http://www.saxproject.org +// Written by David Megginson +// NO WARRANTY! This class is in the Public Domain. + +// $Id: SAXNotRecognizedException.java,v 1.4.2.3 2002/01/29 21:34:14 dbrownell Exp $ + + +package org.xml.sax; + + +/** + * Exception class for an unrecognized identifier. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>An XMLReader will throw this exception when it finds an + * unrecognized feature or property identifier; SAX applications and + * extensions may use this class for other, similar purposes.</p> + * + * @since SAX 2.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + * @see org.xml.sax.SAXNotSupportedException + */ +public class SAXNotRecognizedException extends SAXException +{ + + /** + * Default constructor. + */ + public SAXNotRecognizedException () + { + super(); + } + + + /** + * Construct a new exception with the given message. + * + * @param message The text message of the exception. + */ + public SAXNotRecognizedException (String message) + { + super(message); + } + +} + +// end of SAXNotRecognizedException.java diff --git a/libjava/org/xml/sax/SAXNotSupportedException.java b/libjava/org/xml/sax/SAXNotSupportedException.java index 3376d47cc5b..2939eb192a5 100644 --- a/libjava/org/xml/sax/SAXNotSupportedException.java +++ b/libjava/org/xml/sax/SAXNotSupportedException.java @@ -1,44 +1,55 @@ -// SAXNotSupportedException.java - unsupported feature or value.
-// Written by David Megginson, sax@megginson.com
-// NO WARRANTY! This class is in the Public Domain.
-
-// $Id: SAXNotSupportedException.java,v 1.1 2000/10/02 02:43:17 sboag Exp $
-
-
-package org.xml.sax;
-
-/**
- * Exception class for an unsupported operation.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>An XMLReader will throw this exception when it recognizes a
- * feature or property identifier, but cannot perform the requested
- * operation (setting a state or value). Other SAX2 applications and
- * extensions may use this class for similar purposes.</p>
- *
- * @since SAX 2.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.SAXNotRecognizedException
- */
-public class SAXNotSupportedException extends SAXException
-{
-
- /**
- * Construct a new exception with the given message.
- *
- * @param message The text message of the exception.
- */
- public SAXNotSupportedException (String message)
- {
- super(message);
- }
-
-}
-
-// end of SAXNotSupportedException.java
+// SAXNotSupportedException.java - unsupported feature or value. +// http://www.saxproject.org +// Written by David Megginson +// NO WARRANTY! This class is in the Public Domain. + +// $Id: SAXNotSupportedException.java,v 1.4.2.3 2002/01/29 21:34:14 dbrownell Exp $ + + +package org.xml.sax; + +/** + * Exception class for an unsupported operation. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>An XMLReader will throw this exception when it recognizes a + * feature or property identifier, but cannot perform the requested + * operation (setting a state or value). Other SAX2 applications and + * extensions may use this class for similar purposes.</p> + * + * @since SAX 2.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + * @see org.xml.sax.SAXNotRecognizedException + */ +public class SAXNotSupportedException extends SAXException +{ + + /** + * Construct a new exception with no message. + */ + public SAXNotSupportedException () + { + super(); + } + + + /** + * Construct a new exception with the given message. + * + * @param message The text message of the exception. + */ + public SAXNotSupportedException (String message) + { + super(message); + } + +} + +// end of SAXNotSupportedException.java diff --git a/libjava/org/xml/sax/SAXParseException.java b/libjava/org/xml/sax/SAXParseException.java index a5dcc06f0fb..e87d79f3f74 100644 --- a/libjava/org/xml/sax/SAXParseException.java +++ b/libjava/org/xml/sax/SAXParseException.java @@ -1,264 +1,270 @@ -// SAX exception class.
-// No warranty; no copyright -- use this as you will.
-// $Id: SAXParseException.java,v 1.1 2000/10/02 02:43:17 sboag Exp $
-
-package org.xml.sax;
-
-/**
- * Encapsulate an XML parse error or warning.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>This exception will include information for locating the error
- * in the original XML document. Note that although the application
- * will receive a SAXParseException as the argument to the handlers
- * in the {@link org.xml.sax.ErrorHandler ErrorHandler} interface,
- * the application is not actually required to throw the exception;
- * instead, it can simply read the information in it and take a
- * different action.</p>
- *
- * <p>Since this exception is a subclass of {@link org.xml.sax.SAXException
- * SAXException}, it inherits the ability to wrap another exception.</p>
- *
- * @since SAX 1.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.SAXException
- * @see org.xml.sax.Locator
- * @see org.xml.sax.ErrorHandler
- */
-public class SAXParseException extends SAXException {
-
-
- //////////////////////////////////////////////////////////////////////
- // Constructors.
- //////////////////////////////////////////////////////////////////////
-
-
- /**
- * Create a new SAXParseException from a message and a Locator.
- *
- * <p>This constructor is especially useful when an application is
- * creating its own exception from within a {@link org.xml.sax.ContentHandler
- * ContentHandler} callback.</p>
- *
- * @param message The error or warning message.
- * @param locator The locator object for the error or warning (may be
- * null).
- * @see org.xml.sax.Locator
- * @see org.xml.sax.Parser#setLocale
- */
- public SAXParseException (String message, Locator locator) {
- super(message);
- if (locator != null) {
- init(locator.getPublicId(), locator.getSystemId(),
- locator.getLineNumber(), locator.getColumnNumber());
- } else {
- init(null, null, -1, -1);
- }
- }
-
-
- /**
- * Wrap an existing exception in a SAXParseException.
- *
- * <p>This constructor is especially useful when an application is
- * creating its own exception from within a {@link org.xml.sax.ContentHandler
- * ContentHandler} callback, and needs to wrap an existing exception that is not a
- * subclass of {@link org.xml.sax.SAXException SAXException}.</p>
- *
- * @param message The error or warning message, or null to
- * use the message from the embedded exception.
- * @param locator The locator object for the error or warning (may be
- * null).
- * @param e Any exception.
- * @see org.xml.sax.Locator
- * @see org.xml.sax.Parser#setLocale
- */
- public SAXParseException (String message, Locator locator,
- Exception e) {
- super(message, e);
- if (locator != null) {
- init(locator.getPublicId(), locator.getSystemId(),
- locator.getLineNumber(), locator.getColumnNumber());
- } else {
- init(null, null, -1, -1);
- }
- }
-
-
- /**
- * Create a new SAXParseException.
- *
- * <p>This constructor is most useful for parser writers.</p>
- *
- * <p>If the system identifier is a URL, the parser must resolve it
- * fully before creating the exception.</p>
- *
- * @param message The error or warning message.
- * @param publicId The public identifier of the entity that generated
- * the error or warning.
- * @param systemId The system identifier of the entity that generated
- * the error or warning.
- * @param lineNumber The line number of the end of the text that
- * caused the error or warning.
- * @param columnNumber The column number of the end of the text that
- * cause the error or warning.
- * @see org.xml.sax.Parser#setLocale
- */
- public SAXParseException (String message, String publicId, String systemId,
- int lineNumber, int columnNumber)
- {
- super(message);
- init(publicId, systemId, lineNumber, columnNumber);
- }
-
-
- /**
- * Create a new SAXParseException with an embedded exception.
- *
- * <p>This constructor is most useful for parser writers who
- * need to wrap an exception that is not a subclass of
- * {@link org.xml.sax.SAXException SAXException}.</p>
- *
- * <p>If the system identifier is a URL, the parser must resolve it
- * fully before creating the exception.</p>
- *
- * @param message The error or warning message, or null to use
- * the message from the embedded exception.
- * @param publicId The public identifier of the entity that generated
- * the error or warning.
- * @param systemId The system identifier of the entity that generated
- * the error or warning.
- * @param lineNumber The line number of the end of the text that
- * caused the error or warning.
- * @param columnNumber The column number of the end of the text that
- * cause the error or warning.
- * @param e Another exception to embed in this one.
- * @see org.xml.sax.Parser#setLocale
- */
- public SAXParseException (String message, String publicId, String systemId,
- int lineNumber, int columnNumber, Exception e)
- {
- super(message, e);
- init(publicId, systemId, lineNumber, columnNumber);
- }
-
-
- /**
- * Internal initialization method.
- *
- * @param publicId The public identifier of the entity which generated the exception,
- * or null.
- * @param systemId The system identifier of the entity which generated the exception,
- * or null.
- * @param lineNumber The line number of the error, or -1.
- * @param columnNumber The column number of the error, or -1.
- */
- private void init (String publicId, String systemId,
- int lineNumber, int columnNumber)
- {
- this.publicId = publicId;
- this.systemId = systemId;
- this.lineNumber = lineNumber;
- this.columnNumber = columnNumber;
- }
-
-
- /**
- * Get the public identifier of the entity where the exception occurred.
- *
- * @return A string containing the public identifier, or null
- * if none is available.
- * @see org.xml.sax.Locator#getPublicId
- */
- public String getPublicId ()
- {
- return this.publicId;
- }
-
-
- /**
- * Get the system identifier of the entity where the exception occurred.
- *
- * <p>If the system identifier is a URL, it will be resolved
- * fully.</p>
- *
- * @return A string containing the system identifier, or null
- * if none is available.
- * @see org.xml.sax.Locator#getSystemId
- */
- public String getSystemId ()
- {
- return this.systemId;
- }
-
-
- /**
- * The line number of the end of the text where the exception occurred.
- *
- * @return An integer representing the line number, or -1
- * if none is available.
- * @see org.xml.sax.Locator#getLineNumber
- */
- public int getLineNumber ()
- {
- return this.lineNumber;
- }
-
-
- /**
- * The column number of the end of the text where the exception occurred.
- *
- * <p>The first column in a line is position 1.</p>
- *
- * @return An integer representing the column number, or -1
- * if none is available.
- * @see org.xml.sax.Locator#getColumnNumber
- */
- public int getColumnNumber ()
- {
- return this.columnNumber;
- }
-
-
-
- //////////////////////////////////////////////////////////////////////
- // Internal state.
- //////////////////////////////////////////////////////////////////////
-
-
- /**
- * @serial The public identifier, or null.
- * @see #getPublicId
- */
- private String publicId;
-
-
- /**
- * @serial The system identifier, or null.
- * @see #getSystemId
- */
- private String systemId;
-
-
- /**
- * @serial The line number, or -1.
- * @see #getLineNumber
- */
- private int lineNumber;
-
-
- /**
- * @serial The column number, or -1.
- * @see #getColumnNumber
- */
- private int columnNumber;
-
-}
-
-// end of SAXParseException.java
+// SAX exception class. +// http://www.saxproject.org +// No warranty; no copyright -- use this as you will. +// $Id: SAXParseException.java,v 1.3.2.5 2002/01/29 21:34:14 dbrownell Exp $ + +package org.xml.sax; + +/** + * Encapsulate an XML parse error or warning. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>This exception may include information for locating the error + * in the original XML document, as if it came from a {@link Locator} + * object. Note that although the application + * will receive a SAXParseException as the argument to the handlers + * in the {@link org.xml.sax.ErrorHandler ErrorHandler} interface, + * the application is not actually required to throw the exception; + * instead, it can simply read the information in it and take a + * different action.</p> + * + * <p>Since this exception is a subclass of {@link org.xml.sax.SAXException + * SAXException}, it inherits the ability to wrap another exception.</p> + * + * @since SAX 1.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + * @see org.xml.sax.SAXException + * @see org.xml.sax.Locator + * @see org.xml.sax.ErrorHandler + */ +public class SAXParseException extends SAXException { + + + ////////////////////////////////////////////////////////////////////// + // Constructors. + ////////////////////////////////////////////////////////////////////// + + + /** + * Create a new SAXParseException from a message and a Locator. + * + * <p>This constructor is especially useful when an application is + * creating its own exception from within a {@link org.xml.sax.ContentHandler + * ContentHandler} callback.</p> + * + * @param message The error or warning message. + * @param locator The locator object for the error or warning (may be + * null). + * @see org.xml.sax.Locator + */ + public SAXParseException (String message, Locator locator) { + super(message); + if (locator != null) { + init(locator.getPublicId(), locator.getSystemId(), + locator.getLineNumber(), locator.getColumnNumber()); + } else { + init(null, null, -1, -1); + } + } + + + /** + * Wrap an existing exception in a SAXParseException. + * + * <p>This constructor is especially useful when an application is + * creating its own exception from within a {@link org.xml.sax.ContentHandler + * ContentHandler} callback, and needs to wrap an existing exception that is not a + * subclass of {@link org.xml.sax.SAXException SAXException}.</p> + * + * @param message The error or warning message, or null to + * use the message from the embedded exception. + * @param locator The locator object for the error or warning (may be + * null). + * @param e Any exception. + * @see org.xml.sax.Locator + */ + public SAXParseException (String message, Locator locator, + Exception e) { + super(message, e); + if (locator != null) { + init(locator.getPublicId(), locator.getSystemId(), + locator.getLineNumber(), locator.getColumnNumber()); + } else { + init(null, null, -1, -1); + } + } + + + /** + * Create a new SAXParseException. + * + * <p>This constructor is most useful for parser writers.</p> + * + * <p>All parameters except the message are as if + * they were provided by a {@link Locator}. For example, if the + * system identifier is a URL (including relative filename), the + * caller must resolve it fully before creating the exception.</p> + * + * + * @param message The error or warning message. + * @param publicId The public identifer of the entity that generated + * the error or warning. + * @param systemId The system identifer of the entity that generated + * the error or warning. + * @param lineNumber The line number of the end of the text that + * caused the error or warning. + * @param columnNumber The column number of the end of the text that + * cause the error or warning. + */ + public SAXParseException (String message, String publicId, String systemId, + int lineNumber, int columnNumber) + { + super(message); + init(publicId, systemId, lineNumber, columnNumber); + } + + + /** + * Create a new SAXParseException with an embedded exception. + * + * <p>This constructor is most useful for parser writers who + * need to wrap an exception that is not a subclass of + * {@link org.xml.sax.SAXException SAXException}.</p> + * + * <p>All parameters except the message and exception are as if + * they were provided by a {@link Locator}. For example, if the + * system identifier is a URL (including relative filename), the + * caller must resolve it fully before creating the exception.</p> + * + * @param message The error or warning message, or null to use + * the message from the embedded exception. + * @param publicId The public identifer of the entity that generated + * the error or warning. + * @param systemId The system identifer of the entity that generated + * the error or warning. + * @param lineNumber The line number of the end of the text that + * caused the error or warning. + * @param columnNumber The column number of the end of the text that + * cause the error or warning. + * @param e Another exception to embed in this one. + */ + public SAXParseException (String message, String publicId, String systemId, + int lineNumber, int columnNumber, Exception e) + { + super(message, e); + init(publicId, systemId, lineNumber, columnNumber); + } + + + /** + * Internal initialization method. + * + * @param publicId The public identifier of the entity which generated the exception, + * or null. + * @param systemId The system identifier of the entity which generated the exception, + * or null. + * @param lineNumber The line number of the error, or -1. + * @param columnNumber The column number of the error, or -1. + */ + private void init (String publicId, String systemId, + int lineNumber, int columnNumber) + { + this.publicId = publicId; + this.systemId = systemId; + this.lineNumber = lineNumber; + this.columnNumber = columnNumber; + } + + + /** + * Get the public identifier of the entity where the exception occurred. + * + * @return A string containing the public identifier, or null + * if none is available. + * @see org.xml.sax.Locator#getPublicId + */ + public String getPublicId () + { + return this.publicId; + } + + + /** + * Get the system identifier of the entity where the exception occurred. + * + * <p>If the system identifier is a URL, it will have been resolved + * fully.</p> + * + * @return A string containing the system identifier, or null + * if none is available. + * @see org.xml.sax.Locator#getSystemId + */ + public String getSystemId () + { + return this.systemId; + } + + + /** + * The line number of the end of the text where the exception occurred. + * + * <p>The first line is line 1.</p> + * + * @return An integer representing the line number, or -1 + * if none is available. + * @see org.xml.sax.Locator#getLineNumber + */ + public int getLineNumber () + { + return this.lineNumber; + } + + + /** + * The column number of the end of the text where the exception occurred. + * + * <p>The first column in a line is position 1.</p> + * + * @return An integer representing the column number, or -1 + * if none is available. + * @see org.xml.sax.Locator#getColumnNumber + */ + public int getColumnNumber () + { + return this.columnNumber; + } + + + + ////////////////////////////////////////////////////////////////////// + // Internal state. + ////////////////////////////////////////////////////////////////////// + + + /** + * @serial The public identifier, or null. + * @see #getPublicId + */ + private String publicId; + + + /** + * @serial The system identifier, or null. + * @see #getSystemId + */ + private String systemId; + + + /** + * @serial The line number, or -1. + * @see #getLineNumber + */ + private int lineNumber; + + + /** + * @serial The column number, or -1. + * @see #getColumnNumber + */ + private int columnNumber; + +} + +// end of SAXParseException.java diff --git a/libjava/org/xml/sax/XMLFilter.java b/libjava/org/xml/sax/XMLFilter.java index b10e8647ff0..eaca11ca321 100644 --- a/libjava/org/xml/sax/XMLFilter.java +++ b/libjava/org/xml/sax/XMLFilter.java @@ -1,65 +1,67 @@ -// XMLFilter.java - filter SAX2 events.
-// Written by David Megginson, sax@megginson.com
-// NO WARRANTY! This class is in the Public Domain.
-
-// $Id: XMLFilter.java,v 1.1 2000/10/02 02:43:17 sboag Exp $
-
-
-package org.xml.sax;
-
-
-/**
- * Interface for an XML filter.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>An XML filter is like an XML reader, except that it obtains its
- * events from another XML reader rather than a primary source like
- * an XML document or database. Filters can modify a stream of
- * events as they pass on to the final application.</p>
- *
- * <p>The XMLFilterImpl helper class provides a convenient base
- * for creating SAX2 filters, by passing on all {@link org.xml.sax.EntityResolver
- * EntityResolver}, {@link org.xml.sax.DTDHandler DTDHandler},
- * {@link org.xml.sax.ContentHandler ContentHandler} and {@link org.xml.sax.ErrorHandler
- * ErrorHandler} events automatically.</p>
- *
- * @since SAX 2.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.helpers.XMLFilterImpl
- */
-public interface XMLFilter extends XMLReader
-{
-
- /**
- * Set the parent reader.
- *
- * <p>This method allows the application to link the filter to
- * a parent reader (which may be another filter). The argument
- * may not be null.</p>
- *
- * @param parent The parent reader.
- */
- public abstract void setParent (XMLReader parent);
-
-
- /**
- * Get the parent reader.
- *
- * <p>This method allows the application to query the parent
- * reader (which may be another filter). It is generally a
- * bad idea to perform any operations on the parent reader
- * directly: they should all pass through this filter.</p>
- *
- * @return The parent filter, or null if none has been set.
- */
- public abstract XMLReader getParent ();
-
-}
-
-// end of XMLFilter.java
+// XMLFilter.java - filter SAX2 events. +// http://www.saxproject.org +// Written by David Megginson +// NO WARRANTY! This class is in the Public Domain. + +// $Id: XMLFilter.java,v 1.3.2.3 2002/01/29 21:34:14 dbrownell Exp $ + + +package org.xml.sax; + + +/** + * Interface for an XML filter. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>An XML filter is like an XML reader, except that it obtains its + * events from another XML reader rather than a primary source like + * an XML document or database. Filters can modify a stream of + * events as they pass on to the final application.</p> + * + * <p>The XMLFilterImpl helper class provides a convenient base + * for creating SAX2 filters, by passing on all {@link org.xml.sax.EntityResolver + * EntityResolver}, {@link org.xml.sax.DTDHandler DTDHandler}, + * {@link org.xml.sax.ContentHandler ContentHandler} and {@link org.xml.sax.ErrorHandler + * ErrorHandler} events automatically.</p> + * + * @since SAX 2.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + * @see org.xml.sax.helpers.XMLFilterImpl + */ +public interface XMLFilter extends XMLReader +{ + + /** + * Set the parent reader. + * + * <p>This method allows the application to link the filter to + * a parent reader (which may be another filter). The argument + * may not be null.</p> + * + * @param parent The parent reader. + */ + public abstract void setParent (XMLReader parent); + + + /** + * Get the parent reader. + * + * <p>This method allows the application to query the parent + * reader (which may be another filter). It is generally a + * bad idea to perform any operations on the parent reader + * directly: they should all pass through this filter.</p> + * + * @return The parent filter, or null if none has been set. + */ + public abstract XMLReader getParent (); + +} + +// end of XMLFilter.java diff --git a/libjava/org/xml/sax/XMLReader.java b/libjava/org/xml/sax/XMLReader.java index 26e382b9fa9..23f3daf3a9f 100644 --- a/libjava/org/xml/sax/XMLReader.java +++ b/libjava/org/xml/sax/XMLReader.java @@ -1,415 +1,398 @@ -// XMLReader.java - read an XML document.
-// Written by David Megginson, sax@megginson.com
-// NO WARRANTY! This class is in the Public Domain.
-
-// $Id: XMLReader.java,v 1.1 2000/10/02 02:43:17 sboag Exp $
-
-package org.xml.sax;
-
-import java.io.IOException;
-
-
-/**
- * Interface for reading an XML document using callbacks.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p><strong>Note:</strong> despite its name, this interface does
- * <em>not</em> extend the standard Java {@link java.io.Reader Reader}
- * interface, because reading XML is a fundamentally different activity
- * than reading character data.</p>
- *
- * <p>XMLReader is the interface that an XML parser's SAX2 driver must
- * implement. This interface allows an application to set and
- * query features and properties in the parser, to register
- * event handlers for document processing, and to initiate
- * a document parse.</p>
- *
- * <p>All SAX interfaces are assumed to be synchronous: the
- * {@link #parse parse} methods must not return until parsing
- * is complete, and readers must wait for an event-handler callback
- * to return before reporting the next event.</p>
- *
- * <p>This interface replaces the (now deprecated) SAX 1.0 {@link
- * org.xml.sax.Parser Parser} interface. The XMLReader interface
- * contains two important enhancements over the old Parser
- * interface:</p>
- *
- * <ol>
- * <li>it adds a standard way to query and set features and
- * properties; and</li>
- * <li>it adds Namespace support, which is required for many
- * higher-level XML standards.</li>
- * </ol>
- *
- * <p>There are adapters available to convert a SAX1 Parser to
- * a SAX2 XMLReader and vice-versa.</p>
- *
- * @since SAX 2.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.XMLFilter
- * @see org.xml.sax.helpers.ParserAdapter
- * @see org.xml.sax.helpers.XMLReaderAdapter
- */
-public interface XMLReader
-{
-
-
- ////////////////////////////////////////////////////////////////////
- // Configuration.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Look up the value of a feature.
- *
- * <p>The feature name is any fully-qualified URI. It is
- * possible for an XMLReader to recognize a feature name but
- * to be unable to return its value; this is especially true
- * in the case of an adapter for a SAX1 Parser, which has
- * no way of knowing whether the underlying parser is
- * performing validation or expanding external entities.</p>
- *
- * <p>All XMLReaders are required to recognize the
- * http://xml.org/sax/features/namespaces and the
- * http://xml.org/sax/features/namespace-prefixes feature names.</p>
- *
- * <p>Some feature values may be available only in specific
- * contexts, such as before, during, or after a parse.</p>
- *
- * <p>Typical usage is something like this:</p>
- *
- * <pre>
- * XMLReader r = new MySAXDriver();
- *
- * // try to activate validation
- * try {
- * r.setFeature("http://xml.org/sax/features/validation", true);
- * } catch (SAXException e) {
- * System.err.println("Cannot activate validation.");
- * }
- *
- * // register event handlers
- * r.setContentHandler(new MyContentHandler());
- * r.setErrorHandler(new MyErrorHandler());
- *
- * // parse the first document
- * try {
- * r.parse("http://www.foo.com/mydoc.xml");
- * } catch (IOException e) {
- * System.err.println("I/O exception reading XML document");
- * } catch (SAXException e) {
- * System.err.println("XML exception reading document.");
- * }
- * </pre>
- *
- * <p>Implementors are free (and encouraged) to invent their own features,
- * using names built on their own URIs.</p>
- *
- * @param name The feature name, which is a fully-qualified URI.
- * @return The current state of the feature (true or false).
- * @exception org.xml.sax.SAXNotRecognizedException When the
- * XMLReader does not recognize the feature name.
- * @exception org.xml.sax.SAXNotSupportedException When the
- * XMLReader recognizes the feature name but
- * cannot determine its value at this time.
- * @see #setFeature
- */
- public boolean getFeature (String name)
- throws SAXNotRecognizedException, SAXNotSupportedException;
-
-
- /**
- * Set the state of a feature.
- *
- * <p>The feature name is any fully-qualified URI. It is
- * possible for an XMLReader to recognize a feature name but
- * to be unable to set its value; this is especially true
- * in the case of an adapter for a SAX1 {@link org.xml.sax.Parser Parser},
- * which has no way of affecting whether the underlying parser is
- * validating, for example.</p>
- *
- * <p>All XMLReaders are required to support setting
- * http://xml.org/sax/features/namespaces to true and
- * http://xml.org/sax/features/namespace-prefixes to false.</p>
- *
- * <p>Some feature values may be immutable or mutable only
- * in specific contexts, such as before, during, or after
- * a parse.</p>
- *
- * @param name The feature name, which is a fully-qualified URI.
- * @param state The requested state of the feature (true or false).
- * @exception org.xml.sax.SAXNotRecognizedException When the
- * XMLReader does not recognize the feature name.
- * @exception org.xml.sax.SAXNotSupportedException When the
- * XMLReader recognizes the feature name but
- * cannot set the requested value.
- * @see #getFeature
- */
- public void setFeature (String name, boolean value)
- throws SAXNotRecognizedException, SAXNotSupportedException;
-
-
- /**
- * Look up the value of a property.
- *
- * <p>The property name is any fully-qualified URI. It is
- * possible for an XMLReader to recognize a property name but
- * to be unable to return its state; this is especially true
- * in the case of an adapter for a SAX1 {@link org.xml.sax.Parser
- * Parser}.</p>
- *
- * <p>XMLReaders are not required to recognize any specific
- * property names, though an initial core set is documented for
- * SAX2.</p>
- *
- * <p>Some property values may be available only in specific
- * contexts, such as before, during, or after a parse.</p>
- *
- * <p>Implementors are free (and encouraged) to invent their own properties,
- * using names built on their own URIs.</p>
- *
- * @param name The property name, which is a fully-qualified URI.
- * @return The current value of the property.
- * @exception org.xml.sax.SAXNotRecognizedException When the
- * XMLReader does not recognize the property name.
- * @exception org.xml.sax.SAXNotSupportedException When the
- * XMLReader recognizes the property name but
- * cannot determine its value at this time.
- * @see #setProperty
- */
- public Object getProperty (String name)
- throws SAXNotRecognizedException, SAXNotSupportedException;
-
-
- /**
- * Set the value of a property.
- *
- * <p>The property name is any fully-qualified URI. It is
- * possible for an XMLReader to recognize a property name but
- * to be unable to set its value; this is especially true
- * in the case of an adapter for a SAX1 {@link org.xml.sax.Parser
- * Parser}.</p>
- *
- * <p>XMLReaders are not required to recognize setting
- * any specific property names, though a core set is provided with
- * SAX2.</p>
- *
- * <p>Some property values may be immutable or mutable only
- * in specific contexts, such as before, during, or after
- * a parse.</p>
- *
- * <p>This method is also the standard mechanism for setting
- * extended handlers.</p>
- *
- * @param name The property name, which is a fully-qualified URI.
- * @param state The requested value for the property.
- * @exception org.xml.sax.SAXNotRecognizedException When the
- * XMLReader does not recognize the property name.
- * @exception org.xml.sax.SAXNotSupportedException When the
- * XMLReader recognizes the property name but
- * cannot set the requested value.
- */
- public void setProperty (String name, Object value)
- throws SAXNotRecognizedException, SAXNotSupportedException;
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Event handlers.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Allow an application to register an entity resolver.
- *
- * <p>If the application does not register an entity resolver,
- * the XMLReader will perform its own default resolution.</p>
- *
- * <p>Applications may register a new or different resolver in the
- * middle of a parse, and the SAX parser must begin using the new
- * resolver immediately.</p>
- *
- * @param resolver The entity resolver.
- * @exception java.lang.NullPointerException If the resolver
- * argument is null.
- * @see #getEntityResolver
- */
- public void setEntityResolver (EntityResolver resolver);
-
-
- /**
- * Return the current entity resolver.
- *
- * @return The current entity resolver, or null if none
- * has been registered.
- * @see #setEntityResolver
- */
- public EntityResolver getEntityResolver ();
-
-
- /**
- * Allow an application to register a DTD event handler.
- *
- * <p>If the application does not register a DTD handler, all DTD
- * events reported by the SAX parser will be silently ignored.</p>
- *
- * <p>Applications may register a new or different handler in the
- * middle of a parse, and the SAX parser must begin using the new
- * handler immediately.</p>
- *
- * @param handler The DTD handler.
- * @exception java.lang.NullPointerException If the handler
- * argument is null.
- * @see #getDTDHandler
- */
- public void setDTDHandler (DTDHandler handler);
-
-
- /**
- * Return the current DTD handler.
- *
- * @return The current DTD handler, or null if none
- * has been registered.
- * @see #setDTDHandler
- */
- public DTDHandler getDTDHandler ();
-
-
- /**
- * Allow an application to register a content event handler.
- *
- * <p>If the application does not register a content handler, all
- * content events reported by the SAX parser will be silently
- * ignored.</p>
- *
- * <p>Applications may register a new or different handler in the
- * middle of a parse, and the SAX parser must begin using the new
- * handler immediately.</p>
- *
- * @param handler The content handler.
- * @exception java.lang.NullPointerException If the handler
- * argument is null.
- * @see #getContentHandler
- */
- public void setContentHandler (ContentHandler handler);
-
-
- /**
- * Return the current content handler.
- *
- * @return The current content handler, or null if none
- * has been registered.
- * @see #setContentHandler
- */
- public ContentHandler getContentHandler ();
-
-
- /**
- * Allow an application to register an error event handler.
- *
- * <p>If the application does not register an error handler, all
- * error events reported by the SAX parser will be silently
- * ignored; however, normal processing may not continue. It is
- * highly recommended that all SAX applications implement an
- * error handler to avoid unexpected bugs.</p>
- *
- * <p>Applications may register a new or different handler in the
- * middle of a parse, and the SAX parser must begin using the new
- * handler immediately.</p>
- *
- * @param handler The error handler.
- * @exception java.lang.NullPointerException If the handler
- * argument is null.
- * @see #getErrorHandler
- */
- public void setErrorHandler (ErrorHandler handler);
-
-
- /**
- * Return the current error handler.
- *
- * @return The current error handler, or null if none
- * has been registered.
- * @see #setErrorHandler
- */
- public ErrorHandler getErrorHandler ();
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Parsing.
- ////////////////////////////////////////////////////////////////////
-
- /**
- * Parse an XML document.
- *
- * <p>The application can use this method to instruct the XML
- * reader to begin parsing an XML document from any valid input
- * source (a character stream, a byte stream, or a URI).</p>
- *
- * <p>Applications may not invoke this method while a parse is in
- * progress (they should create a new XMLReader instead for each
- * nested XML document). Once a parse is complete, an
- * application may reuse the same XMLReader object, possibly with a
- * different input source.</p>
- *
- * <p>During the parse, the XMLReader will provide information
- * about the XML document through the registered event
- * handlers.</p>
- *
- * <p>This method is synchronous: it will not return until parsing
- * has ended. If a client application wants to terminate
- * parsing early, it should throw an exception.</p>
- *
- * @param source The input source for the top-level of the
- * XML document.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @exception java.io.IOException An IO exception from the parser,
- * possibly from a byte stream or character stream
- * supplied by the application.
- * @see org.xml.sax.InputSource
- * @see #parse(java.lang.String)
- * @see #setEntityResolver
- * @see #setDTDHandler
- * @see #setContentHandler
- * @see #setErrorHandler
- */
- public void parse (InputSource input)
- throws IOException, SAXException;
-
-
- /**
- * Parse an XML document from a system identifier (URI).
- *
- * <p>This method is a shortcut for the common case of reading a
- * document from a system identifier. It is the exact
- * equivalent of the following:</p>
- *
- * <pre>
- * parse(new InputSource(systemId));
- * </pre>
- *
- * <p>If the system identifier is a URL, it must be fully resolved
- * by the application before it is passed to the parser.</p>
- *
- * @param systemId The system identifier (URI).
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @exception java.io.IOException An IO exception from the parser,
- * possibly from a byte stream or character stream
- * supplied by the application.
- * @see #parse(org.xml.sax.InputSource)
- */
- public void parse (String systemId)
- throws IOException, SAXException;
-
-}
-
-// end of XMLReader.java
+// XMLReader.java - read an XML document. +// http://www.saxproject.org +// Written by David Megginson +// NO WARRANTY! This class is in the Public Domain. + +// $Id: XMLReader.java,v 1.3.2.5 2002/01/29 21:34:14 dbrownell Exp $ + +package org.xml.sax; + +import java.io.IOException; + + +/** + * Interface for reading an XML document using callbacks. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p><strong>Note:</strong> despite its name, this interface does + * <em>not</em> extend the standard Java {@link java.io.Reader Reader} + * interface, because reading XML is a fundamentally different activity + * than reading character data.</p> + * + * <p>XMLReader is the interface that an XML parser's SAX2 driver must + * implement. This interface allows an application to set and + * query features and properties in the parser, to register + * event handlers for document processing, and to initiate + * a document parse.</p> + * + * <p>All SAX interfaces are assumed to be synchronous: the + * {@link #parse parse} methods must not return until parsing + * is complete, and readers must wait for an event-handler callback + * to return before reporting the next event.</p> + * + * <p>This interface replaces the (now deprecated) SAX 1.0 {@link + * org.xml.sax.Parser Parser} interface. The XMLReader interface + * contains two important enhancements over the old Parser + * interface (as well as some minor ones):</p> + * + * <ol> + * <li>it adds a standard way to query and set features and + * properties; and</li> + * <li>it adds Namespace support, which is required for many + * higher-level XML standards.</li> + * </ol> + * + * <p>There are adapters available to convert a SAX1 Parser to + * a SAX2 XMLReader and vice-versa.</p> + * + * @since SAX 2.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + * @see org.xml.sax.XMLFilter + * @see org.xml.sax.helpers.ParserAdapter + * @see org.xml.sax.helpers.XMLReaderAdapter + */ +public interface XMLReader +{ + + + //////////////////////////////////////////////////////////////////// + // Configuration. + //////////////////////////////////////////////////////////////////// + + + /** + * Look up the value of a feature flag. + * + * <p>The feature name is any fully-qualified URI. It is + * possible for an XMLReader to recognize a feature name but + * temporarily be unable to return its value. + * Some feature values may be available only in specific + * contexts, such as before, during, or after a parse. + * Also, some feature values may not be programmatically accessible. + * (In the case of an adapter for SAX1 {@link Parser}, there is no + * implementation-independent way to expose whether the underlying + * parser is performing validation, expanding external entities, + * and so forth.) </p> + * + * <p>All XMLReaders are required to recognize the + * http://xml.org/sax/features/namespaces and the + * http://xml.org/sax/features/namespace-prefixes feature names.</p> + * + * <p>Typical usage is something like this:</p> + * + * <pre> + * XMLReader r = new MySAXDriver(); + * + * // try to activate validation + * try { + * r.setFeature("http://xml.org/sax/features/validation", true); + * } catch (SAXException e) { + * System.err.println("Cannot activate validation."); + * } + * + * // register event handlers + * r.setContentHandler(new MyContentHandler()); + * r.setErrorHandler(new MyErrorHandler()); + * + * // parse the first document + * try { + * r.parse("http://www.foo.com/mydoc.xml"); + * } catch (IOException e) { + * System.err.println("I/O exception reading XML document"); + * } catch (SAXException e) { + * System.err.println("XML exception reading document."); + * } + * </pre> + * + * <p>Implementors are free (and encouraged) to invent their own features, + * using names built on their own URIs.</p> + * + * @param name The feature name, which is a fully-qualified URI. + * @return The current value of the feature (true or false). + * @exception org.xml.sax.SAXNotRecognizedException If the feature + * value can't be assigned or retrieved. + * @exception org.xml.sax.SAXNotSupportedException When the + * XMLReader recognizes the feature name but + * cannot determine its value at this time. + * @see #setFeature + */ + public boolean getFeature (String name) + throws SAXNotRecognizedException, SAXNotSupportedException; + + + /** + * Set the value of a feature flag. + * + * <p>The feature name is any fully-qualified URI. It is + * possible for an XMLReader to expose a feature value but + * to be unable to change the current value. + * Some feature values may be immutable or mutable only + * in specific contexts, such as before, during, or after + * a parse.</p> + * + * <p>All XMLReaders are required to support setting + * http://xml.org/sax/features/namespaces to true and + * http://xml.org/sax/features/namespace-prefixes to false.</p> + * + * @param name The feature name, which is a fully-qualified URI. + * @param value The requested value of the feature (true or false). + * @exception org.xml.sax.SAXNotRecognizedException If the feature + * value can't be assigned or retrieved. + * @exception org.xml.sax.SAXNotSupportedException When the + * XMLReader recognizes the feature name but + * cannot set the requested value. + * @see #getFeature + */ + public void setFeature (String name, boolean value) + throws SAXNotRecognizedException, SAXNotSupportedException; + + + /** + * Look up the value of a property. + * + * <p>The property name is any fully-qualified URI. It is + * possible for an XMLReader to recognize a property name but + * temporarily be unable to return its value. + * Some property values may be available only in specific + * contexts, such as before, during, or after a parse.</p> + * + * <p>XMLReaders are not required to recognize any specific + * property names, though an initial core set is documented for + * SAX2.</p> + * + * <p>Implementors are free (and encouraged) to invent their own properties, + * using names built on their own URIs.</p> + * + * @param name The property name, which is a fully-qualified URI. + * @return The current value of the property. + * @exception org.xml.sax.SAXNotRecognizedException If the property + * value can't be assigned or retrieved. + * @exception org.xml.sax.SAXNotSupportedException When the + * XMLReader recognizes the property name but + * cannot determine its value at this time. + * @see #setProperty + */ + public Object getProperty (String name) + throws SAXNotRecognizedException, SAXNotSupportedException; + + + /** + * Set the value of a property. + * + * <p>The property name is any fully-qualified URI. It is + * possible for an XMLReader to recognize a property name but + * to be unable to change the current value. + * Some property values may be immutable or mutable only + * in specific contexts, such as before, during, or after + * a parse.</p> + * + * <p>XMLReaders are not required to recognize setting + * any specific property names, though a core set is defined by + * SAX2.</p> + * + * <p>This method is also the standard mechanism for setting + * extended handlers.</p> + * + * @param name The property name, which is a fully-qualified URI. + * @param value The requested value for the property. + * @exception org.xml.sax.SAXNotRecognizedException If the property + * value can't be assigned or retrieved. + * @exception org.xml.sax.SAXNotSupportedException When the + * XMLReader recognizes the property name but + * cannot set the requested value. + */ + public void setProperty (String name, Object value) + throws SAXNotRecognizedException, SAXNotSupportedException; + + + + //////////////////////////////////////////////////////////////////// + // Event handlers. + //////////////////////////////////////////////////////////////////// + + + /** + * Allow an application to register an entity resolver. + * + * <p>If the application does not register an entity resolver, + * the XMLReader will perform its own default resolution.</p> + * + * <p>Applications may register a new or different resolver in the + * middle of a parse, and the SAX parser must begin using the new + * resolver immediately.</p> + * + * @param resolver The entity resolver. + * @see #getEntityResolver + */ + public void setEntityResolver (EntityResolver resolver); + + + /** + * Return the current entity resolver. + * + * @return The current entity resolver, or null if none + * has been registered. + * @see #setEntityResolver + */ + public EntityResolver getEntityResolver (); + + + /** + * Allow an application to register a DTD event handler. + * + * <p>If the application does not register a DTD handler, all DTD + * events reported by the SAX parser will be silently ignored.</p> + * + * <p>Applications may register a new or different handler in the + * middle of a parse, and the SAX parser must begin using the new + * handler immediately.</p> + * + * @param handler The DTD handler. + * @see #getDTDHandler + */ + public void setDTDHandler (DTDHandler handler); + + + /** + * Return the current DTD handler. + * + * @return The current DTD handler, or null if none + * has been registered. + * @see #setDTDHandler + */ + public DTDHandler getDTDHandler (); + + + /** + * Allow an application to register a content event handler. + * + * <p>If the application does not register a content handler, all + * content events reported by the SAX parser will be silently + * ignored.</p> + * + * <p>Applications may register a new or different handler in the + * middle of a parse, and the SAX parser must begin using the new + * handler immediately.</p> + * + * @param handler The content handler. + * @see #getContentHandler + */ + public void setContentHandler (ContentHandler handler); + + + /** + * Return the current content handler. + * + * @return The current content handler, or null if none + * has been registered. + * @see #setContentHandler + */ + public ContentHandler getContentHandler (); + + + /** + * Allow an application to register an error event handler. + * + * <p>If the application does not register an error handler, all + * error events reported by the SAX parser will be silently + * ignored; however, normal processing may not continue. It is + * highly recommended that all SAX applications implement an + * error handler to avoid unexpected bugs.</p> + * + * <p>Applications may register a new or different handler in the + * middle of a parse, and the SAX parser must begin using the new + * handler immediately.</p> + * + * @param handler The error handler. + * @see #getErrorHandler + */ + public void setErrorHandler (ErrorHandler handler); + + + /** + * Return the current error handler. + * + * @return The current error handler, or null if none + * has been registered. + * @see #setErrorHandler + */ + public ErrorHandler getErrorHandler (); + + + + //////////////////////////////////////////////////////////////////// + // Parsing. + //////////////////////////////////////////////////////////////////// + + /** + * Parse an XML document. + * + * <p>The application can use this method to instruct the XML + * reader to begin parsing an XML document from any valid input + * source (a character stream, a byte stream, or a URI).</p> + * + * <p>Applications may not invoke this method while a parse is in + * progress (they should create a new XMLReader instead for each + * nested XML document). Once a parse is complete, an + * application may reuse the same XMLReader object, possibly with a + * different input source.</p> + * + * <p>During the parse, the XMLReader will provide information + * about the XML document through the registered event + * handlers.</p> + * + * <p>This method is synchronous: it will not return until parsing + * has ended. If a client application wants to terminate + * parsing early, it should throw an exception.</p> + * + * @param source The input source for the top-level of the + * XML document. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @exception java.io.IOException An IO exception from the parser, + * possibly from a byte stream or character stream + * supplied by the application. + * @see org.xml.sax.InputSource + * @see #parse(java.lang.String) + * @see #setEntityResolver + * @see #setDTDHandler + * @see #setContentHandler + * @see #setErrorHandler + */ + public void parse (InputSource input) + throws IOException, SAXException; + + + /** + * Parse an XML document from a system identifier (URI). + * + * <p>This method is a shortcut for the common case of reading a + * document from a system identifier. It is the exact + * equivalent of the following:</p> + * + * <pre> + * parse(new InputSource(systemId)); + * </pre> + * + * <p>If the system identifier is a URL, it must be fully resolved + * by the application before it is passed to the parser.</p> + * + * @param systemId The system identifier (URI). + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @exception java.io.IOException An IO exception from the parser, + * possibly from a byte stream or character stream + * supplied by the application. + * @see #parse(org.xml.sax.InputSource) + */ + public void parse (String systemId) + throws IOException, SAXException; + +} diff --git a/libjava/org/xml/sax/ext/DeclHandler.java b/libjava/org/xml/sax/ext/DeclHandler.java index 1fede3428de..742f4648c90 100644 --- a/libjava/org/xml/sax/ext/DeclHandler.java +++ b/libjava/org/xml/sax/ext/DeclHandler.java @@ -1,131 +1,143 @@ -// DeclHandler.java - Optional handler for DTD declaration events.
-// Public Domain: no warranty.
-// $Id: DeclHandler.java,v 1.1 2000/10/02 02:43:19 sboag Exp $
-
-package org.xml.sax.ext;
-
-import org.xml.sax.SAXException;
-
-
-/**
- * SAX2 extension handler for DTD declaration events.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>This is an optional extension handler for SAX2 to provide
- * information about DTD declarations in an XML document. XML
- * readers are not required to support this handler.</p>
- *
- * <p>Note that data-related DTD declarations (unparsed entities and
- * notations) are already reported through the {@link
- * org.xml.sax.DTDHandler DTDHandler} interface.</p>
- *
- * <p>If you are using the declaration handler together with a lexical
- * handler, all of the events will occur between the
- * {@link org.xml.sax.ext.LexicalHandler#startDTD startDTD} and the
- * {@link org.xml.sax.ext.LexicalHandler#endDTD endDTD} events.</p>
- *
- * <p>To set the DeclHandler for an XML reader, use the
- * {@link org.xml.sax.XMLReader#setProperty setProperty} method
- * with the propertyId "http://xml.org/sax/handlers/DeclHandler".
- * If the reader does not support declaration events, it will throw a
- * {@link org.xml.sax.SAXNotRecognizedException SAXNotRecognizedException}
- * or a
- * {@link org.xml.sax.SAXNotSupportedException SAXNotSupportedException}
- * when you attempt to register the handler.</p>
- *
- * @since SAX 2.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0beta
- * @see org.xml.sax.XMLReader
- */
-public interface DeclHandler
-{
-
- /**
- * Report an element type declaration.
- *
- * <p>The content model will consist of the string "EMPTY", the
- * string "ANY", or a parenthesised group, optionally followed
- * by an occurrence indicator. The model will be normalized so
- * that all whitespace is removed,and will include the enclosing
- * parentheses.</p>
- *
- * @param name The element type name.
- * @param model The content model as a normalized string.
- * @exception SAXException The application may raise an exception.
- */
- public abstract void elementDecl (String name, String model)
- throws SAXException;
-
-
- /**
- * Report an attribute type declaration.
- *
- * <p>Only the effective (first) declaration for an attribute will
- * be reported. The type will be one of the strings "CDATA",
- * "ID", "IDREF", "IDREFS", "NMTOKEN", "NMTOKENS", "ENTITY",
- * "ENTITIES", or "NOTATION", or a parenthesized token group with
- * the separator "|" and all whitespace removed.</p>
- *
- * @param eName The name of the associated element.
- * @param aName The name of the attribute.
- * @param type A string representing the attribute type.
- * @param valueDefault A string representing the attribute default
- * ("#IMPLIED", "#REQUIRED", or "#FIXED") or null if
- * none of these applies.
- * @param value A string representing the attribute's default value,
- * or null if there is none.
- * @exception SAXException The application may raise an exception.
- */
- public abstract void attributeDecl (String eName,
- String aName,
- String type,
- String valueDefault,
- String value)
- throws SAXException;
-
-
- /**
- * Report an internal entity declaration.
- *
- * <p>Only the effective (first) declaration for each entity
- * will be reported.</p>
- *
- * @param name The name of the entity. If it is a parameter
- * entity, the name will begin with '%'.
- * @param value The replacement text of the entity.
- * @exception SAXException The application may raise an exception.
- * @see #externalEntityDecl
- * @see org.xml.sax.DTDHandler#unparsedEntityDecl
- */
- public abstract void internalEntityDecl (String name, String value)
- throws SAXException;
-
-
- /**
- * Report a parsed external entity declaration.
- *
- * <p>Only the effective (first) declaration for each entity
- * will be reported.</p>
- *
- * @param name The name of the entity. If it is a parameter
- * entity, the name will begin with '%'.
- * @param publicId The declared public identifier of the entity, or
- * null if none was declared.
- * @param systemId The declared system identifier of the entity.
- * @exception SAXException The application may raise an exception.
- * @see #internalEntityDecl
- * @see org.xml.sax.DTDHandler#unparsedEntityDecl
- */
- public abstract void externalEntityDecl (String name, String publicId,
- String systemId)
- throws SAXException;
-
-}
-
-// end of DeclHandler.java
+// DeclHandler.java - Optional handler for DTD declaration events. +// http://www.saxproject.org +// Public Domain: no warranty. +// $Id: DeclHandler.java,v 1.2.2.5 2002/01/29 21:34:14 dbrownell Exp $ + +package org.xml.sax.ext; + +import org.xml.sax.SAXException; + + +/** + * SAX2 extension handler for DTD declaration events. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>This is an optional extension handler for SAX2 to provide more + * complete information about DTD declarations in an XML document. + * XML readers are not required to recognize this handler, and it + * is not part of core-only SAX2 distributions.</p> + * + * <p>Note that data-related DTD declarations (unparsed entities and + * notations) are already reported through the {@link + * org.xml.sax.DTDHandler DTDHandler} interface.</p> + * + * <p>If you are using the declaration handler together with a lexical + * handler, all of the events will occur between the + * {@link org.xml.sax.ext.LexicalHandler#startDTD startDTD} and the + * {@link org.xml.sax.ext.LexicalHandler#endDTD endDTD} events.</p> + * + * <p>To set the DeclHandler for an XML reader, use the + * {@link org.xml.sax.XMLReader#setProperty setProperty} method + * with the property name + * <code>http://xml.org/sax/properties/declaration-handler</code> + * and an object implementing this interface (or null) as the value. + * If the reader does not report declaration events, it will throw a + * {@link org.xml.sax.SAXNotRecognizedException SAXNotRecognizedException} + * when you attempt to register the handler.</p> + * + * @since SAX 2.0 (extensions 1.0) + * @author David Megginson + * @version 2.0.1 (sax2r2) + */ +public interface DeclHandler +{ + + /** + * Report an element type declaration. + * + * <p>The content model will consist of the string "EMPTY", the + * string "ANY", or a parenthesised group, optionally followed + * by an occurrence indicator. The model will be normalized so + * that all parameter entities are fully resolved and all whitespace + * is removed,and will include the enclosing parentheses. Other + * normalization (such as removing redundant parentheses or + * simplifying occurrence indicators) is at the discretion of the + * parser.</p> + * + * @param name The element type name. + * @param model The content model as a normalized string. + * @exception SAXException The application may raise an exception. + */ + public abstract void elementDecl (String name, String model) + throws SAXException; + + + /** + * Report an attribute type declaration. + * + * <p>Only the effective (first) declaration for an attribute will + * be reported. The type will be one of the strings "CDATA", + * "ID", "IDREF", "IDREFS", "NMTOKEN", "NMTOKENS", "ENTITY", + * "ENTITIES", a parenthesized token group with + * the separator "|" and all whitespace removed, or the word + * "NOTATION" followed by a space followed by a parenthesized + * token group with all whitespace removed.</p> + * + * <p>The value will be the value as reported to applications, + * appropriately normalized and with entity and character + * references expanded. </p> + * + * @param eName The name of the associated element. + * @param aName The name of the attribute. + * @param type A string representing the attribute type. + * @param mode A string representing the attribute defaulting mode + * ("#IMPLIED", "#REQUIRED", or "#FIXED") or null if + * none of these applies. + * @param value A string representing the attribute's default value, + * or null if there is none. + * @exception SAXException The application may raise an exception. + */ + public abstract void attributeDecl (String eName, + String aName, + String type, + String mode, + String value) + throws SAXException; + + + /** + * Report an internal entity declaration. + * + * <p>Only the effective (first) declaration for each entity + * will be reported. All parameter entities in the value + * will be expanded, but general entities will not.</p> + * + * @param name The name of the entity. If it is a parameter + * entity, the name will begin with '%'. + * @param value The replacement text of the entity. + * @exception SAXException The application may raise an exception. + * @see #externalEntityDecl + * @see org.xml.sax.DTDHandler#unparsedEntityDecl + */ + public abstract void internalEntityDecl (String name, String value) + throws SAXException; + + + /** + * Report a parsed external entity declaration. + * + * <p>Only the effective (first) declaration for each entity + * will be reported.</p> + * + * @param name The name of the entity. If it is a parameter + * entity, the name will begin with '%'. + * @param publicId The declared public identifier of the entity, or + * null if none was declared. + * @param systemId The declared system identifier of the entity. + * @exception SAXException The application may raise an exception. + * @see #internalEntityDecl + * @see org.xml.sax.DTDHandler#unparsedEntityDecl + */ + public abstract void externalEntityDecl (String name, String publicId, + String systemId) + throws SAXException; + +} + +// end of DeclHandler.java diff --git a/libjava/org/xml/sax/ext/LexicalHandler.java b/libjava/org/xml/sax/ext/LexicalHandler.java index 4ac1617ca00..15b2557c504 100644 --- a/libjava/org/xml/sax/ext/LexicalHandler.java +++ b/libjava/org/xml/sax/ext/LexicalHandler.java @@ -1,161 +1,212 @@ -// LexicalHandler.java - optional handler for lexical parse events.
-// Public Domain: no warranty.
-// $Id: LexicalHandler.java,v 1.1 2000/10/02 02:43:20 sboag Exp $
-
-package org.xml.sax.ext;
-
-import org.xml.sax.SAXException;
-
-/**
- * SAX2 extension handler for lexical events.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>This is an optional extension handler for SAX2 to provide
- * lexical information about an XML document, such as comments
- * and CDATA section boundaries; XML readers are not required to
- * support this handler.</p>
- *
- * <p>The events in the lexical handler apply to the entire document,
- * not just to the document element, and all lexical handler events
- * must appear between the content handler's startDocument and
- * endDocument events.</p>
- *
- * <p>To set the LexicalHandler for an XML reader, use the
- * {@link org.xml.sax.XMLReader#setProperty setProperty} method
- * with the propertyId "http://xml.org/sax/handlers/LexicalHandler".
- * If the reader does not support lexical events, it will throw a
- * {@link org.xml.sax.SAXNotRecognizedException SAXNotRecognizedException}
- * or a
- * {@link org.xml.sax.SAXNotSupportedException SAXNotSupportedException}
- * when you attempt to register the handler.</p>
- *
- * @since SAX 2.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0beta
- * @see org.xml.sax.XMLReader#setProperty
- * @see org.xml.sax.SAXNotRecognizedException
- * @see org.xml.sax.SAXNotSupportedException
- */
-public interface LexicalHandler
-{
-
- /**
- * Report the start of DTD declarations, if any.
- *
- * <p>Any declarations are assumed to be in the internal subset
- * unless otherwise indicated by a {@link #startEntity startEntity}
- * event.</p>
- *
- * <p>Note that the start/endDTD events will appear within
- * the start/endDocument events from ContentHandler and
- * before the first startElement event.</p>
- *
- * @param name The document type name.
- * @param publicId The declared public identifier for the
- * external DTD subset, or null if none was declared.
- * @param systemId The declared system identifier for the
- * external DTD subset, or null if none was declared.
- * @exception SAXException The application may raise an
- * exception.
- * @see #endDTD
- * @see #startEntity
- */
- public abstract void startDTD (String name, String publicId,
- String systemId)
- throws SAXException;
-
-
- /**
- * Report the end of DTD declarations.
- *
- * @exception SAXException The application may raise an exception.
- * @see #startDTD
- */
- public abstract void endDTD ()
- throws SAXException;
-
-
- /**
- * Report the beginning of an entity in content.
- *
- * <p><strong>NOTE:</entity> entity references in attribute
- * values -- and the start and end of the document entity --
- * are never reported.</p>
- *
- * <p>The start and end of the external DTD subset are reported
- * using the pseudo-name "[dtd]". All other events must be
- * properly nested within start/end entity events.</p>
- *
- * <p>Note that skipped entities will be reported through the
- * {@link org.xml.sax.ContentHandler#skippedEntity skippedEntity}
- * event, which is part of the ContentHandler interface.</p>
- *
- * @param name The name of the entity. If it is a parameter
- * entity, the name will begin with '%'.
- * @exception SAXException The application may raise an exception.
- * @see #endEntity
- * @see org.xml.sax.ext.DeclHandler#internalEntityDecl
- * @see org.xml.sax.ext.DeclHandler#externalEntityDecl
- */
- public abstract void startEntity (String name)
- throws SAXException;
-
-
- /**
- * Report the end of an entity.
- *
- * @param name The name of the entity that is ending.
- * @exception SAXException The application may raise an exception.
- * @see #startEntity
- */
- public abstract void endEntity (String name)
- throws SAXException;
-
-
- /**
- * Report the start of a CDATA section.
- *
- * <p>The contents of the CDATA section will be reported through
- * the regular {@link org.xml.sax.ContentHandler#characters
- * characters} event.</p>
- *
- * @exception SAXException The application may raise an exception.
- * @see #endCDATA
- */
- public abstract void startCDATA ()
- throws SAXException;
-
-
- /**
- * Report the end of a CDATA section.
- *
- * @exception SAXException The application may raise an exception.
- * @see #startCDATA
- */
- public abstract void endCDATA ()
- throws SAXException;
-
-
- /**
- * Report an XML comment anywhere in the document.
- *
- * <p>This callback will be used for comments inside or outside the
- * document element, including comments in the external DTD
- * subset (if read).</p>
- *
- * @param ch An array holding the characters in the comment.
- * @param start The starting position in the array.
- * @param length The number of characters to use from the array.
- * @exception SAXException The application may raise an exception.
- */
- public abstract void comment (char ch[], int start, int length)
- throws SAXException;
-
-}
-
-// end of LexicalHandler.java
+// LexicalHandler.java - optional handler for lexical parse events. +// http://www.saxproject.org +// Public Domain: no warranty. +// $Id: LexicalHandler.java,v 1.2.2.4 2002/01/29 21:34:14 dbrownell Exp $ + +package org.xml.sax.ext; + +import org.xml.sax.SAXException; + +/** + * SAX2 extension handler for lexical events. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>This is an optional extension handler for SAX2 to provide + * lexical information about an XML document, such as comments + * and CDATA section boundaries. + * XML readers are not required to recognize this handler, and it + * is not part of core-only SAX2 distributions.</p> + * + * <p>The events in the lexical handler apply to the entire document, + * not just to the document element, and all lexical handler events + * must appear between the content handler's startDocument and + * endDocument events.</p> + * + * <p>To set the LexicalHandler for an XML reader, use the + * {@link org.xml.sax.XMLReader#setProperty setProperty} method + * with the property name + * <code>http://xml.org/sax/properties/lexical-handler</code> + * and an object implementing this interface (or null) as the value. + * If the reader does not report lexical events, it will throw a + * {@link org.xml.sax.SAXNotRecognizedException SAXNotRecognizedException} + * when you attempt to register the handler.</p> + * + * @since SAX 2.0 (extensions 1.0) + * @author David Megginson + * @version 2.0.1 (sax2r2) + */ +public interface LexicalHandler +{ + + /** + * Report the start of DTD declarations, if any. + * + * <p>This method is intended to report the beginning of the + * DOCTYPE declaration; if the document has no DOCTYPE declaration, + * this method will not be invoked.</p> + * + * <p>All declarations reported through + * {@link org.xml.sax.DTDHandler DTDHandler} or + * {@link org.xml.sax.ext.DeclHandler DeclHandler} events must appear + * between the startDTD and {@link #endDTD endDTD} events. + * Declarations are assumed to belong to the internal DTD subset + * unless they appear between {@link #startEntity startEntity} + * and {@link #endEntity endEntity} events. Comments and + * processing instructions from the DTD should also be reported + * between the startDTD and endDTD events, in their original + * order of (logical) occurrence; they are not required to + * appear in their correct locations relative to DTDHandler + * or DeclHandler events, however.</p> + * + * <p>Note that the start/endDTD events will appear within + * the start/endDocument events from ContentHandler and + * before the first + * {@link org.xml.sax.ContentHandler#startElement startElement} + * event.</p> + * + * @param name The document type name. + * @param publicId The declared public identifier for the + * external DTD subset, or null if none was declared. + * @param systemId The declared system identifier for the + * external DTD subset, or null if none was declared. + * (Note that this is not resolved against the document + * base URI.) + * @exception SAXException The application may raise an + * exception. + * @see #endDTD + * @see #startEntity + */ + public abstract void startDTD (String name, String publicId, + String systemId) + throws SAXException; + + + /** + * Report the end of DTD declarations. + * + * <p>This method is intended to report the end of the + * DOCTYPE declaration; if the document has no DOCTYPE declaration, + * this method will not be invoked.</p> + * + * @exception SAXException The application may raise an exception. + * @see #startDTD + */ + public abstract void endDTD () + throws SAXException; + + + /** + * Report the beginning of some internal and external XML entities. + * + * <p>The reporting of parameter entities (including + * the external DTD subset) is optional, and SAX2 drivers that + * report LexicalHandler events may not implement it; you can use the + * <code + * >http://xml.org/sax/features/lexical-handler/parameter-entities</code> + * feature to query or control the reporting of parameter entities.</p> + * + * <p>General entities are reported with their regular names, + * parameter entities have '%' prepended to their names, and + * the external DTD subset has the pseudo-entity name "[dtd]".</p> + * + * <p>When a SAX2 driver is providing these events, all other + * events must be properly nested within start/end entity + * events. There is no additional requirement that events from + * {@link org.xml.sax.ext.DeclHandler DeclHandler} or + * {@link org.xml.sax.DTDHandler DTDHandler} be properly ordered.</p> + * + * <p>Note that skipped entities will be reported through the + * {@link org.xml.sax.ContentHandler#skippedEntity skippedEntity} + * event, which is part of the ContentHandler interface.</p> + * + * <p>Because of the streaming event model that SAX uses, some + * entity boundaries cannot be reported under any + * circumstances:</p> + * + * <ul> + * <li>general entities within attribute values</li> + * <li>parameter entities within declarations</li> + * </ul> + * + * <p>These will be silently expanded, with no indication of where + * the original entity boundaries were.</p> + * + * <p>Note also that the boundaries of character references (which + * are not really entities anyway) are not reported.</p> + * + * <p>All start/endEntity events must be properly nested. + * + * @param name The name of the entity. If it is a parameter + * entity, the name will begin with '%', and if it is the + * external DTD subset, it will be "[dtd]". + * @exception SAXException The application may raise an exception. + * @see #endEntity + * @see org.xml.sax.ext.DeclHandler#internalEntityDecl + * @see org.xml.sax.ext.DeclHandler#externalEntityDecl + */ + public abstract void startEntity (String name) + throws SAXException; + + + /** + * Report the end of an entity. + * + * @param name The name of the entity that is ending. + * @exception SAXException The application may raise an exception. + * @see #startEntity + */ + public abstract void endEntity (String name) + throws SAXException; + + + /** + * Report the start of a CDATA section. + * + * <p>The contents of the CDATA section will be reported through + * the regular {@link org.xml.sax.ContentHandler#characters + * characters} event; this event is intended only to report + * the boundary.</p> + * + * @exception SAXException The application may raise an exception. + * @see #endCDATA + */ + public abstract void startCDATA () + throws SAXException; + + + /** + * Report the end of a CDATA section. + * + * @exception SAXException The application may raise an exception. + * @see #startCDATA + */ + public abstract void endCDATA () + throws SAXException; + + + /** + * Report an XML comment anywhere in the document. + * + * <p>This callback will be used for comments inside or outside the + * document element, including comments in the external DTD + * subset (if read). Comments in the DTD must be properly + * nested inside start/endDTD and start/endEntity events (if + * used).</p> + * + * @param ch An array holding the characters in the comment. + * @param start The starting position in the array. + * @param length The number of characters to use from the array. + * @exception SAXException The application may raise an exception. + */ + public abstract void comment (char ch[], int start, int length) + throws SAXException; + +} + +// end of LexicalHandler.java diff --git a/libjava/org/xml/sax/ext/package.html b/libjava/org/xml/sax/ext/package.html new file mode 100644 index 00000000000..bbb02f9276b --- /dev/null +++ b/libjava/org/xml/sax/ext/package.html @@ -0,0 +1,49 @@ +<HTML><HEAD> + +</HEAD><BODY> + +<p> +This package contains interfaces to optional SAX2 handlers. + +<p>See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> +for more information about SAX.</p> + +<p> +The package is independent of the SAX2 core, though the functionality +exposed generally needs to be implemented within a parser. +That independence has several consequences:</p> + +<ul> + +<li>SAX2 drivers are <em>not</em> required to recognize these handlers, +and you cannot assume that the class files will be present in every SAX2 +installation.</li> + +<li>This package may be updated independently of SAX2 (i.e. new +handlers may be added without updating SAX2 itself).</li> + +<li>The handlers are not implemented by the SAX2 +<code>org.xml.sax.helpers.DefaultHandler</code> or +<code>org.xml.sax.helpers.XMLFilterImpl</code> classes. +You can subclass these if you need such behaviour.</li> + +<li>The handlers need to be registered differently than regular SAX2 +handlers.</li> + +</ul> + +<p>This package, SAX2-ext, is a standardized extension to SAX2. It is +designed both to allow SAX parsers to pass certain types of information +to applications, and to serve as a simple model for other SAX2 parser +extension packages. Not all such extension packages should need to +be recognized directly by parsers, however. +As an example, most schema systems can be cleanly layered on top +of parsers supporting the standardized SAX2 interfaces. </p> + +<p><strong>NOTE:</strong> this package alone does add any +functionality; it simply provides optional interfaces for SAX2 drivers +to use. You must use a SAX2 driver that recognizes these interfaces if +you actually want to have access to lexical and declaration +information.</p> + +</BODY></HTML> diff --git a/libjava/org/xml/sax/helpers/AttributeListImpl.java b/libjava/org/xml/sax/helpers/AttributeListImpl.java index 69754728c1f..6cabed4fe8b 100644 --- a/libjava/org/xml/sax/helpers/AttributeListImpl.java +++ b/libjava/org/xml/sax/helpers/AttributeListImpl.java @@ -1,310 +1,312 @@ -// SAX default implementation for AttributeList.
-// No warranty; no copyright -- use this as you will.
-// $Id: AttributeListImpl.java,v 1.1 2000/10/02 02:43:20 sboag Exp $
-
-package org.xml.sax.helpers;
-
-import org.xml.sax.AttributeList;
-
-import java.util.Vector;
-
-
-/**
- * Default implementation for AttributeList.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>AttributeList implements the deprecated SAX1 {@link
- * org.xml.sax.AttributeList AttributeList} interface, and has been
- * replaced by the new SAX2 {@link org.xml.sax.helpers.AttributesImpl
- * AttributesImpl} interface.</p>
- *
- * <p>This class provides a convenience implementation of the SAX
- * {@link org.xml.sax.AttributeList AttributeList} interface. This
- * implementation is useful both for SAX parser writers, who can use
- * it to provide attributes to the application, and for SAX application
- * writers, who can use it to create a persistent copy of an element's
- * attribute specifications:</p>
- *
- * <pre>
- * private AttributeList myatts;
- *
- * public void startElement (String name, AttributeList atts)
- * {
- * // create a persistent copy of the attribute list
- * // for use outside this method
- * myatts = new AttributeListImpl(atts);
- * [...]
- * }
- * </pre>
- *
- * <p>Please note that SAX parsers are not required to use this
- * class to provide an implementation of AttributeList; it is
- * supplied only as an optional convenience. In particular,
- * parser writers are encouraged to invent more efficient
- * implementations.</p>
- *
- * @deprecated This class implements a deprecated interface,
- * {@link org.xml.sax.AttributeList AttributeList};
- * that interface has been replaced by
- * {@link org.xml.sax.Attributes Attributes},
- * which is implemented in the
- * {@link org.xml.sax.helpers.AttributesImpl
- * AttributesImpl} helper class.
- * @since SAX 1.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.AttributeList
- * @see org.xml.sax.DocumentHandler#startElement
- */
-public class AttributeListImpl implements AttributeList
-{
-
- /**
- * Create an empty attribute list.
- *
- * <p>This constructor is most useful for parser writers, who
- * will use it to create a single, reusable attribute list that
- * can be reset with the clear method between elements.</p>
- *
- * @see #addAttribute
- * @see #clear
- */
- public AttributeListImpl ()
- {
- }
-
-
- /**
- * Construct a persistent copy of an existing attribute list.
- *
- * <p>This constructor is most useful for application writers,
- * who will use it to create a persistent copy of an existing
- * attribute list.</p>
- *
- * @param atts The attribute list to copy
- * @see org.xml.sax.DocumentHandler#startElement
- */
- public AttributeListImpl (AttributeList atts)
- {
- setAttributeList(atts);
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Methods specific to this class.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Set the attribute list, discarding previous contents.
- *
- * <p>This method allows an application writer to reuse an
- * attribute list easily.</p>
- *
- * @param atts The attribute list to copy.
- */
- public void setAttributeList (AttributeList atts)
- {
- int count = atts.getLength();
-
- clear();
-
- for (int i = 0; i < count; i++) {
- addAttribute(atts.getName(i), atts.getType(i), atts.getValue(i));
- }
- }
-
-
- /**
- * Add an attribute to an attribute list.
- *
- * <p>This method is provided for SAX parser writers, to allow them
- * to build up an attribute list incrementally before delivering
- * it to the application.</p>
- *
- * @param name The attribute name.
- * @param type The attribute type ("NMTOKEN" for an enumeration).
- * @param value The attribute value (must not be null).
- * @see #removeAttribute
- * @see org.xml.sax.DocumentHandler#startElement
- */
- public void addAttribute (String name, String type, String value)
- {
- names.addElement(name);
- types.addElement(type);
- values.addElement(value);
- }
-
-
- /**
- * Remove an attribute from the list.
- *
- * <p>SAX application writers can use this method to filter an
- * attribute out of an AttributeList. Note that invoking this
- * method will change the length of the attribute list and
- * some of the attribute's indices.</p>
- *
- * <p>If the requested attribute is not in the list, this is
- * a no-op.</p>
- *
- * @param name The attribute name.
- * @see #addAttribute
- */
- public void removeAttribute (String name)
- {
- int i = names.indexOf(name);
-
- if (i >= 0) {
- names.removeElementAt(i);
- types.removeElementAt(i);
- values.removeElementAt(i);
- }
- }
-
-
- /**
- * Clear the attribute list.
- *
- * <p>SAX parser writers can use this method to reset the attribute
- * list between DocumentHandler.startElement events. Normally,
- * it will make sense to reuse the same AttributeListImpl object
- * rather than allocating a new one each time.</p>
- *
- * @see org.xml.sax.DocumentHandler#startElement
- */
- public void clear ()
- {
- names.removeAllElements();
- types.removeAllElements();
- values.removeAllElements();
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Implementation of org.xml.sax.AttributeList
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Return the number of attributes in the list.
- *
- * @return The number of attributes in the list.
- * @see org.xml.sax.AttributeList#getLength
- */
- public int getLength ()
- {
- return names.size();
- }
-
-
- /**
- * Get the name of an attribute (by position).
- *
- * @param i The position of the attribute in the list.
- * @return The attribute name as a string, or null if there
- * is no attribute at that position.
- * @see org.xml.sax.AttributeList#getName(int)
- */
- public String getName (int i)
- {
- if (i < 0) {
- return null;
- }
- try {
- return (String)names.elementAt(i);
- } catch (ArrayIndexOutOfBoundsException e) {
- return null;
- }
- }
-
-
- /**
- * Get the type of an attribute (by position).
- *
- * @param i The position of the attribute in the list.
- * @return The attribute type as a string ("NMTOKEN" for an
- * enumeration, and "CDATA" if no declaration was
- * read), or null if there is no attribute at
- * that position.
- * @see org.xml.sax.AttributeList#getType(int)
- */
- public String getType (int i)
- {
- if (i < 0) {
- return null;
- }
- try {
- return (String)types.elementAt(i);
- } catch (ArrayIndexOutOfBoundsException e) {
- return null;
- }
- }
-
-
- /**
- * Get the value of an attribute (by position).
- *
- * @param i The position of the attribute in the list.
- * @return The attribute value as a string, or null if
- * there is no attribute at that position.
- * @see org.xml.sax.AttributeList#getValue(int)
- */
- public String getValue (int i)
- {
- if (i < 0) {
- return null;
- }
- try {
- return (String)values.elementAt(i);
- } catch (ArrayIndexOutOfBoundsException e) {
- return null;
- }
- }
-
-
- /**
- * Get the type of an attribute (by name).
- *
- * @param name The attribute name.
- * @return The attribute type as a string ("NMTOKEN" for an
- * enumeration, and "CDATA" if no declaration was
- * read).
- * @see org.xml.sax.AttributeList#getType(java.lang.String)
- */
- public String getType (String name)
- {
- return getType(names.indexOf(name));
- }
-
-
- /**
- * Get the value of an attribute (by name).
- *
- * @param name The attribute name.
- * @see org.xml.sax.AttributeList#getValue(java.lang.String)
- */
- public String getValue (String name)
- {
- return getValue(names.indexOf(name));
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Internal state.
- ////////////////////////////////////////////////////////////////////
-
- Vector names = new Vector();
- Vector types = new Vector();
- Vector values = new Vector();
-
-}
-
-// end of AttributeListImpl.java
+// SAX default implementation for AttributeList. +// http://www.saxproject.org +// No warranty; no copyright -- use this as you will. +// $Id: AttributeListImpl.java,v 1.3.2.3 2002/01/29 21:34:14 dbrownell Exp $ + +package org.xml.sax.helpers; + +import org.xml.sax.AttributeList; + +import java.util.Vector; + + +/** + * Default implementation for AttributeList. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>AttributeList implements the deprecated SAX1 {@link + * org.xml.sax.AttributeList AttributeList} interface, and has been + * replaced by the new SAX2 {@link org.xml.sax.helpers.AttributesImpl + * AttributesImpl} interface.</p> + * + * <p>This class provides a convenience implementation of the SAX + * {@link org.xml.sax.AttributeList AttributeList} interface. This + * implementation is useful both for SAX parser writers, who can use + * it to provide attributes to the application, and for SAX application + * writers, who can use it to create a persistent copy of an element's + * attribute specifications:</p> + * + * <pre> + * private AttributeList myatts; + * + * public void startElement (String name, AttributeList atts) + * { + * // create a persistent copy of the attribute list + * // for use outside this method + * myatts = new AttributeListImpl(atts); + * [...] + * } + * </pre> + * + * <p>Please note that SAX parsers are not required to use this + * class to provide an implementation of AttributeList; it is + * supplied only as an optional convenience. In particular, + * parser writers are encouraged to invent more efficient + * implementations.</p> + * + * @deprecated This class implements a deprecated interface, + * {@link org.xml.sax.AttributeList AttributeList}; + * that interface has been replaced by + * {@link org.xml.sax.Attributes Attributes}, + * which is implemented in the + * {@link org.xml.sax.helpers.AttributesImpl + * AttributesImpl} helper class. + * @since SAX 1.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + * @see org.xml.sax.AttributeList + * @see org.xml.sax.DocumentHandler#startElement + */ +public class AttributeListImpl implements AttributeList +{ + + /** + * Create an empty attribute list. + * + * <p>This constructor is most useful for parser writers, who + * will use it to create a single, reusable attribute list that + * can be reset with the clear method between elements.</p> + * + * @see #addAttribute + * @see #clear + */ + public AttributeListImpl () + { + } + + + /** + * Construct a persistent copy of an existing attribute list. + * + * <p>This constructor is most useful for application writers, + * who will use it to create a persistent copy of an existing + * attribute list.</p> + * + * @param atts The attribute list to copy + * @see org.xml.sax.DocumentHandler#startElement + */ + public AttributeListImpl (AttributeList atts) + { + setAttributeList(atts); + } + + + + //////////////////////////////////////////////////////////////////// + // Methods specific to this class. + //////////////////////////////////////////////////////////////////// + + + /** + * Set the attribute list, discarding previous contents. + * + * <p>This method allows an application writer to reuse an + * attribute list easily.</p> + * + * @param atts The attribute list to copy. + */ + public void setAttributeList (AttributeList atts) + { + int count = atts.getLength(); + + clear(); + + for (int i = 0; i < count; i++) { + addAttribute(atts.getName(i), atts.getType(i), atts.getValue(i)); + } + } + + + /** + * Add an attribute to an attribute list. + * + * <p>This method is provided for SAX parser writers, to allow them + * to build up an attribute list incrementally before delivering + * it to the application.</p> + * + * @param name The attribute name. + * @param type The attribute type ("NMTOKEN" for an enumeration). + * @param value The attribute value (must not be null). + * @see #removeAttribute + * @see org.xml.sax.DocumentHandler#startElement + */ + public void addAttribute (String name, String type, String value) + { + names.addElement(name); + types.addElement(type); + values.addElement(value); + } + + + /** + * Remove an attribute from the list. + * + * <p>SAX application writers can use this method to filter an + * attribute out of an AttributeList. Note that invoking this + * method will change the length of the attribute list and + * some of the attribute's indices.</p> + * + * <p>If the requested attribute is not in the list, this is + * a no-op.</p> + * + * @param name The attribute name. + * @see #addAttribute + */ + public void removeAttribute (String name) + { + int i = names.indexOf(name); + + if (i >= 0) { + names.removeElementAt(i); + types.removeElementAt(i); + values.removeElementAt(i); + } + } + + + /** + * Clear the attribute list. + * + * <p>SAX parser writers can use this method to reset the attribute + * list between DocumentHandler.startElement events. Normally, + * it will make sense to reuse the same AttributeListImpl object + * rather than allocating a new one each time.</p> + * + * @see org.xml.sax.DocumentHandler#startElement + */ + public void clear () + { + names.removeAllElements(); + types.removeAllElements(); + values.removeAllElements(); + } + + + + //////////////////////////////////////////////////////////////////// + // Implementation of org.xml.sax.AttributeList + //////////////////////////////////////////////////////////////////// + + + /** + * Return the number of attributes in the list. + * + * @return The number of attributes in the list. + * @see org.xml.sax.AttributeList#getLength + */ + public int getLength () + { + return names.size(); + } + + + /** + * Get the name of an attribute (by position). + * + * @param i The position of the attribute in the list. + * @return The attribute name as a string, or null if there + * is no attribute at that position. + * @see org.xml.sax.AttributeList#getName(int) + */ + public String getName (int i) + { + if (i < 0) { + return null; + } + try { + return (String)names.elementAt(i); + } catch (ArrayIndexOutOfBoundsException e) { + return null; + } + } + + + /** + * Get the type of an attribute (by position). + * + * @param i The position of the attribute in the list. + * @return The attribute type as a string ("NMTOKEN" for an + * enumeration, and "CDATA" if no declaration was + * read), or null if there is no attribute at + * that position. + * @see org.xml.sax.AttributeList#getType(int) + */ + public String getType (int i) + { + if (i < 0) { + return null; + } + try { + return (String)types.elementAt(i); + } catch (ArrayIndexOutOfBoundsException e) { + return null; + } + } + + + /** + * Get the value of an attribute (by position). + * + * @param i The position of the attribute in the list. + * @return The attribute value as a string, or null if + * there is no attribute at that position. + * @see org.xml.sax.AttributeList#getValue(int) + */ + public String getValue (int i) + { + if (i < 0) { + return null; + } + try { + return (String)values.elementAt(i); + } catch (ArrayIndexOutOfBoundsException e) { + return null; + } + } + + + /** + * Get the type of an attribute (by name). + * + * @param name The attribute name. + * @return The attribute type as a string ("NMTOKEN" for an + * enumeration, and "CDATA" if no declaration was + * read). + * @see org.xml.sax.AttributeList#getType(java.lang.String) + */ + public String getType (String name) + { + return getType(names.indexOf(name)); + } + + + /** + * Get the value of an attribute (by name). + * + * @param name The attribute name. + * @see org.xml.sax.AttributeList#getValue(java.lang.String) + */ + public String getValue (String name) + { + return getValue(names.indexOf(name)); + } + + + + //////////////////////////////////////////////////////////////////// + // Internal state. + //////////////////////////////////////////////////////////////////// + + Vector names = new Vector(); + Vector types = new Vector(); + Vector values = new Vector(); + +} + +// end of AttributeListImpl.java diff --git a/libjava/org/xml/sax/helpers/AttributesImpl.java b/libjava/org/xml/sax/helpers/AttributesImpl.java index b714f39fdb8..d16cb335664 100644 --- a/libjava/org/xml/sax/helpers/AttributesImpl.java +++ b/libjava/org/xml/sax/helpers/AttributesImpl.java @@ -1,606 +1,620 @@ -// AttributesImpl.java - default implementation of Attributes.
-// Written by David Megginson, sax@megginson.com
-// NO WARRANTY! This class is in the public domain.
-
-// $Id: AttributesImpl.java,v 1.2 2001/05/31 16:03:17 garyp Exp $
-
-
-package org.xml.sax.helpers;
-
-import org.xml.sax.Attributes;
-
-
-/**
- * Default implementation of the Attributes interface.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>This class provides a default implementation of the SAX2
- * {@link org.xml.sax.Attributes Attributes} interface, with the
- * addition of manipulators so that the list can be modified or
- * reused.</p>
- *
- * <p>There are two typical uses of this class:</p>
- *
- * <ol>
- * <li>to take a persistent snapshot of an Attributes object
- * in a {@link org.xml.sax.ContentHandler#startElement startElement} event; or</li>
- * <li>to construct or modify an Attributes object in a SAX2 driver or filter.</li>
- * </ol>
- *
- * <p>This class replaces the now-deprecated SAX1 {@link
- * org.xml.sax.helpers.AttributeListImpl AttributeListImpl}
- * class; in addition to supporting the updated Attributes
- * interface rather than the deprecated {@link org.xml.sax.AttributeList
- * AttributeList} interface, it also includes a much more efficient
- * implementation using a single array rather than a set of Vectors.</p>
- *
- * @since SAX 2.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- */
-public class AttributesImpl implements Attributes
-{
-
-
- ////////////////////////////////////////////////////////////////////
- // Constructors.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Construct a new, empty AttributesImpl object.
- */
- public AttributesImpl ()
- {
- length = 0;
- data = null;
- }
-
-
- /**
- * Copy an existing Attributes object.
- *
- * <p>This constructor is especially useful inside a
- * {@link org.xml.sax.ContentHandler#startElement startElement} event.</p>
- *
- * @param atts The existing Attributes object.
- */
- public AttributesImpl (Attributes atts)
- {
- setAttributes(atts);
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Implementation of org.xml.sax.Attributes.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Return the number of attributes in the list.
- *
- * @return The number of attributes in the list.
- * @see org.xml.sax.Attributes#getLength
- */
- public int getLength ()
- {
- return length;
- }
-
-
- /**
- * Return an attribute's Namespace URI.
- *
- * @param index The attribute's index (zero-based).
- * @return The Namespace URI, the empty string if none is
- * available, or null if the index is out of range.
- * @see org.xml.sax.Attributes#getURI
- */
- public String getURI (int index)
- {
- if (index >= 0 && index < length) {
- return data[index*5];
- } else {
- return null;
- }
- }
-
-
- /**
- * Return an attribute's local name.
- *
- * @param index The attribute's index (zero-based).
- * @return The attribute's local name, the empty string if
- * none is available, or null if the index if out of range.
- * @see org.xml.sax.Attributes#getLocalName
- */
- public String getLocalName (int index)
- {
- if (index >= 0 && index < length) {
- return data[index*5+1];
- } else {
- return null;
- }
- }
-
-
- /**
- * Return an attribute's qualified (prefixed) name.
- *
- * @param index The attribute's index (zero-based).
- * @return The attribute's qualified name, the empty string if
- * none is available, or null if the index is out of bounds.
- * @see org.xml.sax.Attributes#getQName
- */
- public String getQName (int index)
- {
- if (index >= 0 && index < length) {
- return data[index*5+2];
- } else {
- return null;
- }
- }
-
-
- /**
- * Return an attribute's type by index.
- *
- * @param index The attribute's index (zero-based).
- * @return The attribute's type, "CDATA" if the type is unknown, or null
- * if the index is out of bounds.
- * @see org.xml.sax.Attributes#getType(int)
- */
- public String getType (int index)
- {
- if (index >= 0 && index < length) {
- return data[index*5+3];
- } else {
- return null;
- }
- }
-
-
- /**
- * Return an attribute's value by index.
- *
- * @param index The attribute's index (zero-based).
- * @return The attribute's value or null if the index is out of bounds.
- * @see org.xml.sax.Attributes#getValue(int)
- */
- public String getValue (int index)
- {
- if (index >= 0 && index < length) {
- return data[index*5+4];
- } else {
- return null;
- }
- }
-
-
- /**
- * Look up an attribute's index by Namespace name.
- *
- * <p>In many cases, it will be more efficient to look up the name once and
- * use the index query methods rather than using the name query methods
- * repeatedly.</p>
- *
- * @param uri The attribute's Namespace URI, or the empty
- * string if none is available.
- * @param localName The attribute's local name.
- * @return The attribute's index, or -1 if none matches.
- * @see org.xml.sax.Attributes#getIndex(java.lang.String,java.lang.String)
- */
- public int getIndex (String uri, String localName)
- {
- int max = length * 5;
- for (int i = 0; i < max; i += 5) {
- if (data[i].equals(uri) && data[i+1].equals(localName)) {
- return i / 5;
- }
- }
- return -1;
- }
-
-
- /**
- * Look up an attribute's index by qualified (prefixed) name.
- *
- * @param qName The qualified name.
- * @return The attribute's index, or -1 if none matches.
- * @see org.xml.sax.Attributes#getIndex(java.lang.String)
- */
- public int getIndex (String qName)
- {
- int max = length * 5;
- for (int i = 0; i < max; i += 5) {
- if (data[i+2].equals(qName)) {
- return i / 5;
- }
- }
- return -1;
- }
-
-
- /**
- * Look up an attribute's type by Namespace-qualified name.
- *
- * @param uri The Namespace URI, or the empty string for a name
- * with no explicit Namespace URI.
- * @param localName The local name.
- * @return The attribute's type, or null if there is no
- * matching attribute.
- * @see org.xml.sax.Attributes#getType(java.lang.String,java.lang.String)
- */
- public String getType (String uri, String localName)
- {
- int max = length * 5;
- for (int i = 0; i < max; i += 5) {
- if (data[i].equals(uri) && data[i+1].equals(localName)) {
- return data[i+3];
- }
- }
- return null;
- }
-
-
- /**
- * Look up an attribute's type by qualified (prefixed) name.
- *
- * @param qName The qualified name.
- * @return The attribute's type, or null if there is no
- * matching attribute.
- * @see org.xml.sax.Attributes#getType(java.lang.String)
- */
- public String getType (String qName)
- {
- int max = length * 5;
- for (int i = 0; i < max; i += 5) {
- if (data[i+2].equals(qName)) {
- return data[i+3];
- }
- }
- return null;
- }
-
-
- /**
- * Look up an attribute's value by Namespace-qualified name.
- *
- * @param uri The Namespace URI, or the empty string for a name
- * with no explicit Namespace URI.
- * @param localName The local name.
- * @return The attribute's value, or null if there is no
- * matching attribute.
- * @see org.xml.sax.Attributes#getValue(java.lang.String,java.lang.String)
- */
- public String getValue (String uri, String localName)
- {
- int max = length * 5;
- for (int i = 0; i < max; i += 5) {
- if (data[i].equals(uri) && data[i+1].equals(localName)) {
- return data[i+4];
- }
- }
- return null;
- }
-
-
- /**
- * Look up an attribute's value by qualified (prefixed) name.
- *
- * @param qName The qualified name.
- * @return The attribute's value, or null if there is no
- * matching attribute.
- * @see org.xml.sax.Attributes#getValue(java.lang.String)
- */
- public String getValue (String qName)
- {
- int max = length * 5;
- for (int i = 0; i < max; i += 5) {
- if (data[i+2].equals(qName)) {
- return data[i+4];
- }
- }
- return null;
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Manipulators.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Clear the attribute list for reuse.
- *
- * <p>Note that no memory is actually freed by this call:
- * the current arrays are kept so that they can be
- * reused.</p>
- */
- public void clear ()
- {
- length = 0;
- }
-
-
- /**
- * Copy an entire Attributes object.
- *
- * <p>It may be more efficient to reuse an existing object
- * rather than constantly allocating new ones.</p>
- *
- * @param atts The attributes to copy.
- */
- public void setAttributes (Attributes atts)
- {
- clear();
- length = atts.getLength();
- data = new String[length*5];
- for (int i = 0; i < length; i++) {
- data[i*5] = atts.getURI(i);
- data[i*5+1] = atts.getLocalName(i);
- data[i*5+2] = atts.getQName(i);
- data[i*5+3] = atts.getType(i);
- data[i*5+4] = atts.getValue(i);
- }
- }
-
-
- /**
- * Add an attribute to the end of the list.
- *
- * <p>For the sake of speed, this method does no checking
- * to see if the attribute is already in the list: that is
- * the responsibility of the application.</p>
- *
- * @param uri The Namespace URI, or the empty string if
- * none is available or Namespace processing is not
- * being performed.
- * @param localName The local name, or the empty string if
- * Namespace processing is not being performed.
- * @param qName The qualified (prefixed) name, or the empty string
- * if qualified names are not available.
- * @param type The attribute type as a string.
- * @param value The attribute value.
- */
- public void addAttribute (String uri, String localName, String qName,
- String type, String value)
- {
- ensureCapacity(length+1);
- data[length*5] = uri;
- data[length*5+1] = localName;
- data[length*5+2] = qName;
- data[length*5+3] = type;
- data[length*5+4] = value;
- length++;
- }
-
-
- /**
- * Set an attribute in the list.
- *
- * <p>For the sake of speed, this method does no checking
- * for name conflicts or well-formedness: such checks are the
- * responsibility of the application.</p>
- *
- * @param index The index of the attribute (zero-based).
- * @param uri The Namespace URI, or the empty string if
- * none is available or Namespace processing is not
- * being performed.
- * @param localName The local name, or the empty string if
- * Namespace processing is not being performed.
- * @param qName The qualified name, or the empty string
- * if qualified names are not available.
- * @param type The attribute type as a string.
- * @param value The attribute value.
- * @exception java.lang.ArrayIndexOutOfBoundsException When the
- * supplied index does not point to an attribute
- * in the list.
- */
- public void setAttribute (int index, String uri, String localName,
- String qName, String type, String value)
- {
- if (index >= 0 && index < length) {
- data[index*5] = uri;
- data[index*5+1] = localName;
- data[index*5+2] = qName;
- data[index*5+3] = type;
- data[index*5+4] = value;
- } else {
- badIndex(index);
- }
- }
-
-
- /**
- * Remove an attribute from the list.
- *
- * @param index The index of the attribute (zero-based).
- * @exception java.lang.ArrayIndexOutOfBoundsException When the
- * supplied index does not point to an attribute
- * in the list.
- */
- public void removeAttribute (int index)
- {
- if (index >= 0 && index < length) {
- data[index*5] = null;
- data[index*5+1] = null;
- data[index*5+2] = null;
- data[index*5+3] = null;
- data[index*5+4] = null;
- if (index < length - 1) {
- System.arraycopy(data, (index+1)*5, data, index*5,
- (length-index-1)*5);
- }
- length--;
- } else {
- badIndex(index);
- }
- }
-
-
- /**
- * Set the Namespace URI of a specific attribute.
- *
- * @param index The index of the attribute (zero-based).
- * @param uri The attribute's Namespace URI, or the empty
- * string for none.
- * @exception java.lang.ArrayIndexOutOfBoundsException When the
- * supplied index does not point to an attribute
- * in the list.
- */
- public void setURI (int index, String uri)
- {
- if (index >= 0 && index < length) {
- data[index*5] = uri;
- } else {
- badIndex(index);
- }
- }
-
-
- /**
- * Set the local name of a specific attribute.
- *
- * @param index The index of the attribute (zero-based).
- * @param localName The attribute's local name, or the empty
- * string for none.
- * @exception java.lang.ArrayIndexOutOfBoundsException When the
- * supplied index does not point to an attribute
- * in the list.
- */
- public void setLocalName (int index, String localName)
- {
- if (index >= 0 && index < length) {
- data[index*5+1] = localName;
- } else {
- badIndex(index);
- }
- }
-
-
- /**
- * Set the qualified name of a specific attribute.
- *
- * @param index The index of the attribute (zero-based).
- * @param qName The attribute's qualified name, or the empty
- * string for none.
- * @exception java.lang.ArrayIndexOutOfBoundsException When the
- * supplied index does not point to an attribute
- * in the list.
- */
- public void setQName (int index, String qName)
- {
- if (index >= 0 && index < length) {
- data[index*5+2] = qName;
- } else {
- badIndex(index);
- }
- }
-
-
- /**
- * Set the type of a specific attribute.
- *
- * @param index The index of the attribute (zero-based).
- * @param type The attribute's type.
- * @exception java.lang.ArrayIndexOutOfBoundsException When the
- * supplied index does not point to an attribute
- * in the list.
- */
- public void setType (int index, String type)
- {
- if (index >= 0 && index < length) {
- data[index*5+3] = type;
- } else {
- badIndex(index);
- }
- }
-
-
- /**
- * Set the value of a specific attribute.
- *
- * @param index The index of the attribute (zero-based).
- * @param value The attribute's value.
- * @exception java.lang.ArrayIndexOutOfBoundsException When the
- * supplied index does not point to an attribute
- * in the list.
- */
- public void setValue (int index, String value)
- {
- if (index >= 0 && index < length) {
- data[index*5+4] = value;
- } else {
- badIndex(index);
- }
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Internal methods.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Ensure the internal array's capacity.
- *
- * @param n The minimum number of attributes that the array must
- * be able to hold.
- */
- private void ensureCapacity (int n)
- {
- if (n > 0 && data == null) {
- data = new String[25];
- }
-
- int max = data.length;
- if (max >= n * 5) {
- return;
- }
-
-
- while (max < n * 5) {
- max *= 2;
- }
- String newData[] = new String[max];
- System.arraycopy(data, 0, newData, 0, length*5);
- data = newData;
- }
-
-
- /**
- * Report a bad array index in a manipulator.
- *
- * @param index The index to report.
- * @exception java.lang.ArrayIndexOutOfBoundsException Always.
- */
- private void badIndex (int index)
- throws ArrayIndexOutOfBoundsException
- {
- String msg =
- "Attempt to modify attribute at illegal index: " + index;
- throw new ArrayIndexOutOfBoundsException(msg);
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Internal state.
- ////////////////////////////////////////////////////////////////////
-
- int length;
- String data [];
-
-}
-
-// end of AttributesImpl.java
-
+// AttributesImpl.java - default implementation of Attributes. +// http://www.saxproject.org +// Written by David Megginson +// NO WARRANTY! This class is in the public domain. + +// $Id: AttributesImpl.java,v 1.6.2.3 2002/01/29 21:34:14 dbrownell Exp $ + + +package org.xml.sax.helpers; + +import org.xml.sax.Attributes; + + +/** + * Default implementation of the Attributes interface. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>This class provides a default implementation of the SAX2 + * {@link org.xml.sax.Attributes Attributes} interface, with the + * addition of manipulators so that the list can be modified or + * reused.</p> + * + * <p>There are two typical uses of this class:</p> + * + * <ol> + * <li>to take a persistent snapshot of an Attributes object + * in a {@link org.xml.sax.ContentHandler#startElement startElement} event; or</li> + * <li>to construct or modify an Attributes object in a SAX2 driver or filter.</li> + * </ol> + * + * <p>This class replaces the now-deprecated SAX1 {@link + * org.xml.sax.helpers.AttributeListImpl AttributeListImpl} + * class; in addition to supporting the updated Attributes + * interface rather than the deprecated {@link org.xml.sax.AttributeList + * AttributeList} interface, it also includes a much more efficient + * implementation using a single array rather than a set of Vectors.</p> + * + * @since SAX 2.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + */ +public class AttributesImpl implements Attributes +{ + + + //////////////////////////////////////////////////////////////////// + // Constructors. + //////////////////////////////////////////////////////////////////// + + + /** + * Construct a new, empty AttributesImpl object. + */ + public AttributesImpl () + { + length = 0; + data = null; + } + + + /** + * Copy an existing Attributes object. + * + * <p>This constructor is especially useful inside a + * {@link org.xml.sax.ContentHandler#startElement startElement} event.</p> + * + * @param atts The existing Attributes object. + */ + public AttributesImpl (Attributes atts) + { + setAttributes(atts); + } + + + + //////////////////////////////////////////////////////////////////// + // Implementation of org.xml.sax.Attributes. + //////////////////////////////////////////////////////////////////// + + + /** + * Return the number of attributes in the list. + * + * @return The number of attributes in the list. + * @see org.xml.sax.Attributes#getLength + */ + public int getLength () + { + return length; + } + + + /** + * Return an attribute's Namespace URI. + * + * @param index The attribute's index (zero-based). + * @return The Namespace URI, the empty string if none is + * available, or null if the index is out of range. + * @see org.xml.sax.Attributes#getURI + */ + public String getURI (int index) + { + if (index >= 0 && index < length) { + return data[index*5]; + } else { + return null; + } + } + + + /** + * Return an attribute's local name. + * + * @param index The attribute's index (zero-based). + * @return The attribute's local name, the empty string if + * none is available, or null if the index if out of range. + * @see org.xml.sax.Attributes#getLocalName + */ + public String getLocalName (int index) + { + if (index >= 0 && index < length) { + return data[index*5+1]; + } else { + return null; + } + } + + + /** + * Return an attribute's qualified (prefixed) name. + * + * @param index The attribute's index (zero-based). + * @return The attribute's qualified name, the empty string if + * none is available, or null if the index is out of bounds. + * @see org.xml.sax.Attributes#getQName + */ + public String getQName (int index) + { + if (index >= 0 && index < length) { + return data[index*5+2]; + } else { + return null; + } + } + + + /** + * Return an attribute's type by index. + * + * @param index The attribute's index (zero-based). + * @return The attribute's type, "CDATA" if the type is unknown, or null + * if the index is out of bounds. + * @see org.xml.sax.Attributes#getType(int) + */ + public String getType (int index) + { + if (index >= 0 && index < length) { + return data[index*5+3]; + } else { + return null; + } + } + + + /** + * Return an attribute's value by index. + * + * @param index The attribute's index (zero-based). + * @return The attribute's value or null if the index is out of bounds. + * @see org.xml.sax.Attributes#getValue(int) + */ + public String getValue (int index) + { + if (index >= 0 && index < length) { + return data[index*5+4]; + } else { + return null; + } + } + + + /** + * Look up an attribute's index by Namespace name. + * + * <p>In many cases, it will be more efficient to look up the name once and + * use the index query methods rather than using the name query methods + * repeatedly.</p> + * + * @param uri The attribute's Namespace URI, or the empty + * string if none is available. + * @param localName The attribute's local name. + * @return The attribute's index, or -1 if none matches. + * @see org.xml.sax.Attributes#getIndex(java.lang.String,java.lang.String) + */ + public int getIndex (String uri, String localName) + { + int max = length * 5; + for (int i = 0; i < max; i += 5) { + if (data[i].equals(uri) && data[i+1].equals(localName)) { + return i / 5; + } + } + return -1; + } + + + /** + * Look up an attribute's index by qualified (prefixed) name. + * + * @param qName The qualified name. + * @return The attribute's index, or -1 if none matches. + * @see org.xml.sax.Attributes#getIndex(java.lang.String) + */ + public int getIndex (String qName) + { + int max = length * 5; + for (int i = 0; i < max; i += 5) { + if (data[i+2].equals(qName)) { + return i / 5; + } + } + return -1; + } + + + /** + * Look up an attribute's type by Namespace-qualified name. + * + * @param uri The Namespace URI, or the empty string for a name + * with no explicit Namespace URI. + * @param localName The local name. + * @return The attribute's type, or null if there is no + * matching attribute. + * @see org.xml.sax.Attributes#getType(java.lang.String,java.lang.String) + */ + public String getType (String uri, String localName) + { + int max = length * 5; + for (int i = 0; i < max; i += 5) { + if (data[i].equals(uri) && data[i+1].equals(localName)) { + return data[i+3]; + } + } + return null; + } + + + /** + * Look up an attribute's type by qualified (prefixed) name. + * + * @param qName The qualified name. + * @return The attribute's type, or null if there is no + * matching attribute. + * @see org.xml.sax.Attributes#getType(java.lang.String) + */ + public String getType (String qName) + { + int max = length * 5; + for (int i = 0; i < max; i += 5) { + if (data[i+2].equals(qName)) { + return data[i+3]; + } + } + return null; + } + + + /** + * Look up an attribute's value by Namespace-qualified name. + * + * @param uri The Namespace URI, or the empty string for a name + * with no explicit Namespace URI. + * @param localName The local name. + * @return The attribute's value, or null if there is no + * matching attribute. + * @see org.xml.sax.Attributes#getValue(java.lang.String,java.lang.String) + */ + public String getValue (String uri, String localName) + { + int max = length * 5; + for (int i = 0; i < max; i += 5) { + if (data[i].equals(uri) && data[i+1].equals(localName)) { + return data[i+4]; + } + } + return null; + } + + + /** + * Look up an attribute's value by qualified (prefixed) name. + * + * @param qName The qualified name. + * @return The attribute's value, or null if there is no + * matching attribute. + * @see org.xml.sax.Attributes#getValue(java.lang.String) + */ + public String getValue (String qName) + { + int max = length * 5; + for (int i = 0; i < max; i += 5) { + if (data[i+2].equals(qName)) { + return data[i+4]; + } + } + return null; + } + + + + //////////////////////////////////////////////////////////////////// + // Manipulators. + //////////////////////////////////////////////////////////////////// + + + /** + * Clear the attribute list for reuse. + * + * <p>Note that little memory is freed by this call: + * the current array is kept so it can be + * reused.</p> + */ + public void clear () + { + if (data != null) { + for (int i = 0; i < (length * 5); i++) + data [i] = null; + } + length = 0; + } + + + /** + * Copy an entire Attributes object. + * + * <p>It may be more efficient to reuse an existing object + * rather than constantly allocating new ones.</p> + * + * @param atts The attributes to copy. + */ + public void setAttributes (Attributes atts) + { + clear(); + length = atts.getLength(); + if (length > 0) { + data = new String[length*5]; + for (int i = 0; i < length; i++) { + data[i*5] = atts.getURI(i); + data[i*5+1] = atts.getLocalName(i); + data[i*5+2] = atts.getQName(i); + data[i*5+3] = atts.getType(i); + data[i*5+4] = atts.getValue(i); + } + } + } + + + /** + * Add an attribute to the end of the list. + * + * <p>For the sake of speed, this method does no checking + * to see if the attribute is already in the list: that is + * the responsibility of the application.</p> + * + * @param uri The Namespace URI, or the empty string if + * none is available or Namespace processing is not + * being performed. + * @param localName The local name, or the empty string if + * Namespace processing is not being performed. + * @param qName The qualified (prefixed) name, or the empty string + * if qualified names are not available. + * @param type The attribute type as a string. + * @param value The attribute value. + */ + public void addAttribute (String uri, String localName, String qName, + String type, String value) + { + ensureCapacity(length+1); + data[length*5] = uri; + data[length*5+1] = localName; + data[length*5+2] = qName; + data[length*5+3] = type; + data[length*5+4] = value; + length++; + } + + + /** + * Set an attribute in the list. + * + * <p>For the sake of speed, this method does no checking + * for name conflicts or well-formedness: such checks are the + * responsibility of the application.</p> + * + * @param index The index of the attribute (zero-based). + * @param uri The Namespace URI, or the empty string if + * none is available or Namespace processing is not + * being performed. + * @param localName The local name, or the empty string if + * Namespace processing is not being performed. + * @param qName The qualified name, or the empty string + * if qualified names are not available. + * @param type The attribute type as a string. + * @param value The attribute value. + * @exception java.lang.ArrayIndexOutOfBoundsException When the + * supplied index does not point to an attribute + * in the list. + */ + public void setAttribute (int index, String uri, String localName, + String qName, String type, String value) + { + if (index >= 0 && index < length) { + data[index*5] = uri; + data[index*5+1] = localName; + data[index*5+2] = qName; + data[index*5+3] = type; + data[index*5+4] = value; + } else { + badIndex(index); + } + } + + + /** + * Remove an attribute from the list. + * + * @param index The index of the attribute (zero-based). + * @exception java.lang.ArrayIndexOutOfBoundsException When the + * supplied index does not point to an attribute + * in the list. + */ + public void removeAttribute (int index) + { + if (index >= 0 && index < length) { + if (index < length - 1) { + System.arraycopy(data, (index+1)*5, data, index*5, + (length-index-1)*5); + } + index = (length - 1) * 5; + data [index++] = null; + data [index++] = null; + data [index++] = null; + data [index++] = null; + data [index] = null; + length--; + } else { + badIndex(index); + } + } + + + /** + * Set the Namespace URI of a specific attribute. + * + * @param index The index of the attribute (zero-based). + * @param uri The attribute's Namespace URI, or the empty + * string for none. + * @exception java.lang.ArrayIndexOutOfBoundsException When the + * supplied index does not point to an attribute + * in the list. + */ + public void setURI (int index, String uri) + { + if (index >= 0 && index < length) { + data[index*5] = uri; + } else { + badIndex(index); + } + } + + + /** + * Set the local name of a specific attribute. + * + * @param index The index of the attribute (zero-based). + * @param localName The attribute's local name, or the empty + * string for none. + * @exception java.lang.ArrayIndexOutOfBoundsException When the + * supplied index does not point to an attribute + * in the list. + */ + public void setLocalName (int index, String localName) + { + if (index >= 0 && index < length) { + data[index*5+1] = localName; + } else { + badIndex(index); + } + } + + + /** + * Set the qualified name of a specific attribute. + * + * @param index The index of the attribute (zero-based). + * @param qName The attribute's qualified name, or the empty + * string for none. + * @exception java.lang.ArrayIndexOutOfBoundsException When the + * supplied index does not point to an attribute + * in the list. + */ + public void setQName (int index, String qName) + { + if (index >= 0 && index < length) { + data[index*5+2] = qName; + } else { + badIndex(index); + } + } + + + /** + * Set the type of a specific attribute. + * + * @param index The index of the attribute (zero-based). + * @param type The attribute's type. + * @exception java.lang.ArrayIndexOutOfBoundsException When the + * supplied index does not point to an attribute + * in the list. + */ + public void setType (int index, String type) + { + if (index >= 0 && index < length) { + data[index*5+3] = type; + } else { + badIndex(index); + } + } + + + /** + * Set the value of a specific attribute. + * + * @param index The index of the attribute (zero-based). + * @param value The attribute's value. + * @exception java.lang.ArrayIndexOutOfBoundsException When the + * supplied index does not point to an attribute + * in the list. + */ + public void setValue (int index, String value) + { + if (index >= 0 && index < length) { + data[index*5+4] = value; + } else { + badIndex(index); + } + } + + + + //////////////////////////////////////////////////////////////////// + // Internal methods. + //////////////////////////////////////////////////////////////////// + + + /** + * Ensure the internal array's capacity. + * + * @param n The minimum number of attributes that the array must + * be able to hold. + */ + private void ensureCapacity (int n) { + if (n <= 0) { + return; + } + int max; + if (data == null || data.length == 0) { + max = 25; + } + else if (data.length >= n * 5) { + return; + } + else { + max = data.length; + } + while (max < n * 5) { + max *= 2; + } + + String newData[] = new String[max]; + if (length > 0) { + System.arraycopy(data, 0, newData, 0, length*5); + } + data = newData; + } + + + /** + * Report a bad array index in a manipulator. + * + * @param index The index to report. + * @exception java.lang.ArrayIndexOutOfBoundsException Always. + */ + private void badIndex (int index) + throws ArrayIndexOutOfBoundsException + { + String msg = + "Attempt to modify attribute at illegal index: " + index; + throw new ArrayIndexOutOfBoundsException(msg); + } + + + + //////////////////////////////////////////////////////////////////// + // Internal state. + //////////////////////////////////////////////////////////////////// + + int length; + String data []; + +} + +// end of AttributesImpl.java + diff --git a/libjava/org/xml/sax/helpers/DefaultHandler.java b/libjava/org/xml/sax/helpers/DefaultHandler.java index 957d44d882e..873e754a1a5 100644 --- a/libjava/org/xml/sax/helpers/DefaultHandler.java +++ b/libjava/org/xml/sax/helpers/DefaultHandler.java @@ -1,447 +1,468 @@ -// DefaultHandler.java - default implementation of the core handlers.
-// Written by David Megginson, sax@megginson.com
-// NO WARRANTY! This class is in the public domain.
-
-// $Id: DefaultHandler.java,v 1.1 2000/10/02 02:43:20 sboag Exp $
-
-package org.xml.sax.helpers;
-
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.Attributes;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.DTDHandler;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-
-/**
- * Default base class for SAX2 event handlers.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>This class is available as a convenience base class for SAX2
- * applications: it provides default implementations for all of the
- * callbacks in the four core SAX2 handler classes:</p>
- *
- * <ul>
- * <li>{@link org.xml.sax.EntityResolver EntityResolver}</li>
- * <li>{@link org.xml.sax.DTDHandler DTDHandler}</li>
- * <li>{@link org.xml.sax.ContentHandler ContentHandler}</li>
- * <li>{@link org.xml.sax.ErrorHandler ErrorHandler}</li>
- * </ul>
- *
- * <p>Application writers can extend this class when they need to
- * implement only part of an interface; parser writers can
- * instantiate this class to provide default handlers when the
- * application has not supplied its own.</p>
- *
- * <p>This class replaces the deprecated SAX1
- * {@link org.xml.sax.HandlerBase HandlerBase} class.</p>
- *
- * @since SAX 2.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.EntityResolver
- * @see org.xml.sax.DTDHandler
- * @see org.xml.sax.ContentHandler
- * @see org.xml.sax.ErrorHandler
- */
-public class DefaultHandler
- implements EntityResolver, DTDHandler, ContentHandler, ErrorHandler
-{
-
-
- ////////////////////////////////////////////////////////////////////
- // Default implementation of the EntityResolver interface.
- ////////////////////////////////////////////////////////////////////
-
- /**
- * Resolve an external entity.
- *
- * <p>Always return null, so that the parser will use the system
- * identifier provided in the XML document. This method implements
- * the SAX default behaviour: application writers can override it
- * in a subclass to do special translations such as catalog lookups
- * or URI redirection.</p>
- *
- * @param publicId The public identifier, or null if none is
- * available.
- * @param systemId The system identifier provided in the XML
- * document.
- * @return The new input source, or null to require the
- * default behaviour.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.EntityResolver#resolveEntity
- */
- public InputSource resolveEntity (String publicId, String systemId)
- throws SAXException
- {
- return null;
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Default implementation of DTDHandler interface.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Receive notification of a notation declaration.
- *
- * <p>By default, do nothing. Application writers may override this
- * method in a subclass if they wish to keep track of the notations
- * declared in a document.</p>
- *
- * @param name The notation name.
- * @param publicId The notation public identifier, or null if not
- * available.
- * @param systemId The notation system identifier.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.DTDHandler#notationDecl
- */
- public void notationDecl (String name, String publicId, String systemId)
- throws SAXException
- {
- // no op
- }
-
-
- /**
- * Receive notification of an unparsed entity declaration.
- *
- * <p>By default, do nothing. Application writers may override this
- * method in a subclass to keep track of the unparsed entities
- * declared in a document.</p>
- *
- * @param name The entity name.
- * @param publicId The entity public identifier, or null if not
- * available.
- * @param systemId The entity system identifier.
- * @param notationName The name of the associated notation.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.DTDHandler#unparsedEntityDecl
- */
- public void unparsedEntityDecl (String name, String publicId,
- String systemId, String notationName)
- throws SAXException
- {
- // no op
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Default implementation of ContentHandler interface.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Receive a Locator object for document events.
- *
- * <p>By default, do nothing. Application writers may override this
- * method in a subclass if they wish to store the locator for use
- * with other document events.</p>
- *
- * @param locator A locator for all SAX document events.
- * @see org.xml.sax.ContentHandler#setDocumentLocator
- * @see org.xml.sax.Locator
- */
- public void setDocumentLocator (Locator locator)
- {
- // no op
- }
-
-
- /**
- * Receive notification of the beginning of the document.
- *
- * <p>By default, do nothing. Application writers may override this
- * method in a subclass to take specific actions at the beginning
- * of a document (such as allocating the root node of a tree or
- * creating an output file).</p>
- *
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.ContentHandler#startDocument
- */
- public void startDocument ()
- throws SAXException
- {
- // no op
- }
-
-
- /**
- * Receive notification of the end of the document.
- *
- * <p>By default, do nothing. Application writers may override this
- * method in a subclass to take specific actions at the end
- * of a document (such as finalising a tree or closing an output
- * file).</p>
- *
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.ContentHandler#endDocument
- */
- public void endDocument ()
- throws SAXException
- {
- // no op
- }
-
-
- /**
- * Receive notification of the start of a Namespace mapping.
- *
- * <p>By default, do nothing. Application writers may override this
- * method in a subclass to take specific actions at the start of
- * each Namespace prefix scope (such as storing the prefix mapping).</p>
- *
- * @param prefix The Namespace prefix being declared.
- * @param uri The Namespace URI mapped to the prefix.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.ContentHandler#startPrefixMapping
- */
- public void startPrefixMapping (String prefix, String uri)
- throws SAXException
- {
- // no op
- }
-
-
- /**
- * Receive notification of the end of a Namespace mapping.
- *
- * <p>By default, do nothing. Application writers may override this
- * method in a subclass to take specific actions at the end of
- * each prefix mapping.</p>
- *
- * @param prefix The Namespace prefix being declared.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.ContentHandler#endPrefixMapping
- */
- public void endPrefixMapping (String prefix)
- throws SAXException
- {
- // no op
- }
-
-
- /**
- * Receive notification of the start of an element.
- *
- * <p>By default, do nothing. Application writers may override this
- * method in a subclass to take specific actions at the start of
- * each element (such as allocating a new tree node or writing
- * output to a file).</p>
- *
- * @param name The element type name.
- * @param attributes The specified or defaulted attributes.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.ContentHandler#startElement
- */
- public void startElement (String uri, String localName,
- String qName, Attributes attributes)
- throws SAXException
- {
- // no op
- }
-
-
- /**
- * Receive notification of the end of an element.
- *
- * <p>By default, do nothing. Application writers may override this
- * method in a subclass to take specific actions at the end of
- * each element (such as finalising a tree node or writing
- * output to a file).</p>
- *
- * @param name The element type name.
- * @param attributes The specified or defaulted attributes.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.ContentHandler#endElement
- */
- public void endElement (String uri, String localName, String qName)
- throws SAXException
- {
- // no op
- }
-
-
- /**
- * Receive notification of character data inside an element.
- *
- * <p>By default, do nothing. Application writers may override this
- * method to take specific actions for each chunk of character data
- * (such as adding the data to a node or buffer, or printing it to
- * a file).</p>
- *
- * @param ch The characters.
- * @param start The start position in the character array.
- * @param length The number of characters to use from the
- * character array.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.ContentHandler#characters
- */
- public void characters (char ch[], int start, int length)
- throws SAXException
- {
- // no op
- }
-
-
- /**
- * Receive notification of ignorable whitespace in element content.
- *
- * <p>By default, do nothing. Application writers may override this
- * method to take specific actions for each chunk of ignorable
- * whitespace (such as adding data to a node or buffer, or printing
- * it to a file).</p>
- *
- * @param ch The whitespace characters.
- * @param start The start position in the character array.
- * @param length The number of characters to use from the
- * character array.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.ContentHandler#ignorableWhitespace
- */
- public void ignorableWhitespace (char ch[], int start, int length)
- throws SAXException
- {
- // no op
- }
-
-
- /**
- * Receive notification of a processing instruction.
- *
- * <p>By default, do nothing. Application writers may override this
- * method in a subclass to take specific actions for each
- * processing instruction, such as setting status variables or
- * invoking other methods.</p>
- *
- * @param target The processing instruction target.
- * @param data The processing instruction data, or null if
- * none is supplied.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.ContentHandler#processingInstruction
- */
- public void processingInstruction (String target, String data)
- throws SAXException
- {
- // no op
- }
-
-
- /**
- * Receive notification of a skipped entity.
- *
- * <p>By default, do nothing. Application writers may override this
- * method in a subclass to take specific actions for each
- * processing instruction, such as setting status variables or
- * invoking other methods.</p>
- *
- * @param name The name of the skipped entity.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.ContentHandler#processingInstruction
- */
- public void skippedEntity (String name)
- throws SAXException
- {
- // no op
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Default implementation of the ErrorHandler interface.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Receive notification of a parser warning.
- *
- * <p>The default implementation does nothing. Application writers
- * may override this method in a subclass to take specific actions
- * for each warning, such as inserting the message in a log file or
- * printing it to the console.</p>
- *
- * @param e The warning information encoded as an exception.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.ErrorHandler#warning
- * @see org.xml.sax.SAXParseException
- */
- public void warning (SAXParseException e)
- throws SAXException
- {
- // no op
- }
-
-
- /**
- * Receive notification of a recoverable parser error.
- *
- * <p>The default implementation does nothing. Application writers
- * may override this method in a subclass to take specific actions
- * for each error, such as inserting the message in a log file or
- * printing it to the console.</p>
- *
- * @param e The warning information encoded as an exception.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.ErrorHandler#warning
- * @see org.xml.sax.SAXParseException
- */
- public void error (SAXParseException e)
- throws SAXException
- {
- // no op
- }
-
-
- /**
- * Report a fatal XML parsing error.
- *
- * <p>The default implementation throws a SAXParseException.
- * Application writers may override this method in a subclass if
- * they need to take specific actions for each fatal error (such as
- * collecting all of the errors into a single report): in any case,
- * the application must stop all regular processing when this
- * method is invoked, since the document is no longer reliable, and
- * the parser may no longer report parsing events.</p>
- *
- * @param e The error information encoded as an exception.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @see org.xml.sax.ErrorHandler#fatalError
- * @see org.xml.sax.SAXParseException
- */
- public void fatalError (SAXParseException e)
- throws SAXException
- {
- throw e;
- }
-
-}
-
-// end of DefaultHandler.java
+// DefaultHandler.java - default implementation of the core handlers. +// http://www.saxproject.org +// Written by David Megginson +// NO WARRANTY! This class is in the public domain. + +// $Id: DefaultHandler.java,v 1.5.2.3 2002/01/29 21:34:14 dbrownell Exp $ + +package org.xml.sax.helpers; + +import java.io.IOException; + +import org.xml.sax.InputSource; +import org.xml.sax.Locator; +import org.xml.sax.Attributes; +import org.xml.sax.EntityResolver; +import org.xml.sax.DTDHandler; +import org.xml.sax.ContentHandler; +import org.xml.sax.ErrorHandler; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; + + +/** + * Default base class for SAX2 event handlers. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>This class is available as a convenience base class for SAX2 + * applications: it provides default implementations for all of the + * callbacks in the four core SAX2 handler classes:</p> + * + * <ul> + * <li>{@link org.xml.sax.EntityResolver EntityResolver}</li> + * <li>{@link org.xml.sax.DTDHandler DTDHandler}</li> + * <li>{@link org.xml.sax.ContentHandler ContentHandler}</li> + * <li>{@link org.xml.sax.ErrorHandler ErrorHandler}</li> + * </ul> + * + * <p>Application writers can extend this class when they need to + * implement only part of an interface; parser writers can + * instantiate this class to provide default handlers when the + * application has not supplied its own.</p> + * + * <p>This class replaces the deprecated SAX1 + * {@link org.xml.sax.HandlerBase HandlerBase} class.</p> + * + * @since SAX 2.0 + * @author David Megginson, + * @version 2.0.1 (sax2r2) + * @see org.xml.sax.EntityResolver + * @see org.xml.sax.DTDHandler + * @see org.xml.sax.ContentHandler + * @see org.xml.sax.ErrorHandler + */ +public class DefaultHandler + implements EntityResolver, DTDHandler, ContentHandler, ErrorHandler +{ + + + //////////////////////////////////////////////////////////////////// + // Default implementation of the EntityResolver interface. + //////////////////////////////////////////////////////////////////// + + /** + * Resolve an external entity. + * + * <p>Always return null, so that the parser will use the system + * identifier provided in the XML document. This method implements + * the SAX default behaviour: application writers can override it + * in a subclass to do special translations such as catalog lookups + * or URI redirection.</p> + * + * @param publicId The public identifer, or null if none is + * available. + * @param systemId The system identifier provided in the XML + * document. + * @return The new input source, or null to require the + * default behaviour. + * @exception java.io.IOException If there is an error setting + * up the new input source. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.EntityResolver#resolveEntity + */ + public InputSource resolveEntity (String publicId, String systemId) + throws IOException, SAXException + { + return null; + } + + + + //////////////////////////////////////////////////////////////////// + // Default implementation of DTDHandler interface. + //////////////////////////////////////////////////////////////////// + + + /** + * Receive notification of a notation declaration. + * + * <p>By default, do nothing. Application writers may override this + * method in a subclass if they wish to keep track of the notations + * declared in a document.</p> + * + * @param name The notation name. + * @param publicId The notation public identifier, or null if not + * available. + * @param systemId The notation system identifier. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.DTDHandler#notationDecl + */ + public void notationDecl (String name, String publicId, String systemId) + throws SAXException + { + // no op + } + + + /** + * Receive notification of an unparsed entity declaration. + * + * <p>By default, do nothing. Application writers may override this + * method in a subclass to keep track of the unparsed entities + * declared in a document.</p> + * + * @param name The entity name. + * @param publicId The entity public identifier, or null if not + * available. + * @param systemId The entity system identifier. + * @param notationName The name of the associated notation. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.DTDHandler#unparsedEntityDecl + */ + public void unparsedEntityDecl (String name, String publicId, + String systemId, String notationName) + throws SAXException + { + // no op + } + + + + //////////////////////////////////////////////////////////////////// + // Default implementation of ContentHandler interface. + //////////////////////////////////////////////////////////////////// + + + /** + * Receive a Locator object for document events. + * + * <p>By default, do nothing. Application writers may override this + * method in a subclass if they wish to store the locator for use + * with other document events.</p> + * + * @param locator A locator for all SAX document events. + * @see org.xml.sax.ContentHandler#setDocumentLocator + * @see org.xml.sax.Locator + */ + public void setDocumentLocator (Locator locator) + { + // no op + } + + + /** + * Receive notification of the beginning of the document. + * + * <p>By default, do nothing. Application writers may override this + * method in a subclass to take specific actions at the beginning + * of a document (such as allocating the root node of a tree or + * creating an output file).</p> + * + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.ContentHandler#startDocument + */ + public void startDocument () + throws SAXException + { + // no op + } + + + /** + * Receive notification of the end of the document. + * + * <p>By default, do nothing. Application writers may override this + * method in a subclass to take specific actions at the end + * of a document (such as finalising a tree or closing an output + * file).</p> + * + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.ContentHandler#endDocument + */ + public void endDocument () + throws SAXException + { + // no op + } + + + /** + * Receive notification of the start of a Namespace mapping. + * + * <p>By default, do nothing. Application writers may override this + * method in a subclass to take specific actions at the start of + * each Namespace prefix scope (such as storing the prefix mapping).</p> + * + * @param prefix The Namespace prefix being declared. + * @param uri The Namespace URI mapped to the prefix. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.ContentHandler#startPrefixMapping + */ + public void startPrefixMapping (String prefix, String uri) + throws SAXException + { + // no op + } + + + /** + * Receive notification of the end of a Namespace mapping. + * + * <p>By default, do nothing. Application writers may override this + * method in a subclass to take specific actions at the end of + * each prefix mapping.</p> + * + * @param prefix The Namespace prefix being declared. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.ContentHandler#endPrefixMapping + */ + public void endPrefixMapping (String prefix) + throws SAXException + { + // no op + } + + + /** + * Receive notification of the start of an element. + * + * <p>By default, do nothing. Application writers may override this + * method in a subclass to take specific actions at the start of + * each element (such as allocating a new tree node or writing + * output to a file).</p> + * + * @param uri The Namespace URI, or the empty string if the + * element has no Namespace URI or if Namespace + * processing is not being performed. + * @param localName The local name (without prefix), or the + * empty string if Namespace processing is not being + * performed. + * @param qName The qualified name (with prefix), or the + * empty string if qualified names are not available. + * @param atts The attributes attached to the element. If + * there are no attributes, it shall be an empty + * Attributes object. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.ContentHandler#startElement + */ + public void startElement (String uri, String localName, + String qName, Attributes attributes) + throws SAXException + { + // no op + } + + + /** + * Receive notification of the end of an element. + * + * <p>By default, do nothing. Application writers may override this + * method in a subclass to take specific actions at the end of + * each element (such as finalising a tree node or writing + * output to a file).</p> + * + * @param uri The Namespace URI, or the empty string if the + * element has no Namespace URI or if Namespace + * processing is not being performed. + * @param localName The local name (without prefix), or the + * empty string if Namespace processing is not being + * performed. + * @param qName The qualified name (with prefix), or the + * empty string if qualified names are not available. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.ContentHandler#endElement + */ + public void endElement (String uri, String localName, String qName) + throws SAXException + { + // no op + } + + + /** + * Receive notification of character data inside an element. + * + * <p>By default, do nothing. Application writers may override this + * method to take specific actions for each chunk of character data + * (such as adding the data to a node or buffer, or printing it to + * a file).</p> + * + * @param ch The characters. + * @param start The start position in the character array. + * @param length The number of characters to use from the + * character array. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.ContentHandler#characters + */ + public void characters (char ch[], int start, int length) + throws SAXException + { + // no op + } + + + /** + * Receive notification of ignorable whitespace in element content. + * + * <p>By default, do nothing. Application writers may override this + * method to take specific actions for each chunk of ignorable + * whitespace (such as adding data to a node or buffer, or printing + * it to a file).</p> + * + * @param ch The whitespace characters. + * @param start The start position in the character array. + * @param length The number of characters to use from the + * character array. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.ContentHandler#ignorableWhitespace + */ + public void ignorableWhitespace (char ch[], int start, int length) + throws SAXException + { + // no op + } + + + /** + * Receive notification of a processing instruction. + * + * <p>By default, do nothing. Application writers may override this + * method in a subclass to take specific actions for each + * processing instruction, such as setting status variables or + * invoking other methods.</p> + * + * @param target The processing instruction target. + * @param data The processing instruction data, or null if + * none is supplied. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.ContentHandler#processingInstruction + */ + public void processingInstruction (String target, String data) + throws SAXException + { + // no op + } + + + /** + * Receive notification of a skipped entity. + * + * <p>By default, do nothing. Application writers may override this + * method in a subclass to take specific actions for each + * processing instruction, such as setting status variables or + * invoking other methods.</p> + * + * @param name The name of the skipped entity. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.ContentHandler#processingInstruction + */ + public void skippedEntity (String name) + throws SAXException + { + // no op + } + + + + //////////////////////////////////////////////////////////////////// + // Default implementation of the ErrorHandler interface. + //////////////////////////////////////////////////////////////////// + + + /** + * Receive notification of a parser warning. + * + * <p>The default implementation does nothing. Application writers + * may override this method in a subclass to take specific actions + * for each warning, such as inserting the message in a log file or + * printing it to the console.</p> + * + * @param e The warning information encoded as an exception. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.ErrorHandler#warning + * @see org.xml.sax.SAXParseException + */ + public void warning (SAXParseException e) + throws SAXException + { + // no op + } + + + /** + * Receive notification of a recoverable parser error. + * + * <p>The default implementation does nothing. Application writers + * may override this method in a subclass to take specific actions + * for each error, such as inserting the message in a log file or + * printing it to the console.</p> + * + * @param e The warning information encoded as an exception. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.ErrorHandler#warning + * @see org.xml.sax.SAXParseException + */ + public void error (SAXParseException e) + throws SAXException + { + // no op + } + + + /** + * Report a fatal XML parsing error. + * + * <p>The default implementation throws a SAXParseException. + * Application writers may override this method in a subclass if + * they need to take specific actions for each fatal error (such as + * collecting all of the errors into a single report): in any case, + * the application must stop all regular processing when this + * method is invoked, since the document is no longer reliable, and + * the parser may no longer report parsing events.</p> + * + * @param e The error information encoded as an exception. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @see org.xml.sax.ErrorHandler#fatalError + * @see org.xml.sax.SAXParseException + */ + public void fatalError (SAXParseException e) + throws SAXException + { + throw e; + } + +} + +// end of DefaultHandler.java diff --git a/libjava/org/xml/sax/helpers/LocatorImpl.java b/libjava/org/xml/sax/helpers/LocatorImpl.java index 634044ccff2..4b297eabd9c 100644 --- a/libjava/org/xml/sax/helpers/LocatorImpl.java +++ b/libjava/org/xml/sax/helpers/LocatorImpl.java @@ -1,212 +1,214 @@ -// SAX default implementation for Locator.
-// No warranty; no copyright -- use this as you will.
-// $Id: LocatorImpl.java,v 1.1 2000/10/02 02:43:20 sboag Exp $
-
-package org.xml.sax.helpers;
-
-import org.xml.sax.Locator;
-
-
-/**
- * Provide an optional convenience implementation of Locator.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>This class is available mainly for application writers, who
- * can use it to make a persistent snapshot of a locator at any
- * point during a document parse:</p>
- *
- * <pre>
- * Locator locator;
- * Locator startloc;
- *
- * public void setLocator (Locator locator)
- * {
- * // note the locator
- * this.locator = locator;
- * }
- *
- * public void startDocument ()
- * {
- * // save the location of the start of the document
- * // for future use.
- * Locator startloc = new LocatorImpl(locator);
- * }
- *</pre>
- *
- * <p>Normally, parser writers will not use this class, since it
- * is more efficient to provide location information only when
- * requested, rather than constantly updating a Locator object.</p>
- *
- * @since SAX 1.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.Locator Locator
- */
-public class LocatorImpl implements Locator
-{
-
-
- /**
- * Zero-argument constructor.
- *
- * <p>This will not normally be useful, since the main purpose
- * of this class is to make a snapshot of an existing Locator.</p>
- */
- public LocatorImpl ()
- {
- }
-
-
- /**
- * Copy constructor.
- *
- * <p>Create a persistent copy of the current state of a locator.
- * When the original locator changes, this copy will still keep
- * the original values (and it can be used outside the scope of
- * DocumentHandler methods).</p>
- *
- * @param locator The locator to copy.
- */
- public LocatorImpl (Locator locator)
- {
- setPublicId(locator.getPublicId());
- setSystemId(locator.getSystemId());
- setLineNumber(locator.getLineNumber());
- setColumnNumber(locator.getColumnNumber());
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Implementation of org.xml.sax.Locator
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Return the saved public identifier.
- *
- * @return The public identifier as a string, or null if none
- * is available.
- * @see org.xml.sax.Locator#getPublicId
- * @see #setPublicId
- */
- public String getPublicId ()
- {
- return publicId;
- }
-
-
- /**
- * Return the saved system identifier.
- *
- * @return The system identifier as a string, or null if none
- * is available.
- * @see org.xml.sax.Locator#getSystemId
- * @see #setSystemId
- */
- public String getSystemId ()
- {
- return systemId;
- }
-
-
- /**
- * Return the saved line number (1-based).
- *
- * @return The line number as an integer, or -1 if none is available.
- * @see org.xml.sax.Locator#getLineNumber
- * @see #setLineNumber
- */
- public int getLineNumber ()
- {
- return lineNumber;
- }
-
-
- /**
- * Return the saved column number (1-based).
- *
- * @return The column number as an integer, or -1 if none is available.
- * @see org.xml.sax.Locator#getColumnNumber
- * @see #setColumnNumber
- */
- public int getColumnNumber ()
- {
- return columnNumber;
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Setters for the properties (not in org.xml.sax.Locator)
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Set the public identifier for this locator.
- *
- * @param publicId The new public identifier, or null
- * if none is available.
- * @see #getPublicId
- */
- public void setPublicId (String publicId)
- {
- this.publicId = publicId;
- }
-
-
- /**
- * Set the system identifier for this locator.
- *
- * @param systemId The new system identifier, or null
- * if none is available.
- * @see #getSystemId
- */
- public void setSystemId (String systemId)
- {
- this.systemId = systemId;
- }
-
-
- /**
- * Set the line number for this locator (1-based).
- *
- * @param lineNumber The line number, or -1 if none is available.
- * @see #getLineNumber
- */
- public void setLineNumber (int lineNumber)
- {
- this.lineNumber = lineNumber;
- }
-
-
- /**
- * Set the column number for this locator (1-based).
- *
- * @param columnNumber The column number, or -1 if none is available.
- * @see #getColumnNumber
- */
- public void setColumnNumber (int columnNumber)
- {
- this.columnNumber = columnNumber;
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Internal state.
- ////////////////////////////////////////////////////////////////////
-
- private String publicId;
- private String systemId;
- private int lineNumber;
- private int columnNumber;
-
-}
-
-// end of LocatorImpl.java
+// SAX default implementation for Locator. +// http://www.saxproject.org +// No warranty; no copyright -- use this as you will. +// $Id: LocatorImpl.java,v 1.3.2.3 2002/01/29 21:34:14 dbrownell Exp $ + +package org.xml.sax.helpers; + +import org.xml.sax.Locator; + + +/** + * Provide an optional convenience implementation of Locator. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>This class is available mainly for application writers, who + * can use it to make a persistent snapshot of a locator at any + * point during a document parse:</p> + * + * <pre> + * Locator locator; + * Locator startloc; + * + * public void setLocator (Locator locator) + * { + * // note the locator + * this.locator = locator; + * } + * + * public void startDocument () + * { + * // save the location of the start of the document + * // for future use. + * Locator startloc = new LocatorImpl(locator); + * } + *</pre> + * + * <p>Normally, parser writers will not use this class, since it + * is more efficient to provide location information only when + * requested, rather than constantly updating a Locator object.</p> + * + * @since SAX 1.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + * @see org.xml.sax.Locator Locator + */ +public class LocatorImpl implements Locator +{ + + + /** + * Zero-argument constructor. + * + * <p>This will not normally be useful, since the main purpose + * of this class is to make a snapshot of an existing Locator.</p> + */ + public LocatorImpl () + { + } + + + /** + * Copy constructor. + * + * <p>Create a persistent copy of the current state of a locator. + * When the original locator changes, this copy will still keep + * the original values (and it can be used outside the scope of + * DocumentHandler methods).</p> + * + * @param locator The locator to copy. + */ + public LocatorImpl (Locator locator) + { + setPublicId(locator.getPublicId()); + setSystemId(locator.getSystemId()); + setLineNumber(locator.getLineNumber()); + setColumnNumber(locator.getColumnNumber()); + } + + + + //////////////////////////////////////////////////////////////////// + // Implementation of org.xml.sax.Locator + //////////////////////////////////////////////////////////////////// + + + /** + * Return the saved public identifier. + * + * @return The public identifier as a string, or null if none + * is available. + * @see org.xml.sax.Locator#getPublicId + * @see #setPublicId + */ + public String getPublicId () + { + return publicId; + } + + + /** + * Return the saved system identifier. + * + * @return The system identifier as a string, or null if none + * is available. + * @see org.xml.sax.Locator#getSystemId + * @see #setSystemId + */ + public String getSystemId () + { + return systemId; + } + + + /** + * Return the saved line number (1-based). + * + * @return The line number as an integer, or -1 if none is available. + * @see org.xml.sax.Locator#getLineNumber + * @see #setLineNumber + */ + public int getLineNumber () + { + return lineNumber; + } + + + /** + * Return the saved column number (1-based). + * + * @return The column number as an integer, or -1 if none is available. + * @see org.xml.sax.Locator#getColumnNumber + * @see #setColumnNumber + */ + public int getColumnNumber () + { + return columnNumber; + } + + + + //////////////////////////////////////////////////////////////////// + // Setters for the properties (not in org.xml.sax.Locator) + //////////////////////////////////////////////////////////////////// + + + /** + * Set the public identifier for this locator. + * + * @param publicId The new public identifier, or null + * if none is available. + * @see #getPublicId + */ + public void setPublicId (String publicId) + { + this.publicId = publicId; + } + + + /** + * Set the system identifier for this locator. + * + * @param systemId The new system identifier, or null + * if none is available. + * @see #getSystemId + */ + public void setSystemId (String systemId) + { + this.systemId = systemId; + } + + + /** + * Set the line number for this locator (1-based). + * + * @param lineNumber The line number, or -1 if none is available. + * @see #getLineNumber + */ + public void setLineNumber (int lineNumber) + { + this.lineNumber = lineNumber; + } + + + /** + * Set the column number for this locator (1-based). + * + * @param columnNumber The column number, or -1 if none is available. + * @see #getColumnNumber + */ + public void setColumnNumber (int columnNumber) + { + this.columnNumber = columnNumber; + } + + + + //////////////////////////////////////////////////////////////////// + // Internal state. + //////////////////////////////////////////////////////////////////// + + private String publicId; + private String systemId; + private int lineNumber; + private int columnNumber; + +} + +// end of LocatorImpl.java diff --git a/libjava/org/xml/sax/helpers/NamespaceSupport.java b/libjava/org/xml/sax/helpers/NamespaceSupport.java index a4588c3d2c7..917a7f75dce 100644 --- a/libjava/org/xml/sax/helpers/NamespaceSupport.java +++ b/libjava/org/xml/sax/helpers/NamespaceSupport.java @@ -1,689 +1,770 @@ -// NamespaceSupport.java - generic Namespace support for SAX.
-// Written by David Megginson, sax@megginson.com
-// This class is in the Public Domain. NO WARRANTY!
-
-// $Id: NamespaceSupport.java,v 1.1 2000/10/02 02:43:20 sboag Exp $
-
-package org.xml.sax.helpers;
-
-import java.util.EmptyStackException;
-import java.util.Enumeration;
-import java.util.Hashtable;
-import java.util.Vector;
-
-
-/**
- * Encapsulate Namespace logic for use by SAX drivers.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>This class encapsulates the logic of Namespace processing:
- * it tracks the declarations currently in force for each context
- * and automatically processes qualified XML 1.0 names into their
- * Namespace parts; it can also be used in reverse for generating
- * XML 1.0 from Namespaces.</p>
- *
- * <p>Namespace support objects are reusable, but the reset method
- * must be invoked between each session.</p>
- *
- * <p>Here is a simple session:</p>
- *
- * <pre>
- * String parts[] = new String[3];
- * NamespaceSupport support = new NamespaceSupport();
- *
- * support.pushContext();
- * support.declarePrefix("", "http://www.w3.org/1999/xhtml");
- * support.declarePrefix("dc", "http://www.purl.org/dc#");
- *
- * String parts[] = support.processName("p", parts, false);
- * System.out.println("Namespace URI: " + parts[0]);
- * System.out.println("Local name: " + parts[1]);
- * System.out.println("Raw name: " + parts[2]);
-
- * String parts[] = support.processName("dc:title", parts, false);
- * System.out.println("Namespace URI: " + parts[0]);
- * System.out.println("Local name: " + parts[1]);
- * System.out.println("Raw name: " + parts[2]);
-
- * support.popContext();
- * </pre>
- *
- * <p>Note that this class is optimized for the use case where most
- * elements do not contain Namespace declarations: if the same
- * prefix/URI mapping is repeated for each context (for example), this
- * class will be somewhat less efficient.</p>
- *
- * @since SAX 2.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- */
-public class NamespaceSupport
-{
-
-
- ////////////////////////////////////////////////////////////////////
- // Constants.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * The XML Namespace as a constant.
- *
- * <p>This is the Namespace URI that is automatically mapped
- * to the "xml" prefix.</p>
- */
- public final static String XMLNS =
- "http://www.w3.org/XML/1998/namespace";
-
-
- /**
- * An empty enumeration.
- */
- private final static Enumeration EMPTY_ENUMERATION =
- new Vector().elements();
-
-
- ////////////////////////////////////////////////////////////////////
- // Constructor.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Create a new Namespace support object.
- */
- public NamespaceSupport ()
- {
- reset();
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Context management.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Reset this Namespace support object for reuse.
- *
- * <p>It is necessary to invoke this method before reusing the
- * Namespace support object for a new session.</p>
- */
- public void reset ()
- {
- contexts = new Context[32];
- contextPos = 0;
- contexts[contextPos] = currentContext = new Context();
- currentContext.declarePrefix("xml", XMLNS);
- }
-
-
- /**
- * Start a new Namespace context.
- *
- * <p>Normally, you should push a new context at the beginning
- * of each XML element: the new context will automatically inherit
- * the declarations of its parent context, but it will also keep
- * track of which declarations were made within this context.</p>
- *
- * <p>The Namespace support object always starts with a base context
- * already in force: in this context, only the "xml" prefix is
- * declared.</p>
- *
- * @see #popContext
- */
- public void pushContext ()
- {
- int max = contexts.length;
- contextPos++;
-
- // Extend the array if necessary
- if (contextPos >= max) {
- Context newContexts[] = new Context[max*2];
- System.arraycopy(contexts, 0, newContexts, 0, max);
- max *= 2;
- contexts = newContexts;
- }
-
- // Allocate the context if necessary.
- currentContext = contexts[contextPos];
- if (currentContext == null) {
- contexts[contextPos] = currentContext = new Context();
- }
-
- // Set the parent, if any.
- if (contextPos > 0) {
- currentContext.setParent(contexts[contextPos - 1]);
- }
- }
-
-
- /**
- * Revert to the previous Namespace context.
- *
- * <p>Normally, you should pop the context at the end of each
- * XML element. After popping the context, all Namespace prefix
- * mappings that were previously in force are restored.</p>
- *
- * <p>You must not attempt to declare additional Namespace
- * prefixes after popping a context, unless you push another
- * context first.</p>
- *
- * @see #pushContext
- */
- public void popContext ()
- {
- contextPos--;
- if (contextPos < 0) {
- throw new EmptyStackException();
- }
- currentContext = contexts[contextPos];
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Operations within a context.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Declare a Namespace prefix.
- *
- * <p>This method declares a prefix in the current Namespace
- * context; the prefix will remain in force until this context
- * is popped, unless it is shadowed in a descendant context.</p>
- *
- * <p>To declare a default Namespace, use the empty string. The
- * prefix must not be "xml" or "xmlns".</p>
- *
- * <p>Note that you must <em>not</em> declare a prefix after
- * you've pushed and popped another Namespace.</p>
- *
- * <p>Note that there is an asymmetry in this library: while {@link
- * #getPrefix getPrefix} will not return the default "" prefix,
- * even if you have declared one; to check for a default prefix,
- * you have to look it up explicitly using {@link #getURI getURI}.
- * This asymmetry exists to make it easier to look up prefixes
- * for attribute names, where the default prefix is not allowed.</p>
- *
- * @param prefix The prefix to declare, or null for the empty
- * string.
- * @param uri The Namespace URI to associate with the prefix.
- * @return true if the prefix was legal, false otherwise
- * @see #processName
- * @see #getURI
- * @see #getPrefix
- */
- public boolean declarePrefix (String prefix, String uri)
- {
- if (prefix.equals("xml") || prefix.equals("xmlns")) {
- return false;
- } else {
- currentContext.declarePrefix(prefix, uri);
- return true;
- }
- }
-
-
- /**
- * Process a raw XML 1.0 name.
- *
- * <p>This method processes a raw XML 1.0 name in the current
- * context by removing the prefix and looking it up among the
- * prefixes currently declared. The return value will be the
- * array supplied by the caller, filled in as follows:</p>
- *
- * <dl>
- * <dt>parts[0]</dt>
- * <dd>The Namespace URI, or an empty string if none is
- * in use.</dd>
- * <dt>parts[1]</dt>
- * <dd>The local name (without prefix).</dd>
- * <dt>parts[2]</dt>
- * <dd>The original raw name.</dd>
- * </dl>
- *
- * <p>All of the strings in the array will be internalized. If
- * the raw name has a prefix that has not been declared, then
- * the return value will be null.</p>
- *
- * <p>Note that attribute names are processed differently than
- * element names: an unprefixed element name will received the
- * default Namespace (if any), while an unprefixed element name
- * will not.</p>
- *
- * @param qName The raw XML 1.0 name to be processed.
- * @param parts An array supplied by the caller, capable of
- * holding at least three members.
- * @param isAttribute A flag indicating whether this is an
- * attribute name (true) or an element name (false).
- * @return The supplied array holding three internalized strings
- * representing the Namespace URI (or empty string), the
- * local name, and the raw XML 1.0 name; or null if there
- * is an undeclared prefix.
- * @see #declarePrefix
- * @see java.lang.String#intern */
- public String [] processName (String qName, String parts[],
- boolean isAttribute)
- {
- String myParts[] = currentContext.processName(qName, isAttribute);
- if (myParts == null) {
- return null;
- } else {
- parts[0] = myParts[0];
- parts[1] = myParts[1];
- parts[2] = myParts[2];
- return parts;
- }
- }
-
-
- /**
- * Look up a prefix and get the currently-mapped Namespace URI.
- *
- * <p>This method looks up the prefix in the current context.
- * Use the empty string ("") for the default Namespace.</p>
- *
- * @param prefix The prefix to look up.
- * @return The associated Namespace URI, or null if the prefix
- * is undeclared in this context.
- * @see #getPrefix
- * @see #getPrefixes
- */
- public String getURI (String prefix)
- {
- return currentContext.getURI(prefix);
- }
-
-
- /**
- * Return an enumeration of all prefixes currently declared.
- *
- * <p><strong>Note:</strong> if there is a default prefix, it will not be
- * returned in this enumeration; check for the default prefix
- * using the {@link #getURI getURI} with an argument of "".</p>
- *
- * @return An enumeration of all prefixes declared in the
- * current context except for the empty (default)
- * prefix.
- * @see #getDeclaredPrefixes
- * @see #getURI
- */
- public Enumeration getPrefixes ()
- {
- return currentContext.getPrefixes();
- }
-
-
- /**
- * Return one of the prefixes mapped to a Namespace URI.
- *
- * <p>If more than one prefix is currently mapped to the same
- * URI, this method will make an arbitrary selection; if you
- * want all of the prefixes, use the {@link #getPrefixes}
- * method instead.</p>
- *
- * <p><strong>Note:</strong> this will never return the empty (default) prefix;
- * to check for a default prefix, use the {@link #getURI getURI}
- * method with an argument of "".</p>
- *
- * @param uri The Namespace URI.
- * @param isAttribute true if this prefix is for an attribute
- * (and the default Namespace is not allowed).
- * @return One of the prefixes currently mapped to the URI supplied,
- * or null if none is mapped or if the URI is assigned to
- * the default Namespace.
- * @see #getPrefixes(java.lang.String)
- * @see #getURI
- */
- public String getPrefix (String uri)
- {
- return currentContext.getPrefix(uri);
- }
-
-
- /**
- * Return an enumeration of all prefixes currently declared for a URI.
- *
- * <p>This method returns prefixes mapped to a specific Namespace
- * URI. The xml: prefix will be included. If you want only one
- * prefix that's mapped to the Namespace URI, and you don't care
- * which one you get, use the {@link #getPrefix getPrefix}
- * method instead.</p>
- *
- * <p><strong>Note:</strong> the empty (default) prefix is <em>never</em> included
- * in this enumeration; to check for the presence of a default
- * Namespace, use the {@link #getURI getURI} method with an
- * argument of "".</p>
- *
- * @param uri The Namespace URI.
- * @return An enumeration of all prefixes declared in the
- * current context.
- * @see #getPrefix
- * @see #getDeclaredPrefixes
- * @see #getURI
- */
- public Enumeration getPrefixes (String uri)
- {
- Vector prefixes = new Vector();
- Enumeration allPrefixes = getPrefixes();
- while (allPrefixes.hasMoreElements()) {
- String prefix = (String)allPrefixes.nextElement();
- if (uri.equals(getURI(prefix))) {
- prefixes.addElement(prefix);
- }
- }
- return prefixes.elements();
- }
-
-
- /**
- * Return an enumeration of all prefixes declared in this context.
- *
- * <p>The empty (default) prefix will be included in this
- * enumeration; note that this behaviour differs from that of
- * {@link #getPrefix} and {@link #getPrefixes}.</p>
- *
- * @return An enumeration of all prefixes declared in this
- * context.
- * @see #getPrefixes
- * @see #getURI
- */
- public Enumeration getDeclaredPrefixes ()
- {
- return currentContext.getDeclaredPrefixes();
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Internal state.
- ////////////////////////////////////////////////////////////////////
-
- private Context contexts[];
- private Context currentContext;
- private int contextPos;
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Internal classes.
- ////////////////////////////////////////////////////////////////////
-
- /**
- * Internal class for a single Namespace context.
- *
- * <p>This module caches and reuses Namespace contexts, so the number allocated
- * will be equal to the element depth of the document, not to the total
- * number of elements (i.e. 5-10 rather than tens of thousands).</p>
- */
- final class Context {
-
- /**
- * Create the root-level Namespace context.
- */
- Context ()
- {
- copyTables();
- }
-
-
- /**
- * (Re)set the parent of this Namespace context.
- *
- * @param context The parent Namespace context object.
- */
- void setParent (Context parent)
- {
- this.parent = parent;
- declarations = null;
- prefixTable = parent.prefixTable;
- uriTable = parent.uriTable;
- elementNameTable = parent.elementNameTable;
- attributeNameTable = parent.attributeNameTable;
- defaultNS = parent.defaultNS;
- tablesDirty = false;
- }
-
-
- /**
- * Declare a Namespace prefix for this context.
- *
- * @param prefix The prefix to declare.
- * @param uri The associated Namespace URI.
- * @see org.xml.sax.helpers.NamespaceSupport#declarePrefix
- */
- void declarePrefix (String prefix, String uri)
- {
- // Lazy processing...
- if (!tablesDirty) {
- copyTables();
- }
- if (declarations == null) {
- declarations = new Vector();
- }
-
- prefix = prefix.intern();
- uri = uri.intern();
- if ("".equals(prefix)) {
- if ("".equals(uri)) {
- defaultNS = null;
- } else {
- defaultNS = uri;
- }
- } else {
- prefixTable.put(prefix, uri);
- uriTable.put(uri, prefix); // may wipe out another prefix
- }
- declarations.addElement(prefix);
- }
-
-
- /**
- * Process a raw XML 1.0 name in this context.
- *
- * @param qName The raw XML 1.0 name.
- * @param isAttribute true if this is an attribute name.
- * @return An array of three strings containing the
- * URI part (or empty string), the local part,
- * and the raw name, all internalized, or null
- * if there is an undeclared prefix.
- * @see org.xml.sax.helpers.NamespaceSupport#processName
- */
- String [] processName (String qName, boolean isAttribute)
- {
- String name[];
- Hashtable table;
-
- // Select the appropriate table.
- if (isAttribute) {
- table = elementNameTable;
- } else {
- table = attributeNameTable;
- }
-
- // Start by looking in the cache, and
- // return immediately if the name
- // is already known in this content
- name = (String[])table.get(qName);
- if (name != null) {
- return name;
- }
-
- // We haven't seen this name in this
- // context before.
- name = new String[3];
- int index = qName.indexOf(':');
-
-
- // No prefix.
- if (index == -1) {
- if (isAttribute || defaultNS == null) {
- name[0] = "";
- } else {
- name[0] = defaultNS;
- }
- name[1] = qName.intern();
- name[2] = name[1];
- }
-
- // Prefix
- else {
- String prefix = qName.substring(0, index);
- String local = qName.substring(index+1);
- String uri;
- if ("".equals(prefix)) {
- uri = defaultNS;
- } else {
- uri = (String)prefixTable.get(prefix);
- }
- if (uri == null) {
- return null;
- }
- name[0] = uri;
- name[1] = local.intern();
- name[2] = qName.intern();
- }
-
- // Save in the cache for future use.
- table.put(name[2], name);
- tablesDirty = true;
- return name;
- }
-
-
- /**
- * Look up the URI associated with a prefix in this context.
- *
- * @param prefix The prefix to look up.
- * @return The associated Namespace URI, or null if none is
- * declared.
- * @see org.xml.sax.helpers.NamespaceSupport#getURI
- */
- String getURI (String prefix)
- {
- if ("".equals(prefix)) {
- return defaultNS;
- } else if (prefixTable == null) {
- return null;
- } else {
- return (String)prefixTable.get(prefix);
- }
- }
-
-
- /**
- * Look up one of the prefixes associated with a URI in this context.
- *
- * <p>Since many prefixes may be mapped to the same URI,
- * the return value may be unreliable.</p>
- *
- * @param uri The URI to look up.
- * @return The associated prefix, or null if none is declared.
- * @see org.xml.sax.helpers.NamespaceSupport#getPrefix
- */
- String getPrefix (String uri)
- {
- if (uriTable == null) {
- return null;
- } else {
- return (String)uriTable.get(uri);
- }
- }
-
-
- /**
- * Return an enumeration of prefixes declared in this context.
- *
- * @return An enumeration of prefixes (possibly empty).
- * @see org.xml.sax.helpers.NamespaceSupport#getDeclaredPrefixes
- */
- Enumeration getDeclaredPrefixes ()
- {
- if (declarations == null) {
- return EMPTY_ENUMERATION;
- } else {
- return declarations.elements();
- }
- }
-
-
- /**
- * Return an enumeration of all prefixes currently in force.
- *
- * <p>The default prefix, if in force, is <em>not</em>
- * returned, and will have to be checked for separately.</p>
- *
- * @return An enumeration of prefixes (never empty).
- * @see org.xml.sax.helpers.NamespaceSupport#getPrefixes
- */
- Enumeration getPrefixes ()
- {
- if (prefixTable == null) {
- return EMPTY_ENUMERATION;
- } else {
- return prefixTable.keys();
- }
- }
-
-
-
- ////////////////////////////////////////////////////////////////
- // Internal methods.
- ////////////////////////////////////////////////////////////////
-
-
- /**
- * Copy on write for the internal tables in this context.
- *
- * <p>This class is optimized for the normal case where most
- * elements do not contain Namespace declarations.</p>
- */
- private void copyTables ()
- {
- if (prefixTable != null) {
- prefixTable = (Hashtable)prefixTable.clone();
- } else {
- prefixTable = new Hashtable();
- }
- if (uriTable != null) {
- uriTable = (Hashtable)uriTable.clone();
- } else {
- uriTable = new Hashtable();
- }
- elementNameTable = new Hashtable();
- attributeNameTable = new Hashtable();
- tablesDirty = true;
- }
-
-
-
- ////////////////////////////////////////////////////////////////
- // Protected state.
- ////////////////////////////////////////////////////////////////
-
- Hashtable prefixTable;
- Hashtable uriTable;
- Hashtable elementNameTable;
- Hashtable attributeNameTable;
- String defaultNS = null;
-
-
-
- ////////////////////////////////////////////////////////////////
- // Internal state.
- ////////////////////////////////////////////////////////////////
-
- private Vector declarations = null;
- private boolean tablesDirty = false;
- private Context parent = null;
- }
-}
-
-// end of NamespaceSupport.java
+// NamespaceSupport.java - generic Namespace support for SAX. +// http://www.saxproject.org +// Written by David Megginson +// This class is in the Public Domain. NO WARRANTY! + +// $Id: NamespaceSupport.java,v 1.6.2.5 2002/01/29 21:34:14 dbrownell Exp $ + +package org.xml.sax.helpers; + +import java.util.EmptyStackException; +import java.util.Enumeration; +import java.util.Hashtable; +import java.util.Vector; + + +/** + * Encapsulate Namespace logic for use by applications using SAX, + * or internally by SAX drivers. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>This class encapsulates the logic of Namespace processing: + * it tracks the declarations currently in force for each context + * and automatically processes qualified XML 1.0 names into their + * Namespace parts; it can also be used in reverse for generating + * XML 1.0 from Namespaces.</p> + * + * <p>Namespace support objects are reusable, but the reset method + * must be invoked between each session.</p> + * + * <p>Here is a simple session:</p> + * + * <pre> + * String parts[] = new String[3]; + * NamespaceSupport support = new NamespaceSupport(); + * + * support.pushContext(); + * support.declarePrefix("", "http://www.w3.org/1999/xhtml"); + * support.declarePrefix("dc", "http://www.purl.org/dc#"); + * + * parts = support.processName("p", parts, false); + * System.out.println("Namespace URI: " + parts[0]); + * System.out.println("Local name: " + parts[1]); + * System.out.println("Raw name: " + parts[2]); + * + * parts = support.processName("dc:title", parts, false); + * System.out.println("Namespace URI: " + parts[0]); + * System.out.println("Local name: " + parts[1]); + * System.out.println("Raw name: " + parts[2]); + * + * support.popContext(); + * </pre> + * + * <p>Note that this class is optimized for the use case where most + * elements do not contain Namespace declarations: if the same + * prefix/URI mapping is repeated for each context (for example), this + * class will be somewhat less efficient.</p> + * + * <p>Although SAX drivers (parsers) may choose to use this class to + * implement namespace handling, they are not required to do so. + * Applications must track namespace information themselves if they + * want to use namespace information. + * + * @since SAX 2.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + */ +public class NamespaceSupport +{ + + + //////////////////////////////////////////////////////////////////// + // Constants. + //////////////////////////////////////////////////////////////////// + + + /** + * The XML Namespace URI as a constant. + * The value is <code>http://www.w3.org/XML/1998/namespace</code> + * as defined in the XML Namespaces specification. + * + * <p>This is the Namespace URI that is automatically mapped + * to the "xml" prefix.</p> + */ + public final static String XMLNS = + "http://www.w3.org/XML/1998/namespace"; + + + /** + * An empty enumeration. + */ + private final static Enumeration EMPTY_ENUMERATION = + new Vector().elements(); + + + //////////////////////////////////////////////////////////////////// + // Constructor. + //////////////////////////////////////////////////////////////////// + + + /** + * Create a new Namespace support object. + */ + public NamespaceSupport () + { + reset(); + } + + + + //////////////////////////////////////////////////////////////////// + // Context management. + //////////////////////////////////////////////////////////////////// + + + /** + * Reset this Namespace support object for reuse. + * + * <p>It is necessary to invoke this method before reusing the + * Namespace support object for a new session.</p> + */ + public void reset () + { + contexts = new Context[32]; + contextPos = 0; + contexts[contextPos] = currentContext = new Context(); + currentContext.declarePrefix("xml", XMLNS); + } + + + /** + * Start a new Namespace context. + * The new context will automatically inherit + * the declarations of its parent context, but it will also keep + * track of which declarations were made within this context. + * + * <p>Event callback code should start a new context once per element. + * This means being ready to call this in either of two places. + * For elements that don't include namespace declarations, the + * <em>ContentHandler.startElement()</em> callback is the right place. + * For elements with such a declaration, it'd done in the first + * <em>ContentHandler.startPrefixMapping()</em> callback. + * A boolean flag can be used to + * track whether a context has been started yet. When either of + * those methods is called, it checks the flag to see if a new context + * needs to be started. If so, it starts the context and sets the + * flag. After <em>ContentHandler.startElement()</em> + * does that, it always clears the flag. + * + * <p>Normally, SAX drivers would push a new context at the beginning + * of each XML element. Then they perform a first pass over the + * attributes to process all namespace declarations, making + * <em>ContentHandler.startPrefixMapping()</em> callbacks. + * Then a second pass is made, to determine the namespace-qualified + * names for all attributes and for the element name. + * Finally all the information for the + * <em>ContentHandler.startElement()</em> callback is available, + * so it can then be made. + * + * <p>The Namespace support object always starts with a base context + * already in force: in this context, only the "xml" prefix is + * declared.</p> + * + * @see org.xml.sax.ContentHandler + * @see #popContext + */ + public void pushContext () + { + int max = contexts.length; + + contexts [contextPos].declsOK = false; + contextPos++; + + // Extend the array if necessary + if (contextPos >= max) { + Context newContexts[] = new Context[max*2]; + System.arraycopy(contexts, 0, newContexts, 0, max); + max *= 2; + contexts = newContexts; + } + + // Allocate the context if necessary. + currentContext = contexts[contextPos]; + if (currentContext == null) { + contexts[contextPos] = currentContext = new Context(); + } + + // Set the parent, if any. + if (contextPos > 0) { + currentContext.setParent(contexts[contextPos - 1]); + } + } + + + /** + * Revert to the previous Namespace context. + * + * <p>Normally, you should pop the context at the end of each + * XML element. After popping the context, all Namespace prefix + * mappings that were previously in force are restored.</p> + * + * <p>You must not attempt to declare additional Namespace + * prefixes after popping a context, unless you push another + * context first.</p> + * + * @see #pushContext + */ + public void popContext () + { + contexts[contextPos].clear(); + contextPos--; + if (contextPos < 0) { + throw new EmptyStackException(); + } + currentContext = contexts[contextPos]; + } + + + + //////////////////////////////////////////////////////////////////// + // Operations within a context. + //////////////////////////////////////////////////////////////////// + + + /** + * Declare a Namespace prefix. All prefixes must be declared + * before they are referenced. For example, a SAX driver (parser) + * would scan an element's attributes + * in two passes: first for namespace declarations, + * then a second pass using {@link #processName processName()} to + * interpret prefixes against (potentially redefined) prefixes. + * + * <p>This method declares a prefix in the current Namespace + * context; the prefix will remain in force until this context + * is popped, unless it is shadowed in a descendant context.</p> + * + * <p>To declare the default element Namespace, use the empty string as + * the prefix.</p> + * + * <p>Note that you must <em>not</em> declare a prefix after + * you've pushed and popped another Namespace context, or + * treated the declarations phase as complete by processing + * a prefixed name.</p> + * + * <p>Note that there is an asymmetry in this library: {@link + * #getPrefix getPrefix} will not return the "" prefix, + * even if you have declared a default element namespace. + * To check for a default namespace, + * you have to look it up explicitly using {@link #getURI getURI}. + * This asymmetry exists to make it easier to look up prefixes + * for attribute names, where the default prefix is not allowed.</p> + * + * @param prefix The prefix to declare, or the empty string to + * indicate the default element namespace. This may never have + * the value "xml" or "xmlns". + * @param uri The Namespace URI to associate with the prefix. + * @return true if the prefix was legal, false otherwise + * @exception IllegalStateException when a prefix is declared + * after looking up a name in the context, or after pushing + * another context on top of it. + * + * @see #processName + * @see #getURI + * @see #getPrefix + */ + public boolean declarePrefix (String prefix, String uri) + { + if (prefix.equals("xml") || prefix.equals("xmlns")) { + return false; + } else { + currentContext.declarePrefix(prefix, uri); + return true; + } + } + + + /** + * Process a raw XML 1.0 name, after all declarations in the current + * context have been handled by {@link #declarePrefix declarePrefix()}. + * + * <p>This method processes a raw XML 1.0 name in the current + * context by removing the prefix and looking it up among the + * prefixes currently declared. The return value will be the + * array supplied by the caller, filled in as follows:</p> + * + * <dl> + * <dt>parts[0]</dt> + * <dd>The Namespace URI, or an empty string if none is + * in use.</dd> + * <dt>parts[1]</dt> + * <dd>The local name (without prefix).</dd> + * <dt>parts[2]</dt> + * <dd>The original raw name.</dd> + * </dl> + * + * <p>All of the strings in the array will be internalized. If + * the raw name has a prefix that has not been declared, then + * the return value will be null.</p> + * + * <p>Note that attribute names are processed differently than + * element names: an unprefixed element name will received the + * default Namespace (if any), while an unprefixed attribute name + * will not.</p> + * + * @param qName The raw XML 1.0 name to be processed. + * @param parts An array supplied by the caller, capable of + * holding at least three members. + * @param isAttribute A flag indicating whether this is an + * attribute name (true) or an element name (false). + * @return The supplied array holding three internalized strings + * representing the Namespace URI (or empty string), the + * local name, and the raw XML 1.0 name; or null if there + * is an undeclared prefix. + * @see #declarePrefix + * @see java.lang.String#intern */ + public String [] processName (String qName, String parts[], + boolean isAttribute) + { + String myParts[] = currentContext.processName(qName, isAttribute); + if (myParts == null) { + return null; + } else { + parts[0] = myParts[0]; + parts[1] = myParts[1]; + parts[2] = myParts[2]; + return parts; + } + } + + + /** + * Look up a prefix and get the currently-mapped Namespace URI. + * + * <p>This method looks up the prefix in the current context. + * Use the empty string ("") for the default Namespace.</p> + * + * @param prefix The prefix to look up. + * @return The associated Namespace URI, or null if the prefix + * is undeclared in this context. + * @see #getPrefix + * @see #getPrefixes + */ + public String getURI (String prefix) + { + return currentContext.getURI(prefix); + } + + + /** + * Return an enumeration of all prefixes currently declared. + * + * <p><strong>Note:</strong> if there is a default prefix, it will not be + * returned in this enumeration; check for the default prefix + * using the {@link #getURI getURI} with an argument of "".</p> + * + * @return An enumeration of all prefixes declared in the + * current context except for the empty (default) + * prefix. + * @see #getDeclaredPrefixes + * @see #getURI + */ + public Enumeration getPrefixes () + { + return currentContext.getPrefixes(); + } + + + /** + * Return one of the prefixes mapped to a Namespace URI. + * + * <p>If more than one prefix is currently mapped to the same + * URI, this method will make an arbitrary selection; if you + * want all of the prefixes, use the {@link #getPrefixes} + * method instead.</p> + * + * <p><strong>Note:</strong> this will never return the empty (default) prefix; + * to check for a default prefix, use the {@link #getURI getURI} + * method with an argument of "".</p> + * + * @param uri The Namespace URI. + * @param isAttribute true if this prefix is for an attribute + * (and the default Namespace is not allowed). + * @return One of the prefixes currently mapped to the URI supplied, + * or null if none is mapped or if the URI is assigned to + * the default Namespace. + * @see #getPrefixes(java.lang.String) + * @see #getURI + */ + public String getPrefix (String uri) + { + return currentContext.getPrefix(uri); + } + + + /** + * Return an enumeration of all prefixes currently declared for a URI. + * + * <p>This method returns prefixes mapped to a specific Namespace + * URI. The xml: prefix will be included. If you want only one + * prefix that's mapped to the Namespace URI, and you don't care + * which one you get, use the {@link #getPrefix getPrefix} + * method instead.</p> + * + * <p><strong>Note:</strong> the empty (default) prefix is <em>never</em> included + * in this enumeration; to check for the presence of a default + * Namespace, use the {@link #getURI getURI} method with an + * argument of "".</p> + * + * @param uri The Namespace URI. + * @return An enumeration of all prefixes declared in the + * current context. + * @see #getPrefix + * @see #getDeclaredPrefixes + * @see #getURI + */ + public Enumeration getPrefixes (String uri) + { + Vector prefixes = new Vector(); + Enumeration allPrefixes = getPrefixes(); + while (allPrefixes.hasMoreElements()) { + String prefix = (String)allPrefixes.nextElement(); + if (uri.equals(getURI(prefix))) { + prefixes.addElement(prefix); + } + } + return prefixes.elements(); + } + + + /** + * Return an enumeration of all prefixes declared in this context. + * + * <p>The empty (default) prefix will be included in this + * enumeration; note that this behaviour differs from that of + * {@link #getPrefix} and {@link #getPrefixes}.</p> + * + * @return An enumeration of all prefixes declared in this + * context. + * @see #getPrefixes + * @see #getURI + */ + public Enumeration getDeclaredPrefixes () + { + return currentContext.getDeclaredPrefixes(); + } + + + + //////////////////////////////////////////////////////////////////// + // Internal state. + //////////////////////////////////////////////////////////////////// + + private Context contexts[]; + private Context currentContext; + private int contextPos; + + + + //////////////////////////////////////////////////////////////////// + // Internal classes. + //////////////////////////////////////////////////////////////////// + + /** + * Internal class for a single Namespace context. + * + * <p>This module caches and reuses Namespace contexts, + * so the number allocated + * will be equal to the element depth of the document, not to the total + * number of elements (i.e. 5-10 rather than tens of thousands). + * Also, data structures used to represent contexts are shared when + * possible (child contexts without declarations) to further reduce + * the amount of memory that's consumed. + * </p> + */ + final class Context { + + /** + * Create the root-level Namespace context. + */ + Context () + { + copyTables(); + } + + + /** + * (Re)set the parent of this Namespace context. + * The context must either have been freshly constructed, + * or must have been cleared. + * + * @param context The parent Namespace context object. + */ + void setParent (Context parent) + { + this.parent = parent; + declarations = null; + prefixTable = parent.prefixTable; + uriTable = parent.uriTable; + elementNameTable = parent.elementNameTable; + attributeNameTable = parent.attributeNameTable; + defaultNS = parent.defaultNS; + declSeen = false; + declsOK = true; + } + + /** + * Makes associated state become collectible, + * invalidating this context. + * {@link #setParent} must be called before + * this context may be used again. + */ + void clear () + { + parent = null; + prefixTable = null; + uriTable = null; + elementNameTable = null; + attributeNameTable = null; + defaultNS = null; + } + + + /** + * Declare a Namespace prefix for this context. + * + * @param prefix The prefix to declare. + * @param uri The associated Namespace URI. + * @see org.xml.sax.helpers.NamespaceSupport#declarePrefix + */ + void declarePrefix (String prefix, String uri) + { + // Lazy processing... + if (!declsOK) + throw new IllegalStateException ( + "can't declare any more prefixes in this context"); + if (!declSeen) { + copyTables(); + } + if (declarations == null) { + declarations = new Vector(); + } + + prefix = prefix.intern(); + uri = uri.intern(); + if ("".equals(prefix)) { + if ("".equals(uri)) { + defaultNS = null; + } else { + defaultNS = uri; + } + } else { + prefixTable.put(prefix, uri); + uriTable.put(uri, prefix); // may wipe out another prefix + } + declarations.addElement(prefix); + } + + + /** + * Process a raw XML 1.0 name in this context. + * + * @param qName The raw XML 1.0 name. + * @param isAttribute true if this is an attribute name. + * @return An array of three strings containing the + * URI part (or empty string), the local part, + * and the raw name, all internalized, or null + * if there is an undeclared prefix. + * @see org.xml.sax.helpers.NamespaceSupport#processName + */ + String [] processName (String qName, boolean isAttribute) + { + String name[]; + Hashtable table; + + // detect errors in call sequence + declsOK = false; + + // Select the appropriate table. + if (isAttribute) { + table = attributeNameTable; + } else { + table = elementNameTable; + } + + // Start by looking in the cache, and + // return immediately if the name + // is already known in this content + name = (String[])table.get(qName); + if (name != null) { + return name; + } + + // We haven't seen this name in this + // context before. Maybe in the parent + // context, but we can't assume prefix + // bindings are the same. + name = new String[3]; + name[2] = qName.intern(); + int index = qName.indexOf(':'); + + + // No prefix. + if (index == -1) { + if (isAttribute || defaultNS == null) { + name[0] = ""; + } else { + name[0] = defaultNS; + } + name[1] = name[2]; + } + + // Prefix + else { + String prefix = qName.substring(0, index); + String local = qName.substring(index+1); + String uri; + if ("".equals(prefix)) { + uri = defaultNS; + } else { + uri = (String)prefixTable.get(prefix); + } + if (uri == null) { + return null; + } + name[0] = uri; + name[1] = local.intern(); + } + + // Save in the cache for future use. + // (Could be shared with parent context...) + table.put(name[2], name); + return name; + } + + + /** + * Look up the URI associated with a prefix in this context. + * + * @param prefix The prefix to look up. + * @return The associated Namespace URI, or null if none is + * declared. + * @see org.xml.sax.helpers.NamespaceSupport#getURI + */ + String getURI (String prefix) + { + if ("".equals(prefix)) { + return defaultNS; + } else if (prefixTable == null) { + return null; + } else { + return (String)prefixTable.get(prefix); + } + } + + + /** + * Look up one of the prefixes associated with a URI in this context. + * + * <p>Since many prefixes may be mapped to the same URI, + * the return value may be unreliable.</p> + * + * @param uri The URI to look up. + * @return The associated prefix, or null if none is declared. + * @see org.xml.sax.helpers.NamespaceSupport#getPrefix + */ + String getPrefix (String uri) + { + if (uriTable == null) { + return null; + } else { + return (String)uriTable.get(uri); + } + } + + + /** + * Return an enumeration of prefixes declared in this context. + * + * @return An enumeration of prefixes (possibly empty). + * @see org.xml.sax.helpers.NamespaceSupport#getDeclaredPrefixes + */ + Enumeration getDeclaredPrefixes () + { + if (declarations == null) { + return EMPTY_ENUMERATION; + } else { + return declarations.elements(); + } + } + + + /** + * Return an enumeration of all prefixes currently in force. + * + * <p>The default prefix, if in force, is <em>not</em> + * returned, and will have to be checked for separately.</p> + * + * @return An enumeration of prefixes (never empty). + * @see org.xml.sax.helpers.NamespaceSupport#getPrefixes + */ + Enumeration getPrefixes () + { + if (prefixTable == null) { + return EMPTY_ENUMERATION; + } else { + return prefixTable.keys(); + } + } + + + + //////////////////////////////////////////////////////////////// + // Internal methods. + //////////////////////////////////////////////////////////////// + + + /** + * Copy on write for the internal tables in this context. + * + * <p>This class is optimized for the normal case where most + * elements do not contain Namespace declarations.</p> + */ + private void copyTables () + { + if (prefixTable != null) { + prefixTable = (Hashtable)prefixTable.clone(); + } else { + prefixTable = new Hashtable(); + } + if (uriTable != null) { + uriTable = (Hashtable)uriTable.clone(); + } else { + uriTable = new Hashtable(); + } + elementNameTable = new Hashtable(); + attributeNameTable = new Hashtable(); + declSeen = true; + } + + + + //////////////////////////////////////////////////////////////// + // Protected state. + //////////////////////////////////////////////////////////////// + + Hashtable prefixTable; + Hashtable uriTable; + Hashtable elementNameTable; + Hashtable attributeNameTable; + String defaultNS = null; + boolean declsOK = true; + + + + //////////////////////////////////////////////////////////////// + // Internal state. + //////////////////////////////////////////////////////////////// + + private Vector declarations = null; + private boolean declSeen = false; + private Context parent = null; + } +} + +// end of NamespaceSupport.java diff --git a/libjava/org/xml/sax/helpers/NewInstance.java b/libjava/org/xml/sax/helpers/NewInstance.java new file mode 100644 index 00000000000..7d107a65239 --- /dev/null +++ b/libjava/org/xml/sax/helpers/NewInstance.java @@ -0,0 +1,80 @@ +// NewInstance.java - create a new instance of a class by name. +// http://www.saxproject.org +// Written by Edwin Goei, edwingo@apache.org +// and by David Brownell, dbrownell@users.sourceforge.net +// NO WARRANTY! This class is in the Public Domain. + +// $Id: NewInstance.java,v 1.1.2.4 2002/01/29 21:34:14 dbrownell Exp $ + +package org.xml.sax.helpers; + +import java.lang.reflect.Method; +import java.lang.reflect.InvocationTargetException; + +/** + * Create a new instance of a class by name. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>This class contains a static method for creating an instance of a + * class from an explicit class name. It tries to use the thread's context + * ClassLoader if possible and falls back to using + * Class.forName(String).</p> + * + * <p>This code is designed to compile and run on JDK version 1.1 and later + * including versions of Java 2.</p> + * + * @author Edwin Goei, David Brownell + * @version 2.0.1 (sax2r2) + */ +class NewInstance { + + /** + * Creates a new instance of the specified class name + * + * Package private so this code is not exposed at the API level. + */ + static Object newInstance (ClassLoader classLoader, String className) + throws ClassNotFoundException, IllegalAccessException, + InstantiationException + { + Class driverClass; + if (classLoader == null) { + driverClass = Class.forName(className); + } else { + driverClass = classLoader.loadClass(className); + } + return driverClass.newInstance(); + } + + /** + * Figure out which ClassLoader to use. For JDK 1.2 and later use + * the context ClassLoader. + */ + static ClassLoader getClassLoader () + { + Method m = null; + + try { + m = Thread.class.getMethod("getContextClassLoader", null); + } catch (NoSuchMethodException e) { + // Assume that we are running JDK 1.1, use the current ClassLoader + return NewInstance.class.getClassLoader(); + } + + try { + return (ClassLoader) m.invoke(Thread.currentThread(), null); + } catch (IllegalAccessException e) { + // assert(false) + throw new UnknownError(e.getMessage()); + } catch (InvocationTargetException e) { + // assert(e.getTargetException() instanceof SecurityException) + throw new UnknownError(e.getMessage()); + } + } +} diff --git a/libjava/org/xml/sax/helpers/ParserAdapter.java b/libjava/org/xml/sax/helpers/ParserAdapter.java index 06071b7bdd5..ca66a9e2dc7 100644 --- a/libjava/org/xml/sax/helpers/ParserAdapter.java +++ b/libjava/org/xml/sax/helpers/ParserAdapter.java @@ -1,1008 +1,1026 @@ -// ParserAdapter.java - adapt a SAX1 Parser to a SAX2 XMLReader.
-// Written by David Megginson, sax@megginson.com
-// NO WARRANTY! This class is in the public domain.
-
-// $Id: ParserAdapter.java,v 1.1 2000/10/02 02:43:20 sboag Exp $
-
-package org.xml.sax.helpers;
-
-import java.io.IOException;
-import java.util.Enumeration;
-
-import org.xml.sax.Parser; // deprecated
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.AttributeList; // deprecated
-import org.xml.sax.EntityResolver;
-import org.xml.sax.DTDHandler;
-import org.xml.sax.DocumentHandler; // deprecated
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-
-import org.xml.sax.XMLReader;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXNotRecognizedException;
-import org.xml.sax.SAXNotSupportedException;
-
-
-/**
- * Adapt a SAX1 Parser as a SAX2 XMLReader.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>This class wraps a SAX1 {@link org.xml.sax.Parser Parser}
- * and makes it act as a SAX2 {@link org.xml.sax.XMLReader XMLReader},
- * with feature, property, and Namespace support. Note
- * that it is not possible to report {@link org.xml.sax.ContentHandler#skippedEntity
- * skippedEntity} events, since SAX1 does not make that information available.</p>
- *
- * <p>This adapter does not test for duplicate Namespace-qualified
- * attribute names.</p>
- *
- * @since SAX 2.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.helpers.XMLReaderAdapter
- * @see org.xml.sax.XMLReader
- * @see org.xml.sax.Parser
- */
-public class ParserAdapter implements XMLReader, DocumentHandler
-{
-
-
- ////////////////////////////////////////////////////////////////////
- // Constructors.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Construct a new parser adapter.
- *
- * <p>Use the "org.xml.sax.parser" property to locate the
- * embedded SAX1 driver.</p>
- *
- * @exception org.xml.sax.SAXException If the embedded driver
- * cannot be instantiated or if the
- * org.xml.sax.parser property is not specified.
- */
- public ParserAdapter ()
- throws SAXException
- {
- super();
-
- String driver = System.getProperty("org.xml.sax.parser");
-
- try {
- setup(ParserFactory.makeParser());
- } catch (ClassNotFoundException e1) {
- throw new
- SAXException("Cannot find SAX1 driver class " +
- driver, e1);
- } catch (IllegalAccessException e2) {
- throw new
- SAXException("SAX1 driver class " +
- driver +
- " found but cannot be loaded", e2);
- } catch (InstantiationException e3) {
- throw new
- SAXException("SAX1 driver class " +
- driver +
- " loaded but cannot be instantiated", e3);
- } catch (ClassCastException e4) {
- throw new
- SAXException("SAX1 driver class " +
- driver +
- " does not implement org.xml.sax.Parser");
- } catch (NullPointerException e5) {
- throw new
- SAXException("System property org.xml.sax.parser not specified");
- }
- }
-
-
- /**
- * Construct a new parser adapter.
- *
- * <p>Note that the embedded parser cannot be changed once the
- * adapter is created; to embed a different parser, allocate
- * a new ParserAdapter.</p>
- *
- * @param parser The SAX1 parser to embed.
- * @exception java.lang.NullPointerException If the parser parameter
- * is null.
- */
- public ParserAdapter (Parser parser)
- {
- super();
- setup(parser);
- }
-
-
- /**
- * Internal setup method.
- *
- * @param parser The embedded parser.
- * @exception java.lang.NullPointerException If the parser parameter
- * is null.
- */
- private void setup (Parser parser)
- {
- if (parser == null) {
- throw new
- NullPointerException("Parser argument must not be null");
- }
- this.parser = parser;
- atts = new AttributesImpl();
- nsSupport = new NamespaceSupport();
- attAdapter = new AttributeListAdapter();
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Implementation of org.xml.sax.XMLReader.
- ////////////////////////////////////////////////////////////////////
-
-
- //
- // Internal constants for the sake of convenience.
- //
- private final static String FEATURES = "http://xml.org/sax/features/";
- private final static String NAMESPACES = FEATURES + "namespaces";
- private final static String NAMESPACE_PREFIXES = FEATURES + "namespace-prefixes";
- private final static String VALIDATION = FEATURES + "validation";
- private final static String EXTERNAL_GENERAL =
- FEATURES + "external-general-entities";
- private final static String EXTERNAL_PARAMETER =
- FEATURES + "external-parameter-entities";
-
-
- /**
- * Set a feature for the parser.
- *
- * <p>The only features supported are namespaces and
- * namespace-prefixes.</p>
- *
- * @param name The feature name, as a complete URI.
- * @param state The requested feature state.
- * @exception org.xml.sax.SAXNotRecognizedException If the feature
- * name is not known.
- * @exception org.xml.sax.SAXNotSupportedException If the feature
- * state is not supported.
- * @see org.xml.sax.XMLReader#setFeature
- */
- public void setFeature (String name, boolean state)
- throws SAXNotRecognizedException, SAXNotSupportedException
- {
- if (name.equals(NAMESPACES)) {
- checkNotParsing("feature", name);
- namespaces = state;
- if (!namespaces && !prefixes) {
- prefixes = true;
- }
- } else if (name.equals(NAMESPACE_PREFIXES)) {
- checkNotParsing("feature", name);
- prefixes = state;
- if (!prefixes && !namespaces) {
- namespaces = true;
- }
- } else if (name.equals(VALIDATION) ||
- name.equals(EXTERNAL_GENERAL) ||
- name.equals(EXTERNAL_PARAMETER)) {
- throw new SAXNotSupportedException("Feature: " + name);
- } else {
- throw new SAXNotRecognizedException("Feature: " + name);
- }
- }
-
-
- /**
- * Check a parser feature.
- *
- * <p>The only features supported are namespaces and
- * namespace-prefixes.</p>
- *
- * @param name The feature name, as a complete URI.
- * @return The current feature state.
- * @exception org.xml.sax.SAXNotRecognizedException If the feature
- * name is not known.
- * @exception org.xml.sax.SAXNotSupportedException If querying the
- * feature state is not supported.
- * @see org.xml.sax.XMLReader#setFeature
- */
- public boolean getFeature (String name)
- throws SAXNotRecognizedException, SAXNotSupportedException
- {
- if (name.equals(NAMESPACES)) {
- return namespaces;
- } else if (name.equals(NAMESPACE_PREFIXES)) {
- return prefixes;
- } else if (name.equals(VALIDATION) ||
- name.equals(EXTERNAL_GENERAL) ||
- name.equals(EXTERNAL_PARAMETER)) {
- throw new SAXNotSupportedException("Feature: " + name);
- } else {
- throw new SAXNotRecognizedException("Feature: " + name);
- }
- }
-
-
- /**
- * Set a parser property.
- *
- * <p>No special properties are currently supported.</p>
- *
- * @param name The property name.
- * @param value The property value.
- * @exception org.xml.sax.SAXNotRecognizedException If the feature
- * name is not known.
- * @exception org.xml.sax.SAXNotSupportedException If the feature
- * state is not supported.
- * @see org.xml.sax.XMLReader#setProperty
- */
- public void setProperty (String name, Object value)
- throws SAXNotRecognizedException, SAXNotSupportedException
- {
- throw new SAXNotRecognizedException("Property: " + name);
- }
-
-
- /**
- * Get a parser property.
- *
- * <p>No special properties are currently supported.</p>
- *
- * @param name The property name.
- * @return The property value.
- * @exception org.xml.sax.SAXNotRecognizedException If the feature
- * name is not known.
- * @exception org.xml.sax.SAXNotSupportedException If the feature
- * state is not supported.
- * @see org.xml.sax.XMLReader#getProperty
- */
- public Object getProperty (String name)
- throws SAXNotRecognizedException, SAXNotSupportedException
- {
- throw new SAXNotRecognizedException("Property: " + name);
- }
-
-
- /**
- * Set the entity resolver.
- *
- * @param resolver The new entity resolver.
- * @exception java.lang.NullPointerException If the entity resolver
- * parameter is null.
- * @see org.xml.sax.XMLReader#setEntityResolver
- */
- public void setEntityResolver (EntityResolver resolver)
- {
- if (resolver == null) {
- throw new NullPointerException("Null entity resolver");
- }
- entityResolver = resolver;
- }
-
-
- /**
- * Return the current entity resolver.
- *
- * @return The current entity resolver, or null if none was supplied.
- * @see org.xml.sax.XMLReader#getEntityResolver
- */
- public EntityResolver getEntityResolver ()
- {
- return entityResolver;
- }
-
-
- /**
- * Set the DTD handler.
- *
- * @param resolver The new DTD handler.
- * @exception java.lang.NullPointerException If the DTD handler
- * parameter is null.
- * @see org.xml.sax.XMLReader#setEntityResolver
- */
- public void setDTDHandler (DTDHandler handler)
- {
- if (handler == null) {
- throw new NullPointerException("Null DTD handler");
- }
- dtdHandler = handler;
- }
-
-
- /**
- * Return the current DTD handler.
- *
- * @return The current DTD handler, or null if none was supplied.
- * @see org.xml.sax.XMLReader#getEntityResolver
- */
- public DTDHandler getDTDHandler ()
- {
- return dtdHandler;
- }
-
-
- /**
- * Set the content handler.
- *
- * @param resolver The new content handler.
- * @exception java.lang.NullPointerException If the content handler
- * parameter is null.
- * @see org.xml.sax.XMLReader#setEntityResolver
- */
- public void setContentHandler (ContentHandler handler)
- {
- if (handler == null) {
- throw new NullPointerException("Null content handler");
- }
- contentHandler = handler;
- }
-
-
- /**
- * Return the current content handler.
- *
- * @return The current content handler, or null if none was supplied.
- * @see org.xml.sax.XMLReader#getEntityResolver
- */
- public ContentHandler getContentHandler ()
- {
- return contentHandler;
- }
-
-
- /**
- * Set the error handler.
- *
- * @param resolver The new error handler.
- * @exception java.lang.NullPointerException If the error handler
- * parameter is null.
- * @see org.xml.sax.XMLReader#setEntityResolver
- */
- public void setErrorHandler (ErrorHandler handler)
- {
- if (handler == null) {
- throw new NullPointerException("Null error handler");
- }
- errorHandler = handler;
- }
-
-
- /**
- * Return the current error handler.
- *
- * @return The current error handler, or null if none was supplied.
- * @see org.xml.sax.XMLReader#getEntityResolver
- */
- public ErrorHandler getErrorHandler ()
- {
- return errorHandler;
- }
-
-
- /**
- * Parse an XML document.
- *
- * @param systemId The absolute URL of the document.
- * @exception java.io.IOException If there is a problem reading
- * the raw content of the document.
- * @exception org.xml.sax.SAXException If there is a problem
- * processing the document.
- * @see #parse(org.xml.sax.InputSource)
- * @see org.xml.sax.Parser#parse(java.lang.String)
- */
- public void parse (String systemId)
- throws IOException, SAXException
- {
- parse(new InputSource(systemId));
- }
-
-
- /**
- * Parse an XML document.
- *
- * @param input An input source for the document.
- * @exception java.io.IOException If there is a problem reading
- * the raw content of the document.
- * @exception org.xml.sax.SAXException If there is a problem
- * processing the document.
- * @see #parse(java.lang.String)
- * @see org.xml.sax.Parser#parse(org.xml.sax.InputSource)
- */
- public void parse (InputSource input)
- throws IOException, SAXException
- {
- if (parsing) {
- throw new SAXException("Parser is already in use");
- }
- setupParser();
- parsing = true;
- try {
- parser.parse(input);
- } finally {
- parsing = false;
- }
- parsing = false;
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Implementation of org.xml.sax.DocumentHandler.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Adapt a SAX1 document locator event.
- *
- * @param locator A document locator.
- * @see org.xml.sax.ContentHandler#setDocumentLocator
- */
- public void setDocumentLocator (Locator locator)
- {
- this.locator = locator;
- if (contentHandler != null) {
- contentHandler.setDocumentLocator(locator);
- }
- }
-
-
- /**
- * Adapt a SAX1 start document event.
- *
- * @exception org.xml.sax.SAXException The client may raise a
- * processing exception.
- * @see org.xml.sax.DocumentHandler#startDocument
- */
- public void startDocument ()
- throws SAXException
- {
- if (contentHandler != null) {
- contentHandler.startDocument();
- }
- }
-
-
- /**
- * Adapt a SAX1 end document event.
- *
- * @exception org.xml.sax.SAXException The client may raise a
- * processing exception.
- * @see org.xml.sax.DocumentHandler#endDocument
- */
- public void endDocument ()
- throws SAXException
- {
- if (contentHandler != null) {
- contentHandler.endDocument();
- }
- }
-
-
- /**
- * Adapt a SAX1 startElement event.
- *
- * <p>If necessary, perform Namespace processing.</p>
- *
- * @param qName The qualified (prefixed) name.
- * @param qAtts The XML 1.0 attribute list (with qnames).
- */
- public void startElement (String qName, AttributeList qAtts)
- throws SAXException
- {
- // If we're not doing Namespace
- // processing, dispatch this quickly.
- if (!namespaces) {
- if (contentHandler != null) {
- attAdapter.setAttributeList(qAtts);
- contentHandler.startElement("", "", qName.intern(),
- attAdapter);
- }
- return;
- }
-
-
- // OK, we're doing Namespace processing.
- nsSupport.pushContext();
- boolean seenDecl = false;
- atts.clear();
-
- // Take a first pass and copy all
- // attributes into the SAX2 attribute
- // list, noting any Namespace
- // declarations.
- int length = qAtts.getLength();
- for (int i = 0; i < length; i++) {
- String attQName = qAtts.getName(i);
- String type = qAtts.getType(i);
- String value = qAtts.getValue(i);
-
- // Found a declaration...
- if (attQName.startsWith("xmlns")) {
- String prefix;
- int n = attQName.indexOf(':');
- if (n == -1) {
- prefix = "";
- } else {
- prefix = attQName.substring(n+1);
- }
- if (!nsSupport.declarePrefix(prefix, value)) {
- reportError("Illegal Namespace prefix: " + prefix);
- }
- if (contentHandler != null) {
- contentHandler.startPrefixMapping(prefix, value);
- }
- // We may still have to add this to
- // the list.
- if (prefixes) {
- atts.addAttribute("", "", attQName.intern(),
- type, value);
- }
- seenDecl = true;
-
- // This isn't a declaration.
- } else {
- String attName[] = processName(attQName, true);
- atts.addAttribute(attName[0], attName[1], attName[2],
- type, value);
- }
- }
-
- // If there was a Namespace declaration,
- // we have to make a second pass just
- // to be safe -- this will happen very
- // rarely, possibly only once for each
- // document.
- if (seenDecl) {
- length = atts.getLength();
- for (int i = 0; i < length; i++) {
- String attQName = atts.getQName(i);
- if (!attQName.startsWith("xmlns")) {
- String attName[] = processName(attQName, true);
- atts.setURI(i, attName[0]);
- atts.setLocalName(i, attName[1]);
- }
- }
- }
-
- // OK, finally report the event.
- if (contentHandler != null) {
- String name[] = processName(qName, false);
- contentHandler.startElement(name[0], name[1], name[2], atts);
- }
- }
-
-
- /**
- * Adapt a SAX1 end element event.
- *
- * @param qName The qualified (prefixed) name.
- * @exception org.xml.sax.SAXException The client may raise a
- * processing exception.
- * @see org.xml.sax.DocumentHandler#endElement
- */
- public void endElement (String qName)
- throws SAXException
- {
- // If we're not doing Namespace
- // processing, dispatch this quickly.
- if (!namespaces) {
- if (contentHandler != null) {
- contentHandler.endElement("", "", qName.intern());
- }
- return;
- }
-
- // Split the name.
- String names[] = processName(qName, false);
- if (contentHandler != null) {
- contentHandler.endElement(names[0], names[1], names[2]);
- Enumeration prefixes = nsSupport.getDeclaredPrefixes();
- while (prefixes.hasMoreElements()) {
- String prefix = (String)prefixes.nextElement();
- contentHandler.endPrefixMapping(prefix);
- }
- }
- nsSupport.popContext();
- }
-
-
- /**
- * Adapt a SAX1 characters event.
- *
- * @param ch An array of characters.
- * @param start The starting position in the array.
- * @param length The number of characters to use.
- * @exception org.xml.sax.SAXException The client may raise a
- * processing exception.
- * @see org.xml.sax.DocumentHandler#characters
- */
- public void characters (char ch[], int start, int length)
- throws SAXException
- {
- if (contentHandler != null) {
- contentHandler.characters(ch, start, length);
- }
- }
-
-
- /**
- * Adapt a SAX1 ignorable whitespace event.
- *
- * @param ch An array of characters.
- * @param start The starting position in the array.
- * @param length The number of characters to use.
- * @exception org.xml.sax.SAXException The client may raise a
- * processing exception.
- * @see org.xml.sax.DocumentHandler#ignorableWhitespace
- */
- public void ignorableWhitespace (char ch[], int start, int length)
- throws SAXException
- {
- if (contentHandler != null) {
- contentHandler.ignorableWhitespace(ch, start, length);
- }
- }
-
-
- /**
- * Adapt a SAX1 processing instruction event.
- *
- * @param target The processing instruction target.
- * @param data The remainder of the processing instruction
- * @exception org.xml.sax.SAXException The client may raise a
- * processing exception.
- * @see org.xml.sax.DocumentHandler#processingInstruction
- */
- public void processingInstruction (String target, String data)
- throws SAXException
- {
- if (contentHandler != null) {
- contentHandler.processingInstruction(target, data);
- }
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Internal utility methods.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Initialize the parser before each run.
- */
- private void setupParser ()
- {
- nsSupport.reset();
-
- if (entityResolver != null) {
- parser.setEntityResolver(entityResolver);
- }
- if (dtdHandler != null) {
- parser.setDTDHandler(dtdHandler);
- }
- if (errorHandler != null) {
- parser.setErrorHandler(errorHandler);
- }
- parser.setDocumentHandler(this);
- locator = null;
- }
-
-
- /**
- * Process a qualified (prefixed) name.
- *
- * <p>If the name has an undeclared prefix, use only the qname
- * and make an ErrorHandler.error callback in case the app is
- * interested.</p>
- *
- * @param qName The qualified (prefixed) name.
- * @param isAttribute true if this is an attribute name.
- * @return The name split into three parts.
- * @exception org.xml.sax.SAXException The client may throw
- * an exception if there is an error callback.
- */
- private String [] processName (String qName, boolean isAttribute)
- throws SAXException
- {
- String parts[] = nsSupport.processName(qName, nameParts,
- isAttribute);
- if (parts == null) {
- parts = new String[3];
- parts[2] = qName.intern();
- reportError("Undeclared prefix: " + qName);
- }
- return parts;
- }
-
-
- /**
- * Report a non-fatal error.
- *
- * @param message The error message.
- * @exception org.xml.sax.SAXException The client may throw
- * an exception.
- */
- void reportError (String message)
- throws SAXException
- {
- if (errorHandler == null) {
- return;
- }
-
- SAXParseException e;
- if (locator != null) {
- e = new SAXParseException(message, locator);
- } else {
- e = new SAXParseException(message, null, null, -1, -1);
- }
- errorHandler.error(e);
- }
-
-
- /**
- * Throw an exception if we are parsing.
- *
- * <p>Use this method to detect illegal feature or
- * property changes.</p>
- *
- * @param type The type of thing (feature or property).
- * @param name The feature or property name.
- * @exception org.xml.sax.SAXNotSupportedException If a
- * document is currently being parsed.
- */
- private void checkNotParsing (String type, String name)
- throws SAXNotSupportedException
- {
- if (parsing) {
- throw new SAXNotSupportedException("Cannot change " +
- type + ' ' +
- name + " while parsing");
-
- }
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Internal state.
- ////////////////////////////////////////////////////////////////////
-
- private NamespaceSupport nsSupport;
- private AttributeListAdapter attAdapter;
-
- private boolean parsing = false;
- private String nameParts[] = new String[3];
-
- private Parser parser = null;
-
- private AttributesImpl atts = null;
-
- // Features
- private boolean namespaces = true;
- private boolean prefixes = false;
-
- // Properties
-
- // Handlers
- Locator locator;
-
- EntityResolver entityResolver = null;
- DTDHandler dtdHandler = null;
- ContentHandler contentHandler = null;
- ErrorHandler errorHandler = null;
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Inner class to wrap an AttributeList when not doing NS proc.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Adapt a SAX1 AttributeList as a SAX2 Attributes object.
- *
- * <p>This class is in the Public Domain, and comes with NO
- * WARRANTY of any kind.</p>
- *
- * <p>This wrapper class is used only when Namespace support
- * is disabled -- it provides pretty much a direct mapping
- * from SAX1 to SAX2, except that names and types are
- * interned whenever requested.</p>
- */
- final class AttributeListAdapter implements Attributes
- {
-
- /**
- * Construct a new adapter.
- */
- AttributeListAdapter ()
- {
- }
-
-
- /**
- * Set the embedded AttributeList.
- *
- * <p>This method must be invoked before any of the others
- * can be used.</p>
- *
- * @param The SAX1 attribute list (with qnames).
- */
- void setAttributeList (AttributeList qAtts)
- {
- this.qAtts = qAtts;
- }
-
-
- /**
- * Return the length of the attribute list.
- *
- * @return The number of attributes in the list.
- * @see org.xml.sax.Attributes#getLength
- */
- public int getLength ()
- {
- return qAtts.getLength();
- }
-
-
- /**
- * Return the Namespace URI of the specified attribute.
- *
- * @param The attribute's index.
- * @return Always the empty string.
- * @see org.xml.sax.Attributes#getURI
- */
- public String getURI (int i)
- {
- return "";
- }
-
-
- /**
- * Return the local name of the specified attribute.
- *
- * @param The attribute's index.
- * @return Always the empty string.
- * @see org.xml.sax.Attributes#getLocalName
- */
- public String getLocalName (int i)
- {
- return "";
- }
-
-
- /**
- * Return the qualified (prefixed) name of the specified attribute.
- *
- * @param The attribute's index.
- * @return The attribute's qualified name, internalized.
- */
- public String getQName (int i)
- {
- return qAtts.getName(i).intern();
- }
-
-
- /**
- * Return the type of the specified attribute.
- *
- * @param The attribute's index.
- * @return The attribute's type as an internalized string.
- */
- public String getType (int i)
- {
- return qAtts.getType(i).intern();
- }
-
-
- /**
- * Return the value of the specified attribute.
- *
- * @param The attribute's index.
- * @return The attribute's value.
- */
- public String getValue (int i)
- {
- return qAtts.getValue(i);
- }
-
-
- /**
- * Look up an attribute index by Namespace name.
- *
- * @param uri The Namespace URI or the empty string.
- * @param localName The local name.
- * @return The attributes index, or -1 if none was found.
- * @see org.xml.sax.Attributes#getIndex(java.lang.String,java.lang.String)
- */
- public int getIndex (String uri, String localName)
- {
- return -1;
- }
-
-
- /**
- * Look up an attribute index by qualified (prefixed) name.
- *
- * @param qName The qualified name.
- * @return The attributes index, or -1 if none was found.
- * @see org.xml.sax.Attributes#getIndex(java.lang.String)
- */
- public int getIndex (String qName)
- {
- int max = atts.getLength();
- for (int i = 0; i < max; i++) {
- if (qAtts.getName(i).equals(qName)) {
- return i;
- }
- }
- return -1;
- }
-
-
- /**
- * Look up the type of an attribute by Namespace name.
- *
- * @param uri The Namespace URI
- * @param localName The local name.
- * @return The attribute's type as an internalized string.
- */
- public String getType (String uri, String localName)
- {
- return null;
- }
-
-
- /**
- * Look up the type of an attribute by qualified (prefixed) name.
- *
- * @param qName The qualified name.
- * @return The attribute's type as an internalized string.
- */
- public String getType (String qName)
- {
- return qAtts.getType(qName).intern();
- }
-
-
- /**
- * Look up the value of an attribute by Namespace name.
- *
- * @param uri The Namespace URI
- * @param localName The local name.
- * @return The attribute's value.
- */
- public String getValue (String uri, String localName)
- {
- return null;
- }
-
-
- /**
- * Look up the value of an attribute by qualified (prefixed) name.
- *
- * @param qName The qualified name.
- * @return The attribute's value.
- */
- public String getValue (String qName)
- {
- return qAtts.getValue(qName);
- }
-
- private AttributeList qAtts;
- }
-}
-
-// end of ParserAdapter.java
+// ParserAdapter.java - adapt a SAX1 Parser to a SAX2 XMLReader. +// http://www.saxproject.org +// Written by David Megginson +// NO WARRANTY! This class is in the public domain. + +// $Id: ParserAdapter.java,v 1.8.2.4 2002/01/29 21:34:14 dbrownell Exp $ + +package org.xml.sax.helpers; + +import java.io.IOException; +import java.util.Enumeration; +import java.util.Vector; + +import org.xml.sax.Parser; // deprecated +import org.xml.sax.InputSource; +import org.xml.sax.Locator; +import org.xml.sax.AttributeList; // deprecated +import org.xml.sax.EntityResolver; +import org.xml.sax.DTDHandler; +import org.xml.sax.DocumentHandler; // deprecated +import org.xml.sax.ErrorHandler; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; + +import org.xml.sax.XMLReader; +import org.xml.sax.Attributes; +import org.xml.sax.ContentHandler; +import org.xml.sax.SAXNotRecognizedException; +import org.xml.sax.SAXNotSupportedException; + + +/** + * Adapt a SAX1 Parser as a SAX2 XMLReader. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>This class wraps a SAX1 {@link org.xml.sax.Parser Parser} + * and makes it act as a SAX2 {@link org.xml.sax.XMLReader XMLReader}, + * with feature, property, and Namespace support. Note + * that it is not possible to report {@link org.xml.sax.ContentHandler#skippedEntity + * skippedEntity} events, since SAX1 does not make that information available.</p> + * + * <p>This adapter does not test for duplicate Namespace-qualified + * attribute names.</p> + * + * @since SAX 2.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + * @see org.xml.sax.helpers.XMLReaderAdapter + * @see org.xml.sax.XMLReader + * @see org.xml.sax.Parser + */ +public class ParserAdapter implements XMLReader, DocumentHandler +{ + + + //////////////////////////////////////////////////////////////////// + // Constructors. + //////////////////////////////////////////////////////////////////// + + + /** + * Construct a new parser adapter. + * + * <p>Use the "org.xml.sax.parser" property to locate the + * embedded SAX1 driver.</p> + * + * @exception SAXException If the embedded driver + * cannot be instantiated or if the + * org.xml.sax.parser property is not specified. + */ + public ParserAdapter () + throws SAXException + { + super(); + + String driver = System.getProperty("org.xml.sax.parser"); + + try { + setup(ParserFactory.makeParser()); + } catch (ClassNotFoundException e1) { + throw new + SAXException("Cannot find SAX1 driver class " + + driver, e1); + } catch (IllegalAccessException e2) { + throw new + SAXException("SAX1 driver class " + + driver + + " found but cannot be loaded", e2); + } catch (InstantiationException e3) { + throw new + SAXException("SAX1 driver class " + + driver + + " loaded but cannot be instantiated", e3); + } catch (ClassCastException e4) { + throw new + SAXException("SAX1 driver class " + + driver + + " does not implement org.xml.sax.Parser"); + } catch (NullPointerException e5) { + throw new + SAXException("System property org.xml.sax.parser not specified"); + } + } + + + /** + * Construct a new parser adapter. + * + * <p>Note that the embedded parser cannot be changed once the + * adapter is created; to embed a different parser, allocate + * a new ParserAdapter.</p> + * + * @param parser The SAX1 parser to embed. + * @exception java.lang.NullPointerException If the parser parameter + * is null. + */ + public ParserAdapter (Parser parser) + { + super(); + setup(parser); + } + + + /** + * Internal setup method. + * + * @param parser The embedded parser. + * @exception java.lang.NullPointerException If the parser parameter + * is null. + */ + private void setup (Parser parser) + { + if (parser == null) { + throw new + NullPointerException("Parser argument must not be null"); + } + this.parser = parser; + atts = new AttributesImpl(); + nsSupport = new NamespaceSupport(); + attAdapter = new AttributeListAdapter(); + } + + + + //////////////////////////////////////////////////////////////////// + // Implementation of org.xml.sax.XMLReader. + //////////////////////////////////////////////////////////////////// + + + // + // Internal constants for the sake of convenience. + // + private final static String FEATURES = "http://xml.org/sax/features/"; + private final static String NAMESPACES = FEATURES + "namespaces"; + private final static String NAMESPACE_PREFIXES = FEATURES + "namespace-prefixes"; + + + /** + * Set a feature flag for the parser. + * + * <p>The only features recognized are namespaces and + * namespace-prefixes.</p> + * + * @param name The feature name, as a complete URI. + * @param value The requested feature value. + * @exception SAXNotRecognizedException If the feature + * can't be assigned or retrieved. + * @exception SAXNotSupportedException If the feature + * can't be assigned that value. + * @see org.xml.sax.XMLReader#setFeature + */ + public void setFeature (String name, boolean value) + throws SAXNotRecognizedException, SAXNotSupportedException + { + if (name.equals(NAMESPACES)) { + checkNotParsing("feature", name); + namespaces = value; + if (!namespaces && !prefixes) { + prefixes = true; + } + } else if (name.equals(NAMESPACE_PREFIXES)) { + checkNotParsing("feature", name); + prefixes = value; + if (!prefixes && !namespaces) { + namespaces = true; + } + } else { + throw new SAXNotRecognizedException("Feature: " + name); + } + } + + + /** + * Check a parser feature flag. + * + * <p>The only features recognized are namespaces and + * namespace-prefixes.</p> + * + * @param name The feature name, as a complete URI. + * @return The current feature value. + * @exception SAXNotRecognizedException If the feature + * value can't be assigned or retrieved. + * @exception SAXNotSupportedException If the + * feature is not currently readable. + * @see org.xml.sax.XMLReader#setFeature + */ + public boolean getFeature (String name) + throws SAXNotRecognizedException, SAXNotSupportedException + { + if (name.equals(NAMESPACES)) { + return namespaces; + } else if (name.equals(NAMESPACE_PREFIXES)) { + return prefixes; + } else { + throw new SAXNotRecognizedException("Feature: " + name); + } + } + + + /** + * Set a parser property. + * + * <p>No properties are currently recognized.</p> + * + * @param name The property name. + * @param value The property value. + * @exception SAXNotRecognizedException If the property + * value can't be assigned or retrieved. + * @exception SAXNotSupportedException If the property + * can't be assigned that value. + * @see org.xml.sax.XMLReader#setProperty + */ + public void setProperty (String name, Object value) + throws SAXNotRecognizedException, SAXNotSupportedException + { + throw new SAXNotRecognizedException("Property: " + name); + } + + + /** + * Get a parser property. + * + * <p>No properties are currently recognized.</p> + * + * @param name The property name. + * @return The property value. + * @exception SAXNotRecognizedException If the property + * value can't be assigned or retrieved. + * @exception SAXNotSupportedException If the property + * value is not currently readable. + * @see org.xml.sax.XMLReader#getProperty + */ + public Object getProperty (String name) + throws SAXNotRecognizedException, SAXNotSupportedException + { + throw new SAXNotRecognizedException("Property: " + name); + } + + + /** + * Set the entity resolver. + * + * @param resolver The new entity resolver. + * @see org.xml.sax.XMLReader#setEntityResolver + */ + public void setEntityResolver (EntityResolver resolver) + { + entityResolver = resolver; + } + + + /** + * Return the current entity resolver. + * + * @return The current entity resolver, or null if none was supplied. + * @see org.xml.sax.XMLReader#getEntityResolver + */ + public EntityResolver getEntityResolver () + { + return entityResolver; + } + + + /** + * Set the DTD handler. + * + * @param resolver The new DTD handler. + * @see org.xml.sax.XMLReader#setEntityResolver + */ + public void setDTDHandler (DTDHandler handler) + { + dtdHandler = handler; + } + + + /** + * Return the current DTD handler. + * + * @return The current DTD handler, or null if none was supplied. + * @see org.xml.sax.XMLReader#getEntityResolver + */ + public DTDHandler getDTDHandler () + { + return dtdHandler; + } + + + /** + * Set the content handler. + * + * @param resolver The new content handler. + * @see org.xml.sax.XMLReader#setEntityResolver + */ + public void setContentHandler (ContentHandler handler) + { + contentHandler = handler; + } + + + /** + * Return the current content handler. + * + * @return The current content handler, or null if none was supplied. + * @see org.xml.sax.XMLReader#getEntityResolver + */ + public ContentHandler getContentHandler () + { + return contentHandler; + } + + + /** + * Set the error handler. + * + * @param resolver The new error handler. + * @see org.xml.sax.XMLReader#setEntityResolver + */ + public void setErrorHandler (ErrorHandler handler) + { + errorHandler = handler; + } + + + /** + * Return the current error handler. + * + * @return The current error handler, or null if none was supplied. + * @see org.xml.sax.XMLReader#getEntityResolver + */ + public ErrorHandler getErrorHandler () + { + return errorHandler; + } + + + /** + * Parse an XML document. + * + * @param systemId The absolute URL of the document. + * @exception java.io.IOException If there is a problem reading + * the raw content of the document. + * @exception SAXException If there is a problem + * processing the document. + * @see #parse(org.xml.sax.InputSource) + * @see org.xml.sax.Parser#parse(java.lang.String) + */ + public void parse (String systemId) + throws IOException, SAXException + { + parse(new InputSource(systemId)); + } + + + /** + * Parse an XML document. + * + * @param input An input source for the document. + * @exception java.io.IOException If there is a problem reading + * the raw content of the document. + * @exception SAXException If there is a problem + * processing the document. + * @see #parse(java.lang.String) + * @see org.xml.sax.Parser#parse(org.xml.sax.InputSource) + */ + public void parse (InputSource input) + throws IOException, SAXException + { + if (parsing) { + throw new SAXException("Parser is already in use"); + } + setupParser(); + parsing = true; + try { + parser.parse(input); + } finally { + parsing = false; + } + parsing = false; + } + + + + //////////////////////////////////////////////////////////////////// + // Implementation of org.xml.sax.DocumentHandler. + //////////////////////////////////////////////////////////////////// + + + /** + * Adapter implementation method; do not call. + * Adapt a SAX1 document locator event. + * + * @param locator A document locator. + * @see org.xml.sax.ContentHandler#setDocumentLocator + */ + public void setDocumentLocator (Locator locator) + { + this.locator = locator; + if (contentHandler != null) { + contentHandler.setDocumentLocator(locator); + } + } + + + /** + * Adapter implementation method; do not call. + * Adapt a SAX1 start document event. + * + * @exception SAXException The client may raise a + * processing exception. + * @see org.xml.sax.DocumentHandler#startDocument + */ + public void startDocument () + throws SAXException + { + if (contentHandler != null) { + contentHandler.startDocument(); + } + } + + + /** + * Adapter implementation method; do not call. + * Adapt a SAX1 end document event. + * + * @exception SAXException The client may raise a + * processing exception. + * @see org.xml.sax.DocumentHandler#endDocument + */ + public void endDocument () + throws SAXException + { + if (contentHandler != null) { + contentHandler.endDocument(); + } + } + + + /** + * Adapter implementation method; do not call. + * Adapt a SAX1 startElement event. + * + * <p>If necessary, perform Namespace processing.</p> + * + * @param qName The qualified (prefixed) name. + * @param qAtts The XML 1.0 attribute list (with qnames). + * @exception SAXException The client may raise a + * processing exception. + */ + public void startElement (String qName, AttributeList qAtts) + throws SAXException + { + // These are exceptions from the + // first pass; they should be + // ignored if there's a second pass, + // but reported otherwise. + Vector exceptions = null; + + // If we're not doing Namespace + // processing, dispatch this quickly. + if (!namespaces) { + if (contentHandler != null) { + attAdapter.setAttributeList(qAtts); + contentHandler.startElement("", "", qName.intern(), + attAdapter); + } + return; + } + + + // OK, we're doing Namespace processing. + nsSupport.pushContext(); + int length = qAtts.getLength(); + + // First pass: handle NS decls + for (int i = 0; i < length; i++) { + String attQName = qAtts.getName(i); + + if (!attQName.startsWith("xmlns")) + continue; + // Could be a declaration... + String prefix; + int n = attQName.indexOf(':'); + + // xmlns=... + if (n == -1 && attQName.length () == 5) { + prefix = ""; + } else if (n != 5) { + // XML namespaces spec doesn't discuss "xmlnsf:oo" + // (and similarly named) attributes ... at most, warn + continue; + } else // xmlns:foo=... + prefix = attQName.substring(n+1); + + String value = qAtts.getValue(i); + if (!nsSupport.declarePrefix(prefix, value)) { + reportError("Illegal Namespace prefix: " + prefix); + continue; + } + if (contentHandler != null) + contentHandler.startPrefixMapping(prefix, value); + } + + // Second pass: copy all relevant + // attributes into the SAX2 AttributeList + // using updated prefix bindings + atts.clear(); + for (int i = 0; i < length; i++) { + String attQName = qAtts.getName(i); + String type = qAtts.getType(i); + String value = qAtts.getValue(i); + + // Declaration? + if (attQName.startsWith("xmlns")) { + String prefix; + int n = attQName.indexOf(':'); + + if (n == -1 && attQName.length () == 5) { + prefix = ""; + } else if (n != 5) { + // XML namespaces spec doesn't discuss "xmlnsf:oo" + // (and similarly named) attributes ... ignore + prefix = null; + } else { + prefix = attQName.substring(n+1); + } + // Yes, decl: report or prune + if (prefix != null) { + if (prefixes) + atts.addAttribute("", "", attQName.intern(), + type, value); + continue; + } + } + + // Not a declaration -- report + try { + String attName[] = processName(attQName, true, true); + atts.addAttribute(attName[0], attName[1], attName[2], + type, value); + } catch (SAXException e) { + if (exceptions == null) + exceptions = new Vector(); + exceptions.addElement(e); + atts.addAttribute("", attQName, attQName, type, value); + } + } + + // now handle the deferred exception reports + if (exceptions != null && errorHandler != null) { + for (int i = 0; i < exceptions.size(); i++) + errorHandler.error((SAXParseException) + (exceptions.elementAt(i))); + } + + // OK, finally report the event. + if (contentHandler != null) { + String name[] = processName(qName, false, false); + contentHandler.startElement(name[0], name[1], name[2], atts); + } + } + + + /** + * Adapter implementation method; do not call. + * Adapt a SAX1 end element event. + * + * @param qName The qualified (prefixed) name. + * @exception SAXException The client may raise a + * processing exception. + * @see org.xml.sax.DocumentHandler#endElement + */ + public void endElement (String qName) + throws SAXException + { + // If we're not doing Namespace + // processing, dispatch this quickly. + if (!namespaces) { + if (contentHandler != null) { + contentHandler.endElement("", "", qName.intern()); + } + return; + } + + // Split the name. + String names[] = processName(qName, false, false); + if (contentHandler != null) { + contentHandler.endElement(names[0], names[1], names[2]); + Enumeration prefixes = nsSupport.getDeclaredPrefixes(); + while (prefixes.hasMoreElements()) { + String prefix = (String)prefixes.nextElement(); + contentHandler.endPrefixMapping(prefix); + } + } + nsSupport.popContext(); + } + + + /** + * Adapter implementation method; do not call. + * Adapt a SAX1 characters event. + * + * @param ch An array of characters. + * @param start The starting position in the array. + * @param length The number of characters to use. + * @exception SAXException The client may raise a + * processing exception. + * @see org.xml.sax.DocumentHandler#characters + */ + public void characters (char ch[], int start, int length) + throws SAXException + { + if (contentHandler != null) { + contentHandler.characters(ch, start, length); + } + } + + + /** + * Adapter implementation method; do not call. + * Adapt a SAX1 ignorable whitespace event. + * + * @param ch An array of characters. + * @param start The starting position in the array. + * @param length The number of characters to use. + * @exception SAXException The client may raise a + * processing exception. + * @see org.xml.sax.DocumentHandler#ignorableWhitespace + */ + public void ignorableWhitespace (char ch[], int start, int length) + throws SAXException + { + if (contentHandler != null) { + contentHandler.ignorableWhitespace(ch, start, length); + } + } + + + /** + * Adapter implementation method; do not call. + * Adapt a SAX1 processing instruction event. + * + * @param target The processing instruction target. + * @param data The remainder of the processing instruction + * @exception SAXException The client may raise a + * processing exception. + * @see org.xml.sax.DocumentHandler#processingInstruction + */ + public void processingInstruction (String target, String data) + throws SAXException + { + if (contentHandler != null) { + contentHandler.processingInstruction(target, data); + } + } + + + + //////////////////////////////////////////////////////////////////// + // Internal utility methods. + //////////////////////////////////////////////////////////////////// + + + /** + * Initialize the parser before each run. + */ + private void setupParser () + { + nsSupport.reset(); + + if (entityResolver != null) { + parser.setEntityResolver(entityResolver); + } + if (dtdHandler != null) { + parser.setDTDHandler(dtdHandler); + } + if (errorHandler != null) { + parser.setErrorHandler(errorHandler); + } + parser.setDocumentHandler(this); + locator = null; + } + + + /** + * Process a qualified (prefixed) name. + * + * <p>If the name has an undeclared prefix, use only the qname + * and make an ErrorHandler.error callback in case the app is + * interested.</p> + * + * @param qName The qualified (prefixed) name. + * @param isAttribute true if this is an attribute name. + * @return The name split into three parts. + * @exception SAXException The client may throw + * an exception if there is an error callback. + */ + private String [] processName (String qName, boolean isAttribute, + boolean useException) + throws SAXException + { + String parts[] = nsSupport.processName(qName, nameParts, + isAttribute); + if (parts == null) { + if (useException) + throw makeException("Undeclared prefix: " + qName); + reportError("Undeclared prefix: " + qName); + parts = new String[3]; + parts[0] = parts[1] = ""; + parts[2] = qName.intern(); + } + return parts; + } + + + /** + * Report a non-fatal error. + * + * @param message The error message. + * @exception SAXException The client may throw + * an exception. + */ + void reportError (String message) + throws SAXException + { + if (errorHandler != null) + errorHandler.error(makeException(message)); + } + + + /** + * Construct an exception for the current context. + * + * @param message The error message. + */ + private SAXParseException makeException (String message) + { + if (locator != null) { + return new SAXParseException(message, locator); + } else { + return new SAXParseException(message, null, null, -1, -1); + } + } + + + /** + * Throw an exception if we are parsing. + * + * <p>Use this method to detect illegal feature or + * property changes.</p> + * + * @param type The type of thing (feature or property). + * @param name The feature or property name. + * @exception SAXNotSupportedException If a + * document is currently being parsed. + */ + private void checkNotParsing (String type, String name) + throws SAXNotSupportedException + { + if (parsing) { + throw new SAXNotSupportedException("Cannot change " + + type + ' ' + + name + " while parsing"); + + } + } + + + + //////////////////////////////////////////////////////////////////// + // Internal state. + //////////////////////////////////////////////////////////////////// + + private NamespaceSupport nsSupport; + private AttributeListAdapter attAdapter; + + private boolean parsing = false; + private String nameParts[] = new String[3]; + + private Parser parser = null; + + private AttributesImpl atts = null; + + // Features + private boolean namespaces = true; + private boolean prefixes = false; + + // Properties + + // Handlers + Locator locator; + + EntityResolver entityResolver = null; + DTDHandler dtdHandler = null; + ContentHandler contentHandler = null; + ErrorHandler errorHandler = null; + + + + //////////////////////////////////////////////////////////////////// + // Inner class to wrap an AttributeList when not doing NS proc. + //////////////////////////////////////////////////////////////////// + + + /** + * Adapt a SAX1 AttributeList as a SAX2 Attributes object. + * + * <p>This class is in the Public Domain, and comes with NO + * WARRANTY of any kind.</p> + * + * <p>This wrapper class is used only when Namespace support + * is disabled -- it provides pretty much a direct mapping + * from SAX1 to SAX2, except that names and types are + * interned whenever requested.</p> + */ + final class AttributeListAdapter implements Attributes + { + + /** + * Construct a new adapter. + */ + AttributeListAdapter () + { + } + + + /** + * Set the embedded AttributeList. + * + * <p>This method must be invoked before any of the others + * can be used.</p> + * + * @param The SAX1 attribute list (with qnames). + */ + void setAttributeList (AttributeList qAtts) + { + this.qAtts = qAtts; + } + + + /** + * Return the length of the attribute list. + * + * @return The number of attributes in the list. + * @see org.xml.sax.Attributes#getLength + */ + public int getLength () + { + return qAtts.getLength(); + } + + + /** + * Return the Namespace URI of the specified attribute. + * + * @param The attribute's index. + * @return Always the empty string. + * @see org.xml.sax.Attributes#getURI + */ + public String getURI (int i) + { + return ""; + } + + + /** + * Return the local name of the specified attribute. + * + * @param The attribute's index. + * @return Always the empty string. + * @see org.xml.sax.Attributes#getLocalName + */ + public String getLocalName (int i) + { + return ""; + } + + + /** + * Return the qualified (prefixed) name of the specified attribute. + * + * @param The attribute's index. + * @return The attribute's qualified name, internalized. + */ + public String getQName (int i) + { + return qAtts.getName(i).intern(); + } + + + /** + * Return the type of the specified attribute. + * + * @param The attribute's index. + * @return The attribute's type as an internalized string. + */ + public String getType (int i) + { + return qAtts.getType(i).intern(); + } + + + /** + * Return the value of the specified attribute. + * + * @param The attribute's index. + * @return The attribute's value. + */ + public String getValue (int i) + { + return qAtts.getValue(i); + } + + + /** + * Look up an attribute index by Namespace name. + * + * @param uri The Namespace URI or the empty string. + * @param localName The local name. + * @return The attributes index, or -1 if none was found. + * @see org.xml.sax.Attributes#getIndex(java.lang.String,java.lang.String) + */ + public int getIndex (String uri, String localName) + { + return -1; + } + + + /** + * Look up an attribute index by qualified (prefixed) name. + * + * @param qName The qualified name. + * @return The attributes index, or -1 if none was found. + * @see org.xml.sax.Attributes#getIndex(java.lang.String) + */ + public int getIndex (String qName) + { + int max = atts.getLength(); + for (int i = 0; i < max; i++) { + if (qAtts.getName(i).equals(qName)) { + return i; + } + } + return -1; + } + + + /** + * Look up the type of an attribute by Namespace name. + * + * @param uri The Namespace URI + * @param localName The local name. + * @return The attribute's type as an internalized string. + */ + public String getType (String uri, String localName) + { + return null; + } + + + /** + * Look up the type of an attribute by qualified (prefixed) name. + * + * @param qName The qualified name. + * @return The attribute's type as an internalized string. + */ + public String getType (String qName) + { + return qAtts.getType(qName).intern(); + } + + + /** + * Look up the value of an attribute by Namespace name. + * + * @param uri The Namespace URI + * @param localName The local name. + * @return The attribute's value. + */ + public String getValue (String uri, String localName) + { + return null; + } + + + /** + * Look up the value of an attribute by qualified (prefixed) name. + * + * @param qName The qualified name. + * @return The attribute's value. + */ + public String getValue (String qName) + { + return qAtts.getValue(qName); + } + + private AttributeList qAtts; + } +} + +// end of ParserAdapter.java diff --git a/libjava/org/xml/sax/helpers/ParserFactory.java b/libjava/org/xml/sax/helpers/ParserFactory.java index 9ca7b55002f..acedfd13ae4 100644 --- a/libjava/org/xml/sax/helpers/ParserFactory.java +++ b/libjava/org/xml/sax/helpers/ParserFactory.java @@ -1,129 +1,129 @@ -// SAX parser factory.
-// No warranty; no copyright -- use this as you will.
-// $Id: ParserFactory.java,v 1.1 2000/10/02 02:43:20 sboag Exp $
-
-package org.xml.sax.helpers;
-
-import java.lang.ClassNotFoundException;
-import java.lang.IllegalAccessException;
-import java.lang.InstantiationException;
-import java.lang.SecurityException;
-import java.lang.ClassCastException;
-
-import org.xml.sax.Parser;
-
-
-/**
- * Java-specific class for dynamically loading SAX parsers.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p><strong>Note:</strong> This class is designed to work with the now-deprecated
- * SAX1 {@link org.xml.sax.Parser Parser} class. SAX2 applications should use
- * {@link org.xml.sax.helpers.XMLReaderFactory XMLReaderFactory} instead.</p>
- *
- * <p>ParserFactory is not part of the platform-independent definition
- * of SAX; it is an additional convenience class designed
- * specifically for Java XML application writers. SAX applications
- * can use the static methods in this class to allocate a SAX parser
- * dynamically at run-time based either on the value of the
- * `org.xml.sax.parser' system property or on a string containing the class
- * name.</p>
- *
- * <p>Note that the application still requires an XML parser that
- * implements SAX1.</p>
- *
- * @deprecated This class works with the deprecated
- * {@link org.xml.sax.Parser Parser}
- * interface.
- * @since SAX 1.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.Parser
- * @see java.lang.Class
- */
-public class ParserFactory {
-
-
- /**
- * Private null constructor.
- */
- private ParserFactory ()
- {
- }
-
-
- /**
- * Create a new SAX parser using the `org.xml.sax.parser' system property.
- *
- * <p>The named class must exist and must implement the
- * {@link org.xml.sax.Parser Parser} interface.</p>
- *
- * @exception java.lang.NullPointerException There is no value
- * for the `org.xml.sax.parser' system property.
- * @exception java.lang.ClassNotFoundException The SAX parser
- * class was not found (check your CLASSPATH).
- * @exception IllegalAccessException The SAX parser class was
- * found, but you do not have permission to load
- * it.
- * @exception InstantiationException The SAX parser class was
- * found but could not be instantiated.
- * @exception java.lang.ClassCastException The SAX parser class
- * was found and instantiated, but does not implement
- * org.xml.sax.Parser.
- * @see #makeParser(java.lang.String)
- * @see org.xml.sax.Parser
- */
- public static Parser makeParser ()
- throws ClassNotFoundException,
- IllegalAccessException,
- InstantiationException,
- NullPointerException,
- ClassCastException
- {
- String className = System.getProperty("org.xml.sax.parser");
- if (className == null) {
- throw new NullPointerException("No value for sax.parser property");
- } else {
- return makeParser(className);
- }
- }
-
-
- /**
- * Create a new SAX parser object using the class name provided.
- *
- * <p>The named class must exist and must implement the
- * {@link org.xml.sax.Parser Parser} interface.</p>
- *
- * @param className A string containing the name of the
- * SAX parser class.
- * @exception java.lang.ClassNotFoundException The SAX parser
- * class was not found (check your CLASSPATH).
- * @exception IllegalAccessException The SAX parser class was
- * found, but you do not have permission to load
- * it.
- * @exception InstantiationException The SAX parser class was
- * found but could not be instantiated.
- * @exception java.lang.ClassCastException The SAX parser class
- * was found and instantiated, but does not implement
- * org.xml.sax.Parser.
- * @see #makeParser()
- * @see org.xml.sax.Parser
- */
- public static Parser makeParser (String className)
- throws ClassNotFoundException,
- IllegalAccessException,
- InstantiationException,
- ClassCastException
- {
- return (Parser)(Class.forName(className).newInstance());
- }
-
-}
-
-// end of ParserFactory.java
+// SAX parser factory. +// http://www.saxproject.org +// No warranty; no copyright -- use this as you will. +// $Id: ParserFactory.java,v 1.4.2.3 2002/01/29 21:34:14 dbrownell Exp $ + +package org.xml.sax.helpers; + +import java.lang.ClassNotFoundException; +import java.lang.IllegalAccessException; +import java.lang.InstantiationException; +import java.lang.SecurityException; +import java.lang.ClassCastException; + +import org.xml.sax.Parser; + + +/** + * Java-specific class for dynamically loading SAX parsers. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p><strong>Note:</strong> This class is designed to work with the now-deprecated + * SAX1 {@link org.xml.sax.Parser Parser} class. SAX2 applications should use + * {@link org.xml.sax.helpers.XMLReaderFactory XMLReaderFactory} instead.</p> + * + * <p>ParserFactory is not part of the platform-independent definition + * of SAX; it is an additional convenience class designed + * specifically for Java XML application writers. SAX applications + * can use the static methods in this class to allocate a SAX parser + * dynamically at run-time based either on the value of the + * `org.xml.sax.parser' system property or on a string containing the class + * name.</p> + * + * <p>Note that the application still requires an XML parser that + * implements SAX1.</p> + * + * @deprecated This class works with the deprecated + * {@link org.xml.sax.Parser Parser} + * interface. + * @since SAX 1.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + */ +public class ParserFactory { + + + /** + * Private null constructor. + */ + private ParserFactory () + { + } + + + /** + * Create a new SAX parser using the `org.xml.sax.parser' system property. + * + * <p>The named class must exist and must implement the + * {@link org.xml.sax.Parser Parser} interface.</p> + * + * @exception java.lang.NullPointerException There is no value + * for the `org.xml.sax.parser' system property. + * @exception java.lang.ClassNotFoundException The SAX parser + * class was not found (check your CLASSPATH). + * @exception IllegalAccessException The SAX parser class was + * found, but you do not have permission to load + * it. + * @exception InstantiationException The SAX parser class was + * found but could not be instantiated. + * @exception java.lang.ClassCastException The SAX parser class + * was found and instantiated, but does not implement + * org.xml.sax.Parser. + * @see #makeParser(java.lang.String) + * @see org.xml.sax.Parser + */ + public static Parser makeParser () + throws ClassNotFoundException, + IllegalAccessException, + InstantiationException, + NullPointerException, + ClassCastException + { + String className = System.getProperty("org.xml.sax.parser"); + if (className == null) { + throw new NullPointerException("No value for sax.parser property"); + } else { + return makeParser(className); + } + } + + + /** + * Create a new SAX parser object using the class name provided. + * + * <p>The named class must exist and must implement the + * {@link org.xml.sax.Parser Parser} interface.</p> + * + * @param className A string containing the name of the + * SAX parser class. + * @exception java.lang.ClassNotFoundException The SAX parser + * class was not found (check your CLASSPATH). + * @exception IllegalAccessException The SAX parser class was + * found, but you do not have permission to load + * it. + * @exception InstantiationException The SAX parser class was + * found but could not be instantiated. + * @exception java.lang.ClassCastException The SAX parser class + * was found and instantiated, but does not implement + * org.xml.sax.Parser. + * @see #makeParser() + * @see org.xml.sax.Parser + */ + public static Parser makeParser (String className) + throws ClassNotFoundException, + IllegalAccessException, + InstantiationException, + ClassCastException + { + return (Parser) NewInstance.newInstance ( + NewInstance.getClassLoader (), className); + } + +} + diff --git a/libjava/org/xml/sax/helpers/XMLFilterImpl.java b/libjava/org/xml/sax/helpers/XMLFilterImpl.java index 5b1afaf6c2f..2f848089131 100644 --- a/libjava/org/xml/sax/helpers/XMLFilterImpl.java +++ b/libjava/org/xml/sax/helpers/XMLFilterImpl.java @@ -1,769 +1,714 @@ -// XMLFilterImpl.java - base SAX2 filter implementation.
-// Written by David Megginson, sax@megginson.com
-// NO WARRANTY! This class is in the Public Domain.
-
-// $Id: XMLFilterImpl.java,v 1.1 2000/10/02 02:43:20 sboag Exp $
-
-package org.xml.sax.helpers;
-
-import java.io.IOException;
-
-import org.xml.sax.XMLReader;
-import org.xml.sax.XMLFilter;
-import org.xml.sax.InputSource;
-import org.xml.sax.Locator;
-import org.xml.sax.Attributes;
-import org.xml.sax.EntityResolver;
-import org.xml.sax.DTDHandler;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.SAXParseException;
-import org.xml.sax.SAXNotSupportedException;
-import org.xml.sax.SAXNotRecognizedException;
-
-
-/**
- * Base class for deriving an XML filter.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>This class is designed to sit between an {@link org.xml.sax.XMLReader
- * XMLReader} and the client application's event handlers. By default, it
- * does nothing but pass requests up to the reader and events
- * on to the handlers unmodified, but subclasses can override
- * specific methods to modify the event stream or the configuration
- * requests as they pass through.</p>
- *
- * @since SAX 2.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.XMLFilter
- * @see org.xml.sax.XMLReader
- * @see org.xml.sax.EntityResolver
- * @see org.xml.sax.DTDHandler
- * @see org.xml.sax.ContentHandler
- * @see org.xml.sax.ErrorHandler
- */
-public class XMLFilterImpl
- implements XMLFilter, EntityResolver, DTDHandler, ContentHandler, ErrorHandler
-{
-
-
- ////////////////////////////////////////////////////////////////////
- // Constructors.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Construct an empty XML filter, with no parent.
- *
- * <p>This filter will have no parent: you must assign a parent
- * before you start a parse or do any configuration with
- * setFeature or setProperty.</p>
- *
- * @see org.xml.sax.XMLReader#setFeature
- * @see org.xml.sax.XMLReader#setProperty
- */
- public XMLFilterImpl ()
- {
- super();
- }
-
-
- /**
- * Construct an XML filter with the specified parent.
- *
- * @see #setParent
- * @see #getParent
- */
- public XMLFilterImpl (XMLReader parent)
- {
- super();
- setParent(parent);
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Implementation of org.xml.sax.XMLFilter.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Set the parent reader.
- *
- * <p>This is the {@link org.xml.sax.XMLReader XMLReader} from which
- * this filter will obtain its events and to which it will pass its
- * configuration requests. The parent may itself be another filter.</p>
- *
- * <p>If there is no parent reader set, any attempt to parse
- * or to set or get a feature or property will fail.</p>
- *
- * @param parent The parent XML reader.
- * @exception java.lang.NullPointerException If the parent is null.
- * @see #getParent
- */
- public void setParent (XMLReader parent)
- {
- if (parent == null) {
- throw new NullPointerException("Null parent");
- }
- this.parent = parent;
- }
-
-
- /**
- * Get the parent reader.
- *
- * @return The parent XML reader, or null if none is set.
- * @see #setParent
- */
- public XMLReader getParent ()
- {
- return parent;
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Implementation of org.xml.sax.XMLReader.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Set the state of a feature.
- *
- * <p>This will always fail if the parent is null.</p>
- *
- * @param name The feature name.
- * @param state The requested feature state.
- * @exception org.xml.sax.SAXNotRecognizedException When the
- * XMLReader does not recognize the feature name.
- * @exception org.xml.sax.SAXNotSupportedException When the
- * XMLReader recognizes the feature name but
- * cannot set the requested value.
- * @see org.xml.sax.XMLReader#setFeature
- */
- public void setFeature (String name, boolean state)
- throws SAXNotRecognizedException, SAXNotSupportedException
- {
- if (parent != null) {
- parent.setFeature(name, state);
- } else {
- throw new SAXNotRecognizedException("Feature: " + name);
- }
- }
-
-
- /**
- * Look up the state of a feature.
- *
- * <p>This will always fail if the parent is null.</p>
- *
- * @param name The feature name.
- * @return The current state of the feature.
- * @exception org.xml.sax.SAXNotRecognizedException When the
- * XMLReader does not recognize the feature name.
- * @exception org.xml.sax.SAXNotSupportedException When the
- * XMLReader recognizes the feature name but
- * cannot determine its state at this time.
- * @see org.xml.sax.XMLReader#getFeature
- */
- public boolean getFeature (String name)
- throws SAXNotRecognizedException, SAXNotSupportedException
- {
- if (parent != null) {
- return parent.getFeature(name);
- } else {
- throw new SAXNotRecognizedException("Feature: " + name);
- }
- }
-
-
- /**
- * Set the value of a property.
- *
- * <p>This will always fail if the parent is null.</p>
- *
- * @param name The property name.
- * @param state The requested property value.
- * @exception org.xml.sax.SAXNotRecognizedException When the
- * XMLReader does not recognize the property name.
- * @exception org.xml.sax.SAXNotSupportedException When the
- * XMLReader recognizes the property name but
- * cannot set the requested value.
- * @see org.xml.sax.XMLReader#setProperty
- */
- public void setProperty (String name, Object value)
- throws SAXNotRecognizedException, SAXNotSupportedException
- {
- if (parent != null) {
- parent.setProperty(name, value);
- } else {
- throw new SAXNotRecognizedException("Property: " + name);
- }
- }
-
-
- /**
- * Look up the value of a property.
- *
- * @param name The property name.
- * @return The current value of the property.
- * @exception org.xml.sax.SAXNotRecognizedException When the
- * XMLReader does not recognize the feature name.
- * @exception org.xml.sax.SAXNotSupportedException When the
- * XMLReader recognizes the property name but
- * cannot determine its value at this time.
- * @see org.xml.sax.XMLReader#setFeature
- */
- public Object getProperty (String name)
- throws SAXNotRecognizedException, SAXNotSupportedException
- {
- if (parent != null) {
- return parent.getProperty(name);
- } else {
- throw new SAXNotRecognizedException("Property: " + name);
- }
- }
-
-
- /**
- * Set the entity resolver.
- *
- * @param resolver The new entity resolver.
- * @exception java.lang.NullPointerException If the resolver
- * is null.
- * @see org.xml.sax.XMLReader#setEntityResolver
- */
- public void setEntityResolver (EntityResolver resolver)
- {
- if (resolver == null) {
- throw new NullPointerException("Null entity resolver");
- } else {
- entityResolver = resolver;
- }
- }
-
-
- /**
- * Get the current entity resolver.
- *
- * @return The current entity resolver, or null if none was set.
- * @see org.xml.sax.XMLReader#getEntityResolver
- */
- public EntityResolver getEntityResolver ()
- {
- return entityResolver;
- }
-
-
- /**
- * Set the DTD event handler.
- *
- * @param resolver The new DTD handler.
- * @exception java.lang.NullPointerException If the handler
- * is null.
- * @see org.xml.sax.XMLReader#setDTDHandler
- */
- public void setDTDHandler (DTDHandler handler)
- {
- if (handler == null) {
- throw new NullPointerException("Null DTD handler");
- } else {
- dtdHandler = handler;
- }
- }
-
-
- /**
- * Get the current DTD event handler.
- *
- * @return The current DTD handler, or null if none was set.
- * @see org.xml.sax.XMLReader#getDTDHandler
- */
- public DTDHandler getDTDHandler ()
- {
- return dtdHandler;
- }
-
-
- /**
- * Set the content event handler.
- *
- * @param resolver The new content handler.
- * @exception java.lang.NullPointerException If the handler
- * is null.
- * @see org.xml.sax.XMLReader#setContentHandler
- */
- public void setContentHandler (ContentHandler handler)
- {
- if (handler == null) {
- throw new NullPointerException("Null content handler");
- } else {
- contentHandler = handler;
- }
- }
-
-
- /**
- * Get the content event handler.
- *
- * @return The current content handler, or null if none was set.
- * @see org.xml.sax.XMLReader#getContentHandler
- */
- public ContentHandler getContentHandler ()
- {
- return contentHandler;
- }
-
-
- /**
- * Set the error event handler.
- *
- * @param handle The new error handler.
- * @exception java.lang.NullPointerException If the handler
- * is null.
- * @see org.xml.sax.XMLReader#setErrorHandler
- */
- public void setErrorHandler (ErrorHandler handler)
- {
- if (handler == null) {
- throw new NullPointerException("Null error handler");
- } else {
- errorHandler = handler;
- }
- }
-
-
- /**
- * Get the current error event handler.
- *
- * @return The current error handler, or null if none was set.
- * @see org.xml.sax.XMLReader#getErrorHandler
- */
- public ErrorHandler getErrorHandler ()
- {
- return errorHandler;
- }
-
-
- /**
- * Parse a document.
- *
- * @param input The input source for the document entity.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @exception java.io.IOException An IO exception from the parser,
- * possibly from a byte stream or character stream
- * supplied by the application.
- * @see org.xml.sax.XMLReader#parse(org.xml.sax.InputSource)
- */
- public void parse (InputSource input)
- throws SAXException, IOException
- {
- setupParse();
- parent.parse(input);
- }
-
-
- /**
- * Parse a document.
- *
- * @param systemId The system identifier as a fully-qualified URI.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
- * wrapping another exception.
- * @exception java.io.IOException An IO exception from the parser,
- * possibly from a byte stream or character stream
- * supplied by the application.
- * @see org.xml.sax.XMLReader#parse(java.lang.String)
- */
- public void parse (String systemId)
- throws SAXException, IOException
- {
- parse(new InputSource(systemId));
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Implementation of org.xml.sax.EntityResolver.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Filter an external entity resolution.
- *
- * @param publicId The entity's public identifier, or null.
- * @param systemId The entity's system identifier.
- * @return A new InputSource or null for the default.
- * @exception org.xml.sax.SAXException The client may throw
- * an exception during processing.
- * @exception java.io.IOException The client may throw an
- * I/O-related exception while obtaining the
- * new InputSource.
- * @see org.xml.sax.EntityResolver#resolveEntity
- */
- public InputSource resolveEntity (String publicId, String systemId)
- throws SAXException, IOException
- {
- if (entityResolver != null) {
- return entityResolver.resolveEntity(publicId, systemId);
- } else {
- return null;
- }
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Implementation of org.xml.sax.DTDHandler.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Filter a notation declaration event.
- *
- * @param name The notation name.
- * @param publicId The notation's public identifier, or null.
- * @param systemId The notation's system identifier, or null.
- * @exception org.xml.sax.SAXException The client may throw
- * an exception during processing.
- * @see org.xml.sax.DTDHandler#notationDecl
- */
- public void notationDecl (String name, String publicId, String systemId)
- throws SAXException
- {
- if (dtdHandler != null) {
- dtdHandler.notationDecl(name, publicId, systemId);
- }
- }
-
-
- /**
- * Filter an unparsed entity declaration event.
- *
- * @param name The entity name.
- * @param publicId The entity's public identifier, or null.
- * @param systemId The entity's system identifier, or null.
- * @param notationName The name of the associated notation.
- * @exception org.xml.sax.SAXException The client may throw
- * an exception during processing.
- * @see org.xml.sax.DTDHandler#unparsedEntityDecl
- */
- public void unparsedEntityDecl (String name, String publicId,
- String systemId, String notationName)
- throws SAXException
- {
- if (dtdHandler != null) {
- dtdHandler.unparsedEntityDecl(name, publicId, systemId,
- notationName);
- }
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Implementation of org.xml.sax.ContentHandler.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Filter a new document locator event.
- *
- * @param locator The document locator.
- * @see org.xml.sax.ContentHandler#setDocumentLocator
- */
- public void setDocumentLocator (Locator locator)
- {
- this.locator = locator;
- if (contentHandler != null) {
- contentHandler.setDocumentLocator(locator);
- }
- }
-
-
- /**
- * Filter a start document event.
- *
- * @exception org.xml.sax.SAXException The client may throw
- * an exception during processing.
- * @see org.xml.sax.ContentHandler#startDocument
- */
- public void startDocument ()
- throws SAXException
- {
- if (contentHandler != null) {
- contentHandler.startDocument();
- }
- }
-
-
- /**
- * Filter an end document event.
- *
- * @exception org.xml.sax.SAXException The client may throw
- * an exception during processing.
- * @see org.xml.sax.ContentHandler#endDocument
- */
- public void endDocument ()
- throws SAXException
- {
- if (contentHandler != null) {
- contentHandler.endDocument();
- }
- }
-
-
- /**
- * Filter a start Namespace prefix mapping event.
- *
- * @param prefix The Namespace prefix.
- * @param uri The Namespace URI.
- * @exception org.xml.sax.SAXException The client may throw
- * an exception during processing.
- * @see org.xml.sax.ContentHandler#startPrefixMapping
- */
- public void startPrefixMapping (String prefix, String uri)
- throws SAXException
- {
- if (contentHandler != null) {
- contentHandler.startPrefixMapping(prefix, uri);
- }
- }
-
-
- /**
- * Filter an end Namespace prefix mapping event.
- *
- * @param prefix The Namespace prefix.
- * @exception org.xml.sax.SAXException The client may throw
- * an exception during processing.
- * @see org.xml.sax.ContentHandler#endPrefixMapping
- */
- public void endPrefixMapping (String prefix)
- throws SAXException
- {
- if (contentHandler != null) {
- contentHandler.endPrefixMapping(prefix);
- }
- }
-
-
- /**
- * Filter a start element event.
- *
- * @param uri The element's Namespace URI, or the empty string.
- * @param localName The element's local name, or the empty string.
- * @param qName The element's qualified (prefixed) name, or the empty
- * string.
- * @param atts The element's attributes.
- * @exception org.xml.sax.SAXException The client may throw
- * an exception during processing.
- * @see org.xml.sax.ContentHandler#startElement
- */
- public void startElement (String uri, String localName, String qName,
- Attributes atts)
- throws SAXException
- {
- if (contentHandler != null) {
- contentHandler.startElement(uri, localName, qName, atts);
- }
- }
-
-
- /**
- * Filter an end element event.
- *
- * @param uri The element's Namespace URI, or the empty string.
- * @param localName The element's local name, or the empty string.
- * @param qName The element's qualified (prefixed) name, or the empty
- * string.
- * @exception org.xml.sax.SAXException The client may throw
- * an exception during processing.
- * @see org.xml.sax.ContentHandler#endElement
- */
- public void endElement (String uri, String localName, String qName)
- throws SAXException
- {
- if (contentHandler != null) {
- contentHandler.endElement(uri, localName, qName);
- }
- }
-
-
- /**
- * Filter a character data event.
- *
- * @param ch An array of characters.
- * @param start The starting position in the array.
- * @param length The number of characters to use from the array.
- * @exception org.xml.sax.SAXException The client may throw
- * an exception during processing.
- * @see org.xml.sax.ContentHandler#characters
- */
- public void characters (char ch[], int start, int length)
- throws SAXException
- {
- if (contentHandler != null) {
- contentHandler.characters(ch, start, length);
- }
- }
-
-
- /**
- * Filter an ignorable whitespace event.
- *
- * @param ch An array of characters.
- * @param start The starting position in the array.
- * @param length The number of characters to use from the array.
- * @exception org.xml.sax.SAXException The client may throw
- * an exception during processing.
- * @see org.xml.sax.ContentHandler#ignorableWhitespace
- */
- public void ignorableWhitespace (char ch[], int start, int length)
- throws SAXException
- {
- if (contentHandler != null) {
- contentHandler.ignorableWhitespace(ch, start, length);
- }
- }
-
-
- /**
- * Filter a processing instruction event.
- *
- * @param target The processing instruction target.
- * @param data The text following the target.
- * @exception org.xml.sax.SAXException The client may throw
- * an exception during processing.
- * @see org.xml.sax.ContentHandler#processingInstruction
- */
- public void processingInstruction (String target, String data)
- throws SAXException
- {
- if (contentHandler != null) {
- contentHandler.processingInstruction(target, data);
- }
- }
-
-
- /**
- * Filter a skipped entity event.
- *
- * @param name The name of the skipped entity.
- * @exception org.xml.sax.SAXException The client may throw
- * an exception during processing.
- * @see org.xml.sax.ContentHandler#skippedEntity
- */
- public void skippedEntity (String name)
- throws SAXException
- {
- if (contentHandler != null) {
- contentHandler.skippedEntity(name);
- }
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Implementation of org.xml.sax.ErrorHandler.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Filter a warning event.
- *
- * @param e The nwarning as an exception.
- * @exception org.xml.sax.SAXException The client may throw
- * an exception during processing.
- * @see org.xml.sax.ErrorHandler#warning
- */
- public void warning (SAXParseException e)
- throws SAXException
- {
- if (errorHandler != null) {
- errorHandler.warning(e);
- }
- }
-
-
- /**
- * Filter an error event.
- *
- * @param e The error as an exception.
- * @exception org.xml.sax.SAXException The client may throw
- * an exception during processing.
- * @see org.xml.sax.ErrorHandler#error
- */
- public void error (SAXParseException e)
- throws SAXException
- {
- if (errorHandler != null) {
- errorHandler.error(e);
- }
- }
-
-
- /**
- * Filter a fatal error event.
- *
- * @param e The error as an exception.
- * @exception org.xml.sax.SAXException The client may throw
- * an exception during processing.
- * @see org.xml.sax.ErrorHandler#fatalError
- */
- public void fatalError (SAXParseException e)
- throws SAXException
- {
- if (errorHandler != null) {
- errorHandler.fatalError(e);
- }
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Internal methods.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Set up before a parse.
- *
- * <p>Before every parse, check whether the parent is
- * non-null, and re-register the filter for all of the
- * events.</p>
- */
- private void setupParse ()
- {
- if (parent == null) {
- throw new NullPointerException("No parent for filter");
- }
- parent.setEntityResolver(this);
- parent.setDTDHandler(this);
- parent.setContentHandler(this);
- parent.setErrorHandler(this);
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Internal state.
- ////////////////////////////////////////////////////////////////////
-
- private XMLReader parent = null;
- private Locator locator = null;
- private EntityResolver entityResolver = null;
- private DTDHandler dtdHandler = null;
- private ContentHandler contentHandler = null;
- private ErrorHandler errorHandler = null;
-
-}
-
-// end of XMLFilterImpl.java
+// XMLFilterImpl.java - base SAX2 filter implementation. +// http://www.saxproject.org +// Written by David Megginson +// NO WARRANTY! This class is in the Public Domain. + +// $Id: XMLFilterImpl.java,v 1.3.2.7 2002/01/29 21:34:14 dbrownell Exp $ + +package org.xml.sax.helpers; + +import java.io.IOException; + +import org.xml.sax.XMLReader; +import org.xml.sax.XMLFilter; +import org.xml.sax.InputSource; +import org.xml.sax.Locator; +import org.xml.sax.Attributes; +import org.xml.sax.EntityResolver; +import org.xml.sax.DTDHandler; +import org.xml.sax.ContentHandler; +import org.xml.sax.ErrorHandler; +import org.xml.sax.SAXException; +import org.xml.sax.SAXParseException; +import org.xml.sax.SAXNotSupportedException; +import org.xml.sax.SAXNotRecognizedException; + + +/** + * Base class for deriving an XML filter. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>This class is designed to sit between an {@link org.xml.sax.XMLReader + * XMLReader} and the client application's event handlers. By default, it + * does nothing but pass requests up to the reader and events + * on to the handlers unmodified, but subclasses can override + * specific methods to modify the event stream or the configuration + * requests as they pass through.</p> + * + * @since SAX 2.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + * @see org.xml.sax.XMLFilter + * @see org.xml.sax.XMLReader + * @see org.xml.sax.EntityResolver + * @see org.xml.sax.DTDHandler + * @see org.xml.sax.ContentHandler + * @see org.xml.sax.ErrorHandler + */ +public class XMLFilterImpl + implements XMLFilter, EntityResolver, DTDHandler, ContentHandler, ErrorHandler +{ + + + //////////////////////////////////////////////////////////////////// + // Constructors. + //////////////////////////////////////////////////////////////////// + + + /** + * Construct an empty XML filter, with no parent. + * + * <p>This filter will have no parent: you must assign a parent + * before you start a parse or do any configuration with + * setFeature or setProperty, unless you use this as a pure event + * consumer rather than as an {@link XMLReader}.</p> + * + * @see org.xml.sax.XMLReader#setFeature + * @see org.xml.sax.XMLReader#setProperty + * @see #setParent + */ + public XMLFilterImpl () + { + super(); + } + + + /** + * Construct an XML filter with the specified parent. + * + * @see #setParent + * @see #getParent + */ + public XMLFilterImpl (XMLReader parent) + { + super(); + setParent(parent); + } + + + + //////////////////////////////////////////////////////////////////// + // Implementation of org.xml.sax.XMLFilter. + //////////////////////////////////////////////////////////////////// + + + /** + * Set the parent reader. + * + * <p>This is the {@link org.xml.sax.XMLReader XMLReader} from which + * this filter will obtain its events and to which it will pass its + * configuration requests. The parent may itself be another filter.</p> + * + * <p>If there is no parent reader set, any attempt to parse + * or to set or get a feature or property will fail.</p> + * + * @param parent The parent XML reader. + * @see #getParent + */ + public void setParent (XMLReader parent) + { + this.parent = parent; + } + + + /** + * Get the parent reader. + * + * @return The parent XML reader, or null if none is set. + * @see #setParent + */ + public XMLReader getParent () + { + return parent; + } + + + + //////////////////////////////////////////////////////////////////// + // Implementation of org.xml.sax.XMLReader. + //////////////////////////////////////////////////////////////////// + + + /** + * Set the value of a feature. + * + * <p>This will always fail if the parent is null.</p> + * + * @param name The feature name. + * @param value The requested feature value. + * @exception org.xml.sax.SAXNotRecognizedException If the feature + * value can't be assigned or retrieved from the parent. + * @exception org.xml.sax.SAXNotSupportedException When the + * parent recognizes the feature name but + * cannot set the requested value. + */ + public void setFeature (String name, boolean value) + throws SAXNotRecognizedException, SAXNotSupportedException + { + if (parent != null) { + parent.setFeature(name, value); + } else { + throw new SAXNotRecognizedException("Feature: " + name); + } + } + + + /** + * Look up the value of a feature. + * + * <p>This will always fail if the parent is null.</p> + * + * @param name The feature name. + * @return The current value of the feature. + * @exception org.xml.sax.SAXNotRecognizedException If the feature + * value can't be assigned or retrieved from the parent. + * @exception org.xml.sax.SAXNotSupportedException When the + * parent recognizes the feature name but + * cannot determine its value at this time. + */ + public boolean getFeature (String name) + throws SAXNotRecognizedException, SAXNotSupportedException + { + if (parent != null) { + return parent.getFeature(name); + } else { + throw new SAXNotRecognizedException("Feature: " + name); + } + } + + + /** + * Set the value of a property. + * + * <p>This will always fail if the parent is null.</p> + * + * @param name The property name. + * @param value The requested property value. + * @exception org.xml.sax.SAXNotRecognizedException If the property + * value can't be assigned or retrieved from the parent. + * @exception org.xml.sax.SAXNotSupportedException When the + * parent recognizes the property name but + * cannot set the requested value. + */ + public void setProperty (String name, Object value) + throws SAXNotRecognizedException, SAXNotSupportedException + { + if (parent != null) { + parent.setProperty(name, value); + } else { + throw new SAXNotRecognizedException("Property: " + name); + } + } + + + /** + * Look up the value of a property. + * + * @param name The property name. + * @return The current value of the property. + * @exception org.xml.sax.SAXNotRecognizedException If the property + * value can't be assigned or retrieved from the parent. + * @exception org.xml.sax.SAXNotSupportedException When the + * parent recognizes the property name but + * cannot determine its value at this time. + */ + public Object getProperty (String name) + throws SAXNotRecognizedException, SAXNotSupportedException + { + if (parent != null) { + return parent.getProperty(name); + } else { + throw new SAXNotRecognizedException("Property: " + name); + } + } + + + /** + * Set the entity resolver. + * + * @param resolver The new entity resolver. + */ + public void setEntityResolver (EntityResolver resolver) + { + entityResolver = resolver; + } + + + /** + * Get the current entity resolver. + * + * @return The current entity resolver, or null if none was set. + */ + public EntityResolver getEntityResolver () + { + return entityResolver; + } + + + /** + * Set the DTD event handler. + * + * @param resolver The new DTD handler. + */ + public void setDTDHandler (DTDHandler handler) + { + dtdHandler = handler; + } + + + /** + * Get the current DTD event handler. + * + * @return The current DTD handler, or null if none was set. + */ + public DTDHandler getDTDHandler () + { + return dtdHandler; + } + + + /** + * Set the content event handler. + * + * @param resolver The new content handler. + */ + public void setContentHandler (ContentHandler handler) + { + contentHandler = handler; + } + + + /** + * Get the content event handler. + * + * @return The current content handler, or null if none was set. + */ + public ContentHandler getContentHandler () + { + return contentHandler; + } + + + /** + * Set the error event handler. + * + * @param handle The new error handler. + */ + public void setErrorHandler (ErrorHandler handler) + { + errorHandler = handler; + } + + + /** + * Get the current error event handler. + * + * @return The current error handler, or null if none was set. + */ + public ErrorHandler getErrorHandler () + { + return errorHandler; + } + + + /** + * Parse a document. + * + * @param input The input source for the document entity. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @exception java.io.IOException An IO exception from the parser, + * possibly from a byte stream or character stream + * supplied by the application. + */ + public void parse (InputSource input) + throws SAXException, IOException + { + setupParse(); + parent.parse(input); + } + + + /** + * Parse a document. + * + * @param systemId The system identifier as a fully-qualified URI. + * @exception org.xml.sax.SAXException Any SAX exception, possibly + * wrapping another exception. + * @exception java.io.IOException An IO exception from the parser, + * possibly from a byte stream or character stream + * supplied by the application. + */ + public void parse (String systemId) + throws SAXException, IOException + { + parse(new InputSource(systemId)); + } + + + + //////////////////////////////////////////////////////////////////// + // Implementation of org.xml.sax.EntityResolver. + //////////////////////////////////////////////////////////////////// + + + /** + * Filter an external entity resolution. + * + * @param publicId The entity's public identifier, or null. + * @param systemId The entity's system identifier. + * @return A new InputSource or null for the default. + * @exception org.xml.sax.SAXException The client may throw + * an exception during processing. + * @exception java.io.IOException The client may throw an + * I/O-related exception while obtaining the + * new InputSource. + */ + public InputSource resolveEntity (String publicId, String systemId) + throws SAXException, IOException + { + if (entityResolver != null) { + return entityResolver.resolveEntity(publicId, systemId); + } else { + return null; + } + } + + + + //////////////////////////////////////////////////////////////////// + // Implementation of org.xml.sax.DTDHandler. + //////////////////////////////////////////////////////////////////// + + + /** + * Filter a notation declaration event. + * + * @param name The notation name. + * @param publicId The notation's public identifier, or null. + * @param systemId The notation's system identifier, or null. + * @exception org.xml.sax.SAXException The client may throw + * an exception during processing. + */ + public void notationDecl (String name, String publicId, String systemId) + throws SAXException + { + if (dtdHandler != null) { + dtdHandler.notationDecl(name, publicId, systemId); + } + } + + + /** + * Filter an unparsed entity declaration event. + * + * @param name The entity name. + * @param publicId The entity's public identifier, or null. + * @param systemId The entity's system identifier, or null. + * @param notationName The name of the associated notation. + * @exception org.xml.sax.SAXException The client may throw + * an exception during processing. + */ + public void unparsedEntityDecl (String name, String publicId, + String systemId, String notationName) + throws SAXException + { + if (dtdHandler != null) { + dtdHandler.unparsedEntityDecl(name, publicId, systemId, + notationName); + } + } + + + + //////////////////////////////////////////////////////////////////// + // Implementation of org.xml.sax.ContentHandler. + //////////////////////////////////////////////////////////////////// + + + /** + * Filter a new document locator event. + * + * @param locator The document locator. + */ + public void setDocumentLocator (Locator locator) + { + this.locator = locator; + if (contentHandler != null) { + contentHandler.setDocumentLocator(locator); + } + } + + + /** + * Filter a start document event. + * + * @exception org.xml.sax.SAXException The client may throw + * an exception during processing. + */ + public void startDocument () + throws SAXException + { + if (contentHandler != null) { + contentHandler.startDocument(); + } + } + + + /** + * Filter an end document event. + * + * @exception org.xml.sax.SAXException The client may throw + * an exception during processing. + */ + public void endDocument () + throws SAXException + { + if (contentHandler != null) { + contentHandler.endDocument(); + } + } + + + /** + * Filter a start Namespace prefix mapping event. + * + * @param prefix The Namespace prefix. + * @param uri The Namespace URI. + * @exception org.xml.sax.SAXException The client may throw + * an exception during processing. + */ + public void startPrefixMapping (String prefix, String uri) + throws SAXException + { + if (contentHandler != null) { + contentHandler.startPrefixMapping(prefix, uri); + } + } + + + /** + * Filter an end Namespace prefix mapping event. + * + * @param prefix The Namespace prefix. + * @exception org.xml.sax.SAXException The client may throw + * an exception during processing. + */ + public void endPrefixMapping (String prefix) + throws SAXException + { + if (contentHandler != null) { + contentHandler.endPrefixMapping(prefix); + } + } + + + /** + * Filter a start element event. + * + * @param uri The element's Namespace URI, or the empty string. + * @param localName The element's local name, or the empty string. + * @param qName The element's qualified (prefixed) name, or the empty + * string. + * @param atts The element's attributes. + * @exception org.xml.sax.SAXException The client may throw + * an exception during processing. + */ + public void startElement (String uri, String localName, String qName, + Attributes atts) + throws SAXException + { + if (contentHandler != null) { + contentHandler.startElement(uri, localName, qName, atts); + } + } + + + /** + * Filter an end element event. + * + * @param uri The element's Namespace URI, or the empty string. + * @param localName The element's local name, or the empty string. + * @param qName The element's qualified (prefixed) name, or the empty + * string. + * @exception org.xml.sax.SAXException The client may throw + * an exception during processing. + */ + public void endElement (String uri, String localName, String qName) + throws SAXException + { + if (contentHandler != null) { + contentHandler.endElement(uri, localName, qName); + } + } + + + /** + * Filter a character data event. + * + * @param ch An array of characters. + * @param start The starting position in the array. + * @param length The number of characters to use from the array. + * @exception org.xml.sax.SAXException The client may throw + * an exception during processing. + */ + public void characters (char ch[], int start, int length) + throws SAXException + { + if (contentHandler != null) { + contentHandler.characters(ch, start, length); + } + } + + + /** + * Filter an ignorable whitespace event. + * + * @param ch An array of characters. + * @param start The starting position in the array. + * @param length The number of characters to use from the array. + * @exception org.xml.sax.SAXException The client may throw + * an exception during processing. + */ + public void ignorableWhitespace (char ch[], int start, int length) + throws SAXException + { + if (contentHandler != null) { + contentHandler.ignorableWhitespace(ch, start, length); + } + } + + + /** + * Filter a processing instruction event. + * + * @param target The processing instruction target. + * @param data The text following the target. + * @exception org.xml.sax.SAXException The client may throw + * an exception during processing. + */ + public void processingInstruction (String target, String data) + throws SAXException + { + if (contentHandler != null) { + contentHandler.processingInstruction(target, data); + } + } + + + /** + * Filter a skipped entity event. + * + * @param name The name of the skipped entity. + * @exception org.xml.sax.SAXException The client may throw + * an exception during processing. + */ + public void skippedEntity (String name) + throws SAXException + { + if (contentHandler != null) { + contentHandler.skippedEntity(name); + } + } + + + + //////////////////////////////////////////////////////////////////// + // Implementation of org.xml.sax.ErrorHandler. + //////////////////////////////////////////////////////////////////// + + + /** + * Filter a warning event. + * + * @param e The warning as an exception. + * @exception org.xml.sax.SAXException The client may throw + * an exception during processing. + */ + public void warning (SAXParseException e) + throws SAXException + { + if (errorHandler != null) { + errorHandler.warning(e); + } + } + + + /** + * Filter an error event. + * + * @param e The error as an exception. + * @exception org.xml.sax.SAXException The client may throw + * an exception during processing. + */ + public void error (SAXParseException e) + throws SAXException + { + if (errorHandler != null) { + errorHandler.error(e); + } + } + + + /** + * Filter a fatal error event. + * + * @param e The error as an exception. + * @exception org.xml.sax.SAXException The client may throw + * an exception during processing. + */ + public void fatalError (SAXParseException e) + throws SAXException + { + if (errorHandler != null) { + errorHandler.fatalError(e); + } + } + + + + //////////////////////////////////////////////////////////////////// + // Internal methods. + //////////////////////////////////////////////////////////////////// + + + /** + * Set up before a parse. + * + * <p>Before every parse, check whether the parent is + * non-null, and re-register the filter for all of the + * events.</p> + */ + private void setupParse () + { + if (parent == null) { + throw new NullPointerException("No parent for filter"); + } + parent.setEntityResolver(this); + parent.setDTDHandler(this); + parent.setContentHandler(this); + parent.setErrorHandler(this); + } + + + + //////////////////////////////////////////////////////////////////// + // Internal state. + //////////////////////////////////////////////////////////////////// + + private XMLReader parent = null; + private Locator locator = null; + private EntityResolver entityResolver = null; + private DTDHandler dtdHandler = null; + private ContentHandler contentHandler = null; + private ErrorHandler errorHandler = null; + +} + +// end of XMLFilterImpl.java diff --git a/libjava/org/xml/sax/helpers/XMLReaderAdapter.java b/libjava/org/xml/sax/helpers/XMLReaderAdapter.java index 4fb44d91d8e..19c8d3f8e88 100644 --- a/libjava/org/xml/sax/helpers/XMLReaderAdapter.java +++ b/libjava/org/xml/sax/helpers/XMLReaderAdapter.java @@ -1,526 +1,539 @@ -// XMLReaderAdapter.java - adapt an SAX2 XMLReader to a SAX1 Parser
-// Written by David Megginson, sax@megginson.com
-// NO WARRANTY! This class is in the public domain.
-
-// $Id: XMLReaderAdapter.java,v 1.1 2000/10/02 02:43:20 sboag Exp $
-
-package org.xml.sax.helpers;
-
-import java.io.IOException;
-import java.util.Locale;
-
-import org.xml.sax.Parser; // deprecated
-import org.xml.sax.Locator;
-import org.xml.sax.InputSource;
-import org.xml.sax.AttributeList; // deprecated
-import org.xml.sax.EntityResolver;
-import org.xml.sax.DTDHandler;
-import org.xml.sax.DocumentHandler; // deprecated
-import org.xml.sax.ErrorHandler;
-import org.xml.sax.SAXException;
-
-import org.xml.sax.XMLReader;
-import org.xml.sax.Attributes;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXNotSupportedException;
-
-
-/**
- * Adapt a SAX2 XMLReader as a SAX1 Parser.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>This class wraps a SAX2 {@link org.xml.sax.XMLReader XMLReader}
- * and makes it act as a SAX1 {@link org.xml.sax.Parser Parser}. The XMLReader
- * must support a true value for the
- * http://xml.org/sax/features/namespace-prefixes property or parsing will fail
- * with a {@link org.xml.sax.SAXException SAXException}; if the XMLReader
- * supports a false value for the http://xml.org/sax/features/namespaces
- * property, that will also be used to improve efficiency.</p>
- *
- * @since SAX 2.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.Parser
- * @see org.xml.sax.XMLReader
- */
-public class XMLReaderAdapter implements Parser, ContentHandler
-{
-
-
- ////////////////////////////////////////////////////////////////////
- // Constructor.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Create a new adapter.
- *
- * <p>Use the "org.xml.sax.driver" property to locate the SAX2
- * driver to embed.</p>
- *
- * @exception org.xml.sax.SAXException If the embedded driver
- * cannot be instantiated or if the
- * org.xml.sax.driver property is not specified.
- */
- public XMLReaderAdapter ()
- throws SAXException
- {
- setup(XMLReaderFactory.createXMLReader());
- }
-
-
- /**
- * Create a new adapter.
- *
- * <p>Create a new adapter, wrapped around a SAX2 XMLReader.
- * The adapter will make the XMLReader act like a SAX1
- * Parser.</p>
- *
- * @param xmlReader The SAX2 XMLReader to wrap.
- * @exception java.lang.NullPointerException If the argument is null.
- */
- public XMLReaderAdapter (XMLReader xmlReader)
- {
- setup(xmlReader);
- }
-
-
-
- /**
- * Internal setup.
- *
- * @param xmlReader The embedded XMLReader.
- */
- private void setup (XMLReader xmlReader)
- {
- if (xmlReader == null) {
- throw new NullPointerException("XMLReader must not be null");
- }
- this.xmlReader = xmlReader;
- qAtts = new AttributesAdapter();
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Implementation of org.xml.sax.Parser.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Set the locale for error reporting.
- *
- * <p>This is not supported in SAX2, and will always throw
- * an exception.</p>
- *
- * @param The locale for error reporting.
- * @see org.xml.sax.Parser#setLocale
- */
- public void setLocale (Locale locale)
- throws SAXException
- {
- throw new SAXNotSupportedException("setLocale not supported");
- }
-
-
- /**
- * Register the entity resolver.
- *
- * @param resolver The new resolver.
- * @see org.xml.sax.Parser#setEntityResolver
- */
- public void setEntityResolver (EntityResolver resolver)
- {
- xmlReader.setEntityResolver(resolver);
- }
-
-
- /**
- * Register the DTD event handler.
- *
- * @param handler The new DTD event handler.
- * @see org.xml.sax.Parser#setDTDHandler
- */
- public void setDTDHandler (DTDHandler handler)
- {
- xmlReader.setDTDHandler(handler);
- }
-
-
- /**
- * Register the SAX1 document event handler.
- *
- * <p>Note that the SAX1 document handler has no Namespace
- * support.</p>
- *
- * @param handler The new SAX1 document event handler.
- * @see org.xml.sax.Parser#setDocumentHandler
- */
- public void setDocumentHandler (DocumentHandler handler)
- {
- documentHandler = handler;
- }
-
-
- /**
- * Register the error event handler.
- *
- * @param handler The new error event handler.
- * @see org.xml.sax.Parser#setErrorHandler
- */
- public void setErrorHandler (ErrorHandler handler)
- {
- xmlReader.setErrorHandler(handler);
- }
-
-
- /**
- * Parse the document.
- *
- * <p>This method will throw an exception if the embedded
- * XMLReader does not support the
- * http://xml.org/sax/features/namespace-prefixes property.</p>
- *
- * @param systemId The absolute URL of the document.
- * @exception java.io.IOException If there is a problem reading
- * the raw content of the document.
- * @exception org.xml.sax.SAXException If there is a problem
- * processing the document.
- * @see #parse(org.xml.sax.InputSource)
- * @see org.xml.sax.Parser#parse(java.lang.String)
- */
- public void parse (String systemId)
- throws IOException, SAXException
- {
- parse(new InputSource(systemId));
- }
-
-
- /**
- * Parse the document.
- *
- * <p>This method will throw an exception if the embedded
- * XMLReader does not support the
- * http://xml.org/sax/features/namespace-prefixes property.</p>
- *
- * @param input An input source for the document.
- * @exception java.io.IOException If there is a problem reading
- * the raw content of the document.
- * @exception org.xml.sax.SAXException If there is a problem
- * processing the document.
- * @see #parse(java.lang.String)
- * @see org.xml.sax.Parser#parse(org.xml.sax.InputSource)
- */
- public void parse (InputSource input)
- throws IOException, SAXException
- {
- setupXMLReader();
- xmlReader.parse(input);
- }
-
-
- /**
- * Set up the XML reader.
- */
- private void setupXMLReader ()
- throws SAXException
- {
- xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
- try {
- xmlReader.setFeature("http://xml.org/sax/features/namespaces",
- false);
- } catch (SAXException e) {
- // NO OP: it's just extra information, and we can ignore it
- }
- xmlReader.setContentHandler(this);
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Implementation of org.xml.sax.ContentHandler.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Set a document locator.
- *
- * @param locator The document locator.
- * @see org.xml.sax.ContentHandler#setDocumentLocator
- */
- public void setDocumentLocator (Locator locator)
- {
- documentHandler.setDocumentLocator(locator);
- }
-
-
- /**
- * Start document event.
- *
- * @exception org.xml.sax.SAXException The client may raise a
- * processing exception.
- * @see org.xml.sax.ContentHandler#startDocument
- */
- public void startDocument ()
- throws SAXException
- {
- documentHandler.startDocument();
- }
-
-
- /**
- * End document event.
- *
- * @exception org.xml.sax.SAXException The client may raise a
- * processing exception.
- * @see org.xml.sax.ContentHandler#endDocument
- */
- public void endDocument ()
- throws SAXException
- {
- documentHandler.endDocument();
- }
-
-
- /**
- * Adapt a SAX2 start prefix mapping event.
- *
- * @param prefix The prefix being mapped.
- * @param uri The Namespace URI being mapped to.
- * @see org.xml.sax.ContentHandler#startPrefixMapping
- */
- public void startPrefixMapping (String prefix, String uri)
- {
- }
-
-
- /**
- * Adapt a SAX2 end prefix mapping event.
- *
- * @param prefix The prefix being mapped.
- * @see org.xml.sax.ContentHandler#endPrefixMapping
- */
- public void endPrefixMapping (String prefix)
- {
- }
-
-
- /**
- * Adapt a SAX2 start element event.
- *
- * @param uri The Namespace URI.
- * @param localName The Namespace local name.
- * @param qName The qualified (prefixed) name.
- * @param atts The SAX2 attributes.
- * @exception org.xml.sax.SAXException The client may raise a
- * processing exception.
- * @see org.xml.sax.ContentHandler#endDocument
- */
- public void startElement (String uri, String localName,
- String qName, Attributes atts)
- throws SAXException
- {
- qAtts.setAttributes(atts);
- documentHandler.startElement(qName, qAtts);
- }
-
-
- /**
- * Adapt a SAX2 end element event.
- *
- * @param uri The Namespace URI.
- * @param localName The Namespace local name.
- * @param qName The qualified (prefixed) name.
- * @exception org.xml.sax.SAXException The client may raise a
- * processing exception.
- * @see org.xml.sax.ContentHandler#endElement
- */
- public void endElement (String uri, String localName,
- String qName)
- throws SAXException
- {
- documentHandler.endElement(qName);
- }
-
-
- /**
- * Adapt a SAX2 characters event.
- *
- * @param ch An array of characters.
- * @param start The starting position in the array.
- * @param length The number of characters to use.
- * @exception org.xml.sax.SAXException The client may raise a
- * processing exception.
- * @see org.xml.sax.ContentHandler#characters
- */
- public void characters (char ch[], int start, int length)
- throws SAXException
- {
- documentHandler.characters(ch, start, length);
- }
-
-
- /**
- * Adapt a SAX2 ignorable whitespace event.
- *
- * @param ch An array of characters.
- * @param start The starting position in the array.
- * @param length The number of characters to use.
- * @exception org.xml.sax.SAXException The client may raise a
- * processing exception.
- * @see org.xml.sax.ContentHandler#ignorableWhitespace
- */
- public void ignorableWhitespace (char ch[], int start, int length)
- throws SAXException
- {
- documentHandler.ignorableWhitespace(ch, start, length);
- }
-
-
- /**
- * Adapt a SAX2 processing instruction event.
- *
- * @param target The processing instruction target.
- * @param data The remainder of the processing instruction
- * @exception org.xml.sax.SAXException The client may raise a
- * processing exception.
- * @see org.xml.sax.ContentHandler#processingInstruction
- */
- public void processingInstruction (String target, String data)
- throws SAXException
- {
- documentHandler.processingInstruction(target, data);
- }
-
-
- /**
- * Adapt a SAX2 skipped entity event.
- *
- * @param name The name of the skipped entity.
- * @see org.xml.sax.ContentHandler#skippedEntity
- */
- public void skippedEntity (String name)
- throws SAXException
- {
- }
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Internal state.
- ////////////////////////////////////////////////////////////////////
-
- XMLReader xmlReader;
- DocumentHandler documentHandler;
- AttributesAdapter qAtts;
-
-
-
- ////////////////////////////////////////////////////////////////////
- // Internal class.
- ////////////////////////////////////////////////////////////////////
-
-
- /**
- * Internal class to wrap a SAX2 Attributes object for SAX1.
- */
- final class AttributesAdapter implements AttributeList
- {
- AttributesAdapter ()
- {
- }
-
-
- /**
- * Set the embedded Attributes object.
- *
- * @param The embedded SAX2 Attributes.
- */
- void setAttributes (Attributes attributes)
- {
- this.attributes = attributes;
- }
-
-
- /**
- * Return the number of attributes.
- *
- * @return The length of the attribute list.
- * @see org.xml.sax.AttributeList#getLength
- */
- public int getLength ()
- {
- return attributes.getLength();
- }
-
-
- /**
- * Return the qualified (prefixed) name of an attribute by position.
- *
- * @return The qualified name.
- * @see org.xml.sax.AttributeList#getName
- */
- public String getName (int i)
- {
- return attributes.getQName(i);
- }
-
-
- /**
- * Return the type of an attribute by position.
- *
- * @return The type.
- * @see org.xml.sax.AttributeList#getType(int)
- */
- public String getType (int i)
- {
- return attributes.getType(i);
- }
-
-
- /**
- * Return the value of an attribute by position.
- *
- * @return The value.
- * @see org.xml.sax.AttributeList#getValue(int)
- */
- public String getValue (int i)
- {
- return attributes.getValue(i);
- }
-
-
- /**
- * Return the type of an attribute by qualified (prefixed) name.
- *
- * @return The type.
- * @see org.xml.sax.AttributeList#getType(java.lang.String)
- */
- public String getType (String qName)
- {
- return attributes.getType(qName);
- }
-
-
- /**
- * Return the value of an attribute by qualified (prefixed) name.
- *
- * @return The value.
- * @see org.xml.sax.AttributeList#getValue(java.lang.String)
- */
- public String getValue (String qName)
- {
- return attributes.getValue(qName);
- }
-
- private Attributes attributes;
- }
-
-}
-
-// end of XMLReaderAdapter.java
+// XMLReaderAdapter.java - adapt an SAX2 XMLReader to a SAX1 Parser +// http://www.saxproject.org +// Written by David Megginson +// NO WARRANTY! This class is in the public domain. + +// $Id: XMLReaderAdapter.java,v 1.5.2.3 2002/01/29 21:34:15 dbrownell Exp $ + +package org.xml.sax.helpers; + +import java.io.IOException; +import java.util.Locale; + +import org.xml.sax.Parser; // deprecated +import org.xml.sax.Locator; +import org.xml.sax.InputSource; +import org.xml.sax.AttributeList; // deprecated +import org.xml.sax.EntityResolver; +import org.xml.sax.DTDHandler; +import org.xml.sax.DocumentHandler; // deprecated +import org.xml.sax.ErrorHandler; +import org.xml.sax.SAXException; + +import org.xml.sax.XMLReader; +import org.xml.sax.Attributes; +import org.xml.sax.ContentHandler; +import org.xml.sax.SAXNotSupportedException; + + +/** + * Adapt a SAX2 XMLReader as a SAX1 Parser. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>This class wraps a SAX2 {@link org.xml.sax.XMLReader XMLReader} + * and makes it act as a SAX1 {@link org.xml.sax.Parser Parser}. The XMLReader + * must support a true value for the + * http://xml.org/sax/features/namespace-prefixes property or parsing will fail + * with a {@link org.xml.sax.SAXException SAXException}; if the XMLReader + * supports a false value for the http://xml.org/sax/features/namespaces + * property, that will also be used to improve efficiency.</p> + * + * @since SAX 2.0 + * @author David Megginson + * @version 2.0.1 (sax2r2) + * @see org.xml.sax.Parser + * @see org.xml.sax.XMLReader + */ +public class XMLReaderAdapter implements Parser, ContentHandler +{ + + + //////////////////////////////////////////////////////////////////// + // Constructor. + //////////////////////////////////////////////////////////////////// + + + /** + * Create a new adapter. + * + * <p>Use the "org.xml.sax.driver" property to locate the SAX2 + * driver to embed.</p> + * + * @exception org.xml.sax.SAXException If the embedded driver + * cannot be instantiated or if the + * org.xml.sax.driver property is not specified. + */ + public XMLReaderAdapter () + throws SAXException + { + setup(XMLReaderFactory.createXMLReader()); + } + + + /** + * Create a new adapter. + * + * <p>Create a new adapter, wrapped around a SAX2 XMLReader. + * The adapter will make the XMLReader act like a SAX1 + * Parser.</p> + * + * @param xmlReader The SAX2 XMLReader to wrap. + * @exception java.lang.NullPointerException If the argument is null. + */ + public XMLReaderAdapter (XMLReader xmlReader) + { + setup(xmlReader); + } + + + + /** + * Internal setup. + * + * @param xmlReader The embedded XMLReader. + */ + private void setup (XMLReader xmlReader) + { + if (xmlReader == null) { + throw new NullPointerException("XMLReader must not be null"); + } + this.xmlReader = xmlReader; + qAtts = new AttributesAdapter(); + } + + + + //////////////////////////////////////////////////////////////////// + // Implementation of org.xml.sax.Parser. + //////////////////////////////////////////////////////////////////// + + + /** + * Set the locale for error reporting. + * + * <p>This is not supported in SAX2, and will always throw + * an exception.</p> + * + * @param The locale for error reporting. + * @see org.xml.sax.Parser#setLocale + * @exception org.xml.sax.SAXException Thrown unless overridden. + */ + public void setLocale (Locale locale) + throws SAXException + { + throw new SAXNotSupportedException("setLocale not supported"); + } + + + /** + * Register the entity resolver. + * + * @param resolver The new resolver. + * @see org.xml.sax.Parser#setEntityResolver + */ + public void setEntityResolver (EntityResolver resolver) + { + xmlReader.setEntityResolver(resolver); + } + + + /** + * Register the DTD event handler. + * + * @param handler The new DTD event handler. + * @see org.xml.sax.Parser#setDTDHandler + */ + public void setDTDHandler (DTDHandler handler) + { + xmlReader.setDTDHandler(handler); + } + + + /** + * Register the SAX1 document event handler. + * + * <p>Note that the SAX1 document handler has no Namespace + * support.</p> + * + * @param handler The new SAX1 document event handler. + * @see org.xml.sax.Parser#setDocumentHandler + */ + public void setDocumentHandler (DocumentHandler handler) + { + documentHandler = handler; + } + + + /** + * Register the error event handler. + * + * @param handler The new error event handler. + * @see org.xml.sax.Parser#setErrorHandler + */ + public void setErrorHandler (ErrorHandler handler) + { + xmlReader.setErrorHandler(handler); + } + + + /** + * Parse the document. + * + * <p>This method will throw an exception if the embedded + * XMLReader does not support the + * http://xml.org/sax/features/namespace-prefixes property.</p> + * + * @param systemId The absolute URL of the document. + * @exception java.io.IOException If there is a problem reading + * the raw content of the document. + * @exception org.xml.sax.SAXException If there is a problem + * processing the document. + * @see #parse(org.xml.sax.InputSource) + * @see org.xml.sax.Parser#parse(java.lang.String) + */ + public void parse (String systemId) + throws IOException, SAXException + { + parse(new InputSource(systemId)); + } + + + /** + * Parse the document. + * + * <p>This method will throw an exception if the embedded + * XMLReader does not support the + * http://xml.org/sax/features/namespace-prefixes property.</p> + * + * @param input An input source for the document. + * @exception java.io.IOException If there is a problem reading + * the raw content of the document. + * @exception org.xml.sax.SAXException If there is a problem + * processing the document. + * @see #parse(java.lang.String) + * @see org.xml.sax.Parser#parse(org.xml.sax.InputSource) + */ + public void parse (InputSource input) + throws IOException, SAXException + { + setupXMLReader(); + xmlReader.parse(input); + } + + + /** + * Set up the XML reader. + */ + private void setupXMLReader () + throws SAXException + { + xmlReader.setFeature("http://xml.org/sax/features/namespace-prefixes", true); + try { + xmlReader.setFeature("http://xml.org/sax/features/namespaces", + false); + } catch (SAXException e) { + // NO OP: it's just extra information, and we can ignore it + } + xmlReader.setContentHandler(this); + } + + + + //////////////////////////////////////////////////////////////////// + // Implementation of org.xml.sax.ContentHandler. + //////////////////////////////////////////////////////////////////// + + + /** + * Set a document locator. + * + * @param locator The document locator. + * @see org.xml.sax.ContentHandler#setDocumentLocator + */ + public void setDocumentLocator (Locator locator) + { + if (documentHandler != null) + documentHandler.setDocumentLocator(locator); + } + + + /** + * Start document event. + * + * @exception org.xml.sax.SAXException The client may raise a + * processing exception. + * @see org.xml.sax.ContentHandler#startDocument + */ + public void startDocument () + throws SAXException + { + if (documentHandler != null) + documentHandler.startDocument(); + } + + + /** + * End document event. + * + * @exception org.xml.sax.SAXException The client may raise a + * processing exception. + * @see org.xml.sax.ContentHandler#endDocument + */ + public void endDocument () + throws SAXException + { + if (documentHandler != null) + documentHandler.endDocument(); + } + + + /** + * Adapt a SAX2 start prefix mapping event. + * + * @param prefix The prefix being mapped. + * @param uri The Namespace URI being mapped to. + * @see org.xml.sax.ContentHandler#startPrefixMapping + */ + public void startPrefixMapping (String prefix, String uri) + { + } + + + /** + * Adapt a SAX2 end prefix mapping event. + * + * @param prefix The prefix being mapped. + * @see org.xml.sax.ContentHandler#endPrefixMapping + */ + public void endPrefixMapping (String prefix) + { + } + + + /** + * Adapt a SAX2 start element event. + * + * @param uri The Namespace URI. + * @param localName The Namespace local name. + * @param qName The qualified (prefixed) name. + * @param atts The SAX2 attributes. + * @exception org.xml.sax.SAXException The client may raise a + * processing exception. + * @see org.xml.sax.ContentHandler#endDocument + */ + public void startElement (String uri, String localName, + String qName, Attributes atts) + throws SAXException + { + if (documentHandler != null) { + qAtts.setAttributes(atts); + documentHandler.startElement(qName, qAtts); + } + } + + + /** + * Adapt a SAX2 end element event. + * + * @param uri The Namespace URI. + * @param localName The Namespace local name. + * @param qName The qualified (prefixed) name. + * @exception org.xml.sax.SAXException The client may raise a + * processing exception. + * @see org.xml.sax.ContentHandler#endElement + */ + public void endElement (String uri, String localName, + String qName) + throws SAXException + { + if (documentHandler != null) + documentHandler.endElement(qName); + } + + + /** + * Adapt a SAX2 characters event. + * + * @param ch An array of characters. + * @param start The starting position in the array. + * @param length The number of characters to use. + * @exception org.xml.sax.SAXException The client may raise a + * processing exception. + * @see org.xml.sax.ContentHandler#characters + */ + public void characters (char ch[], int start, int length) + throws SAXException + { + if (documentHandler != null) + documentHandler.characters(ch, start, length); + } + + + /** + * Adapt a SAX2 ignorable whitespace event. + * + * @param ch An array of characters. + * @param start The starting position in the array. + * @param length The number of characters to use. + * @exception org.xml.sax.SAXException The client may raise a + * processing exception. + * @see org.xml.sax.ContentHandler#ignorableWhitespace + */ + public void ignorableWhitespace (char ch[], int start, int length) + throws SAXException + { + if (documentHandler != null) + documentHandler.ignorableWhitespace(ch, start, length); + } + + + /** + * Adapt a SAX2 processing instruction event. + * + * @param target The processing instruction target. + * @param data The remainder of the processing instruction + * @exception org.xml.sax.SAXException The client may raise a + * processing exception. + * @see org.xml.sax.ContentHandler#processingInstruction + */ + public void processingInstruction (String target, String data) + throws SAXException + { + if (documentHandler != null) + documentHandler.processingInstruction(target, data); + } + + + /** + * Adapt a SAX2 skipped entity event. + * + * @param name The name of the skipped entity. + * @see org.xml.sax.ContentHandler#skippedEntity + * @exception org.xml.sax.SAXException Throwable by subclasses. + */ + public void skippedEntity (String name) + throws SAXException + { + } + + + + //////////////////////////////////////////////////////////////////// + // Internal state. + //////////////////////////////////////////////////////////////////// + + XMLReader xmlReader; + DocumentHandler documentHandler; + AttributesAdapter qAtts; + + + + //////////////////////////////////////////////////////////////////// + // Internal class. + //////////////////////////////////////////////////////////////////// + + + /** + * Internal class to wrap a SAX2 Attributes object for SAX1. + */ + final class AttributesAdapter implements AttributeList + { + AttributesAdapter () + { + } + + + /** + * Set the embedded Attributes object. + * + * @param The embedded SAX2 Attributes. + */ + void setAttributes (Attributes attributes) + { + this.attributes = attributes; + } + + + /** + * Return the number of attributes. + * + * @return The length of the attribute list. + * @see org.xml.sax.AttributeList#getLength + */ + public int getLength () + { + return attributes.getLength(); + } + + + /** + * Return the qualified (prefixed) name of an attribute by position. + * + * @return The qualified name. + * @see org.xml.sax.AttributeList#getName + */ + public String getName (int i) + { + return attributes.getQName(i); + } + + + /** + * Return the type of an attribute by position. + * + * @return The type. + * @see org.xml.sax.AttributeList#getType(int) + */ + public String getType (int i) + { + return attributes.getType(i); + } + + + /** + * Return the value of an attribute by position. + * + * @return The value. + * @see org.xml.sax.AttributeList#getValue(int) + */ + public String getValue (int i) + { + return attributes.getValue(i); + } + + + /** + * Return the type of an attribute by qualified (prefixed) name. + * + * @return The type. + * @see org.xml.sax.AttributeList#getType(java.lang.String) + */ + public String getType (String qName) + { + return attributes.getType(qName); + } + + + /** + * Return the value of an attribute by qualified (prefixed) name. + * + * @return The value. + * @see org.xml.sax.AttributeList#getValue(java.lang.String) + */ + public String getValue (String qName) + { + return attributes.getValue(qName); + } + + private Attributes attributes; + } + +} + +// end of XMLReaderAdapter.java diff --git a/libjava/org/xml/sax/helpers/XMLReaderFactory.java b/libjava/org/xml/sax/helpers/XMLReaderFactory.java index 9443b27dcca..e1fa80c84cf 100644 --- a/libjava/org/xml/sax/helpers/XMLReaderFactory.java +++ b/libjava/org/xml/sax/helpers/XMLReaderFactory.java @@ -1,136 +1,203 @@ -// XMLReaderFactory.java - factory for creating a new reader.
-// Written by David Megginson, sax@megginson.com
-// NO WARRANTY! This class is in the Public Domain.
-
-// $Id: XMLReaderFactory.java,v 1.1 2000/10/02 02:43:20 sboag Exp $
-
-package org.xml.sax.helpers;
-import org.xml.sax.Parser;
-import org.xml.sax.XMLReader;
-import org.xml.sax.SAXException;
-
-
-/**
- * Factory for creating an XML reader.
- *
- * <blockquote>
- * <em>This module, both source code and documentation, is in the
- * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em>
- * </blockquote>
- *
- * <p>This class contains static methods for creating an XML reader
- * from an explicit class name, or for creating an XML reader based
- * on the value of the <code>org.xml.sax.driver</code> system
- * property:</p>
- *
- * <pre>
- * try {
- * XMLReader myReader = XMLReaderFactory.createXMLReader();
- * } catch (SAXException e) {
- * System.err.println(e.getMessage());
- * }
- * </pre>
- *
- * <p>Note that these methods will not be usable in environments where
- * system properties are not accessible or where the application or
- * applet is not permitted to load classes dynamically.</p>
- *
- * <p><strong>Note to implementors:</strong> SAX implementations in specialized
- * environments may replace this class with a different one optimized for the
- * environment, as long as its method signatures remain the same.</p>
- *
- * @since SAX 2.0
- * @author David Megginson,
- * <a href="mailto:sax@megginson.com">sax@megginson.com</a>
- * @version 2.0
- * @see org.xml.sax.XMLReader
- */
-final public class XMLReaderFactory
-{
-
- /**
- * Private constructor.
- *
- * <p>This constructor prevents the class from being instantiated.</p>
- */
- private XMLReaderFactory ()
- {
- }
-
-
- /**
- * Attempt to create an XML reader from a system property.
- *
- * <p>This method uses the value of the system property
- * "org.xml.sax.driver" as the full name of a Java class
- * and tries to instantiate that class as a SAX2
- * XMLReader.</p>
- *
- * <p>Note that many Java interpreters allow system properties
- * to be specified on the command line.</p>
- *
- * @return A new XMLReader.
- * @exception org.xml.sax.SAXException If the value of the
- * "org.xml.sax.driver" system property is null,
- * or if the class cannot be loaded and instantiated.
- * @see #createXMLReader(java.lang.String)
- */
- public static XMLReader createXMLReader ()
- throws SAXException
- {
- String className = System.getProperty("org.xml.sax.driver");
- if (className == null) {
- Parser parser;
- try {
- parser = ParserFactory.makeParser();
- } catch (Exception e) {
- parser = null;
- }
- if (parser == null) {
- throw new
- SAXException("System property org.xml.sax.driver not specified");
- } else {
- return new ParserAdapter(parser);
- }
- } else {
- return createXMLReader(className);
- }
- }
-
-
- /**
- * Attempt to create an XML reader from a class name.
- *
- * <p>Given a class name, this method attempts to load
- * and instantiate the class as an XML reader.</p>
- *
- * @return A new XML reader.
- * @exception org.xml.sax.SAXException If the class cannot be
- * loaded, instantiated, and cast to XMLReader.
- * @see #createXMLReader()
- */
- public static XMLReader createXMLReader (String className)
- throws SAXException
- {
- try {
- return (XMLReader)(Class.forName(className).newInstance());
- } catch (ClassNotFoundException e1) {
- throw new SAXException("SAX2 driver class " + className +
- " not found", e1);
- } catch (IllegalAccessException e2) {
- throw new SAXException("SAX2 driver class " + className +
- " found but cannot be loaded", e2);
- } catch (InstantiationException e3) {
- throw new SAXException("SAX2 driver class " + className +
- " loaded but cannot be instantiated (no empty public constructor?)",
- e3);
- } catch (ClassCastException e4) {
- throw new SAXException("SAX2 driver class " + className +
- " does not implement XMLReader", e4);
- }
-
- }
-
-}
-
-// end of XMLReaderFactory.java
+// XMLReaderFactory.java - factory for creating a new reader. +// http://www.saxproject.org +// Written by David Megginson +// and by David Brownell +// NO WARRANTY! This class is in the Public Domain. + +// $Id: XMLReaderFactory.java,v 1.5.2.4 2002/01/29 21:34:15 dbrownell Exp $ + +package org.xml.sax.helpers; +import java.io.BufferedReader; +import java.io.InputStream; +import java.io.InputStreamReader; +import org.xml.sax.XMLReader; +import org.xml.sax.SAXException; + + +/** + * Factory for creating an XML reader. + * + * <blockquote> + * <em>This module, both source code and documentation, is in the + * Public Domain, and comes with <strong>NO WARRANTY</strong>.</em> + * See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> + * for further information. + * </blockquote> + * + * <p>This class contains static methods for creating an XML reader + * from an explicit class name, or based on runtime defaults:</p> + * + * <pre> + * try { + * XMLReader myReader = XMLReaderFactory.createXMLReader(); + * } catch (SAXException e) { + * System.err.println(e.getMessage()); + * } + * </pre> + * + * <p><strong>Note to Distributions bundled with parsers:</strong> + * You should modify the implementation of the no-arguments + * <em>createXMLReader</em> to handle cases where the external + * configuration mechanisms aren't set up. That method should do its + * best to return a parser when one is in the class path, even when + * nothing bound its class name to <code>org.xml.sax.driver</code> so + * those configuration mechanisms would see it.</p> + * + * @since SAX 2.0 + * @author David Megginson, David Brownell + * @version 2.0.1 (sax2r2) + */ +final public class XMLReaderFactory +{ + /** + * Private constructor. + * + * <p>This constructor prevents the class from being instantiated.</p> + */ + private XMLReaderFactory () + { + } + + private static final String property = "org.xml.sax.driver"; + + /** + * Attempt to create an XMLReader from system defaults. + * In environments which can support it, the name of the XMLReader + * class is determined by trying each these options in order, and + * using the first one which succeeds:</p> <ul> + * + * <li>If the system property <code>org.xml.sax.driver</code> + * has a value, that is used as an XMLReader class name. </li> + * + * <li>The JAR "Services API" is used to look for a class name + * in the <em>META-INF/services/org.xml.sax.driver</em> file in + * jarfiles available to the runtime.</li> + * + * <li> SAX parser distributions are strongly encouraged to provide + * a default XMLReader class name that will take effect only when + * previous options (on this list) are not successful.</li> + * + * <li>Finally, if {@link ParserFactory#makeParser()} can + * return a system default SAX1 parser, that parser is wrapped in + * a {@link ParserAdapter}. (This is a migration aid for SAX1 + * environments, where the <code>org.xml.sax.parser</code> system + * property will often be usable.) </li> + * + * </ul> + * + * <p> In environments such as small embedded systems, which can not + * support that flexibility, other mechanisms to determine the default + * may be used. </p> + * + * <p>Note that many Java environments allow system properties to be + * initialized on a command line. This means that <em>in most cases</em> + * setting a good value for that property ensures that calls to this + * method will succeed, except when security policies intervene. + * This will also maximize application portability to older SAX + * environments, with less robust implementations of this method. + * </p> + * + * @return A new XMLReader. + * @exception org.xml.sax.SAXException If no default XMLReader class + * can be identified and instantiated. + * @see #createXMLReader(java.lang.String) + */ + public static XMLReader createXMLReader () + throws SAXException + { + String className = null; + ClassLoader loader = NewInstance.getClassLoader (); + + // 1. try the JVM-instance-wide system property + try { className = System.getProperty (property); } + catch (Exception e) { /* normally fails for applets */ } + + // 2. if that fails, try META-INF/services/ + if (className == null) { + try { + String service = "META-INF/services/" + property; + InputStream in; + BufferedReader reader; + + if (loader == null) + in = ClassLoader.getSystemResourceAsStream (service); + else + in = loader.getResourceAsStream (service); + + if (in != null) { + reader = new BufferedReader ( + new InputStreamReader (in, "UTF8")); + className = reader.readLine (); + in.close (); + } + } catch (Exception e) { + } + } + + // 3. Distro-specific fallback + if (className == null) { +// BEGIN DISTRIBUTION-SPECIFIC + + // EXAMPLE: + // className = "com.example.sax.XmlReader"; + // or a $JAVA_HOME/jre/lib/*properties setting... + +// END DISTRIBUTION-SPECIFIC + } + + // do we know the XMLReader implementation class yet? + if (className != null) + return loadClass (loader, className); + + // 4. panic -- adapt any SAX1 parser + try { + return new ParserAdapter (ParserFactory.makeParser ()); + } catch (Exception e) { + throw new SAXException ("Can't create default XMLReader; " + + "is system property org.xml.sax.driver set?"); + } + } + + + /** + * Attempt to create an XML reader from a class name. + * + * <p>Given a class name, this method attempts to load + * and instantiate the class as an XML reader.</p> + * + * <p>Note that this method will not be usable in environments where + * the caller (perhaps an applet) is not permitted to load classes + * dynamically.</p> + * + * @return A new XML reader. + * @exception org.xml.sax.SAXException If the class cannot be + * loaded, instantiated, and cast to XMLReader. + * @see #createXMLReader() + */ + public static XMLReader createXMLReader (String className) + throws SAXException + { + return loadClass (NewInstance.getClassLoader (), className); + } + + private static XMLReader loadClass (ClassLoader loader, String className) + throws SAXException + { + try { + return (XMLReader) NewInstance.newInstance (loader, className); + } catch (ClassNotFoundException e1) { + throw new SAXException("SAX2 driver class " + className + + " not found", e1); + } catch (IllegalAccessException e2) { + throw new SAXException("SAX2 driver class " + className + + " found but cannot be loaded", e2); + } catch (InstantiationException e3) { + throw new SAXException("SAX2 driver class " + className + + " loaded but cannot be instantiated (no empty public constructor?)", + e3); + } catch (ClassCastException e4) { + throw new SAXException("SAX2 driver class " + className + + " does not implement XMLReader", e4); + } + } +} diff --git a/libjava/org/xml/sax/helpers/package.html b/libjava/org/xml/sax/helpers/package.html new file mode 100644 index 00000000000..458d1229c47 --- /dev/null +++ b/libjava/org/xml/sax/helpers/package.html @@ -0,0 +1,13 @@ +<HTML><HEAD> + +<!-- $Id: package.html,v 1.3.2.1 2001/11/09 20:32:58 dbrownell Exp $ --> + +</HEAD><BODY> + +<p>This package contains "helper" classes, including +support for bootstrapping SAX-based applications. + +<p>See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> +for more information about SAX.</p> + +</BODY></HTML> diff --git a/libjava/org/xml/sax/package.html b/libjava/org/xml/sax/package.html new file mode 100644 index 00000000000..25f4b86cdf3 --- /dev/null +++ b/libjava/org/xml/sax/package.html @@ -0,0 +1,164 @@ +<html><head> + +<!-- $Id: package.html,v 1.2.2.2 2002/01/12 21:42:21 dbrownell Exp $ --> + +</head><body> + +<p> This package provides the core SAX APIs. +Some SAX1 APIs are deprecated to encourage integration of +namespace-awareness into designs of new applications +and into maintainance of existing infrastructure. </p> + +<p>See <a href='http://www.saxproject.org'>http://www.saxproject.org</a> +for more information about SAX.</p> + + +<h2> SAX2 Standard Feature Flags </h2> + +<p> One of the essential characteristics of SAX2 is that it added +feature flags which can be used to examine and perhaps modify +parser modes, in particular modes such as validation. +Since features are identified by (absolute) URIs, anyone +can define such features. +Currently defined standard feature URIs have the prefix +<code>http://xml.org/sax/features/</code> before an identifier such as +<code>validation</code>. Turn features on or off using +<em>setFeature</em>. Those standard identifiers are: </p> + + +<table border="1" cellpadding="3" cellspacing="0" width="100%"> + <tr align="center" bgcolor="#ccccff"> + <th>Feature ID</th> + <th>Default</th> + <th>Description</th> + </tr> + + <tr> + <td>external-general-entities</td> + <td><em>unspecified</em></td> + <td> Reports whether this parser processes external + general entities; always true if validating</td> + </tr> + + <tr> + <td>external-parameter-entities</td> + <td><em>unspecified</em></td> + <td> Reports whether this parser processes external + parameter entities; always true if validating</td> + </tr> + + <tr> + <td>lexical-handler/parameter-entities</td> + <td><em>unspecified</em></td> + <td> true indicates that the LexicalHandler will report the + beginning and end of parameter entities + </td> + </tr> + + <tr> + <td>namespaces</td> + <td>true</td> + <td> true indicates namespace URIs and unprefixed local names + for element and attribute names will be available </td> + </tr> + + <tr> + <td>namespace-prefixes</td> + <td>false</td> + <td> true indicates XML 1.0 names (with prefixes) and attributes + (including <em>xmlns*</em> attributes) will be available </td> + </tr> + + <tr> + <td>string-interning</td> + <td><em>unspecified</em></td> + <td> true if all XML names (for elements, prefixes, attributes, + entities, notations, and local names), + as well as Namespace URIs, will have been interned + using <em>java.lang.String.intern</em>. This supports fast + testing of equality/inequality against string constants.</td> + </tr> + + <tr> + <td>validation</td> + <td><em>unspecified</em></td> + <td> controls whether the parser is reporting all validity + errors; if true, all external entities will be read. </td> + </tr> + +</table> + +<p> Support for the default values of the +<em>namespaces</em> and <em>namespace-prefixes</em> +properties is required. +</p> + +<p> For default values not specified by SAX2, +each XMLReader implementation specifies its default, +or may choose not to expose the feature flag. +Unless otherwise specified here, +implementations may support changing current values +of these standard feature flags, but not while parsing. +</p> + +<h2> SAX2 Standard Handler and Property IDs </h2> + +<p> For parser interface characteristics that are described +as objects, a separate namespace is defined. The +objects in this namespace are again identified by URI, and +the standard property URIs have the prefix +<code>http://xml.org/sax/properties/</code> before an identifier such as +<code>lexical-handler</code> or +<code>dom-node</code>. Manage those properties using +<em>setProperty()</em>. Those identifiers are: </p> + +<table border="1" cellpadding="3" cellspacing="0" width="100%"> + <tr align="center" bgcolor="#ccccff"> + <th>Property ID</th> + <th>Description</th> + </tr> + + <tr> + <td>declaration-handler</td> + <td> Used to see most DTD declarations except those treated + as lexical ("document element name is ...") or which are + mandatory for all SAX parsers (<em>DTDHandler</em>). + The Object must implement <a href="ext/DeclHandler.html" + ><em>org.xml.sax.ext.DeclHandler</em></a>. + </td> + </tr> + + <tr> + <td>dom-node</td> + <td> For "DOM Walker" style parsers, which ignore their + <em>parser.parse()</em> parameters, this is used to + specify the DOM (sub)tree being walked by the parser. + The Object must implement the + <em>org.w3c.dom.Node</em> interface. + </td> + </tr> + + <tr> + <td>lexical-handler</td> + <td> Used to see some syntax events that are essential in some + applications: comments, CDATA delimeters, selected general + entity inclusions, and the start and end of the DTD + (and declaration of document element name). + The Object must implement <a href="ext/LexicalHandler.html" + ><em>org.xml.sax.ext.LexicalHandler</em></a>. + </td> + </tr> + + <tr> + <td>xml-string</td> + <td> Readable only during a parser callback, this exposes a <b>TBS</b> + chunk of characters responsible for the current event. </td> + </tr> + +</table> + +<p> All of these standard properties are optional; +XMLReader implementations need not support them. +</p> + +</body></html> diff --git a/libjava/resolve.cc b/libjava/resolve.cc index e195c333cc8..00785eed8fc 100644 --- a/libjava/resolve.cc +++ b/libjava/resolve.cc @@ -238,7 +238,7 @@ _Jv_ResolvePoolEntry (jclass klass, int index) // First search the class itself. the_method = _Jv_SearchMethodInClass (owner, klass, - method_name, method_signature); + method_name, method_signature); if (the_method != 0) { @@ -246,9 +246,10 @@ _Jv_ResolvePoolEntry (jclass klass, int index) goto end_of_method_search; } - // If we are resolving an interface method, search the interface's - // superinterfaces (A superinterface is not an interface's superclass - - // a superinterface is implemented by the interface). + // If we are resolving an interface method, search the + // interface's superinterfaces (A superinterface is not an + // interface's superclass - a superinterface is implemented by + // the interface). if (pool->tags[index] == JV_CONSTANT_InterfaceMethodref) { _Jv_ifaces ifaces; @@ -257,8 +258,8 @@ _Jv_ResolvePoolEntry (jclass klass, int index) ifaces.list = (jclass *) _Jv_Malloc (ifaces.len * sizeof (jclass *)); _Jv_GetInterfaces (owner, &ifaces); - - for (int i=0; i < ifaces.count; i++) + + for (int i = 0; i < ifaces.count; i++) { jclass cls = ifaces.list[i]; the_method = _Jv_SearchMethodInClass (cls, klass, method_name, @@ -269,9 +270,9 @@ _Jv_ResolvePoolEntry (jclass klass, int index) break; } } - + _Jv_Free (ifaces.list); - + if (the_method != 0) goto end_of_method_search; } @@ -281,7 +282,7 @@ _Jv_ResolvePoolEntry (jclass klass, int index) cls = cls->getSuperclass ()) { the_method = _Jv_SearchMethodInClass (cls, klass, - method_name, method_signature); + method_name, method_signature); if (the_method != 0) { found_class = cls; @@ -363,6 +364,58 @@ _Jv_SearchMethodInClass (jclass cls, jclass klass, return 0; } +// A helper for _Jv_PrepareClass. This adds missing `Miranda methods' +// to a class. +void +_Jv_PrepareMissingMethods (jclass base2, jclass iface_class) +{ + _Jv_InterpClass *base = reinterpret_cast<_Jv_InterpClass *> (base2); + for (int i = 0; i < iface_class->interface_count; ++i) + { + for (int j = 0; j < iface_class->interfaces[i]->method_count; ++j) + { + _Jv_Method *meth = &iface_class->interfaces[i]->methods[j]; + // Don't bother with <clinit>. + if (meth->name->data[0] == '<') + continue; + _Jv_Method *new_meth = _Jv_LookupDeclaredMethod (base, meth->name, + meth->signature); + if (! new_meth) + { + // We assume that such methods are very unlikely, so we + // just reallocate the method array each time one is + // found. This greatly simplifies the searching -- + // otherwise we have to make sure that each such method + // found is really unique among all superinterfaces. + int new_count = base->method_count + 1; + _Jv_Method *new_m + = (_Jv_Method *) _Jv_AllocBytes (sizeof (_Jv_Method) + * new_count); + memcpy (new_m, base->methods, + sizeof (_Jv_Method) * base->method_count); + + // Add new method. + new_m[base->method_count] = *meth; + new_m[base->method_count].index = (_Jv_ushort) -1; + new_m[base->method_count].accflags + |= java::lang::reflect::Modifier::INVISIBLE; + + _Jv_MethodBase **new_im + = (_Jv_MethodBase **) _Jv_AllocBytes (sizeof (_Jv_MethodBase *) + * new_count); + memcpy (new_im, base->interpreted_methods, + sizeof (_Jv_MethodBase *) * base->method_count); + + base->methods = new_m; + base->interpreted_methods = new_im; + base->method_count = new_count; + } + } + + _Jv_PrepareMissingMethods (base, iface_class->interfaces[i]); + } +} + void _Jv_PrepareClass(jclass klass) { @@ -516,13 +569,24 @@ _Jv_PrepareClass(jclass klass) } } - if (clz->accflags & Modifier::INTERFACE) + if ((clz->accflags & Modifier::INTERFACE)) { clz->state = JV_STATE_PREPARED; clz->notifyAll (); return; } + // A class might have so-called "Miranda methods". This is a method + // that is declared in an interface and not re-declared in an + // abstract class. Some compilers don't emit declarations for such + // methods in the class; this will give us problems since we expect + // a declaration for any method requiring a vtable entry. We handle + // this here by searching for such methods and constructing new + // internal declarations for them. We only need to do this for + // abstract classes. + if ((clz->accflags & Modifier::ABSTRACT)) + _Jv_PrepareMissingMethods (clz, clz); + clz->vtable_method_count = -1; _Jv_MakeVTable (clz); diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog index 8791dd4ec85..5217babbb58 100644 --- a/libjava/testsuite/ChangeLog +++ b/libjava/testsuite/ChangeLog @@ -1,3 +1,67 @@ +2003-01-31 Mark Wielaard <mark@klomp.org> + + * lib/libjava.exp (libjava_prune_warnings): Remove all unreachable + bytecode warnings. + +2003-01-28 Tom Tromey <tromey@redhat.com> + + * libjava.jacks/jacks.xfail: More lexer tests now pass. + +2003-01-27 Tom Tromey <tromey@redhat.com> + + * libjava.compile/consthrow.java: New file. + * libjava.compile/consthrow.xfail: New file. + +2003-01-27 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * libjava.lang/pr8823.xfail: New file, add "xfail-byte". + +2003-01-24 Ranjit Mathew <rmathew@hotmail.com> + + * libjava.jni/calls.c (Java_calls_docall): Define with + JNIEXPORT and JNICALL method attributes. + * libjava.jni/field.c (Java_field_fetch): Likewise. + * libjava.jni/final_method.c (Java_final_1method_meth): Likewise. + * libjava.jni/findclass.c (Java_findclass_doit): Likewise. + * libjava.jni/invoke.c (Java_invoke_val): Likewise. + * libjava.jni/martin.c (Java_martin_myNative): Likewise. + * libjava.jni/noclass.c (Java_noclass_find_1it): Likewise. + * libjava.jni/overload.c (Java_overload_over__I): Likewise. + (Java_overload_over__II): Likewise. + * libjava.jni/register.c (JNI_OnLoad): Likewise. + * libjava.jni/simple_int.c (Java_simple_1int_nat): Likewise. + * libjava.jni/throwit.c (Java_throwit_throwit): Likewise. + * libjava.jni/virtual.c (Java_virtual_equals): Likewise. + +2003-01-21 Tom Tromey <tromey@redhat.com> + + * libjava.jacks/jacks.xfail: All 8.4.3 tests and 9.4-modifier-10 + now pass. + +2003-01-12 Tom Tromey <tromey@redhat.com> + + Fix for PR libgcj/9139: + * lib/libjava.exp (find_javac): Put value of libgcj_jar into + return value when gcj is used. + * libjava.mauve/mauve.exp (test_mauve): Use libgcj_jar global. + +2003-01-03 Tom Tromey <tromey@redhat.com> + + * libjava.compile/pr8712.java: New file, for PR java/8712. + +2003-01-01 Tom Tromey <tromey@redhat.com> + + * libjava.compile/pr8955.java: New test, for PR java/8955. + +2002-12-19 Tom Tromey <tromey@redhat.com> + + * libjava.jacks/jacks.xfail: Updated. + +2002-12-18 Tom Tromey <tromey@redhat.com> + + * libjava.lang/pr8945.java: New file. + * libjava.lang/pr8945.out: New file. + 2002-12-12 Tom Tromey <tromey@redhat.com> * libjava.loader/loader.exp (gcj_loader_test_one): Use diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp index a807c4c8d60..05cf08fe8e3 100644 --- a/libjava/testsuite/lib/libjava.exp +++ b/libjava/testsuite/lib/libjava.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation +# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation load_lib "libgloss.exp" @@ -18,9 +18,15 @@ proc libjava_prune_warnings {text} { set len [llength $tlist] for {set i [expr {$len - 1}]} {$i >= 2} {incr i -1} { if {[string match "*unreachable bytecode*" [lindex $tlist $i]]} { - # Delete this line and the previous two lines. - set tlist [lreplace $tlist [expr {$i - 2}] $i] - incr i -2 + # Delete this line, all other unreachable warnings and the previous + # two lines containing the method and class. + set j [expr {$i - 1}] + while {[string match "*unreachable bytecode*" [lindex $tlist $j]]} { + incr j -1 + } + incr j -1 + set tlist [lreplace $tlist $j $i] + set i $j } } return [join $tlist \n] @@ -74,7 +80,7 @@ proc find_gcjh {} { } proc find_javac {} { - global SUN_JAVAC GCJ_UNDER_TEST env + global SUN_JAVAC GCJ_UNDER_TEST env libgcj_jar # If JDK doesn't run on your platform but some other # JDK-compatible javac does, you may set SUN_JAVAC to point to it. # One of the most important properties of a SUN_JAVAC is that it @@ -87,7 +93,7 @@ proc find_javac {} { if {[info exists env(SUN_JAVAC)]} { set SUN_JAVAC $env(SUN_JAVAC) } else { - set SUN_JAVAC "$GCJ_UNDER_TEST -C" + set SUN_JAVAC "$GCJ_UNDER_TEST -C -I$libgcj_jar" } } return $SUN_JAVAC diff --git a/libjava/testsuite/libjava.compile/consthrow.java b/libjava/testsuite/libjava.compile/consthrow.java new file mode 100644 index 00000000000..02d1afc01dd --- /dev/null +++ b/libjava/testsuite/libjava.compile/consthrow.java @@ -0,0 +1,6 @@ +public class consthrow +{ + public consthrow () throws Object + { + } +} diff --git a/libjava/testsuite/libjava.compile/consthrow.xfail b/libjava/testsuite/libjava.compile/consthrow.xfail new file mode 100644 index 00000000000..f34b59d3181 --- /dev/null +++ b/libjava/testsuite/libjava.compile/consthrow.xfail @@ -0,0 +1,2 @@ +no-link +shouldfail diff --git a/libjava/testsuite/libjava.compile/pr8712.java b/libjava/testsuite/libjava.compile/pr8712.java new file mode 100644 index 00000000000..7a6eb754d90 --- /dev/null +++ b/libjava/testsuite/libjava.compile/pr8712.java @@ -0,0 +1,7 @@ +public class pr8712 +{ + boolean x(pr8712 a) + { + return (!(a instanceof pr8712)); + } +} diff --git a/libjava/testsuite/libjava.compile/pr8955.java b/libjava/testsuite/libjava.compile/pr8955.java new file mode 100644 index 00000000000..ae78f503f9c --- /dev/null +++ b/libjava/testsuite/libjava.compile/pr8955.java @@ -0,0 +1,13 @@ +public class pr8955 +{ + static final int val = Integer.MIN_VALUE; + void foo() + { + switch(1) { + case val: + break; + case 1: + break; + } + } +} diff --git a/libjava/testsuite/libjava.jacks/jacks.xfail b/libjava/testsuite/libjava.jacks/jacks.xfail index 8e2ebe77f0e..74dd9196187 100644 --- a/libjava/testsuite/libjava.jacks/jacks.xfail +++ b/libjava/testsuite/libjava.jacks/jacks.xfail @@ -151,12 +151,8 @@ 8.1.2-enclosing-4 8.1.2-enclosing-5 8.1.3-object-3 -8.1.3-superclass-10 -8.1.3-superclass-12 -8.1.3-superclass-13 -8.1.4-superinterface-8 -8.1.4-superinterface-10 -8.1.4-superinterface-11 +8.1.3-superclass-5 +8.1.3-superclass-6 8.2-accessibility-inherited-member-5 8.8.5.1-example-1 8.8.5.1-example-3 @@ -218,9 +214,14 @@ 8.6-checked-exception-10 8.6-checked-exception-11 8.6-checked-exception-12 +8.6-complete-1 +8.6-complete-4 +8.6-complete-5 8.6-abrupt-1 8.6-abrupt-4 -8.5-inheritance-4 +8.5-inheritance-1 +8.5-inheritance-2 +8.5-inheritance-3 8.5-inheritance-6 8.5.2-non-static-member-usage-2 8.4.6-miranda-2 @@ -257,11 +258,9 @@ 8.4.6.3-signature-10 8.4.6.3-signature-12 8.4.6.3-signature-15 -8.4.3-native-9 -8.4.3-native-10 -8.4.3-bad-1 -8.4.3-bad-2 8.7-abrupt-1 +8.7-complete-1 +8.7-complete-3 5.1.3-dti-1 5.1.3-dti-2 5.1.3-fti-1 @@ -448,7 +447,7 @@ 15.9.1-unqualified-concrete-6 15.9.1-unqualified-concrete-7 15.9.1-unqualified-concrete-10 -15.9.1-unqualified-concrete-15 +15.9.1-unqualified-concrete-14 15.9.1-qualified-concrete-6 15.9.1-qualified-concrete-7 15.9.1-qualified-concrete-10 @@ -456,7 +455,7 @@ 15.9.1-qualified-concrete-14 15.9.1-qualified-concrete-16 15.9.1-qualified-concrete-20 -15.9.1-qualified-concrete-23 +15.9.1-qualified-concrete-24 15.28-primitive-9 15.28-primitive-15 15.28-primitive-16 @@ -589,7 +588,6 @@ 15.15.2-final-3 15.15.1-final-2 15.15.1-final-3 -9.4-modifier-10 9.4.1-conflict-2 9.3.1-init-1 9.3.1-illegal-forward-1 @@ -601,9 +599,6 @@ 9.1.1-in-interface-3 9.1.1-in-interface-9 9.1.1-in-interface-16 -9.1.2-interface-3 -9.1.2-interface-5 -9.1.2-interface-6 9.1.2-supertype-1 9.2-implicit-2 9.2-implicit-3 @@ -616,46 +611,7 @@ 9.2-implicit-17 9.2-implicit-18 9.2-implicit-19 -3.7-line-number-1 -3.7-line-number-2 -3.7-line-number-3 -3.7-line-number-4 -3.7-line-number-5 -3.7-line-number-6 -3.7-line-number-7 -3.7-line-number-8 -3.7-line-number-9 -3.7-line-number-10 -3.7-line-number-11 -3.7-line-number-12 -3.7-line-number-13 -3.7-line-number-14 3.2-valid-1 -3.4-line-number-1 -3.4-line-number-2 -3.4-line-number-3 -3.4-line-number-4 -3.4-line-number-5 -3.4-line-number-6 -3.4-line-number-7 -3.4-line-number-8 -3.4-line-number-9 -3.4-line-number-10 -3.4-line-number-11 -3.4-line-number-12 -3.4-line-number-13 -3.4-line-number-14 -3.4-line-number-15 -3.4-line-number-16 -3.4-line-number-17 -3.4-line-number-18 -3.4-line-number-19 -3.4-line-number-20 -3.4-line-number-21 -3.4-line-number-22 -3.4-line-number-23 -3.4-line-number-24 -3.4-line-number-25 3.10.2-round-6 3.10.2-round-7 3.10.2-round-9 @@ -666,10 +622,6 @@ 3.10.2-double-14 3.10.1-invalid-3 3.10.1-invalid-4 -3.3-invalid-5 -3.3-invalid-6 -3.3-invalid-7 -3.3-invalid-8 6.6.2.2-protected-creation-3 6.6.2.1-protected-instance-field-3 6.6.2.1-protected-instance-field-4 @@ -680,10 +632,6 @@ 6.6.2.1-protected-instance-method-6 6.6.2.1-protected-instance-method-7 6.6.2.1-protected-type-2 -6.6.2.1-protected-type-4 -6.6.2.1-protected-type-5 -6.6.2.1-protected-type-7 -6.6.2.1-protected-type-8 6.6.1-8 6.6.1-11 6.6.1-array-2 @@ -711,14 +659,14 @@ 6.5.6.1-local-4 6.5.6.1-field-6 6.5.6.1-explicit-constructor-2 -6.5.4.2-qualified-1 6.5.4.1-simple-6 -6.5.4.1-simple-8 +6.5.4.1-simple-10 +6.5.4.1-simple-11 6.5.1-type-15 6.5.1-type-16 6.5.1-type-19 -6.5.1-typeorpackage-1 6.5.1-typeorpackage-2 +6.5.5.2-type-4 6.5.5.2-type-5 6.5.5.2-type-6 6.5.5.2-type-7 @@ -733,9 +681,10 @@ 6.5.5.1-nested-19 6.5.5.1-nested-20 6.5.5.1-nested-21 -6.5.5.1-nested-22 6.5.5.1-nested-23 6.3-1 +7.4.2-subpackage-1 +7.4.2-subpackage-2 7.5.1-canonical-3 7.5.1-accessible-1 7.5.1-duplicate-4 @@ -743,8 +692,6 @@ 7.5.2-accessible-1 7.5.2-accessible-3 7.5.2-duplicate-3 -7.1-named-5 -7.1-named-6 7.1-named-7 7.6-unnamed-scope-1 4.5.4-static-1 @@ -805,7 +752,6 @@ non-jls-zip-2 14-runtime-jump-1 14-runtime-jump-2 14.3.1-runtime-3 -14.19.2-runtime-try-1 8.1.2-runtime-1 6.6.1-runtime-privateconstructor-1 8.8.3-runtime-inner-4 @@ -831,11 +777,11 @@ non-jls-zip-2 15.11.1-runtime-static-1 15.11.1-runtime-static-2 15.11.1-runtime-static-3 +15.11.1-runtime-static-4 15.12.3-runtime-mode-1 15.12.3-runtime-mode-2 15.12.3-runtime-mode-3 15.12.3-runtime-mode-4 -15.12.3-runtime-mode-5 15.12.3-runtime-mode-6 15.12.4.1-runtime-static-1 15.12.4.1-runtime-static-2 diff --git a/libjava/testsuite/libjava.jni/calls.c b/libjava/testsuite/libjava.jni/calls.c index 080e5271cfb..dd54005ba18 100644 --- a/libjava/testsuite/libjava.jni/calls.c +++ b/libjava/testsuite/libjava.jni/calls.c @@ -1,7 +1,7 @@ #include <stdio.h> #include <calls.h> -jint +JNIEXPORT jint JNICALL Java_calls_docall (JNIEnv *env, jobject _this) { jmethodID method; diff --git a/libjava/testsuite/libjava.jni/field.c b/libjava/testsuite/libjava.jni/field.c index 358c293e7c5..bce0cc896e6 100644 --- a/libjava/testsuite/libjava.jni/field.c +++ b/libjava/testsuite/libjava.jni/field.c @@ -1,7 +1,7 @@ #include <jni.h> #include <field.h> -jobjectArray +JNIEXPORT jobjectArray JNICALL Java_field_fetch (JNIEnv *env, jobject this) { jclass cls; diff --git a/libjava/testsuite/libjava.jni/final_method.c b/libjava/testsuite/libjava.jni/final_method.c index 82977374bcb..76d5ae52827 100644 --- a/libjava/testsuite/libjava.jni/final_method.c +++ b/libjava/testsuite/libjava.jni/final_method.c @@ -1,6 +1,6 @@ #include <final_method.h> -jstring +JNIEXPORT jstring JNICALL Java_final_1method_meth (JNIEnv *env, jobject thisv) { return (*env)->NewStringUTF (env, "zardoz has spoken"); diff --git a/libjava/testsuite/libjava.jni/findclass.c b/libjava/testsuite/libjava.jni/findclass.c index 9a71508ab3f..1a58a55fee4 100644 --- a/libjava/testsuite/libjava.jni/findclass.c +++ b/libjava/testsuite/libjava.jni/findclass.c @@ -2,7 +2,7 @@ #include <findclass.h> -jclass +JNIEXPORT jclass JNICALL Java_findclass_doit (JNIEnv *env, jclass klass, jstring name) { const char *buf = (*env)->GetStringUTFChars (env, name, NULL); diff --git a/libjava/testsuite/libjava.jni/invoke.c b/libjava/testsuite/libjava.jni/invoke.c index 35a446eae25..c2b78d239cb 100644 --- a/libjava/testsuite/libjava.jni/invoke.c +++ b/libjava/testsuite/libjava.jni/invoke.c @@ -1,6 +1,6 @@ #include <invoke.h> -jint +JNIEXPORT jint JNICALL Java_invoke_val (JNIEnv *env, jclass klass) { return 23; diff --git a/libjava/testsuite/libjava.jni/martin.c b/libjava/testsuite/libjava.jni/martin.c index 947bd452c04..0fbb8d0aa73 100644 --- a/libjava/testsuite/libjava.jni/martin.c +++ b/libjava/testsuite/libjava.jni/martin.c @@ -2,7 +2,8 @@ #include "martin.h" #include <stdio.h> -void Java_martin_myNative(JNIEnv* env, jobject this, jstring s) +JNIEXPORT void JNICALL +Java_martin_myNative(JNIEnv* env, jobject this, jstring s) { jclass cls; jfieldID fid; diff --git a/libjava/testsuite/libjava.jni/noclass.c b/libjava/testsuite/libjava.jni/noclass.c index 5f2caf428ae..87c649c30e6 100644 --- a/libjava/testsuite/libjava.jni/noclass.c +++ b/libjava/testsuite/libjava.jni/noclass.c @@ -1,6 +1,6 @@ #include <noclass.h> -void +JNIEXPORT void JNICALL Java_noclass_find_1it (JNIEnv *env, jclass k) { /* We cause an exception by asking for a class we know does not diff --git a/libjava/testsuite/libjava.jni/overload.c b/libjava/testsuite/libjava.jni/overload.c index d171fc3ac9b..4e7a2d9289b 100644 --- a/libjava/testsuite/libjava.jni/overload.c +++ b/libjava/testsuite/libjava.jni/overload.c @@ -1,13 +1,13 @@ #include <overload.h> -jint +JNIEXPORT jint JNICALL Java_overload_over__I (JNIEnv *env, jclass klass, jint val) { return val; } -jint +JNIEXPORT jint JNICALL Java_overload_over__II (JNIEnv *env, jclass klass, jint one, jint two) { return one + two; diff --git a/libjava/testsuite/libjava.jni/register.c b/libjava/testsuite/libjava.jni/register.c index 738182cf0f6..0490902420e 100644 --- a/libjava/testsuite/libjava.jni/register.c +++ b/libjava/testsuite/libjava.jni/register.c @@ -8,7 +8,7 @@ some_random_name (JNIEnv *env, jclass k, jint v) return v - 1; } -jint +JNIEXPORT jint JNICALL JNI_OnLoad (JavaVM *vm, void *nothing) { JNIEnv *env; diff --git a/libjava/testsuite/libjava.jni/simple_int.c b/libjava/testsuite/libjava.jni/simple_int.c index a86f2d2babd..a7c64b0cd5f 100644 --- a/libjava/testsuite/libjava.jni/simple_int.c +++ b/libjava/testsuite/libjava.jni/simple_int.c @@ -1,6 +1,6 @@ #include <simple_int.h> -jint +JNIEXPORT jint JNICALL Java_simple_1int_nat (JNIEnv *env, jclass klass, jint val) { return 2 * val; diff --git a/libjava/testsuite/libjava.jni/throwit.c b/libjava/testsuite/libjava.jni/throwit.c index 0b02459b464..34a3ca07676 100644 --- a/libjava/testsuite/libjava.jni/throwit.c +++ b/libjava/testsuite/libjava.jni/throwit.c @@ -1,7 +1,7 @@ #include <stdlib.h> #include <throwit.h> -void +JNIEXPORT void JNICALL Java_throwit_throwit (JNIEnv *env, jclass klass, jstring name, jboolean is_new) { diff --git a/libjava/testsuite/libjava.jni/virtual.c b/libjava/testsuite/libjava.jni/virtual.c index bda837df102..0246970835b 100644 --- a/libjava/testsuite/libjava.jni/virtual.c +++ b/libjava/testsuite/libjava.jni/virtual.c @@ -1,6 +1,6 @@ #include <virtual.h> -jboolean +JNIEXPORT jboolean JNICALL Java_virtual_equals (JNIEnv *env, jobject thisv, jobject other) { return JNI_FALSE; diff --git a/libjava/testsuite/libjava.lang/pr8823.xfail b/libjava/testsuite/libjava.lang/pr8823.xfail new file mode 100644 index 00000000000..81d6df0a027 --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr8823.xfail @@ -0,0 +1 @@ +xfail-byte diff --git a/libjava/testsuite/libjava.lang/pr8945.java b/libjava/testsuite/libjava.lang/pr8945.java new file mode 100644 index 00000000000..9c5dce89a4a --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr8945.java @@ -0,0 +1,9 @@ +public class pr8945 +{ + public static void main(String[] args) + { + String foo = "hello"; + int pos = 3; + System.out.println(foo.substring(pos,++pos)); + } +} diff --git a/libjava/testsuite/libjava.lang/pr8945.out b/libjava/testsuite/libjava.lang/pr8945.out new file mode 100644 index 00000000000..1f9d725a9de --- /dev/null +++ b/libjava/testsuite/libjava.lang/pr8945.out @@ -0,0 +1 @@ +l diff --git a/libjava/testsuite/libjava.mauve/mauve.exp b/libjava/testsuite/libjava.mauve/mauve.exp index 1ca2884249c..ce4b0cee9cb 100644 --- a/libjava/testsuite/libjava.mauve/mauve.exp +++ b/libjava/testsuite/libjava.mauve/mauve.exp @@ -1,4 +1,4 @@ -# Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation. +# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation. # Written by Tom Tromey <tromey@cygnus.com>. # Incorporate Mauve into libjava's DejaGNU test suite framework. @@ -86,25 +86,25 @@ proc test_mauve {} { set full_srcdir [pwd] cd $here/mauve-build - global env - global GCJ_UNDER_TEST - global TOOL_EXECUTABLE + global env libgcj_jar + global GCJ_UNDER_TEST + global TOOL_EXECUTABLE - if ![info exists GCJ_UNDER_TEST] { - if [info exists TOOL_EXECUTABLE] { - set GCJ_UNDER_TEST $TOOL_EXECUTABLE; - } else { - if [info exists env(GCJ)] { - set GCJ_UNDER_TEST env(GCJ) - } else { - set GCJ_UNDER_TEST "[find_gcj]" - } - } + if ![info exists GCJ_UNDER_TEST] { + if [info exists TOOL_EXECUTABLE] { + set GCJ_UNDER_TEST $TOOL_EXECUTABLE; + } else { + if [info exists env(GCJ)] { + set GCJ_UNDER_TEST env(GCJ) + } else { + set GCJ_UNDER_TEST "[find_gcj]" + } } + } - # Append -B and -I so that libgcj.spec and libgcj.zip are found - # before they're installed. - set env(GCJ) "$GCJ_UNDER_TEST -B$objdir/../ -I$objdir/../libgcj.jar" + # Append -B and -I so that libgcj.spec and libgcj.jar are found + # before they're installed. + set env(GCJ) "$GCJ_UNDER_TEST -B$objdir/../ -I$libgcj_jar" if {[catch { system "$env(MAUVEDIR)/configure --with-gcj 2>&1" diff --git a/libjava/win32-threads.cc b/libjava/win32-threads.cc index d31c1919a1e..3a3999a8f2d 100644 --- a/libjava/win32-threads.cc +++ b/libjava/win32-threads.cc @@ -1,6 +1,7 @@ // win32-threads.cc - interface between libjava and Win32 threads. -/* Copyright (C) 1998, 1999 Free Software Foundation, Inc. +/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software + Foundation, Inc. This file is part of libgcj. @@ -70,12 +71,14 @@ DWORD _Jv_ThreadDataKey; inline void ensure_condvar_initialized(_Jv_ConditionVariable_t *cv) { - if (cv->ev[0] == 0) { - cv->ev[0] = CreateEvent (NULL, 0, 0, NULL); - if (cv->ev[0] == 0) JvFail("CreateEvent() failed"); - cv->ev[1] = CreateEvent (NULL, 1, 0, NULL); - if (cv->ev[1] == 0) JvFail("CreateEvent() failed"); - } + if (cv->ev[0] == 0) + { + cv->ev[0] = CreateEvent (NULL, 0, 0, NULL); + if (cv->ev[0] == 0) JvFail("CreateEvent() failed"); + + cv->ev[1] = CreateEvent (NULL, 1, 0, NULL); + if (cv->ev[1] == 0) JvFail("CreateEvent() failed"); + } } // Reimplementation of the general algorithm described at @@ -85,11 +88,13 @@ ensure_condvar_initialized(_Jv_ConditionVariable_t *cv) int _Jv_CondWait(_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu, jlong millis, jint nanos) { + if (mu->owner != GetCurrentThreadId ( )) + return _JV_NOT_OWNER; - EnterCriticalSection(&cv->count_mutex); - ensure_condvar_initialized(cv); + EnterCriticalSection (&cv->count_mutex); + ensure_condvar_initialized (cv); cv->blocked_count++; - LeaveCriticalSection(&cv->count_mutex); + LeaveCriticalSection (&cv->count_mutex); DWORD time; if ((millis == 0) && (nanos > 0)) time = 1; @@ -102,18 +107,17 @@ _Jv_CondWait(_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu, jlong millis, jint na EnterCriticalSection(&cv->count_mutex); cv->blocked_count--; - // If we were unblocked by the second event (the broadcast one) and nobody is - // left, then reset the signal. - int last_waiter = rval == WAIT_OBJECT_0 + 1 && cv->blocked_count == 0; + // If we were unblocked by the second event (the broadcast one) + // and nobody is left, then reset the event. + int last_waiter = (rval == (WAIT_OBJECT_0 + 1)) && (cv->blocked_count == 0); LeaveCriticalSection(&cv->count_mutex); - if (last_waiter) ResetEvent(&cv->ev[1]); + if (last_waiter) + ResetEvent (cv->ev[1]); _Jv_MutexLock (mu); - if (rval == WAIT_FAILED) return GetLastError(); - else if (rval == WAIT_TIMEOUT) return ETIMEDOUT; - else return 0; + return 0; } void @@ -121,39 +125,56 @@ _Jv_CondInit (_Jv_ConditionVariable_t *cv) { // we do lazy creation of Events since CreateEvent() is insanely expensive cv->ev[0] = 0; - InitializeCriticalSection(&cv->count_mutex); + InitializeCriticalSection (&cv->count_mutex); cv->blocked_count = 0; } void _Jv_CondDestroy (_Jv_ConditionVariable_t *cv) { - if (cv->ev[0] != 0) CloseHandle(cv->ev[0]); - cv = NULL; + if (cv->ev[0] != 0) + { + CloseHandle (cv->ev[0]); + CloseHandle (cv->ev[1]); + + cv->ev[0] = 0; + } + + DeleteCriticalSection (&cv->count_mutex); } int -_Jv_CondNotify (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *) +_Jv_CondNotify (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu) { - EnterCriticalSection(&cv->count_mutex); - ensure_condvar_initialized(cv); + if (mu->owner != GetCurrentThreadId ( )) + return _JV_NOT_OWNER; + + EnterCriticalSection (&cv->count_mutex); + ensure_condvar_initialized (cv); int somebody_is_blocked = cv->blocked_count > 0; - LeaveCriticalSection(&cv->count_mutex); + LeaveCriticalSection (&cv->count_mutex); + + if (somebody_is_blocked) + SetEvent (cv->ev[0]); - if (somebody_is_blocked) return SetEvent (cv->ev[0]) ? 0 : GetLastError(); - else return 0; + return 0; } int -_Jv_CondNotifyAll (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *) +_Jv_CondNotifyAll (_Jv_ConditionVariable_t *cv, _Jv_Mutex_t *mu) { - EnterCriticalSection(&cv->count_mutex); - ensure_condvar_initialized(cv); + if (mu->owner != GetCurrentThreadId ( )) + return _JV_NOT_OWNER; + + EnterCriticalSection (&cv->count_mutex); + ensure_condvar_initialized (cv); int somebody_is_blocked = cv->blocked_count > 0; - LeaveCriticalSection(&cv->count_mutex); + LeaveCriticalSection (&cv->count_mutex); - if (somebody_is_blocked) return SetEvent (cv->ev[1]) ? 0 : GetLastError(); - else return 0; + if (somebody_is_blocked) + SetEvent (cv->ev[1]); + + return 0; } // @@ -165,8 +186,8 @@ _Jv_InitThreads (void) { _Jv_ThreadKey = TlsAlloc(); _Jv_ThreadDataKey = TlsAlloc(); - daemon_mutex = CreateMutex(NULL, 0, NULL); - daemon_cond = CreateEvent(NULL, 0, 0, NULL); + daemon_mutex = CreateMutex (NULL, 0, NULL); + daemon_cond = CreateEvent (NULL, 1, 0, NULL); non_daemon_count = 0; } @@ -255,7 +276,7 @@ really_start (void* x) WaitForSingleObject (daemon_mutex, INFINITE); non_daemon_count--; if (! non_daemon_count) - PulseEvent (daemon_cond); + SetEvent (daemon_cond); ReleaseMutex (daemon_mutex); } @@ -297,10 +318,12 @@ _Jv_ThreadStart (java::lang::Thread *thread, _Jv_Thread_t *data, _Jv_ThreadStart void _Jv_ThreadWait (void) { - WaitForSingleObject(daemon_mutex, INFINITE); - if(non_daemon_count) - SignalObjectAndWait(daemon_mutex, daemon_cond, INFINITE, 0); - ReleaseMutex(daemon_mutex); + WaitForSingleObject (daemon_mutex, INFINITE); + if (non_daemon_count) + { + ReleaseMutex (daemon_mutex); + WaitForSingleObject (daemon_cond, INFINITE); + } } void diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index dd1bc296408..d684a529caf 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,16 @@ +2003-01-27 Alexandre Oliva <aoliva@redhat.com> + + * aclocal.m4 (glibcpp_toolexeclibdir): Instead of + $(MULTISUBDIR), use `$CC -print-multi-os-directory`, unless + version_specific_libs is enabled. + * configure: Rebuilt. + +2003-01-26 Christian Cornelssen <ccorn@cs.tu-berlin.de> + + * Makefile.in (FLAGS_TO_PASS): Also pass DESTDIR. + (install-libs, install-headers): Prepend $(DESTDIR) to + destination paths in all (un)installation commands. + 2002-09-22 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * Makefile.in (all): Fix multilib parallel build. diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in index 4d5c5da8db4..244f1e75a1a 100644 --- a/libobjc/Makefile.in +++ b/libobjc/Makefile.in @@ -118,6 +118,7 @@ FLAGS_TO_PASS = \ "AR_FLAGS=$(AR_FLAGS)" \ "CC=$(CC)" \ "CFLAGS=$(CFLAGS)" \ + "DESTDIR=$(DESTDIR)" \ "LIBCFLAGS=$(LIBCFLAGS)" \ "EXTRA_OFILES=$(EXTRA_OFILES)" \ "HDEFINES=$(HDEFINES)" \ @@ -318,21 +319,21 @@ ${srcdir}/configure: configure.in install: install-libs install-headers install-libs: installdirs - $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(glibcpp_toolexeclibdir) - $(LIBTOOL_INSTALL) $(INSTALL) libobjc.la $(glibcpp_toolexeclibdir); + $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(DESTDIR)$(glibcpp_toolexeclibdir) + $(LIBTOOL_INSTALL) $(INSTALL) libobjc.la $(DESTDIR)$(glibcpp_toolexeclibdir); if [ "$(OBJC_BOEHM_GC)" ]; then \ $(LIBTOOL_INSTALL) $(INSTALL) libobjc_gc.la \ - $(glibcpp_toolexeclibdir);\ + $(DESTDIR)$(glibcpp_toolexeclibdir);\ fi $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@" - @-$(LIBTOOL) --mode=finish $(glibcpp_toolexeclibdir) + @-$(LIBTOOL) --mode=finish $(DESTDIR)$(glibcpp_toolexeclibdir) # Copy Objective C headers to installation include directory. install-headers: - $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(libsubdir)/include/objc + $(SHELL) $(toplevel_srcdir)/mkinstalldirs $(DESTDIR)$(libsubdir)/include/objc for file in $(OBJC_H); do \ realfile=$(srcdir)/objc/$${file}; \ - $(INSTALL_DATA) $${realfile} $(libsubdir)/include/objc; \ + $(INSTALL_DATA) $${realfile} $(DESTDIR)$(libsubdir)/include/objc; \ done check uninstall install-strip dist installcheck installdirs: diff --git a/libobjc/aclocal.m4 b/libobjc/aclocal.m4 index a85624f1d30..ed643f6038c 100644 --- a/libobjc/aclocal.m4 +++ b/libobjc/aclocal.m4 @@ -207,11 +207,12 @@ if test x"$glibcpp_toolexecdir" = x"no"; then if test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)' - glibcpp_toolexeclibdir='$(toolexecdir)/lib$(MULTISUBDIR)' + glibcpp_toolexeclibdir='$(toolexecdir)/lib' else glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' - glibcpp_toolexeclibdir='$(libdir)$(MULTISUBDIR)' + glibcpp_toolexeclibdir='$(libdir)' fi + glibcpp_toolexeclibdir=$glibcpp_toolexeclibdir/`$CC -print-multi-os-directory` fi AC_SUBST(glibcpp_prefixdir) diff --git a/libobjc/configure b/libobjc/configure index 85ffb615f8c..ad532b70682 100755 --- a/libobjc/configure +++ b/libobjc/configure @@ -52,7 +52,6 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= -sitefile= srcdir= target=NONE verbose= @@ -167,7 +166,6 @@ Configuration: --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages - --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -338,11 +336,6 @@ EOF -site=* | --site=* | --sit=*) site="$ac_optarg" ;; - -site-file | --site-file | --site-fil | --site-fi | --site-f) - ac_prev=sitefile ;; - -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) - sitefile="$ac_optarg" ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -508,16 +501,12 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$sitefile"; then - if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -else - CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -646,7 +635,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:650: checking host system type" >&5 +echo "configure:639: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -667,7 +656,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:671: checking target system type" >&5 +echo "configure:660: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -685,7 +674,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:689: checking build system type" >&5 +echo "configure:678: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -717,12 +706,12 @@ else fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:721: checking for Cygwin environment" >&5 +echo "configure:710: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 726 "configure" +#line 715 "configure" #include "confdefs.h" int main() { @@ -733,7 +722,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -750,19 +739,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:754: checking for mingw32 environment" >&5 +echo "configure:743: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 759 "configure" +#line 748 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -797,7 +786,7 @@ esac # be 'cp -p' if linking isn't available. #ac_cv_prog_LN_S='cp -p' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:801: checking whether ln -s works" >&5 +echo "configure:790: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -853,7 +842,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:857: checking for $ac_word" >&5 +echo "configure:846: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -883,7 +872,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:887: checking for $ac_word" >&5 +echo "configure:876: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -932,7 +921,7 @@ fi fi echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:936: checking whether we are using GNU C" >&5 +echo "configure:925: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -941,7 +930,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -956,7 +945,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:960: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:949: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -987,7 +976,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:991: checking for $ac_word" >&5 +echo "configure:980: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1019,7 +1008,7 @@ fi # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. set dummy ${ac_tool_prefix}ar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1023: checking for $ac_word" >&5 +echo "configure:1012: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1051,7 +1040,7 @@ fi # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1055: checking for $ac_word" >&5 +echo "configure:1044: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1083,7 +1072,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1087: checking for $ac_word" >&5 +echo "configure:1076: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1127,7 +1116,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:1131: checking for a BSD compatible install" >&5 +echo "configure:1120: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1195,7 +1184,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1199: checking for executable suffix" >&5 +echo "configure:1188: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1205,10 +1194,10 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.c | *.o | *.obj | *.ilk | *.pdb) ;; + *.c | *.o | *.obj) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -1235,13 +1224,13 @@ glibcpp_toolexeclibdir=no glibcpp_prefixdir=${prefix} echo $ac_n "checking for interface version number""... $ac_c" 1>&6 -echo "configure:1239: checking for interface version number" >&5 +echo "configure:1228: checking for interface version number" >&5 libstdcxx_interface=$INTERFACE echo "$ac_t""$libstdcxx_interface" 1>&6 # Process the option "--enable-version-specific-runtime-libs" echo $ac_n "checking for --enable-version-specific-runtime-libs""... $ac_c" 1>&6 -echo "configure:1245: checking for --enable-version-specific-runtime-libs" >&5 +echo "configure:1234: checking for --enable-version-specific-runtime-libs" >&5 # Check whether --enable-version-specific-runtime-libs or --disable-version-specific-runtime-libs was given. if test "${enable_version_specific_runtime_libs+set}" = set; then enableval="$enable_version_specific_runtime_libs" @@ -1276,11 +1265,12 @@ if test x"$glibcpp_toolexecdir" = x"no"; then if test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)' - glibcpp_toolexeclibdir='$(toolexecdir)/lib$(MULTISUBDIR)' + glibcpp_toolexeclibdir='$(toolexecdir)/lib' else glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' - glibcpp_toolexeclibdir='$(libdir)$(MULTISUBDIR)' + glibcpp_toolexeclibdir='$(libdir)' fi + glibcpp_toolexeclibdir=$glibcpp_toolexeclibdir/`$CC -print-multi-os-directory` fi @@ -1295,7 +1285,7 @@ fi compiler_name=cc1obj rm -f skip-this-dir echo $ac_n "checking if compiler $compiler_name has been built""... $ac_c" 1>&6 -echo "configure:1299: checking if compiler $compiler_name has been built" >&5 +echo "configure:1289: checking if compiler $compiler_name has been built" >&5 if eval "test \"`echo '$''{'objc_cv_compiler_exists'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1407,7 +1397,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1411: checking for ld used by GCC" >&5 +echo "configure:1401: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1437,10 +1427,10 @@ echo "configure:1411: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1441: checking for GNU ld" >&5 +echo "configure:1431: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1444: checking for non-GNU ld" >&5 +echo "configure:1434: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1475,7 +1465,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1479: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1469: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1492,7 +1482,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1496: checking for $LD option to reload object files" >&5 +echo "configure:1486: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1504,7 +1494,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1508: checking for BSD-compatible nm" >&5 +echo "configure:1498: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1542,7 +1532,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:1546: checking how to recognise dependant libraries" >&5 +echo "configure:1536: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1715,13 +1705,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1719: checking for object suffix" >&5 +echo "configure:1709: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1725: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1715: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1745,7 +1735,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:1749: checking for ${ac_tool_prefix}file" >&5 +echo "configure:1739: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1807,7 +1797,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:1811: checking for file" >&5 +echo "configure:1801: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1878,7 +1868,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1882: checking for $ac_word" >&5 +echo "configure:1872: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1910,7 +1900,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1914: checking for $ac_word" >&5 +echo "configure:1904: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1945,7 +1935,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1949: checking for $ac_word" >&5 +echo "configure:1939: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1977,7 +1967,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1981: checking for $ac_word" >&5 +echo "configure:1971: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2044,8 +2034,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2048 "configure"' > conftest.$ac_ext - if { (eval echo configure:2049: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2038 "configure"' > conftest.$ac_ext + if { (eval echo configure:2039: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2064,7 +2054,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2068: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2058: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2077,12 +2067,54 @@ ia64-*-hpux*) rm -rf conftest* ;; +x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo configure:2074: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + case "`/usr/bin/file conftest.o`" in + *32-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2086: checking whether the C compiler needs -belf" >&5 +echo "configure:2118: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2095,14 +2127,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2099 "configure" +#line 2131 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2132,7 +2164,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. set dummy ${ac_tool_prefix}dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2136: checking for $ac_word" >&5 +echo "configure:2168: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2164,7 +2196,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "dlltool", so it can be a program name with args. set dummy dlltool; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2168: checking for $ac_word" >&5 +echo "configure:2200: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2199,7 +2231,7 @@ fi # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. set dummy ${ac_tool_prefix}as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2203: checking for $ac_word" >&5 +echo "configure:2235: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2231,7 +2263,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "as", so it can be a program name with args. set dummy as; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2235: checking for $ac_word" >&5 +echo "configure:2267: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2266,7 +2298,7 @@ fi # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. set dummy ${ac_tool_prefix}objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2270: checking for $ac_word" >&5 +echo "configure:2302: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2298,7 +2330,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "objdump", so it can be a program name with args. set dummy objdump; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2302: checking for $ac_word" >&5 +echo "configure:2334: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2334,12 +2366,12 @@ fi # recent cygwin and mingw systems supply a stub DllMain which the user # can override, but on older systems we have to supply one echo $ac_n "checking if libtool should supply DllMain function""... $ac_c" 1>&6 -echo "configure:2338: checking if libtool should supply DllMain function" >&5 +echo "configure:2370: checking if libtool should supply DllMain function" >&5 if eval "test \"`echo '$''{'lt_cv_need_dllmain'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2343 "configure" +#line 2375 "configure" #include "confdefs.h" int main() { @@ -2347,7 +2379,7 @@ extern int __attribute__((__stdcall__)) DllMain(void*, int, void*); DllMain (0, 0, 0); ; return 0; } EOF -if { (eval echo configure:2351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_need_dllmain=no else @@ -2368,19 +2400,19 @@ echo "$ac_t""$lt_cv_need_dllmain" 1>&6 SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -mdll" echo $ac_n "checking how to link DLLs""... $ac_c" 1>&6 -echo "configure:2372: checking how to link DLLs" >&5 +echo "configure:2404: checking how to link DLLs" >&5 if eval "test \"`echo '$''{'lt_cv_cc_dll_switch'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2377 "configure" +#line 2409 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_dll_switch=-mdll else @@ -2498,7 +2530,7 @@ else # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2502: checking for $ac_word" >&5 +echo "configure:2534: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2538,7 +2570,7 @@ fi # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:2542: checking for a BSD compatible install" >&5 +echo "configure:2574: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2591,7 +2623,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:2595: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:2627: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2620,7 +2652,7 @@ fi # Sanity check for the cross-compilation case: echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2624: checking how to run the C preprocessor" >&5 +echo "configure:2656: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2635,13 +2667,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 2639 "configure" +#line 2671 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2652,13 +2684,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 2656 "configure" +#line 2688 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2662: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2669,13 +2701,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 2673 "configure" +#line 2705 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2701,17 +2733,17 @@ echo "$ac_t""$CPP" 1>&6 ac_safe=`echo "stdio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for stdio.h""... $ac_c" 1>&6 -echo "configure:2705: checking for stdio.h" >&5 +echo "configure:2737: checking for stdio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2710 "configure" +#line 2742 "configure" #include "confdefs.h" #include <stdio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2715: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2739,12 +2771,12 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2743: checking for ANSI C header files" >&5 +echo "configure:2775: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2748 "configure" +#line 2780 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -2752,7 +2784,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2756: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2788: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2769,7 +2801,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 2773 "configure" +#line 2805 "configure" #include "confdefs.h" #include <string.h> EOF @@ -2787,7 +2819,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 2791 "configure" +#line 2823 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -2808,7 +2840,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 2812 "configure" +#line 2844 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2819,7 +2851,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2823: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2847,17 +2879,17 @@ for ac_hdr in sched.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2851: checking for $ac_hdr" >&5 +echo "configure:2883: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2856 "configure" +#line 2888 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2861: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2887,7 +2919,7 @@ done # Determine CFLAGS for gthread. echo $ac_n "checking for gthread cflags""... $ac_c" 1>&6 -echo "configure:2891: checking for gthread cflags" >&5 +echo "configure:2923: checking for gthread cflags" >&5 if eval "test \"`echo '$''{'objc_cv_gthread_flags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ee8cdb3cd16..461ae2cf066 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,307 @@ +2003-01-28 Nathan Sidwell <nathan@codesourcery.com> + + PR c++/9433 + * libsupc++/tinfo.cc (__vmi_class_type_info::__do_dyncast): Cope + with bases which are very ambiguous. + +2003-01-28 Danny Smith <dannysmith@users.sourceforge.net> + + * src/Makefile.am (CONFIG_CXXFLAGS): Reverse order of + @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@. + * libsupc++/Makefile.am (CONFIG_CXXFLAGS): Likewise. + * src/Makefile.in: Regenerate. + * libsupc++/Makefile.in: Regenerate. + +2003-01-27 Alexandre Oliva <aoliva@redhat.com> + + * acinclude.m4 (glibcpp_toolexeclibdir): Instead of + $(MULTISUBDIR), use `$CC -print-multi-os-directory`, unless + version_specific_libs is enabled. + * aclocal.m4, configure: Rebuilt. + +2003-01-26 Christian Cornelssen <ccorn@cs.tu-berlin.de> + + * include/Makefile.am (install-data-local): Prepend + $(DESTDIR) to destination paths in all (un)installation + commands. Use ${c_base_builddir} and ${std_builddir} + as destination subdirectories to achieve consistency with + preceding mkinstalldirs commands. No effect because both + variables contain "." only. + * include/Makefile.in: Regenerate. + +2003-01-23 Phil Edwards <pme@gcc.gnu.org> + + Bulk documentation merge (copy) from trunk. + * docs/doxygen/tables.html, docs/doxygen/user.cfg.in, + docs/html/configopts.html, docs/html/debug.html, + docs/html/documentation.html, docs/html/17_intro/howto.html, + docs/html/19_diagnostics/howto.html, docs/html/ext/sgiexts.html: + Merge from trunk. + +2003-01-23 Petur Runolfsson <peturr02@ru.is> + + PR libstdc++/9322 + * include/std/std_streambuf.h + (basic_streambuf::basic_streambuf, + basic_streambuf::~basic_streambuf, + basic_streambuf::getloc, basic_streambuf::imbue): + Remove _M_buf_locale_init use. + * include/bits/fstream.tcc (basic_filebuf::imbue): Likewise + * testsuite/27_io/filebuf_virtuals.cc (test08): Add. + * testsuite/27_io/streambuf_members.cc (test08): Add. + * testsuite/27_io/stringbuf_virtuals.cc (test08): Add. + +2003-01-23 Benjamin Kosnik <bkoz@redhat.com> + + Revert include ordering. + * config/locale/generic/c_locale.h: Add include guards. + * config/locale/gnu/c_locale.h: Same. + * include/bits/locale_classes.h: Remove cctype include. + * include/std/std_iosfwd.h: Add c++locale.h, cctype includes. + * include/std/std_fstream.h: Remove streambuf include. + * include/std/std_sstream.h: Remove streambuf include. + +2003-01-23 Benjamin Kosnik <bkoz@redhat.com> + + Match 3.2.0 ABI. + * include/bits/stl_alloc.h: Revert. + + * include/bits/codecvt.h: Revert. + * config/locale/gnu/codecvt_members.cc: Revert. + * src/codecvt.cc: Revert. + * src/localename.cc: Revert. + + * include/bits/ios_base.h (ios_base::~ios_base): Revert. + + * config/linker-map.gnu: Mostly match 3_2-branch file. + +2003-01-22 Benjamin Kosnik <bkoz@redhat.com> + + * include/bits/locale_facets.h: Move non-facet classes requiring + <string> to... + * include/bits/locale_classes.h: New. + * include/bits/Makefile.am (bits_headers_src): Add locale_classes.h. + * include/bits/Makefile.in: Regenerate. + + * include/bits/locale_facets.tcc (__convert_from_v): Move to... + * config/locale/gnu/c_locale.h: ...here. + * config/locale/generic/c_locale.h: Same. + + * include/bits/locale_facets.tcc: Move declarations to... + * include/bits/locale_facets.h: ...here. + * include/bits/basic_ios.h: Tweak includes accordingly. + * include/std/std_sstream.h: Add streambuf include. + * include/std/std_fstream.h: Ditto. + * include/std/std_locale.h: Add locale_classes.h include. + * include/std/std_iosfwd.h: Tweak. + * src/concept-inst.cc: Add iterator include. + + * config/linker-map.gnu: Specify __cxa functions, mark __cxa_dyn_* + bits as unexported in the future. + +2003-01-15 Benjamin Kosnik <bkoz@redhat.com> + + * acinclude.m4 (GLIBCPP_CHECK_WCHAR_T_SUPPORT): Substitute + GLIBCPP_TEST_WCHAR_T if building wchar_t bits in the library. + * aclocal.m4: Regenerate. + * configure: Regenerate. + * testsuite/Makefile.am (all-local): Add conditional rule to + generate testsuite_wchar_t. + * testsuite/Makefile.in: Regenerate. + * testsuite/lib/libstdc++-v3-dg.exp + (libstdc++-v3-list-sourcefiles): Remove wchar_t files if + testsuite_wchar_t is not present in the build directory. + * testsuite/libstdc++-v3.dg/dg.exp: Add -g -O2 to DEFAULT_CXXFLAGS. + Remove setulimit bits. + * testsuite/26_numerics/complex_value.cc: Set to noopts. + * testsuite/Makefile.am (CLEANFILES): Add. + * testsuite/Makefile.in: Regenerate. + +2003-01-15 Benjamin Kosnik <bkoz@redhat.com> + + Renames, namespaces for testsuite utilities. + * testsuite/testsuite_hooks.h: Put into namespace __gnu_cxx_test. + (gnu_allocator_tracker): Rename to allocation_tracker. + (gnu_new_allocator): Rename to tracker_alloc. + (__set_testsuite_memlimit): Rename to set_memory_limits. + (gnu_assignment_operator): Rename to assignment_operator. + (gnu_destructor): Rename to destructor. + (gnu_copy_tracker): Rename to copy_tracker. + (gnu_char, gnu_int, gnu_long): Rename to pod_char, pod_int, pod_long. + (run_tests_wrapped_locale): New. + (run_tests_wrapped_env): New. + * testsuite/testsuite_hooks.cc: Same. + (class locale_data): Add. + (class enviornment_variable): Add. + (class not_found): Add. + * testsuite/testsuite_allocator.h: Same. + * testsuite/testsuite_allocator.cc: Same. + * testsuite/23_containers/deque_ctor.cc + (test_copy_ctor_exception_safety): Change gnu_allocator_tracker to + allocation_tracker. + Change gnu_new_allocator to tracker_alloc. + Change gnu_counting_struct to counter. + Change gnu_copy_tracker to copy_tracker. + Change gnu_copy_constructor to copy_constructor. + Change gnu_assignment_operator to assignment_operator. + Inject. + * testsuite/23_containers/vector_capacity.cc: Same. + * testsuite/23_containers/vector_ctor.cc (test01): Same. + * testsuite/23_containers/list_modifiers.cc: Change + gnu_copy_tracker to copy_tracker. + * testsuite/21_strings/ctor_copy_dtor.cc (main): Change + __set_testsuite_memlimit to set_memory_limits. + * testsuite/21_strings/insert.cc (main): Same. + * testsuite/27_io/filebuf.cc: Change gnu_char to pod_char. + * testsuite/27_io/stringstream.cc: Same. + * testsuite/27_io/stringbuf.cc: Same. + * testsuite/27_io/streambuf.cc: Same. + * testsuite/27_io/ostream.cc: Same. + * testsuite/27_io/istream.cc: Same. + * testsuite/27_io/fstream.cc: Same. + * testsuite/lib/libstdc++-v3-dg.exp + (libstdc++-v3-list-sourcefiles): Additionally handle files two and + three levels deeper in glob patterns. + +2003-01-15 John David Anglin <dave@hiauly1.hia.nrc.ca> + + * config/os/hpux/os_defines.h (_GLIBCPP_GTHREAD_USE_WEAK): Define for + __hppa__. + +2003-01-10 Benjamin Kosnik <bkoz@redhat.com> + Sysoltsev Slawa <Vyatcheslav.Sysoltsev@intel.com> + + PR libstdc++/9269 + * include/std/std_fstream.h (basic_filebuf::uflow): Declare. + (basic_filebuf::underflow): Declare. + Move definitions. + +2003-01-07 Benjamin Kosnik <bkoz@redhat.com> + + PR libstdc++/8707 + * Makefile.am (distclean-multi): Fix. + * Makefile.in: Regenerate. + +2003-01-06 Benjamin Kosnik <bkoz@redhat.com> + + * include/bits/locale_facets.h (messages): Move ctor, dtor + definitions to.. + (__timepunct): Same. + * config/locale/gnu/messages_members.h (messages): Add dtor, ctor + definitions. Conditionalize for GNU systems. + * config/locale/generic/messages_members.h (messages): Add dtor, ctor + definitions. + * config/locale/gnu/time_members.h (messages): New. Add dtor, ctor + definitions. Conditionalize for GNU systems. + * config/locale/generic/time_members.h (messages): New. Add dtor, ctor + definitions. + * include/bits/localefwd.h (locale::facet::_S_c_name): Add. + * src/locale.cc: Define. + * src/localename.cc (locale::_Impl::_Impl(facet**, size_t, bool): + Use it. + * config/locale/gnu/time_members.h: Use it. + * config/locale/gnu/messages_members.h: Use it. + * config/linker-map.gnu: Add locale::facets details. + * include/Makefile.am (target_headers_extra): Add time_members.h. + * include/Makefile.in: Regenerate. + * acinclude.m4: Export CTIME_H. + * aclocal.m4: Regenerate. + * configure: Regnerate. + +2003-01-06 Paolo Carlini <pcarlini@unitus.it> + + * src/codecvt.cc + (codecvt<char, char, mbstate_t>::do_in, do_out): + Tweak parameters to avoid unused parameter warnings. + +2003-01-06 Paolo Carlini <pcarlini@unitus.it> + + PR libstdc++/9151 + * include/bits/locale_facets.cc (num_put::_M_convert_float): + Limit __prec to digits10 + 2, not digits10 + 1, taking into + account the possibility of %{g,G} conversion specifiers + inside _S_format_float. + * testsuite/27_io/ostream_inserter_arith.cc (test06): Add. + +2003-01-06 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * testsuite/lib/libstdc++-v3-dg.exp (libstdc++-v3-init, + libstdc++-v3-list-sourcefiles): Additionally handle files one + level deeper in glob patterns. + + * testsuite/27_io/istream_extractor_arith.cc: Delete, split... + * testsuite/27_io/istream_extractor_arith/01.cc, + testsuite/27_io/istream_extractor_arith/02.cc, + testsuite/27_io/istream_extractor_arith/03.cc, + testsuite/27_io/istream_extractor_arith/06.cc, + testsuite/27_io/istream_extractor_arith/07.cc, + testsuite/27_io/istream_extractor_arith/08.cc, + testsuite/27_io/istream_extractor_arith/09.cc, + testsuite/27_io/istream_extractor_arith/10.cc, + testsuite/27_io/istream_extractor_arith/11.cc, + testsuite/27_io/istream_extractor_arith/12.cc, + testsuite/27_io/istream_extractor_arith/13.cc: ... to new files. + * testsuite/27_io/istream_extractor_arith/12.cc: Add XFAIL for + sparc*-*-solaris2*. + +2003-01-05 Paolo Carlini <pcarlini@unitus.it> + + PR libstdc++/9168 + * src/codecvt.cc + (codecvt<char, char, mbstate_t>::do_in, do_out): + Implement the resolution of DR19 (TC). + * testsuite/22_locale/codecvt_members_char_char.cc + (test01): Tweak. + +2002-12-29 Phil Edwards <pme@gcc.gnu.org> + + * include/std/std_bitset.h: Better comments. + +2002-12-29 Phil Edwards <pme@gcc.gnu.org> + + * include/std/std_bitset.h (_Base_bitset::_M_do_left_shift, + _Base_bitset::_M_do_right_shift): Expect a non-zero shift. + (bitset::operator<<=, bitset::operator>>=): When shifting more bits + than are in the bitset, zero memory rather than segfault. + (operator>>(basic_istream,bitset): Only call setstate once, after + all work has been done. + + * testsuite/23_containers/bitset_members.cc (test03): New test. + * testsuite/23_containers/bitset_shift.cc (test02): New test. + +2002-12-28 Joseph S. Myers <jsm@polyomino.org.uk> + + * docs/html/17_intro/porting.texi: Use @copying. + * docs/html/17_intro/porting.html: Regenerate. + +2002-12-23 Danny Smith <dannysmith@users.sourceforge.net> + + * config/io/basic_file_stdio.cc (__basic_file::_M_open_mode): + Don't use O_NONBLOCK if it is not defined. + (__basic_file::open): Don't use fcntl either. + +2002-12-19 Paolo Carlini <pcarlini@unitus.it> + + PR libstdc++/8949 + * include/std/std_limits.h + (struct numeric_limits<short>, + struct numeric_limits<unsigned short>, + struct numeric_limits<int>, + struct numeric_limits<unsigned int>, + struct numeric_limits<long>, + struct numeric_limits<unsigned long>, + struct numeric_limits<long long>, + struct numeric_limits<unsigned long long>): According + to 18.2.1.2,53 and 18.2.1.5,1 is_iec559 shall be false. + * testsuite/18_support/numeric_limits.cc: Add test04. + +2002-12-18 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * testsuite/23_containers/vector_capacity.cc (test03): Move ... + * testsuite/23_containers/vector_resize.cc: ...here as a new file. + Pass in -lmalloc for irix6. + * testsuite/27_io/ios_base_storage.cc: Pass in -lmalloc for irix6. + 2002-12-11 Paolo Carlini <pcarlini@unitus.it> PR libstdc++/8887 diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am index 7e70390ce5e..f75a0fcd147 100644 --- a/libstdc++-v3/Makefile.am +++ b/libstdc++-v3/Makefile.am @@ -1,6 +1,6 @@ ## Makefile for the toplevel directory of the GNU C++ Standard library. ## -## Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 +## Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 ## Free Software Foundation, Inc. ## ## This file is part of the libstdc++ version 3 distribution. @@ -90,7 +90,7 @@ doxygen-man: # Multilib support. MAKEOVERRIDES= -# Multilib variables. +# Multilib support variables. MULTISRCTOP = MULTIBUILDTOP = MULTIDIRS = @@ -98,16 +98,16 @@ MULTISUBDIR = MULTIDO = true MULTICLEAN = true -# Multilib Makefile bits. +# Multilib support. .PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \ maintainer-clean-multi -all-am: all-multi -install-am: install-multi -mostlyclean-am: mostlyclean-multi -clean-am: clean-multi -distclean-am: distclean-multi -maintainer-clean-am: maintainer-clean-multi +all-recursive: all-multi +install-recursive: install-multi +mostlyclean-recursive: mostlyclean-multi +clean-recursive: clean-multi +distclean-recursive: distclean-multi +maintainer-clean-recursive: maintainer-clean-multi all-multi: : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index 97f5ee38aec..1bc4e1e632b 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -75,6 +75,7 @@ CLOCALE_H = @CLOCALE_H@ CMESSAGES_H = @CMESSAGES_H@ CPP = @CPP@ CSTDIO_H = @CSTDIO_H@ +CTIME_H = @CTIME_H@ CXX = @CXX@ CXXCPP = @CXXCPP@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ @@ -147,7 +148,7 @@ baseline_file = @baseline_file@ # Multilib support. MAKEOVERRIDES = -# Multilib variables. +# Multilib support variables. MULTISRCTOP = MULTIBUILDTOP = MULTIDIRS = @@ -523,16 +524,16 @@ doxygen-man: .PHONY: doxygen doxygen-maint doxygen-man -# Multilib Makefile bits. +# Multilib support. .PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \ maintainer-clean-multi -all-am: all-multi -install-am: install-multi -mostlyclean-am: mostlyclean-multi -clean-am: clean-multi -distclean-am: distclean-multi -maintainer-clean-am: maintainer-clean-multi +all-recursive: all-multi +install-recursive: install-multi +mostlyclean-recursive: mostlyclean-multi +clean-recursive: clean-multi +distclean-recursive: distclean-multi +maintainer-clean-recursive: maintainer-clean-multi all-multi: : $(MAKE) ; exec $(MULTIDO) $(AM_MAKEFLAGS) DO=all multi-do diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 567c59b16fb..aa0152fd7fb 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -937,6 +937,8 @@ dnl Define HAVE_MBSTATE_T if mbstate_t is not in wchar.h dnl dnl GLIBCPP_CHECK_WCHAR_T_SUPPORT AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ + dnl Wide characters disabled by default. + enable_wchar_t=no dnl Test wchar.h for mbstate_t, which is needed for char_traits and dnl others even if wchar_t support is not on. @@ -982,7 +984,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ ac_wfuncs=no) dnl Checks for names injected into std:: by the c_std headers. - AC_CHECK_FUNCS(btowc wctob fgetwc fgetwc fgetws fputwc fputws fwide \ + AC_CHECK_FUNCS(btowc wctob fgetwc fgetws fputwc fputws fwide \ fwprintf fwscanf swprintf swscanf vfwprintf vfwscanf vswprintf vswscanf \ vwprintf vwscanf wprintf wscanf getwc getwchar mbsinit mbrlen mbrtowc \ mbsrtowcs wcsrtombs putwc putwchar ungetwc wcrtomb wcstod wcstof wcstol \ @@ -1027,18 +1029,15 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ dnl At the moment, only enable wchar_t specializations if all the dnl above support is present. - AC_MSG_CHECKING([for enabled wchar_t specializations]) if test x"$ac_isoC99_wchar_t" = xyes && test x"$ac_XPG2_wchar_t" = xyes; then - AC_DEFINE(_GLIBCPP_USE_WCHAR_T) - AC_MSG_RESULT("yes") - else - AC_MSG_RESULT("no") + AC_DEFINE(_GLIBCPP_USE_WCHAR_T) + enable_wchar_t=yes fi - else - dnl Wide characters disabled by the user. - AC_MSG_WARN([wchar_t support disabled.]) fi + AC_MSG_CHECKING([for enabled wchar_t specializations]) + AC_MSG_RESULT($enable_wchar_t) + AM_CONDITIONAL(GLIBCPP_TEST_WCHAR_T, test "$enable_wchar_t" = yes) ]) @@ -1227,6 +1226,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ CMESSAGES_CC=config/locale/generic/messages_members.cc CMONEY_CC=config/locale/generic/monetary_members.cc CNUMERIC_CC=config/locale/generic/numeric_members.cc + CTIME_H=config/locale/generic/time_members.h CTIME_CC=config/locale/generic/time_members.cc CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h ;; @@ -1261,6 +1261,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ CMESSAGES_CC=config/locale/gnu/messages_members.cc CMONEY_CC=config/locale/gnu/monetary_members.cc CNUMERIC_CC=config/locale/gnu/numeric_members.cc + CTIME_H=config/locale/gnu/time_members.h CTIME_CC=config/locale/gnu/time_members.cc CLOCALE_INTERNAL_H=config/locale/gnu/c++locale_internal.h ;; @@ -1277,6 +1278,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ CMESSAGES_CC=config/locale/ieee_1003.1-2001/messages_members.cc CMONEY_CC=config/locale/generic/monetary_members.cc CNUMERIC_CC=config/locale/generic/numeric_members.cc + CTIME_H=config/locale/generic/time_members.h CTIME_CC=config/locale/generic/time_members.cc CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h ;; @@ -1298,6 +1300,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ AC_SUBST(CLOCALE_H) AC_SUBST(CCODECVT_H) AC_SUBST(CMESSAGES_H) + AC_SUBST(CTIME_H) AC_LINK_FILES($CLOCALE_CC, src/c++locale.cc) AC_LINK_FILES($CCODECVT_CC, src/codecvt_members.cc) AC_LINK_FILES($CCOLLATE_CC, src/collate_members.cc) @@ -1919,11 +1922,12 @@ if test x"$glibcpp_toolexecdir" = x"no"; then if test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)' - glibcpp_toolexeclibdir='$(toolexecdir)/lib$(MULTISUBDIR)' + glibcpp_toolexeclibdir='$(toolexecdir)/lib' else glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' - glibcpp_toolexeclibdir='$(libdir)$(MULTISUBDIR)' + glibcpp_toolexeclibdir='$(libdir)' fi + glibcpp_toolexeclibdir=$glibcpp_toolexeclibdir/`$CC -print-multi-os-directory` fi AC_MSG_CHECKING([for install location]) diff --git a/libstdc++-v3/aclocal.m4 b/libstdc++-v3/aclocal.m4 index e42653992d8..974888d033f 100644 --- a/libstdc++-v3/aclocal.m4 +++ b/libstdc++-v3/aclocal.m4 @@ -1,4 +1,4 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4-p5 +dnl aclocal.m4 generated automatically by aclocal 1.4-p6 dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation @@ -949,6 +949,8 @@ dnl Define HAVE_MBSTATE_T if mbstate_t is not in wchar.h dnl dnl GLIBCPP_CHECK_WCHAR_T_SUPPORT AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ + dnl Wide characters disabled by default. + enable_wchar_t=no dnl Test wchar.h for mbstate_t, which is needed for char_traits and dnl others even if wchar_t support is not on. @@ -994,7 +996,7 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ ac_wfuncs=no) dnl Checks for names injected into std:: by the c_std headers. - AC_CHECK_FUNCS(btowc wctob fgetwc fgetwc fgetws fputwc fputws fwide \ + AC_CHECK_FUNCS(btowc wctob fgetwc fgetws fputwc fputws fwide \ fwprintf fwscanf swprintf swscanf vfwprintf vfwscanf vswprintf vswscanf \ vwprintf vwscanf wprintf wscanf getwc getwchar mbsinit mbrlen mbrtowc \ mbsrtowcs wcsrtombs putwc putwchar ungetwc wcrtomb wcstod wcstof wcstol \ @@ -1039,18 +1041,15 @@ AC_DEFUN(GLIBCPP_CHECK_WCHAR_T_SUPPORT, [ dnl At the moment, only enable wchar_t specializations if all the dnl above support is present. - AC_MSG_CHECKING([for enabled wchar_t specializations]) if test x"$ac_isoC99_wchar_t" = xyes && test x"$ac_XPG2_wchar_t" = xyes; then - AC_DEFINE(_GLIBCPP_USE_WCHAR_T) - AC_MSG_RESULT("yes") - else - AC_MSG_RESULT("no") + AC_DEFINE(_GLIBCPP_USE_WCHAR_T) + enable_wchar_t=yes fi - else - dnl Wide characters disabled by the user. - AC_MSG_WARN([wchar_t support disabled.]) fi + AC_MSG_CHECKING([for enabled wchar_t specializations]) + AC_MSG_RESULT($enable_wchar_t) + AM_CONDITIONAL(GLIBCPP_TEST_WCHAR_T, test "$enable_wchar_t" = yes) ]) @@ -1239,6 +1238,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ CMESSAGES_CC=config/locale/generic/messages_members.cc CMONEY_CC=config/locale/generic/monetary_members.cc CNUMERIC_CC=config/locale/generic/numeric_members.cc + CTIME_H=config/locale/generic/time_members.h CTIME_CC=config/locale/generic/time_members.cc CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h ;; @@ -1273,6 +1273,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ CMESSAGES_CC=config/locale/gnu/messages_members.cc CMONEY_CC=config/locale/gnu/monetary_members.cc CNUMERIC_CC=config/locale/gnu/numeric_members.cc + CTIME_H=config/locale/gnu/time_members.h CTIME_CC=config/locale/gnu/time_members.cc CLOCALE_INTERNAL_H=config/locale/gnu/c++locale_internal.h ;; @@ -1289,6 +1290,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ CMESSAGES_CC=config/locale/ieee_1003.1-2001/messages_members.cc CMONEY_CC=config/locale/generic/monetary_members.cc CNUMERIC_CC=config/locale/generic/numeric_members.cc + CTIME_H=config/locale/generic/time_members.h CTIME_CC=config/locale/generic/time_members.cc CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h ;; @@ -1310,6 +1312,7 @@ AC_DEFUN(GLIBCPP_ENABLE_CLOCALE, [ AC_SUBST(CLOCALE_H) AC_SUBST(CCODECVT_H) AC_SUBST(CMESSAGES_H) + AC_SUBST(CTIME_H) AC_LINK_FILES($CLOCALE_CC, src/c++locale.cc) AC_LINK_FILES($CCODECVT_CC, src/codecvt_members.cc) AC_LINK_FILES($CCOLLATE_CC, src/collate_members.cc) @@ -1931,11 +1934,12 @@ if test x"$glibcpp_toolexecdir" = x"no"; then if test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)' - glibcpp_toolexeclibdir='$(toolexecdir)/lib$(MULTISUBDIR)' + glibcpp_toolexeclibdir='$(toolexecdir)/lib' else glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' - glibcpp_toolexeclibdir='$(libdir)$(MULTISUBDIR)' + glibcpp_toolexeclibdir='$(libdir)' fi + glibcpp_toolexeclibdir=$glibcpp_toolexeclibdir/`$CC -print-multi-os-directory` fi AC_MSG_CHECKING([for install location]) @@ -2262,7 +2266,7 @@ AC_MSG_RESULT($enable_symvers) ]) -# isc-posix.m4 serial 1 (gettext-0.10.40) +# isc-posix.m4 serial 2 (gettext-0.11.2) dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU dnl General Public License. As a special exception to the GNU General @@ -2270,6 +2274,8 @@ dnl Public License, this file may be distributed as part of a program dnl that contains a configuration script generated by Autoconf, under dnl the same distribution terms as the rest of that program. +# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. + # This test replaces the one in autoconf. # Currently this macro should have the same name as the autoconf macro # because gettext's gettext.m4 (distributed in the automake package) @@ -2330,7 +2336,8 @@ dnl Usage: dnl AM_INIT_AUTOMAKE(package,version, [no-define]) AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AC_PROG_INSTALL]) +[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL]) PACKAGE=[$1] AC_SUBST(PACKAGE) VERSION=[$2] @@ -2346,13 +2353,42 @@ AC_REQUIRE([AM_SANITY_CHECK]) AC_REQUIRE([AC_ARG_PROGRAM]) dnl FIXME This is truly gross. missing_dir=`cd $ac_aux_dir && pwd` -AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir) AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir) AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) AC_REQUIRE([AC_PROG_MAKE_SET])]) +# Copyright 2002 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"]) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION so it can be traced. +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], + [AM_AUTOMAKE_VERSION([1.4-p6])]) + # # Check to make sure that the build environment is sane. # diff --git a/libstdc++-v3/config/io/basic_file_stdio.cc b/libstdc++-v3/config/io/basic_file_stdio.cc index ff23d983ae8..e378b6668a7 100644 --- a/libstdc++-v3/config/io/basic_file_stdio.cc +++ b/libstdc++-v3/config/io/basic_file_stdio.cc @@ -74,7 +74,11 @@ namespace std if (__testi && !__testo && !__testt && !__testa) { strcpy(__c_mode, "r"); +#if defined (O_NONBLOCK) __p_mode |= O_RDONLY | O_NONBLOCK; +#else + __p_mode |= O_RDONLY; +#endif } if (__testi && __testo && !__testt && !__testa) { @@ -151,9 +155,11 @@ namespace std { _M_cfile_created = true; +#if defined (F_SETFL) && defined (O_NONBLOCK) // Set input to nonblocking for fifos. if (__mode & ios_base::in) fcntl(this->fd(), F_SETFL, O_NONBLOCK); +#endif __ret = this; } diff --git a/libstdc++-v3/config/linker-map.gnu b/libstdc++-v3/config/linker-map.gnu index 050376cba93..87b297ceecb 100644 --- a/libstdc++-v3/config/linker-map.gnu +++ b/libstdc++-v3/config/linker-map.gnu @@ -1,6 +1,6 @@ ## Linker script for GNU ld 2.11.94+ only. ## -## Copyright (C) 2002 Free Software Foundation, Inc. +## Copyright (C) 2002, 2003 Free Software Foundation, Inc. ## ## This file is part of the libstdc++ version 3 distribution. ## @@ -50,7 +50,14 @@ GLIBCPP_3.2 { std::[A-Zd-k]*; std::length_error*; std::logic_error*; - std::locale::[A-Za-z]*; + std::locale::[A-Za-e]*; + std::locale::facet::[A-Za-z]*; + std::locale::facet::_M*; + std::locale::facet::_S_c_locale; + std::locale::facet::_S_clone_c_locale*; + std::locale::facet::_S_create_c_locale*; + std::locale::facet::_S_destroy_c_locale*; + std::locale::[A-Zg-z]*; std::locale::_[A-Ra-z]*; std::locale::_S_classic; std::locale::_S_global; @@ -99,6 +106,9 @@ GLIBCPP_3.2 { # std::locale destructors _ZNSt6localeD*; + + # std::locale::facet destructors + _ZNSt6locale5facetD*; # std::codecvt<char> members. _ZNKSt7codecvtIcc11__mbstate_tE*; @@ -204,8 +214,6 @@ GLIBCPP_3.2.1 { _ZStplIcSt11char_traitsIcESaIcEESbIT_T0_T1_ERKS6_S8_; _ZStplIwSt11char_traitsIwESaIwEESbIT_T0_T1_ERKS6_S8_; - _ZNSt24__default_alloc_templateILb1ELi0EE12_S_force_newE; - # stub functions from libmath sinf; sinl; @@ -242,6 +250,13 @@ GLIBCPP_3.2.1 { } GLIBCPP_3.2; +GLIBCPP_3.2.2 { + + _ZNSt24__default_alloc_templateILb1ELi0EE12_S_force_newE; + +} GLIBCPP_3.2.1; + + # Symbols in the support library (libsupc++) have their own tag. CXXABI_1.2 { @@ -253,24 +268,6 @@ CXXABI_1.2 { __cxa_call_unexpected; __cxa_current_exception_type; __cxa_demangle; - __cxa_dyn_string_append_char; - __cxa_dyn_string_append_cstr; - __cxa_dyn_string_append; - __cxa_dyn_string_clear; - __cxa_dyn_string_copy_cstr; - __cxa_dyn_string_copy; - __cxa_dyn_string_delete; - __cxa_dyn_string_eq; - __cxa_dyn_string_init; - __cxa_dyn_string_insert_char; - __cxa_dyn_string_insert_cstr; - __cxa_dyn_string_insert; - __cxa_dyn_string_new; - __cxa_dyn_string_prepend_cstr; - __cxa_dyn_string_prepend; - __cxa_dyn_string_release; - __cxa_dyn_string_resize; - __cxa_dyn_string_substring; __cxa_end_catch; __cxa_free_exception; __cxa_get_globals; @@ -295,6 +292,26 @@ CXXABI_1.2 { # __gnu_cxx::_verbose_terminate_handler() _ZN9__gnu_cxx27__verbose_terminate_handlerEv; + # XXX Should not be exported. + __cxa_dyn_string_append_char; + __cxa_dyn_string_append_cstr; + __cxa_dyn_string_append; + __cxa_dyn_string_clear; + __cxa_dyn_string_copy_cstr; + __cxa_dyn_string_copy; + __cxa_dyn_string_delete; + __cxa_dyn_string_eq; + __cxa_dyn_string_init; + __cxa_dyn_string_insert_char; + __cxa_dyn_string_insert_cstr; + __cxa_dyn_string_insert; + __cxa_dyn_string_new; + __cxa_dyn_string_prepend_cstr; + __cxa_dyn_string_prepend; + __cxa_dyn_string_release; + __cxa_dyn_string_resize; + __cxa_dyn_string_substring; + local: *; }; @@ -306,4 +323,4 @@ CXXABI_1.2.1 { __cxa_guard_release; __cxa_guard_abort; -} CXXABI_1.2;
\ No newline at end of file +} CXXABI_1.2; diff --git a/libstdc++-v3/config/locale/generic/c_locale.h b/libstdc++-v3/config/locale/generic/c_locale.h index 9627d8646af..ccc1f2503e0 100644 --- a/libstdc++-v3/config/locale/generic/c_locale.h +++ b/libstdc++-v3/config/locale/generic/c_locale.h @@ -1,6 +1,6 @@ // Wrapper for underlying C-language localization -*- C++ -*- -// Copyright (C) 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -33,6 +33,11 @@ // Written by Benjamin Kosnik <bkoz@redhat.com> +#ifndef _CPP_BITS_C_LOCALE_H +#define _CPP_BITS_C_LOCALE_H 1 + +#pragma GCC system_header + #include <clocale> #define _GLIBCPP_NUM_CATEGORIES 0 @@ -41,6 +46,10 @@ namespace std { typedef int* __c_locale; + // Convert numeric value of type _Tv to string and return length of + // string. If snprintf is available use it, otherwise fall back to + // the unsafe sprintf which, in general, can be dangerous and should + // be avoided. template<typename _Tv> int __convert_from_v(char* __out, const int __size, const char* __fmt, @@ -69,3 +78,5 @@ namespace std return __ret; } } + +#endif diff --git a/libstdc++-v3/config/locale/generic/messages_members.h b/libstdc++-v3/config/locale/generic/messages_members.h index 62dd24d6838..e8a86560d76 100644 --- a/libstdc++-v3/config/locale/generic/messages_members.h +++ b/libstdc++-v3/config/locale/generic/messages_members.h @@ -1,6 +1,6 @@ // std::messages implementation details, generic version -*- C++ -*- -// Copyright (C) 2001 Free Software Foundation, Inc. +// Copyright (C) 2001, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -35,6 +35,16 @@ // Non-virtual member functions. template<typename _CharT> + messages<_CharT>::messages(size_t __refs) + : locale::facet(__refs) + { _M_c_locale_messages = _S_c_locale; } + + template<typename _CharT> + messages<_CharT>::messages(__c_locale __cloc, const char*, size_t __refs) + : locale::facet(__refs) + { _M_c_locale_messages = _S_c_locale; } + + template<typename _CharT> typename messages<_CharT>::catalog messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc, const char*) const @@ -42,6 +52,10 @@ // Virtual member functions. template<typename _CharT> + messages<_CharT>::~messages() + { _S_destroy_c_locale(_M_c_locale_messages); } + + template<typename _CharT> typename messages<_CharT>::catalog messages<_CharT>::do_open(const basic_string<char>&, const locale&) const { return 0; } @@ -56,3 +70,12 @@ void messages<_CharT>::do_close(catalog) const { } + + // messages_byname + template<typename _CharT> + messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs) + : messages<_CharT>(__refs) + { + _S_destroy_c_locale(_M_c_locale_messages); + _S_create_c_locale(_M_c_locale_messages, __s); + } diff --git a/libstdc++-v3/config/locale/generic/time_members.cc b/libstdc++-v3/config/locale/generic/time_members.cc index 8d5226b0b2e..df43f03a53d 100644 --- a/libstdc++-v3/config/locale/generic/time_members.cc +++ b/libstdc++-v3/config/locale/generic/time_members.cc @@ -1,4 +1,4 @@ -// std::time_get, std::time_put implementation, GNU version -*- C++ -*- +// std::time_get, std::time_put implementation, generic version -*- C++ -*- // Copyright (C) 2001, 2002 Free Software Foundation, Inc. // diff --git a/libstdc++-v3/config/locale/generic/time_members.h b/libstdc++-v3/config/locale/generic/time_members.h new file mode 100644 index 00000000000..03c31d1797e --- /dev/null +++ b/libstdc++-v3/config/locale/generic/time_members.h @@ -0,0 +1,61 @@ +// std::time_get, std::time_put implementation, generic version -*- C++ -*- + +// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// +// ISO C++ 14882: 22.2.5.1.2 - time_get functions +// ISO C++ 14882: 22.2.5.3.2 - time_put functions +// + +// Written by Benjamin Kosnik <bkoz@redhat.com> + + template<typename _CharT> + __timepunct<_CharT>::__timepunct(size_t __refs) + : locale::facet(__refs) + { + _M_name_timepunct = _S_c_name; + _M_initialize_timepunct(); + } + + template<typename _CharT> + __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s, + size_t __refs) + : locale::facet(__refs) + { + _M_name_timepunct = new char[strlen(__s) + 1]; + strcpy(_M_name_timepunct, __s); + _M_initialize_timepunct(__cloc); + } + + template<typename _CharT> + __timepunct<_CharT>::~__timepunct() + { + if (_S_c_name != _M_name_timepunct) + delete [] _M_name_timepunct; + _S_destroy_c_locale(_M_c_locale_timepunct); + } diff --git a/libstdc++-v3/config/locale/gnu/c_locale.cc b/libstdc++-v3/config/locale/gnu/c_locale.cc index 19f98fc98a0..27ae469c04d 100644 --- a/libstdc++-v3/config/locale/gnu/c_locale.cc +++ b/libstdc++-v3/config/locale/gnu/c_locale.cc @@ -1,6 +1,6 @@ // Wrapper for underlying C-language localization -*- C++ -*- -// Copyright (C) 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the diff --git a/libstdc++-v3/config/locale/gnu/c_locale.h b/libstdc++-v3/config/locale/gnu/c_locale.h index 130b843d7f9..37df3fa3a3a 100644 --- a/libstdc++-v3/config/locale/gnu/c_locale.h +++ b/libstdc++-v3/config/locale/gnu/c_locale.h @@ -1,6 +1,6 @@ // Wrapper for underlying C-language localization -*- C++ -*- -// Copyright (C) 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -33,6 +33,11 @@ // Written by Benjamin Kosnik <bkoz@redhat.com> +#ifndef _CPP_BITS_C_LOCALE_H +#define _CPP_BITS_C_LOCALE_H 1 + +#pragma GCC system_header + #include <clocale> #include <langinfo.h> // For codecvt #include <iconv.h> // For codecvt using iconv, iconv_t @@ -53,6 +58,10 @@ namespace std { typedef __locale_t __c_locale; + // Convert numeric value of type _Tv to string and return length of + // string. If snprintf is available use it, otherwise fall back to + // the unsafe sprintf which, in general, can be dangerous and should + // be avoided. template<typename _Tv> int __convert_from_v(char* __out, const int __size, const char* __fmt, @@ -92,3 +101,5 @@ namespace std return __ret; } } + +#endif diff --git a/libstdc++-v3/config/locale/gnu/codecvt_members.cc b/libstdc++-v3/config/locale/gnu/codecvt_members.cc index aa855a6a1f2..bed26111626 100644 --- a/libstdc++-v3/config/locale/gnu/codecvt_members.cc +++ b/libstdc++-v3/config/locale/gnu/codecvt_members.cc @@ -1,6 +1,6 @@ // std::codecvt implementation details, GNU version -*- C++ -*- -// Copyright (C) 2002 Free Software Foundation, Inc. +// Copyright (C) 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -50,7 +50,7 @@ namespace std result __ret = error; size_t __len = min(__from_end - __from, __to_end - __to); #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) - __c_locale __old = __uselocale(_M_c_locale_codecvt); + __c_locale __old = __uselocale(_S_c_locale); #endif size_t __conv = wcsrtombs(__to, &__from, __len, &__state); #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) @@ -85,7 +85,7 @@ namespace std result __ret = error; size_t __len = min(__from_end - __from, __to_end - __to); #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) - __c_locale __old = __uselocale(_M_c_locale_codecvt); + __c_locale __old = __uselocale(_S_c_locale); #endif size_t __conv = mbsrtowcs(__to, &__from, __len, &__state); #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) diff --git a/libstdc++-v3/config/locale/gnu/messages_members.h b/libstdc++-v3/config/locale/gnu/messages_members.h index 68a2ea39531..d98d8d11fff 100644 --- a/libstdc++-v3/config/locale/gnu/messages_members.h +++ b/libstdc++-v3/config/locale/gnu/messages_members.h @@ -1,6 +1,6 @@ // std::messages implementation details, GNU version -*- C++ -*- -// Copyright (C) 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -28,13 +28,35 @@ // the GNU General Public License. // -// ISO C++ 14882: 22.2.7.1.2 messages virtual functions +// ISO C++ 14882: 22.2.7.1.2 messages functions // // Written by Benjamin Kosnik <bkoz@redhat.com> // Non-virtual member functions. template<typename _CharT> + messages<_CharT>::messages(size_t __refs) + : locale::facet(__refs) + { +#if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)) + _M_name_messages = _S_c_name; +#endif + _M_c_locale_messages = _S_c_locale; + } + + template<typename _CharT> + messages<_CharT>::messages(__c_locale __cloc, + const char* __s, size_t __refs) + : locale::facet(__refs) + { +#if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)) + _M_name_messages = new char[strlen(__s) + 1]; + strcpy(_M_name_messages, __s); +#endif + _M_c_locale_messages = _S_clone_c_locale(__cloc); + } + + template<typename _CharT> typename messages<_CharT>::catalog messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc, const char* __dir) const @@ -43,6 +65,17 @@ return this->do_open(__s, __loc); } + // Virtual member functions. + template<typename _CharT> + messages<_CharT>::~messages() + { +#if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)) + if (_S_c_name != _M_name_messages) + delete [] _M_name_messages; +#endif + _S_destroy_c_locale(_M_c_locale_messages); + } + template<typename _CharT> typename messages<_CharT>::catalog messages<_CharT>::do_open(const basic_string<char>& __s, @@ -58,3 +91,18 @@ void messages<_CharT>::do_close(catalog) const { } + + // messages_byname + template<typename _CharT> + messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs) + : messages<_CharT>(__refs) + { +#if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)) + if (_S_c_name != _M_name_messages) + delete [] _M_name_messages; + _M_name_messages = new char[strlen(__s) + 1]; + strcpy(_M_name_messages, __s); +#endif + _S_destroy_c_locale(_M_c_locale_messages); + _S_create_c_locale(_M_c_locale_messages, __s); + } diff --git a/libstdc++-v3/config/locale/gnu/time_members.h b/libstdc++-v3/config/locale/gnu/time_members.h new file mode 100644 index 00000000000..2ea24102808 --- /dev/null +++ b/libstdc++-v3/config/locale/gnu/time_members.h @@ -0,0 +1,68 @@ +// std::time_get, std::time_put implementation, GNU version -*- C++ -*- + +// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// +// ISO C++ 14882: 22.2.5.1.2 - time_get functions +// ISO C++ 14882: 22.2.5.3.2 - time_put functions +// + +// Written by Benjamin Kosnik <bkoz@redhat.com> + + template<typename _CharT> + __timepunct<_CharT>::__timepunct(size_t __refs) + : locale::facet(__refs) + { +#if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)) + _M_name_timepunct = _S_c_name; +#endif + _M_initialize_timepunct(); + } + + template<typename _CharT> + __timepunct<_CharT>::__timepunct(__c_locale __cloc, + const char* __s, + size_t __refs) + : locale::facet(__refs) + { +#if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)) + _M_name_timepunct = new char[strlen(__s) + 1]; + strcpy(_M_name_timepunct, __s); +#endif + _M_initialize_timepunct(__cloc); + } + + template<typename _CharT> + __timepunct<_CharT>::~__timepunct() + { +#if !(__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2)) + if (_S_c_name != _M_name_timepunct) + delete [] _M_name_timepunct; +#endif + _S_destroy_c_locale(_M_c_locale_timepunct); + } diff --git a/libstdc++-v3/config/os/hpux/os_defines.h b/libstdc++-v3/config/os/hpux/os_defines.h index 9dd4fb41af6..87d9d4f8d8e 100644 --- a/libstdc++-v3/config/os/hpux/os_defines.h +++ b/libstdc++-v3/config/os/hpux/os_defines.h @@ -89,4 +89,9 @@ typedef long int __padding_type; #if !defined(_GLIBCPP_SUPPORTS_WEAK) && defined (__hppa__) #define _GLIBCPP_INST_ATOMICITY_LOCK 1 #endif + +/* Don't use pragma weak in gthread headers. */ +#ifdef __hppa__ +#define _GLIBCPP_GTHREAD_USE_WEAK 0 +#endif #endif diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index 972ed70937f..9926fd14708 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -1498,8 +1498,9 @@ ac_exeext=$EXEEXT +am__api_version="1.4" echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:1503: checking whether build environment is sane" >&5 +echo "configure:1504: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -1556,7 +1557,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:1560: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:1561: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1601,21 +1602,21 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` -echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:1606: checking for working aclocal" >&5 +echo $ac_n "checking for working aclocal-${am__api_version}""... $ac_c" 1>&6 +echo "configure:1607: checking for working aclocal-${am__api_version}" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. -if (aclocal --version) < /dev/null > /dev/null 2>&1; then - ACLOCAL=aclocal +if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then + ACLOCAL=aclocal-${am__api_version} echo "$ac_t""found" 1>&6 else - ACLOCAL="$missing_dir/missing aclocal" + ACLOCAL="$missing_dir/missing aclocal-${am__api_version}" echo "$ac_t""missing" 1>&6 fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:1619: checking for working autoconf" >&5 +echo "configure:1620: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1627,21 +1628,21 @@ else echo "$ac_t""missing" 1>&6 fi -echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:1632: checking for working automake" >&5 +echo $ac_n "checking for working automake-${am__api_version}""... $ac_c" 1>&6 +echo "configure:1633: checking for working automake-${am__api_version}" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. -if (automake --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake +if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then + AUTOMAKE=automake-${am__api_version} echo "$ac_t""found" 1>&6 else - AUTOMAKE="$missing_dir/missing automake" + AUTOMAKE="$missing_dir/missing automake-${am__api_version}" echo "$ac_t""missing" 1>&6 fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:1645: checking for working autoheader" >&5 +echo "configure:1646: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1654,7 +1655,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:1658: checking for working makeinfo" >&5 +echo "configure:1659: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -1753,7 +1754,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1757: checking for ld used by GCC" >&5 +echo "configure:1758: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1783,10 +1784,10 @@ echo "configure:1757: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1787: checking for GNU ld" >&5 +echo "configure:1788: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1790: checking for non-GNU ld" >&5 +echo "configure:1791: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1821,7 +1822,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1825: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1826: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1838,7 +1839,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1842: checking for $LD option to reload object files" >&5 +echo "configure:1843: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1850,7 +1851,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1854: checking for BSD-compatible nm" >&5 +echo "configure:1855: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1888,7 +1889,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:1892: checking how to recognise dependant libraries" >&5 +echo "configure:1893: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2061,13 +2062,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:2065: checking for object suffix" >&5 +echo "configure:2066: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:2071: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -2091,7 +2092,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:2095: checking for ${ac_tool_prefix}file" >&5 +echo "configure:2096: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2153,7 +2154,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:2157: checking for file" >&5 +echo "configure:2158: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2224,7 +2225,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2228: checking for $ac_word" >&5 +echo "configure:2229: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2256,7 +2257,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2260: checking for $ac_word" >&5 +echo "configure:2261: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2291,7 +2292,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2295: checking for $ac_word" >&5 +echo "configure:2296: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2323,7 +2324,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2327: checking for $ac_word" >&5 +echo "configure:2328: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2390,8 +2391,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 2394 "configure"' > conftest.$ac_ext - if { (eval echo configure:2395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2395 "configure"' > conftest.$ac_ext + if { (eval echo configure:2396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2410,7 +2411,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2415: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2426,7 +2427,7 @@ ia64-*-hpux*) x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2431: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *32-bit*) case $host in @@ -2470,7 +2471,7 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2474: checking whether the C compiler needs -belf" >&5 +echo "configure:2475: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2483,14 +2484,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2487 "configure" +#line 2488 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2520,7 +2521,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 esac echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:2524: checking how to run the C++ preprocessor" >&5 +echo "configure:2525: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2533,12 +2534,12 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext <<EOF -#line 2537 "configure" +#line 2538 "configure" #include "confdefs.h" #include <stdlib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2542: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2543: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2676,7 +2677,7 @@ exec 5>>./config.log # Check for c++ or library specific bits that don't require linking. #GLIBCPP_CHECK_COMPILER_VERSION echo $ac_n "checking for GNU make""... $ac_c" 1>&6 -echo "configure:2680: checking for GNU make" >&5 +echo "configure:2681: checking for GNU make" >&5 if eval "test \"`echo '$''{'_cv_gnu_make_command'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2724,7 +2725,7 @@ esac echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2728: checking how to run the C preprocessor" >&5 +echo "configure:2729: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2739,13 +2740,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 2743 "configure" +#line 2744 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2749: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2750: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2756,13 +2757,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 2760 "configure" +#line 2761 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2767: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2773,13 +2774,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 2777 "configure" +#line 2778 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2783: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2805,7 +2806,7 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for cstdio to use""... $ac_c" 1>&6 -echo "configure:2809: checking for cstdio to use" >&5 +echo "configure:2810: checking for cstdio to use" >&5 # Check whether --enable-cstdio or --disable-cstdio was given. if test "${enable_cstdio+set}" = set; then enableval="$enable_cstdio" @@ -2829,17 +2830,17 @@ fi # see if we are on a system with libio native (ie, linux) ac_safe=`echo "libio.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libio.h""... $ac_c" 1>&6 -echo "configure:2833: checking for libio.h" >&5 +echo "configure:2834: checking for libio.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2838 "configure" +#line 2839 "configure" #include "confdefs.h" #include <libio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2869,9 +2870,9 @@ fi case "$target" in *-*-linux*) echo $ac_n "checking for glibc version >= 2.2""... $ac_c" 1>&6 -echo "configure:2873: checking for glibc version >= 2.2" >&5 +echo "configure:2874: checking for glibc version >= 2.2" >&5 cat > conftest.$ac_ext <<EOF -#line 2875 "configure" +#line 2876 "configure" #include "confdefs.h" #include <features.h> @@ -2985,7 +2986,7 @@ fi echo $ac_n "checking for clocale to use""... $ac_c" 1>&6 -echo "configure:2989: checking for clocale to use" >&5 +echo "configure:2990: checking for clocale to use" >&5 # Check whether --enable-clocale or --disable-clocale was given. if test "${enable_clocale+set}" = set; then enableval="$enable_clocale" @@ -3003,7 +3004,7 @@ fi case x${target_os} in xlinux* | xgnu*) cat > conftest.$ac_ext <<EOF -#line 3007 "configure" +#line 3008 "configure" #include "confdefs.h" #include <features.h> @@ -3029,7 +3030,7 @@ rm -f conftest* enable_clocale_flag=generic else cat > conftest.$ac_ext <<EOF -#line 3033 "configure" +#line 3034 "configure" #include "confdefs.h" #define _GNU_SOURCE 1 @@ -3056,7 +3057,7 @@ else } EOF -if { (eval echo configure:3060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then enable_clocale_flag=gnu else @@ -3102,6 +3103,7 @@ fi CMESSAGES_CC=config/locale/generic/messages_members.cc CMONEY_CC=config/locale/generic/monetary_members.cc CNUMERIC_CC=config/locale/generic/numeric_members.cc + CTIME_H=config/locale/generic/time_members.h CTIME_CC=config/locale/generic/time_members.cc CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h ;; @@ -3117,7 +3119,7 @@ fi # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3121: checking for $ac_word" >&5 +echo "configure:3123: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_check_msgfmt'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3165,6 +3167,7 @@ fi CMESSAGES_CC=config/locale/gnu/messages_members.cc CMONEY_CC=config/locale/gnu/monetary_members.cc CNUMERIC_CC=config/locale/gnu/numeric_members.cc + CTIME_H=config/locale/gnu/time_members.h CTIME_CC=config/locale/gnu/time_members.cc CLOCALE_INTERNAL_H=config/locale/gnu/c++locale_internal.h ;; @@ -3181,6 +3184,7 @@ fi CMESSAGES_CC=config/locale/ieee_1003.1-2001/messages_members.cc CMONEY_CC=config/locale/generic/monetary_members.cc CNUMERIC_CC=config/locale/generic/numeric_members.cc + CTIME_H=config/locale/generic/time_members.h CTIME_CC=config/locale/generic/time_members.cc CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h ;; @@ -3205,6 +3209,7 @@ fi + # AC_LINK_FILES($CCTYPE_CHAR_CC, src/ctype_members_char.cc) @@ -3250,16 +3255,16 @@ cross_compiling=$ac_cv_prog_cxx_cross # Check for the existence of <math.h> functions used if C99 is enabled. ac_c99_math=yes; echo $ac_n "checking for ISO C99 support in <math.h>""... $ac_c" 1>&6 -echo "configure:3254: checking for ISO C99 support in <math.h>" >&5 +echo "configure:3259: checking for ISO C99 support in <math.h>" >&5 cat > conftest.$ac_ext <<EOF -#line 3256 "configure" +#line 3261 "configure" #include "confdefs.h" #include <math.h> int main() { fpclassify(0.0); ; return 0; } EOF -if { (eval echo configure:3263: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3268: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3269,14 +3274,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3273 "configure" +#line 3278 "configure" #include "confdefs.h" #include <math.h> int main() { isfinite(0.0); ; return 0; } EOF -if { (eval echo configure:3280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3285: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3286,14 +3291,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3290 "configure" +#line 3295 "configure" #include "confdefs.h" #include <math.h> int main() { isinf(0.0); ; return 0; } EOF -if { (eval echo configure:3297: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3303,14 +3308,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3307 "configure" +#line 3312 "configure" #include "confdefs.h" #include <math.h> int main() { isnan(0.0); ; return 0; } EOF -if { (eval echo configure:3314: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3320,14 +3325,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3324 "configure" +#line 3329 "configure" #include "confdefs.h" #include <math.h> int main() { isnormal(0.0); ; return 0; } EOF -if { (eval echo configure:3331: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3336: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3337,14 +3342,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3341 "configure" +#line 3346 "configure" #include "confdefs.h" #include <math.h> int main() { signbit(0.0); ; return 0; } EOF -if { (eval echo configure:3348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3353: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3354,14 +3359,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3358 "configure" +#line 3363 "configure" #include "confdefs.h" #include <math.h> int main() { isgreater(0.0,0.0); ; return 0; } EOF -if { (eval echo configure:3365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3371,14 +3376,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3375 "configure" +#line 3380 "configure" #include "confdefs.h" #include <math.h> int main() { isgreaterequal(0.0,0.0); ; return 0; } EOF -if { (eval echo configure:3382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3388,14 +3393,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3392 "configure" +#line 3397 "configure" #include "confdefs.h" #include <math.h> int main() { isless(0.0,0.0); ; return 0; } EOF -if { (eval echo configure:3399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3405,14 +3410,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3409 "configure" +#line 3414 "configure" #include "confdefs.h" #include <math.h> int main() { islessequal(0.0,0.0); ; return 0; } EOF -if { (eval echo configure:3416: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3422,14 +3427,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3426 "configure" +#line 3431 "configure" #include "confdefs.h" #include <math.h> int main() { islessgreater(0.0,0.0); ; return 0; } EOF -if { (eval echo configure:3433: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3439,14 +3444,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3443 "configure" +#line 3448 "configure" #include "confdefs.h" #include <math.h> int main() { isunordered(0.0,0.0); ; return 0; } EOF -if { (eval echo configure:3450: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3460,16 +3465,16 @@ rm -f conftest* # Check for the existence in <stdio.h> of vscanf, et. al. ac_c99_stdio=yes; echo $ac_n "checking for ISO C99 support in <stdio.h>""... $ac_c" 1>&6 -echo "configure:3464: checking for ISO C99 support in <stdio.h>" >&5 +echo "configure:3469: checking for ISO C99 support in <stdio.h>" >&5 cat > conftest.$ac_ext <<EOF -#line 3466 "configure" +#line 3471 "configure" #include "confdefs.h" #include <stdio.h> int main() { snprintf("12", 0, "%i"); ; return 0; } EOF -if { (eval echo configure:3473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3479,7 +3484,7 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3483 "configure" +#line 3488 "configure" #include "confdefs.h" #include <stdio.h> #include <stdarg.h> @@ -3490,7 +3495,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3500,7 +3505,7 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3504 "configure" +#line 3509 "configure" #include "confdefs.h" #include <stdio.h> #include <stdarg.h> @@ -3511,7 +3516,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3515: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3521,7 +3526,7 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3525 "configure" +#line 3530 "configure" #include "confdefs.h" #include <stdio.h> #include <stdarg.h> @@ -3532,7 +3537,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3536: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3542,7 +3547,7 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3546 "configure" +#line 3551 "configure" #include "confdefs.h" #include <stdio.h> #include <stdarg.h> @@ -3553,7 +3558,7 @@ int main() { ; return 0; } EOF -if { (eval echo configure:3557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3567,20 +3572,20 @@ rm -f conftest* # Check for the existence in <stdlib.h> of lldiv_t, et. al. ac_c99_stdlib=yes; echo $ac_n "checking for lldiv_t declaration""... $ac_c" 1>&6 -echo "configure:3571: checking for lldiv_t declaration" >&5 +echo "configure:3576: checking for lldiv_t declaration" >&5 if eval "test \"`echo '$''{'ac_c99_lldiv_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 3577 "configure" +#line 3582 "configure" #include "confdefs.h" #include <stdlib.h> int main() { lldiv_t mydivt; ; return 0; } EOF -if { (eval echo configure:3584: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_c99_lldiv_t=yes else @@ -3596,16 +3601,16 @@ fi echo "$ac_t""$ac_c99_lldiv_t" 1>&6 echo $ac_n "checking for ISO C99 support in <stdlib.h>""... $ac_c" 1>&6 -echo "configure:3600: checking for ISO C99 support in <stdlib.h>" >&5 +echo "configure:3605: checking for ISO C99 support in <stdlib.h>" >&5 cat > conftest.$ac_ext <<EOF -#line 3602 "configure" +#line 3607 "configure" #include "confdefs.h" #include <stdlib.h> int main() { char* tmp; strtof("gnu", &tmp); ; return 0; } EOF -if { (eval echo configure:3609: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3615,14 +3620,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3619 "configure" +#line 3624 "configure" #include "confdefs.h" #include <stdlib.h> int main() { char* tmp; strtold("gnu", &tmp); ; return 0; } EOF -if { (eval echo configure:3626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3631: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3632,14 +3637,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3636 "configure" +#line 3641 "configure" #include "confdefs.h" #include <stdlib.h> int main() { llabs(10); ; return 0; } EOF -if { (eval echo configure:3643: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3648: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3649,14 +3654,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3653 "configure" +#line 3658 "configure" #include "confdefs.h" #include <stdlib.h> int main() { lldiv(10,1); ; return 0; } EOF -if { (eval echo configure:3660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3665: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3666,14 +3671,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3670 "configure" +#line 3675 "configure" #include "confdefs.h" #include <stdlib.h> int main() { atoll("10"); ; return 0; } EOF -if { (eval echo configure:3677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3682: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3683,14 +3688,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3687 "configure" +#line 3692 "configure" #include "confdefs.h" #include <stdlib.h> int main() { _Exit(0); ; return 0; } EOF -if { (eval echo configure:3694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3708,16 +3713,16 @@ rm -f conftest* # XXX the wchar.h checks should be rolled into the general C99 bits. ac_c99_wchar=yes; echo $ac_n "checking for additional ISO C99 support in <wchar.h>""... $ac_c" 1>&6 -echo "configure:3712: checking for additional ISO C99 support in <wchar.h>" >&5 +echo "configure:3717: checking for additional ISO C99 support in <wchar.h>" >&5 cat > conftest.$ac_ext <<EOF -#line 3714 "configure" +#line 3719 "configure" #include "confdefs.h" #include <wchar.h> int main() { wcstold(L"10.0", NULL); ; return 0; } EOF -if { (eval echo configure:3721: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3727,14 +3732,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3731 "configure" +#line 3736 "configure" #include "confdefs.h" #include <wchar.h> int main() { wcstoll(L"10", NULL, 10); ; return 0; } EOF -if { (eval echo configure:3738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3744,14 +3749,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3748 "configure" +#line 3753 "configure" #include "confdefs.h" #include <wchar.h> int main() { wcstoull(L"10", NULL, 10); ; return 0; } EOF -if { (eval echo configure:3755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3760: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3763,7 +3768,7 @@ rm -f conftest* echo "$ac_t""$ac_c99_wchar" 1>&6 echo $ac_n "checking for enabled ISO C99 support""... $ac_c" 1>&6 -echo "configure:3767: checking for enabled ISO C99 support" >&5 +echo "configure:3772: checking for enabled ISO C99 support" >&5 if test x"$ac_c99_math" = x"no" || test x"$ac_c99_stdio" = x"no" || test x"$ac_c99_stdlib" = x"no" || @@ -3811,17 +3816,17 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for enabled long long I/O support""... $ac_c" 1>&6 -echo "configure:3815: checking for enabled long long I/O support" >&5 +echo "configure:3820: checking for enabled long long I/O support" >&5 # iostreams require strtoll, strtoull to compile cat > conftest.$ac_ext <<EOF -#line 3818 "configure" +#line 3823 "configure" #include "confdefs.h" #include <stdlib.h> int main() { char* tmp; strtoll("gnu", &tmp, 10); ; return 0; } EOF -if { (eval echo configure:3825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3830: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3831,14 +3836,14 @@ else fi rm -f conftest* cat > conftest.$ac_ext <<EOF -#line 3835 "configure" +#line 3840 "configure" #include "confdefs.h" #include <stdlib.h> int main() { char* tmp; strtoull("gnu", &tmp, 10); ; return 0; } EOF -if { (eval echo configure:3842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -3866,7 +3871,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for c header strategy to use""... $ac_c" 1>&6 -echo "configure:3870: checking for c header strategy to use" >&5 +echo "configure:3875: checking for c header strategy to use" >&5 # Check whether --enable-cheaders or --disable-cheaders was given. if test "${enable_cheaders+set}" = set; then enableval="$enable_cheaders" @@ -3927,7 +3932,7 @@ fi echo $ac_n "checking for thread model used by GCC""... $ac_c" 1>&6 -echo "configure:3931: checking for thread model used by GCC" >&5 +echo "configure:3936: checking for thread model used by GCC" >&5 target_thread_file=`$CC -v 2>&1 | sed -n 's/^Thread model: //p'` echo "$ac_t""$target_thread_file" 1>&6 @@ -3980,7 +3985,7 @@ EXTRA_CXX_FLAGS="$enable_cxx_flags" echo $ac_n "checking for exception model to use""... $ac_c" 1>&6 -echo "configure:3984: checking for exception model to use" >&5 +echo "configure:3989: checking for exception model to use" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -3995,7 +4000,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then : else cat > conftest.$ac_ext << EOF -#line 3999 "configure" +#line 4004 "configure" struct S { ~S(); }; void bar(); void foo() @@ -4006,7 +4011,7 @@ void foo() EOF old_CXXFLAGS="$CXXFLAGS" CXXFLAGS=-S - if { (eval echo configure:4010: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:4015: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then if grep _Unwind_SjLj_Resume conftest.s >/dev/null 2>&1 ; then enable_sjlj_exceptions=yes elif grep _Unwind_Resume conftest.s >/dev/null 2>&1 ; then @@ -4039,7 +4044,7 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for use of libunwind""... $ac_c" 1>&6 -echo "configure:4043: checking for use of libunwind" >&5 +echo "configure:4048: checking for use of libunwind" >&5 # Check whether --enable-libunwind-exceptions or --disable-libunwind-exceptions was given. if test "${enable_libunwind_exceptions+set}" = set; then enableval="$enable_libunwind_exceptions" @@ -4080,17 +4085,17 @@ for ac_hdr in string.h stdlib.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4084: checking for $ac_hdr" >&5 +echo "configure:4089: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4089 "configure" +#line 4094 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4099: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4171,17 +4176,17 @@ if test -n "$with_cross_host" || test x"$build" != x"$host"; then do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4175: checking for $ac_hdr" >&5 +echo "configure:4180: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4180 "configure" +#line 4185 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4259,12 +4264,12 @@ done # used sections, first .eh_frame and now some of the glibc sections for # iconv). Bzzzzt. Thanks for playing, maybe next time. echo $ac_n "checking for ld that supports -Wl,--gc-sections""... $ac_c" 1>&6 -echo "configure:4263: checking for ld that supports -Wl,--gc-sections" >&5 +echo "configure:4268: checking for ld that supports -Wl,--gc-sections" >&5 if test "$cross_compiling" = yes; then ac_sectionLDflags=yes else cat > conftest.$ac_ext <<EOF -#line 4268 "configure" +#line 4273 "configure" #include "confdefs.h" int main(void) @@ -4275,7 +4280,7 @@ else } EOF -if { (eval echo configure:4279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:4284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_sectionLDflags=yes else @@ -4309,7 +4314,7 @@ fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:4313: checking for main in -lm" >&5 +echo "configure:4318: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4317,14 +4322,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 4321 "configure" +#line 4326 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:4328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4354,12 +4359,12 @@ fi for ac_func in nan copysignf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4358: checking for $ac_func" >&5 +echo "configure:4363: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4363 "configure" +#line 4368 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4382,7 +4387,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4411,12 +4416,12 @@ done for ac_func in __signbit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4415: checking for $ac_func" >&5 +echo "configure:4420: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4420 "configure" +#line 4425 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4439,7 +4444,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4467,12 +4472,12 @@ done for ac_func in __signbitf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4471: checking for $ac_func" >&5 +echo "configure:4476: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4476 "configure" +#line 4481 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4495,7 +4500,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4504: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4525,12 +4530,12 @@ done for ac_func in __signbitl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4529: checking for $ac_func" >&5 +echo "configure:4534: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4534 "configure" +#line 4539 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4553,7 +4558,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4583,18 +4588,19 @@ done + enable_wchar_t=no echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 -echo "configure:4589: checking for mbstate_t" >&5 +echo "configure:4595: checking for mbstate_t" >&5 cat > conftest.$ac_ext <<EOF -#line 4591 "configure" +#line 4597 "configure" #include "confdefs.h" #include <wchar.h> int main() { mbstate_t teststate; ; return 0; } EOF -if { (eval echo configure:4598: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4604: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_mbstate_t=yes else @@ -4616,17 +4622,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4620: checking for $ac_hdr" >&5 +echo "configure:4626: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4625 "configure" +#line 4631 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4657,17 +4663,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4661: checking for $ac_hdr" >&5 +echo "configure:4667: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4666 "configure" +#line 4672 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4671: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4700,16 +4706,16 @@ done test x"$enable_c_mbchar" != xno; then echo $ac_n "checking for WCHAR_MIN and WCHAR_MAX""... $ac_c" 1>&6 -echo "configure:4704: checking for WCHAR_MIN and WCHAR_MAX" >&5 +echo "configure:4710: checking for WCHAR_MIN and WCHAR_MAX" >&5 cat > conftest.$ac_ext <<EOF -#line 4706 "configure" +#line 4712 "configure" #include "confdefs.h" #include <wchar.h> int main() { int i = WCHAR_MIN; int j = WCHAR_MAX; ; return 0; } EOF -if { (eval echo configure:4713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4719: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_wchar_minmax=yes else @@ -4722,9 +4728,9 @@ rm -f conftest* echo "$ac_t""$has_wchar_minmax" 1>&6 echo $ac_n "checking for WEOF""... $ac_c" 1>&6 -echo "configure:4726: checking for WEOF" >&5 +echo "configure:4732: checking for WEOF" >&5 cat > conftest.$ac_ext <<EOF -#line 4728 "configure" +#line 4734 "configure" #include "confdefs.h" #include <wchar.h> @@ -4733,7 +4739,7 @@ int main() { wint_t i = WEOF; ; return 0; } EOF -if { (eval echo configure:4737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_weof=yes else @@ -4749,12 +4755,12 @@ rm -f conftest* for ac_func in wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4753: checking for $ac_func" >&5 +echo "configure:4759: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4758 "configure" +#line 4764 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4777,7 +4783,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4787: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4804,7 +4810,7 @@ fi done - for ac_func in btowc wctob fgetwc fgetwc fgetws fputwc fputws fwide \ + for ac_func in btowc wctob fgetwc fgetws fputwc fputws fwide \ fwprintf fwscanf swprintf swscanf vfwprintf vfwscanf vswprintf vswscanf \ vwprintf vwscanf wprintf wscanf getwc getwchar mbsinit mbrlen mbrtowc \ mbsrtowcs wcsrtombs putwc putwchar ungetwc wcrtomb wcstod wcstof wcstol \ @@ -4812,12 +4818,12 @@ done wcscspn wcsspn wcstok wcsftime wcschr wcspbrk wcsrchr wcsstr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4816: checking for $ac_func" >&5 +echo "configure:4822: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4821 "configure" +#line 4827 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -4840,7 +4846,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:4844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -4868,7 +4874,7 @@ done echo $ac_n "checking for ISO C99 wchar_t support""... $ac_c" 1>&6 -echo "configure:4872: checking for ISO C99 wchar_t support" >&5 +echo "configure:4878: checking for ISO C99 wchar_t support" >&5 if test x"$has_weof" = xyes && test x"$has_wchar_minmax" = xyes && test x"$ac_wfuncs" = xyes; then @@ -4880,17 +4886,17 @@ echo "configure:4872: checking for ISO C99 wchar_t support" >&5 ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 -echo "configure:4884: checking for iconv.h" >&5 +echo "configure:4890: checking for iconv.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4889 "configure" +#line 4895 "configure" #include "confdefs.h" #include <iconv.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4894: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4900: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4914,17 +4920,17 @@ fi ac_safe=`echo "langinfo.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for langinfo.h""... $ac_c" 1>&6 -echo "configure:4918: checking for langinfo.h" >&5 +echo "configure:4924: checking for langinfo.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 4923 "configure" +#line 4929 "configure" #include "confdefs.h" #include <langinfo.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4948,7 +4954,7 @@ fi echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 -echo "configure:4952: checking for iconv in -liconv" >&5 +echo "configure:4958: checking for iconv in -liconv" >&5 ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4956,7 +4962,7 @@ else ac_save_LIBS="$LIBS" LIBS="-liconv $LIBS" cat > conftest.$ac_ext <<EOF -#line 4960 "configure" +#line 4966 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4967,7 +4973,7 @@ int main() { iconv() ; return 0; } EOF -if { (eval echo configure:4971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4993,12 +4999,12 @@ fi for ac_func in iconv_open iconv_close iconv nl_langinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4997: checking for $ac_func" >&5 +echo "configure:5003: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5002 "configure" +#line 5008 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5021,7 +5027,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5051,7 +5057,7 @@ done LIBS="$ac_save_LIBS" echo $ac_n "checking for XPG2 wchar_t support""... $ac_c" 1>&6 -echo "configure:5055: checking for XPG2 wchar_t support" >&5 +echo "configure:5061: checking for XPG2 wchar_t support" >&5 if test x"$ac_has_iconv_h" = xyes && test x"$ac_has_langinfo_h" = xyes && test x"$ac_XPG2funcs" = xyes; then @@ -5061,21 +5067,27 @@ echo "configure:5055: checking for XPG2 wchar_t support" >&5 fi echo "$ac_t""$ac_XPG2_wchar_t" 1>&6 - echo $ac_n "checking for enabled wchar_t specializations""... $ac_c" 1>&6 -echo "configure:5066: checking for enabled wchar_t specializations" >&5 - if test x"$ac_isoC99_wchar_t" = xyes && + if test x"$ac_isoC99_wchar_t" = xyes && test x"$ac_XPG2_wchar_t" = xyes; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define _GLIBCPP_USE_WCHAR_T 1 EOF - echo "$ac_t"""yes"" 1>&6 - else - echo "$ac_t"""no"" 1>&6 + enable_wchar_t=yes fi - else - echo "configure: warning: wchar_t support disabled." 1>&2 fi + echo $ac_n "checking for enabled wchar_t specializations""... $ac_c" 1>&6 +echo "configure:5081: checking for enabled wchar_t specializations" >&5 + echo "$ac_t""$enable_wchar_t" 1>&6 + + +if test "$enable_wchar_t" = yes; then + GLIBCPP_TEST_WCHAR_T_TRUE= + GLIBCPP_TEST_WCHAR_T_FALSE='#' +else + GLIBCPP_TEST_WCHAR_T_TRUE='#' + GLIBCPP_TEST_WCHAR_T_FALSE= +fi cat >> confdefs.h <<\EOF #define HAVE_COPYSIGN 1 @@ -5152,17 +5164,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5156: checking for $ac_hdr" >&5 +echo "configure:5168: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5161 "configure" +#line 5173 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5240,12 +5252,12 @@ done # used sections, first .eh_frame and now some of the glibc sections for # iconv). Bzzzzt. Thanks for playing, maybe next time. echo $ac_n "checking for ld that supports -Wl,--gc-sections""... $ac_c" 1>&6 -echo "configure:5244: checking for ld that supports -Wl,--gc-sections" >&5 +echo "configure:5256: checking for ld that supports -Wl,--gc-sections" >&5 if test "$cross_compiling" = yes; then ac_sectionLDflags=yes else cat > conftest.$ac_ext <<EOF -#line 5249 "configure" +#line 5261 "configure" #include "confdefs.h" int main(void) @@ -5256,7 +5268,7 @@ else } EOF -if { (eval echo configure:5260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_sectionLDflags=yes else @@ -5290,7 +5302,7 @@ fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:5294: checking for main in -lm" >&5 +echo "configure:5306: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5298,14 +5310,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 5302 "configure" +#line 5314 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5335,12 +5347,12 @@ fi for ac_func in nan copysignf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5339: checking for $ac_func" >&5 +echo "configure:5351: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5344 "configure" +#line 5356 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5363,7 +5375,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5392,12 +5404,12 @@ done for ac_func in __signbit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5396: checking for $ac_func" >&5 +echo "configure:5408: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5401 "configure" +#line 5413 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5420,7 +5432,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5448,12 +5460,12 @@ done for ac_func in __signbitf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5452: checking for $ac_func" >&5 +echo "configure:5464: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5457 "configure" +#line 5469 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5476,7 +5488,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5506,12 +5518,12 @@ done for ac_func in __signbitl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5510: checking for $ac_func" >&5 +echo "configure:5522: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5515 "configure" +#line 5527 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5534,7 +5546,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5564,18 +5576,19 @@ done + enable_wchar_t=no echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 -echo "configure:5570: checking for mbstate_t" >&5 +echo "configure:5583: checking for mbstate_t" >&5 cat > conftest.$ac_ext <<EOF -#line 5572 "configure" +#line 5585 "configure" #include "confdefs.h" #include <wchar.h> int main() { mbstate_t teststate; ; return 0; } EOF -if { (eval echo configure:5579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5592: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_mbstate_t=yes else @@ -5597,17 +5610,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5601: checking for $ac_hdr" >&5 +echo "configure:5614: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5606 "configure" +#line 5619 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5611: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5624: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5638,17 +5651,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5642: checking for $ac_hdr" >&5 +echo "configure:5655: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5647 "configure" +#line 5660 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5681,16 +5694,16 @@ done test x"$enable_c_mbchar" != xno; then echo $ac_n "checking for WCHAR_MIN and WCHAR_MAX""... $ac_c" 1>&6 -echo "configure:5685: checking for WCHAR_MIN and WCHAR_MAX" >&5 +echo "configure:5698: checking for WCHAR_MIN and WCHAR_MAX" >&5 cat > conftest.$ac_ext <<EOF -#line 5687 "configure" +#line 5700 "configure" #include "confdefs.h" #include <wchar.h> int main() { int i = WCHAR_MIN; int j = WCHAR_MAX; ; return 0; } EOF -if { (eval echo configure:5694: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5707: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_wchar_minmax=yes else @@ -5703,9 +5716,9 @@ rm -f conftest* echo "$ac_t""$has_wchar_minmax" 1>&6 echo $ac_n "checking for WEOF""... $ac_c" 1>&6 -echo "configure:5707: checking for WEOF" >&5 +echo "configure:5720: checking for WEOF" >&5 cat > conftest.$ac_ext <<EOF -#line 5709 "configure" +#line 5722 "configure" #include "confdefs.h" #include <wchar.h> @@ -5714,7 +5727,7 @@ int main() { wint_t i = WEOF; ; return 0; } EOF -if { (eval echo configure:5718: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_weof=yes else @@ -5730,12 +5743,12 @@ rm -f conftest* for ac_func in wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5734: checking for $ac_func" >&5 +echo "configure:5747: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5739 "configure" +#line 5752 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5758,7 +5771,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5785,7 +5798,7 @@ fi done - for ac_func in btowc wctob fgetwc fgetwc fgetws fputwc fputws fwide \ + for ac_func in btowc wctob fgetwc fgetws fputwc fputws fwide \ fwprintf fwscanf swprintf swscanf vfwprintf vfwscanf vswprintf vswscanf \ vwprintf vwscanf wprintf wscanf getwc getwchar mbsinit mbrlen mbrtowc \ mbsrtowcs wcsrtombs putwc putwchar ungetwc wcrtomb wcstod wcstof wcstol \ @@ -5793,12 +5806,12 @@ done wcscspn wcsspn wcstok wcsftime wcschr wcspbrk wcsrchr wcsstr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5797: checking for $ac_func" >&5 +echo "configure:5810: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5802 "configure" +#line 5815 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -5821,7 +5834,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:5825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -5849,7 +5862,7 @@ done echo $ac_n "checking for ISO C99 wchar_t support""... $ac_c" 1>&6 -echo "configure:5853: checking for ISO C99 wchar_t support" >&5 +echo "configure:5866: checking for ISO C99 wchar_t support" >&5 if test x"$has_weof" = xyes && test x"$has_wchar_minmax" = xyes && test x"$ac_wfuncs" = xyes; then @@ -5861,17 +5874,17 @@ echo "configure:5853: checking for ISO C99 wchar_t support" >&5 ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 -echo "configure:5865: checking for iconv.h" >&5 +echo "configure:5878: checking for iconv.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5870 "configure" +#line 5883 "configure" #include "confdefs.h" #include <iconv.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5895,17 +5908,17 @@ fi ac_safe=`echo "langinfo.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for langinfo.h""... $ac_c" 1>&6 -echo "configure:5899: checking for langinfo.h" >&5 +echo "configure:5912: checking for langinfo.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5904 "configure" +#line 5917 "configure" #include "confdefs.h" #include <langinfo.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5909: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5929,7 +5942,7 @@ fi echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 -echo "configure:5933: checking for iconv in -liconv" >&5 +echo "configure:5946: checking for iconv in -liconv" >&5 ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5937,7 +5950,7 @@ else ac_save_LIBS="$LIBS" LIBS="-liconv $LIBS" cat > conftest.$ac_ext <<EOF -#line 5941 "configure" +#line 5954 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5948,7 +5961,7 @@ int main() { iconv() ; return 0; } EOF -if { (eval echo configure:5952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5974,12 +5987,12 @@ fi for ac_func in iconv_open iconv_close iconv nl_langinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:5978: checking for $ac_func" >&5 +echo "configure:5991: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 5983 "configure" +#line 5996 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6002,7 +6015,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6006: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6019: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6032,7 +6045,7 @@ done LIBS="$ac_save_LIBS" echo $ac_n "checking for XPG2 wchar_t support""... $ac_c" 1>&6 -echo "configure:6036: checking for XPG2 wchar_t support" >&5 +echo "configure:6049: checking for XPG2 wchar_t support" >&5 if test x"$ac_has_iconv_h" = xyes && test x"$ac_has_langinfo_h" = xyes && test x"$ac_XPG2funcs" = xyes; then @@ -6042,21 +6055,27 @@ echo "configure:6036: checking for XPG2 wchar_t support" >&5 fi echo "$ac_t""$ac_XPG2_wchar_t" 1>&6 - echo $ac_n "checking for enabled wchar_t specializations""... $ac_c" 1>&6 -echo "configure:6047: checking for enabled wchar_t specializations" >&5 - if test x"$ac_isoC99_wchar_t" = xyes && + if test x"$ac_isoC99_wchar_t" = xyes && test x"$ac_XPG2_wchar_t" = xyes; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define _GLIBCPP_USE_WCHAR_T 1 EOF - echo "$ac_t"""yes"" 1>&6 - else - echo "$ac_t"""no"" 1>&6 + enable_wchar_t=yes fi - else - echo "configure: warning: wchar_t support disabled." 1>&2 fi + echo $ac_n "checking for enabled wchar_t specializations""... $ac_c" 1>&6 +echo "configure:6069: checking for enabled wchar_t specializations" >&5 + echo "$ac_t""$enable_wchar_t" 1>&6 + + +if test "$enable_wchar_t" = yes; then + GLIBCPP_TEST_WCHAR_T_TRUE= + GLIBCPP_TEST_WCHAR_T_FALSE='#' +else + GLIBCPP_TEST_WCHAR_T_TRUE='#' + GLIBCPP_TEST_WCHAR_T_FALSE= +fi os_include_dir="os/hpux" cat >> confdefs.h <<\EOF @@ -6113,17 +6132,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6117: checking for $ac_hdr" >&5 +echo "configure:6136: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6122 "configure" +#line 6141 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6127: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6146: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6201,12 +6220,12 @@ done # used sections, first .eh_frame and now some of the glibc sections for # iconv). Bzzzzt. Thanks for playing, maybe next time. echo $ac_n "checking for ld that supports -Wl,--gc-sections""... $ac_c" 1>&6 -echo "configure:6205: checking for ld that supports -Wl,--gc-sections" >&5 +echo "configure:6224: checking for ld that supports -Wl,--gc-sections" >&5 if test "$cross_compiling" = yes; then ac_sectionLDflags=yes else cat > conftest.$ac_ext <<EOF -#line 6210 "configure" +#line 6229 "configure" #include "confdefs.h" int main(void) @@ -6217,7 +6236,7 @@ else } EOF -if { (eval echo configure:6221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_sectionLDflags=yes else @@ -6251,7 +6270,7 @@ fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:6255: checking for main in -lm" >&5 +echo "configure:6274: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6259,14 +6278,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 6263 "configure" +#line 6282 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:6270: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6289: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6296,12 +6315,12 @@ fi for ac_func in nan copysignf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6300: checking for $ac_func" >&5 +echo "configure:6319: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6305 "configure" +#line 6324 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6324,7 +6343,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6353,12 +6372,12 @@ done for ac_func in __signbit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6357: checking for $ac_func" >&5 +echo "configure:6376: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6362 "configure" +#line 6381 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6381,7 +6400,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6409,12 +6428,12 @@ done for ac_func in __signbitf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6413: checking for $ac_func" >&5 +echo "configure:6432: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6418 "configure" +#line 6437 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6437,7 +6456,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6467,12 +6486,12 @@ done for ac_func in __signbitl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6471: checking for $ac_func" >&5 +echo "configure:6490: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6476 "configure" +#line 6495 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6495,7 +6514,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6525,18 +6544,19 @@ done + enable_wchar_t=no echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 -echo "configure:6531: checking for mbstate_t" >&5 +echo "configure:6551: checking for mbstate_t" >&5 cat > conftest.$ac_ext <<EOF -#line 6533 "configure" +#line 6553 "configure" #include "confdefs.h" #include <wchar.h> int main() { mbstate_t teststate; ; return 0; } EOF -if { (eval echo configure:6540: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_mbstate_t=yes else @@ -6558,17 +6578,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6562: checking for $ac_hdr" >&5 +echo "configure:6582: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6567 "configure" +#line 6587 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6572: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6592: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6599,17 +6619,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6603: checking for $ac_hdr" >&5 +echo "configure:6623: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6608 "configure" +#line 6628 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6613: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6642,16 +6662,16 @@ done test x"$enable_c_mbchar" != xno; then echo $ac_n "checking for WCHAR_MIN and WCHAR_MAX""... $ac_c" 1>&6 -echo "configure:6646: checking for WCHAR_MIN and WCHAR_MAX" >&5 +echo "configure:6666: checking for WCHAR_MIN and WCHAR_MAX" >&5 cat > conftest.$ac_ext <<EOF -#line 6648 "configure" +#line 6668 "configure" #include "confdefs.h" #include <wchar.h> int main() { int i = WCHAR_MIN; int j = WCHAR_MAX; ; return 0; } EOF -if { (eval echo configure:6655: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6675: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_wchar_minmax=yes else @@ -6664,9 +6684,9 @@ rm -f conftest* echo "$ac_t""$has_wchar_minmax" 1>&6 echo $ac_n "checking for WEOF""... $ac_c" 1>&6 -echo "configure:6668: checking for WEOF" >&5 +echo "configure:6688: checking for WEOF" >&5 cat > conftest.$ac_ext <<EOF -#line 6670 "configure" +#line 6690 "configure" #include "confdefs.h" #include <wchar.h> @@ -6675,7 +6695,7 @@ int main() { wint_t i = WEOF; ; return 0; } EOF -if { (eval echo configure:6679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_weof=yes else @@ -6691,12 +6711,12 @@ rm -f conftest* for ac_func in wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6695: checking for $ac_func" >&5 +echo "configure:6715: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6700 "configure" +#line 6720 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6719,7 +6739,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6746,7 +6766,7 @@ fi done - for ac_func in btowc wctob fgetwc fgetwc fgetws fputwc fputws fwide \ + for ac_func in btowc wctob fgetwc fgetws fputwc fputws fwide \ fwprintf fwscanf swprintf swscanf vfwprintf vfwscanf vswprintf vswscanf \ vwprintf vwscanf wprintf wscanf getwc getwchar mbsinit mbrlen mbrtowc \ mbsrtowcs wcsrtombs putwc putwchar ungetwc wcrtomb wcstod wcstof wcstol \ @@ -6754,12 +6774,12 @@ done wcscspn wcsspn wcstok wcsftime wcschr wcspbrk wcsrchr wcsstr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6758: checking for $ac_func" >&5 +echo "configure:6778: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6763 "configure" +#line 6783 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6782,7 +6802,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6810,7 +6830,7 @@ done echo $ac_n "checking for ISO C99 wchar_t support""... $ac_c" 1>&6 -echo "configure:6814: checking for ISO C99 wchar_t support" >&5 +echo "configure:6834: checking for ISO C99 wchar_t support" >&5 if test x"$has_weof" = xyes && test x"$has_wchar_minmax" = xyes && test x"$ac_wfuncs" = xyes; then @@ -6822,17 +6842,17 @@ echo "configure:6814: checking for ISO C99 wchar_t support" >&5 ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 -echo "configure:6826: checking for iconv.h" >&5 +echo "configure:6846: checking for iconv.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6831 "configure" +#line 6851 "configure" #include "confdefs.h" #include <iconv.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6856,17 +6876,17 @@ fi ac_safe=`echo "langinfo.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for langinfo.h""... $ac_c" 1>&6 -echo "configure:6860: checking for langinfo.h" >&5 +echo "configure:6880: checking for langinfo.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6865 "configure" +#line 6885 "configure" #include "confdefs.h" #include <langinfo.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6890,7 +6910,7 @@ fi echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 -echo "configure:6894: checking for iconv in -liconv" >&5 +echo "configure:6914: checking for iconv in -liconv" >&5 ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -6898,7 +6918,7 @@ else ac_save_LIBS="$LIBS" LIBS="-liconv $LIBS" cat > conftest.$ac_ext <<EOF -#line 6902 "configure" +#line 6922 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6909,7 +6929,7 @@ int main() { iconv() ; return 0; } EOF -if { (eval echo configure:6913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6935,12 +6955,12 @@ fi for ac_func in iconv_open iconv_close iconv nl_langinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6939: checking for $ac_func" >&5 +echo "configure:6959: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 6944 "configure" +#line 6964 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6963,7 +6983,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:6967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:6987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6993,7 +7013,7 @@ done LIBS="$ac_save_LIBS" echo $ac_n "checking for XPG2 wchar_t support""... $ac_c" 1>&6 -echo "configure:6997: checking for XPG2 wchar_t support" >&5 +echo "configure:7017: checking for XPG2 wchar_t support" >&5 if test x"$ac_has_iconv_h" = xyes && test x"$ac_has_langinfo_h" = xyes && test x"$ac_XPG2funcs" = xyes; then @@ -7003,21 +7023,27 @@ echo "configure:6997: checking for XPG2 wchar_t support" >&5 fi echo "$ac_t""$ac_XPG2_wchar_t" 1>&6 - echo $ac_n "checking for enabled wchar_t specializations""... $ac_c" 1>&6 -echo "configure:7008: checking for enabled wchar_t specializations" >&5 - if test x"$ac_isoC99_wchar_t" = xyes && + if test x"$ac_isoC99_wchar_t" = xyes && test x"$ac_XPG2_wchar_t" = xyes; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define _GLIBCPP_USE_WCHAR_T 1 EOF - echo "$ac_t"""yes"" 1>&6 - else - echo "$ac_t"""no"" 1>&6 + enable_wchar_t=yes fi - else - echo "configure: warning: wchar_t support disabled." 1>&2 fi + echo $ac_n "checking for enabled wchar_t specializations""... $ac_c" 1>&6 +echo "configure:7037: checking for enabled wchar_t specializations" >&5 + echo "$ac_t""$enable_wchar_t" 1>&6 + + +if test "$enable_wchar_t" = yes; then + GLIBCPP_TEST_WCHAR_T_TRUE= + GLIBCPP_TEST_WCHAR_T_FALSE='#' +else + GLIBCPP_TEST_WCHAR_T_TRUE='#' + GLIBCPP_TEST_WCHAR_T_FALSE= +fi os_include_dir="os/bsd/netbsd" cat >> confdefs.h <<\EOF @@ -7084,17 +7110,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7088: checking for $ac_hdr" >&5 +echo "configure:7114: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7093 "configure" +#line 7119 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7172,12 +7198,12 @@ done # used sections, first .eh_frame and now some of the glibc sections for # iconv). Bzzzzt. Thanks for playing, maybe next time. echo $ac_n "checking for ld that supports -Wl,--gc-sections""... $ac_c" 1>&6 -echo "configure:7176: checking for ld that supports -Wl,--gc-sections" >&5 +echo "configure:7202: checking for ld that supports -Wl,--gc-sections" >&5 if test "$cross_compiling" = yes; then ac_sectionLDflags=yes else cat > conftest.$ac_ext <<EOF -#line 7181 "configure" +#line 7207 "configure" #include "confdefs.h" int main(void) @@ -7188,7 +7214,7 @@ else } EOF -if { (eval echo configure:7192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_sectionLDflags=yes else @@ -7222,7 +7248,7 @@ fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:7226: checking for main in -lm" >&5 +echo "configure:7252: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7230,14 +7256,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 7234 "configure" +#line 7260 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:7241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7267,12 +7293,12 @@ fi for ac_func in nan copysignf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7271: checking for $ac_func" >&5 +echo "configure:7297: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7276 "configure" +#line 7302 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7295,7 +7321,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:7299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7324,12 +7350,12 @@ done for ac_func in __signbit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7328: checking for $ac_func" >&5 +echo "configure:7354: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7333 "configure" +#line 7359 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7352,7 +7378,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:7356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7380,12 +7406,12 @@ done for ac_func in __signbitf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7384: checking for $ac_func" >&5 +echo "configure:7410: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7389 "configure" +#line 7415 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7408,7 +7434,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:7412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7438,12 +7464,12 @@ done for ac_func in __signbitl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7442: checking for $ac_func" >&5 +echo "configure:7468: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7447 "configure" +#line 7473 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7466,7 +7492,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:7470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7496,18 +7522,19 @@ done + enable_wchar_t=no echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 -echo "configure:7502: checking for mbstate_t" >&5 +echo "configure:7529: checking for mbstate_t" >&5 cat > conftest.$ac_ext <<EOF -#line 7504 "configure" +#line 7531 "configure" #include "confdefs.h" #include <wchar.h> int main() { mbstate_t teststate; ; return 0; } EOF -if { (eval echo configure:7511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_mbstate_t=yes else @@ -7529,17 +7556,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7533: checking for $ac_hdr" >&5 +echo "configure:7560: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7538 "configure" +#line 7565 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7543: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7570: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7570,17 +7597,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7574: checking for $ac_hdr" >&5 +echo "configure:7601: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7579 "configure" +#line 7606 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7584: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7611: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7613,16 +7640,16 @@ done test x"$enable_c_mbchar" != xno; then echo $ac_n "checking for WCHAR_MIN and WCHAR_MAX""... $ac_c" 1>&6 -echo "configure:7617: checking for WCHAR_MIN and WCHAR_MAX" >&5 +echo "configure:7644: checking for WCHAR_MIN and WCHAR_MAX" >&5 cat > conftest.$ac_ext <<EOF -#line 7619 "configure" +#line 7646 "configure" #include "confdefs.h" #include <wchar.h> int main() { int i = WCHAR_MIN; int j = WCHAR_MAX; ; return 0; } EOF -if { (eval echo configure:7626: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_wchar_minmax=yes else @@ -7635,9 +7662,9 @@ rm -f conftest* echo "$ac_t""$has_wchar_minmax" 1>&6 echo $ac_n "checking for WEOF""... $ac_c" 1>&6 -echo "configure:7639: checking for WEOF" >&5 +echo "configure:7666: checking for WEOF" >&5 cat > conftest.$ac_ext <<EOF -#line 7641 "configure" +#line 7668 "configure" #include "confdefs.h" #include <wchar.h> @@ -7646,7 +7673,7 @@ int main() { wint_t i = WEOF; ; return 0; } EOF -if { (eval echo configure:7650: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_weof=yes else @@ -7662,12 +7689,12 @@ rm -f conftest* for ac_func in wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7666: checking for $ac_func" >&5 +echo "configure:7693: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7671 "configure" +#line 7698 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7690,7 +7717,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:7694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7717,7 +7744,7 @@ fi done - for ac_func in btowc wctob fgetwc fgetwc fgetws fputwc fputws fwide \ + for ac_func in btowc wctob fgetwc fgetws fputwc fputws fwide \ fwprintf fwscanf swprintf swscanf vfwprintf vfwscanf vswprintf vswscanf \ vwprintf vwscanf wprintf wscanf getwc getwchar mbsinit mbrlen mbrtowc \ mbsrtowcs wcsrtombs putwc putwchar ungetwc wcrtomb wcstod wcstof wcstol \ @@ -7725,12 +7752,12 @@ done wcscspn wcsspn wcstok wcsftime wcschr wcspbrk wcsrchr wcsstr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7729: checking for $ac_func" >&5 +echo "configure:7756: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7734 "configure" +#line 7761 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7753,7 +7780,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:7757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7781,7 +7808,7 @@ done echo $ac_n "checking for ISO C99 wchar_t support""... $ac_c" 1>&6 -echo "configure:7785: checking for ISO C99 wchar_t support" >&5 +echo "configure:7812: checking for ISO C99 wchar_t support" >&5 if test x"$has_weof" = xyes && test x"$has_wchar_minmax" = xyes && test x"$ac_wfuncs" = xyes; then @@ -7793,17 +7820,17 @@ echo "configure:7785: checking for ISO C99 wchar_t support" >&5 ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 -echo "configure:7797: checking for iconv.h" >&5 +echo "configure:7824: checking for iconv.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7802 "configure" +#line 7829 "configure" #include "confdefs.h" #include <iconv.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7807: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7834: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7827,17 +7854,17 @@ fi ac_safe=`echo "langinfo.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for langinfo.h""... $ac_c" 1>&6 -echo "configure:7831: checking for langinfo.h" >&5 +echo "configure:7858: checking for langinfo.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7836 "configure" +#line 7863 "configure" #include "confdefs.h" #include <langinfo.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7868: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7861,7 +7888,7 @@ fi echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 -echo "configure:7865: checking for iconv in -liconv" >&5 +echo "configure:7892: checking for iconv in -liconv" >&5 ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7869,7 +7896,7 @@ else ac_save_LIBS="$LIBS" LIBS="-liconv $LIBS" cat > conftest.$ac_ext <<EOF -#line 7873 "configure" +#line 7900 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7880,7 +7907,7 @@ int main() { iconv() ; return 0; } EOF -if { (eval echo configure:7884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7906,12 +7933,12 @@ fi for ac_func in iconv_open iconv_close iconv nl_langinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7910: checking for $ac_func" >&5 +echo "configure:7937: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 7915 "configure" +#line 7942 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7934,7 +7961,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:7938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7964,7 +7991,7 @@ done LIBS="$ac_save_LIBS" echo $ac_n "checking for XPG2 wchar_t support""... $ac_c" 1>&6 -echo "configure:7968: checking for XPG2 wchar_t support" >&5 +echo "configure:7995: checking for XPG2 wchar_t support" >&5 if test x"$ac_has_iconv_h" = xyes && test x"$ac_has_langinfo_h" = xyes && test x"$ac_XPG2funcs" = xyes; then @@ -7974,21 +8001,27 @@ echo "configure:7968: checking for XPG2 wchar_t support" >&5 fi echo "$ac_t""$ac_XPG2_wchar_t" 1>&6 - echo $ac_n "checking for enabled wchar_t specializations""... $ac_c" 1>&6 -echo "configure:7979: checking for enabled wchar_t specializations" >&5 - if test x"$ac_isoC99_wchar_t" = xyes && + if test x"$ac_isoC99_wchar_t" = xyes && test x"$ac_XPG2_wchar_t" = xyes; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define _GLIBCPP_USE_WCHAR_T 1 EOF - echo "$ac_t"""yes"" 1>&6 - else - echo "$ac_t"""no"" 1>&6 + enable_wchar_t=yes fi - else - echo "configure: warning: wchar_t support disabled." 1>&2 fi + echo $ac_n "checking for enabled wchar_t specializations""... $ac_c" 1>&6 +echo "configure:8015: checking for enabled wchar_t specializations" >&5 + echo "$ac_t""$enable_wchar_t" 1>&6 + + +if test "$enable_wchar_t" = yes; then + GLIBCPP_TEST_WCHAR_T_TRUE= + GLIBCPP_TEST_WCHAR_T_FALSE='#' +else + GLIBCPP_TEST_WCHAR_T_TRUE='#' + GLIBCPP_TEST_WCHAR_T_FALSE= +fi os_include_dir="os/bsd/freebsd" cat >> confdefs.h <<\EOF @@ -8071,17 +8104,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8075: checking for $ac_hdr" >&5 +echo "configure:8108: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8080 "configure" +#line 8113 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8085: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8118: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8157,12 +8190,12 @@ done # used sections, first .eh_frame and now some of the glibc sections for # iconv). Bzzzzt. Thanks for playing, maybe next time. echo $ac_n "checking for ld that supports -Wl,--gc-sections""... $ac_c" 1>&6 -echo "configure:8161: checking for ld that supports -Wl,--gc-sections" >&5 +echo "configure:8194: checking for ld that supports -Wl,--gc-sections" >&5 if test "$cross_compiling" = yes; then ac_sectionLDflags=yes else cat > conftest.$ac_ext <<EOF -#line 8166 "configure" +#line 8199 "configure" #include "confdefs.h" int main(void) @@ -8173,7 +8206,7 @@ else } EOF -if { (eval echo configure:8177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:8210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_sectionLDflags=yes else @@ -8207,7 +8240,7 @@ fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:8211: checking for main in -lm" >&5 +echo "configure:8244: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8215,14 +8248,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 8219 "configure" +#line 8252 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:8226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8252,12 +8285,12 @@ fi for ac_func in nan copysignf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8256: checking for $ac_func" >&5 +echo "configure:8289: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8261 "configure" +#line 8294 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8280,7 +8313,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8309,12 +8342,12 @@ done for ac_func in __signbit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8313: checking for $ac_func" >&5 +echo "configure:8346: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8318 "configure" +#line 8351 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8337,7 +8370,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8374: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8365,12 +8398,12 @@ done for ac_func in __signbitf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8369: checking for $ac_func" >&5 +echo "configure:8402: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8374 "configure" +#line 8407 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8393,7 +8426,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8397: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8423,12 +8456,12 @@ done for ac_func in __signbitl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8427: checking for $ac_func" >&5 +echo "configure:8460: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8432 "configure" +#line 8465 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8451,7 +8484,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8481,18 +8514,19 @@ done + enable_wchar_t=no echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 -echo "configure:8487: checking for mbstate_t" >&5 +echo "configure:8521: checking for mbstate_t" >&5 cat > conftest.$ac_ext <<EOF -#line 8489 "configure" +#line 8523 "configure" #include "confdefs.h" #include <wchar.h> int main() { mbstate_t teststate; ; return 0; } EOF -if { (eval echo configure:8496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_mbstate_t=yes else @@ -8514,17 +8548,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8518: checking for $ac_hdr" >&5 +echo "configure:8552: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8523 "configure" +#line 8557 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8528: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8562: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8555,17 +8589,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8559: checking for $ac_hdr" >&5 +echo "configure:8593: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8564 "configure" +#line 8598 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8603: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8598,16 +8632,16 @@ done test x"$enable_c_mbchar" != xno; then echo $ac_n "checking for WCHAR_MIN and WCHAR_MAX""... $ac_c" 1>&6 -echo "configure:8602: checking for WCHAR_MIN and WCHAR_MAX" >&5 +echo "configure:8636: checking for WCHAR_MIN and WCHAR_MAX" >&5 cat > conftest.$ac_ext <<EOF -#line 8604 "configure" +#line 8638 "configure" #include "confdefs.h" #include <wchar.h> int main() { int i = WCHAR_MIN; int j = WCHAR_MAX; ; return 0; } EOF -if { (eval echo configure:8611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_wchar_minmax=yes else @@ -8620,9 +8654,9 @@ rm -f conftest* echo "$ac_t""$has_wchar_minmax" 1>&6 echo $ac_n "checking for WEOF""... $ac_c" 1>&6 -echo "configure:8624: checking for WEOF" >&5 +echo "configure:8658: checking for WEOF" >&5 cat > conftest.$ac_ext <<EOF -#line 8626 "configure" +#line 8660 "configure" #include "confdefs.h" #include <wchar.h> @@ -8631,7 +8665,7 @@ int main() { wint_t i = WEOF; ; return 0; } EOF -if { (eval echo configure:8635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:8669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_weof=yes else @@ -8647,12 +8681,12 @@ rm -f conftest* for ac_func in wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8651: checking for $ac_func" >&5 +echo "configure:8685: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8656 "configure" +#line 8690 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8675,7 +8709,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8702,7 +8736,7 @@ fi done - for ac_func in btowc wctob fgetwc fgetwc fgetws fputwc fputws fwide \ + for ac_func in btowc wctob fgetwc fgetws fputwc fputws fwide \ fwprintf fwscanf swprintf swscanf vfwprintf vfwscanf vswprintf vswscanf \ vwprintf vwscanf wprintf wscanf getwc getwchar mbsinit mbrlen mbrtowc \ mbsrtowcs wcsrtombs putwc putwchar ungetwc wcrtomb wcstod wcstof wcstol \ @@ -8710,12 +8744,12 @@ done wcscspn wcsspn wcstok wcsftime wcschr wcspbrk wcsrchr wcsstr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8714: checking for $ac_func" >&5 +echo "configure:8748: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8719 "configure" +#line 8753 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8738,7 +8772,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8766,7 +8800,7 @@ done echo $ac_n "checking for ISO C99 wchar_t support""... $ac_c" 1>&6 -echo "configure:8770: checking for ISO C99 wchar_t support" >&5 +echo "configure:8804: checking for ISO C99 wchar_t support" >&5 if test x"$has_weof" = xyes && test x"$has_wchar_minmax" = xyes && test x"$ac_wfuncs" = xyes; then @@ -8778,17 +8812,17 @@ echo "configure:8770: checking for ISO C99 wchar_t support" >&5 ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 -echo "configure:8782: checking for iconv.h" >&5 +echo "configure:8816: checking for iconv.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8787 "configure" +#line 8821 "configure" #include "confdefs.h" #include <iconv.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8792: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8812,17 +8846,17 @@ fi ac_safe=`echo "langinfo.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for langinfo.h""... $ac_c" 1>&6 -echo "configure:8816: checking for langinfo.h" >&5 +echo "configure:8850: checking for langinfo.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8821 "configure" +#line 8855 "configure" #include "confdefs.h" #include <langinfo.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8846,7 +8880,7 @@ fi echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 -echo "configure:8850: checking for iconv in -liconv" >&5 +echo "configure:8884: checking for iconv in -liconv" >&5 ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8854,7 +8888,7 @@ else ac_save_LIBS="$LIBS" LIBS="-liconv $LIBS" cat > conftest.$ac_ext <<EOF -#line 8858 "configure" +#line 8892 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8865,7 +8899,7 @@ int main() { iconv() ; return 0; } EOF -if { (eval echo configure:8869: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8891,12 +8925,12 @@ fi for ac_func in iconv_open iconv_close iconv nl_langinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:8895: checking for $ac_func" >&5 +echo "configure:8929: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 8900 "configure" +#line 8934 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -8919,7 +8953,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:8923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8949,7 +8983,7 @@ done LIBS="$ac_save_LIBS" echo $ac_n "checking for XPG2 wchar_t support""... $ac_c" 1>&6 -echo "configure:8953: checking for XPG2 wchar_t support" >&5 +echo "configure:8987: checking for XPG2 wchar_t support" >&5 if test x"$ac_has_iconv_h" = xyes && test x"$ac_has_langinfo_h" = xyes && test x"$ac_XPG2funcs" = xyes; then @@ -8959,21 +8993,27 @@ echo "configure:8953: checking for XPG2 wchar_t support" >&5 fi echo "$ac_t""$ac_XPG2_wchar_t" 1>&6 - echo $ac_n "checking for enabled wchar_t specializations""... $ac_c" 1>&6 -echo "configure:8964: checking for enabled wchar_t specializations" >&5 - if test x"$ac_isoC99_wchar_t" = xyes && + if test x"$ac_isoC99_wchar_t" = xyes && test x"$ac_XPG2_wchar_t" = xyes; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define _GLIBCPP_USE_WCHAR_T 1 EOF - echo "$ac_t"""yes"" 1>&6 - else - echo "$ac_t"""no"" 1>&6 + enable_wchar_t=yes fi - else - echo "configure: warning: wchar_t support disabled." 1>&2 fi + echo $ac_n "checking for enabled wchar_t specializations""... $ac_c" 1>&6 +echo "configure:9007: checking for enabled wchar_t specializations" >&5 + echo "$ac_t""$enable_wchar_t" 1>&6 + + +if test "$enable_wchar_t" = yes; then + GLIBCPP_TEST_WCHAR_T_TRUE= + GLIBCPP_TEST_WCHAR_T_FALSE='#' +else + GLIBCPP_TEST_WCHAR_T_TRUE='#' + GLIBCPP_TEST_WCHAR_T_FALSE= +fi os_include_dir="os/mingw32" ;; @@ -9033,12 +9073,12 @@ EOF # used sections, first .eh_frame and now some of the glibc sections for # iconv). Bzzzzt. Thanks for playing, maybe next time. echo $ac_n "checking for ld that supports -Wl,--gc-sections""... $ac_c" 1>&6 -echo "configure:9037: checking for ld that supports -Wl,--gc-sections" >&5 +echo "configure:9077: checking for ld that supports -Wl,--gc-sections" >&5 if test "$cross_compiling" = yes; then ac_sectionLDflags=yes else cat > conftest.$ac_ext <<EOF -#line 9042 "configure" +#line 9082 "configure" #include "confdefs.h" int main(void) @@ -9049,7 +9089,7 @@ else } EOF -if { (eval echo configure:9053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_sectionLDflags=yes else @@ -9083,7 +9123,7 @@ fi echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:9087: checking for main in -lm" >&5 +echo "configure:9127: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9091,14 +9131,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 9095 "configure" +#line 9135 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:9102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9128,12 +9168,12 @@ fi for ac_func in nan copysignf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9132: checking for $ac_func" >&5 +echo "configure:9172: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9137 "configure" +#line 9177 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -9156,7 +9196,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:9160: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9185,12 +9225,12 @@ done for ac_func in __signbit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9189: checking for $ac_func" >&5 +echo "configure:9229: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9194 "configure" +#line 9234 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -9213,7 +9253,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:9217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9241,12 +9281,12 @@ done for ac_func in __signbitf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9245: checking for $ac_func" >&5 +echo "configure:9285: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9250 "configure" +#line 9290 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -9269,7 +9309,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:9273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9299,12 +9339,12 @@ done for ac_func in __signbitl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9303: checking for $ac_func" >&5 +echo "configure:9343: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9308 "configure" +#line 9348 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -9327,7 +9367,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:9331: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9357,18 +9397,19 @@ done + enable_wchar_t=no echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 -echo "configure:9363: checking for mbstate_t" >&5 +echo "configure:9404: checking for mbstate_t" >&5 cat > conftest.$ac_ext <<EOF -#line 9365 "configure" +#line 9406 "configure" #include "confdefs.h" #include <wchar.h> int main() { mbstate_t teststate; ; return 0; } EOF -if { (eval echo configure:9372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_mbstate_t=yes else @@ -9390,17 +9431,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9394: checking for $ac_hdr" >&5 +echo "configure:9435: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9399 "configure" +#line 9440 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9431,17 +9472,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:9435: checking for $ac_hdr" >&5 +echo "configure:9476: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9440 "configure" +#line 9481 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9445: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9474,16 +9515,16 @@ done test x"$enable_c_mbchar" != xno; then echo $ac_n "checking for WCHAR_MIN and WCHAR_MAX""... $ac_c" 1>&6 -echo "configure:9478: checking for WCHAR_MIN and WCHAR_MAX" >&5 +echo "configure:9519: checking for WCHAR_MIN and WCHAR_MAX" >&5 cat > conftest.$ac_ext <<EOF -#line 9480 "configure" +#line 9521 "configure" #include "confdefs.h" #include <wchar.h> int main() { int i = WCHAR_MIN; int j = WCHAR_MAX; ; return 0; } EOF -if { (eval echo configure:9487: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9528: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_wchar_minmax=yes else @@ -9496,9 +9537,9 @@ rm -f conftest* echo "$ac_t""$has_wchar_minmax" 1>&6 echo $ac_n "checking for WEOF""... $ac_c" 1>&6 -echo "configure:9500: checking for WEOF" >&5 +echo "configure:9541: checking for WEOF" >&5 cat > conftest.$ac_ext <<EOF -#line 9502 "configure" +#line 9543 "configure" #include "confdefs.h" #include <wchar.h> @@ -9507,7 +9548,7 @@ int main() { wint_t i = WEOF; ; return 0; } EOF -if { (eval echo configure:9511: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9552: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_weof=yes else @@ -9523,12 +9564,12 @@ rm -f conftest* for ac_func in wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9527: checking for $ac_func" >&5 +echo "configure:9568: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9532 "configure" +#line 9573 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -9551,7 +9592,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:9555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9578,7 +9619,7 @@ fi done - for ac_func in btowc wctob fgetwc fgetwc fgetws fputwc fputws fwide \ + for ac_func in btowc wctob fgetwc fgetws fputwc fputws fwide \ fwprintf fwscanf swprintf swscanf vfwprintf vfwscanf vswprintf vswscanf \ vwprintf vwscanf wprintf wscanf getwc getwchar mbsinit mbrlen mbrtowc \ mbsrtowcs wcsrtombs putwc putwchar ungetwc wcrtomb wcstod wcstof wcstol \ @@ -9586,12 +9627,12 @@ done wcscspn wcsspn wcstok wcsftime wcschr wcspbrk wcsrchr wcsstr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9590: checking for $ac_func" >&5 +echo "configure:9631: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9595 "configure" +#line 9636 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -9614,7 +9655,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:9618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9642,7 +9683,7 @@ done echo $ac_n "checking for ISO C99 wchar_t support""... $ac_c" 1>&6 -echo "configure:9646: checking for ISO C99 wchar_t support" >&5 +echo "configure:9687: checking for ISO C99 wchar_t support" >&5 if test x"$has_weof" = xyes && test x"$has_wchar_minmax" = xyes && test x"$ac_wfuncs" = xyes; then @@ -9654,17 +9695,17 @@ echo "configure:9646: checking for ISO C99 wchar_t support" >&5 ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 -echo "configure:9658: checking for iconv.h" >&5 +echo "configure:9699: checking for iconv.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9663 "configure" +#line 9704 "configure" #include "confdefs.h" #include <iconv.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9668: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9688,17 +9729,17 @@ fi ac_safe=`echo "langinfo.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for langinfo.h""... $ac_c" 1>&6 -echo "configure:9692: checking for langinfo.h" >&5 +echo "configure:9733: checking for langinfo.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9697 "configure" +#line 9738 "configure" #include "confdefs.h" #include <langinfo.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9702: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9722,7 +9763,7 @@ fi echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 -echo "configure:9726: checking for iconv in -liconv" >&5 +echo "configure:9767: checking for iconv in -liconv" >&5 ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9730,7 +9771,7 @@ else ac_save_LIBS="$LIBS" LIBS="-liconv $LIBS" cat > conftest.$ac_ext <<EOF -#line 9734 "configure" +#line 9775 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9741,7 +9782,7 @@ int main() { iconv() ; return 0; } EOF -if { (eval echo configure:9745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -9767,12 +9808,12 @@ fi for ac_func in iconv_open iconv_close iconv nl_langinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9771: checking for $ac_func" >&5 +echo "configure:9812: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 9776 "configure" +#line 9817 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -9795,7 +9836,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:9799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9825,7 +9866,7 @@ done LIBS="$ac_save_LIBS" echo $ac_n "checking for XPG2 wchar_t support""... $ac_c" 1>&6 -echo "configure:9829: checking for XPG2 wchar_t support" >&5 +echo "configure:9870: checking for XPG2 wchar_t support" >&5 if test x"$ac_has_iconv_h" = xyes && test x"$ac_has_langinfo_h" = xyes && test x"$ac_XPG2funcs" = xyes; then @@ -9835,21 +9876,27 @@ echo "configure:9829: checking for XPG2 wchar_t support" >&5 fi echo "$ac_t""$ac_XPG2_wchar_t" 1>&6 - echo $ac_n "checking for enabled wchar_t specializations""... $ac_c" 1>&6 -echo "configure:9840: checking for enabled wchar_t specializations" >&5 - if test x"$ac_isoC99_wchar_t" = xyes && + if test x"$ac_isoC99_wchar_t" = xyes && test x"$ac_XPG2_wchar_t" = xyes; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define _GLIBCPP_USE_WCHAR_T 1 EOF - echo "$ac_t"""yes"" 1>&6 - else - echo "$ac_t"""no"" 1>&6 + enable_wchar_t=yes fi - else - echo "configure: warning: wchar_t support disabled." 1>&2 fi + echo $ac_n "checking for enabled wchar_t specializations""... $ac_c" 1>&6 +echo "configure:9890: checking for enabled wchar_t specializations" >&5 + echo "$ac_t""$enable_wchar_t" 1>&6 + + +if test "$enable_wchar_t" = yes; then + GLIBCPP_TEST_WCHAR_T_TRUE= + GLIBCPP_TEST_WCHAR_T_FALSE='#' +else + GLIBCPP_TEST_WCHAR_T_TRUE='#' + GLIBCPP_TEST_WCHAR_T_FALSE= +fi os_include_dir="os/qnx/qnx6.1" cat >> confdefs.h <<\EOF @@ -10345,17 +10392,17 @@ else do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:10349: checking for $ac_hdr" >&5 +echo "configure:10396: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10354 "configure" +#line 10401 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:10359: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:10406: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -10406,10 +10453,10 @@ cross_compiling=$ac_cv_prog_cxx_cross # Check for -ffunction-sections -fdata-sections echo $ac_n "checking for g++ that supports -ffunction-sections -fdata-sections""... $ac_c" 1>&6 -echo "configure:10410: checking for g++ that supports -ffunction-sections -fdata-sections" >&5 +echo "configure:10457: checking for g++ that supports -ffunction-sections -fdata-sections" >&5 CXXFLAGS='-Werror -ffunction-sections -fdata-sections' cat > conftest.$ac_ext <<EOF -#line 10413 "configure" +#line 10460 "configure" #include "confdefs.h" int main() { @@ -10417,7 +10464,7 @@ int foo; ; return 0; } EOF -if { (eval echo configure:10421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10468: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_fdsections=yes else @@ -10499,12 +10546,12 @@ cross_compiling=$ac_cv_prog_cc_cross # used sections, first .eh_frame and now some of the glibc sections for # iconv). Bzzzzt. Thanks for playing, maybe next time. echo $ac_n "checking for ld that supports -Wl,--gc-sections""... $ac_c" 1>&6 -echo "configure:10503: checking for ld that supports -Wl,--gc-sections" >&5 +echo "configure:10550: checking for ld that supports -Wl,--gc-sections" >&5 if test "$cross_compiling" = yes; then ac_sectionLDflags=yes else cat > conftest.$ac_ext <<EOF -#line 10508 "configure" +#line 10555 "configure" #include "confdefs.h" int main(void) @@ -10515,7 +10562,7 @@ else } EOF -if { (eval echo configure:10519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_sectionLDflags=yes else @@ -10550,7 +10597,7 @@ fi echo $ac_n "checking for __builtin_abs declaration""... $ac_c" 1>&6 -echo "configure:10554: checking for __builtin_abs declaration" >&5 +echo "configure:10601: checking for __builtin_abs declaration" >&5 if test x${glibcpp_cv_func___builtin_abs_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_abs_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10565,14 +10612,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 10569 "configure" +#line 10616 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_abs(0); ; return 0; } EOF -if { (eval echo configure:10576: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func___builtin_abs_use=yes else @@ -10596,21 +10643,21 @@ fi echo "$ac_t""$glibcpp_cv_func___builtin_abs_use" 1>&6 if test x$glibcpp_cv_func___builtin_abs_use = x"yes"; then echo $ac_n "checking for __builtin_abs linkage""... $ac_c" 1>&6 -echo "configure:10600: checking for __builtin_abs linkage" >&5 +echo "configure:10647: checking for __builtin_abs linkage" >&5 if test x${glibcpp_cv_func___builtin_abs_link+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_abs_link'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10607 "configure" +#line 10654 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_abs(0); ; return 0; } EOF -if { (eval echo configure:10614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* glibcpp_cv_func___builtin_abs_link=yes else @@ -10636,7 +10683,7 @@ EOF echo $ac_n "checking for __builtin_fabsf declaration""... $ac_c" 1>&6 -echo "configure:10640: checking for __builtin_fabsf declaration" >&5 +echo "configure:10687: checking for __builtin_fabsf declaration" >&5 if test x${glibcpp_cv_func___builtin_fabsf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_fabsf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10651,14 +10698,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 10655 "configure" +#line 10702 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_fabsf(0); ; return 0; } EOF -if { (eval echo configure:10662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func___builtin_fabsf_use=yes else @@ -10682,21 +10729,21 @@ fi echo "$ac_t""$glibcpp_cv_func___builtin_fabsf_use" 1>&6 if test x$glibcpp_cv_func___builtin_fabsf_use = x"yes"; then echo $ac_n "checking for __builtin_fabsf linkage""... $ac_c" 1>&6 -echo "configure:10686: checking for __builtin_fabsf linkage" >&5 +echo "configure:10733: checking for __builtin_fabsf linkage" >&5 if test x${glibcpp_cv_func___builtin_fabsf_link+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_fabsf_link'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10693 "configure" +#line 10740 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_fabsf(0); ; return 0; } EOF -if { (eval echo configure:10700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* glibcpp_cv_func___builtin_fabsf_link=yes else @@ -10722,7 +10769,7 @@ EOF echo $ac_n "checking for __builtin_fabs declaration""... $ac_c" 1>&6 -echo "configure:10726: checking for __builtin_fabs declaration" >&5 +echo "configure:10773: checking for __builtin_fabs declaration" >&5 if test x${glibcpp_cv_func___builtin_fabs_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_fabs_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10737,14 +10784,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 10741 "configure" +#line 10788 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_fabs(0); ; return 0; } EOF -if { (eval echo configure:10748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func___builtin_fabs_use=yes else @@ -10768,21 +10815,21 @@ fi echo "$ac_t""$glibcpp_cv_func___builtin_fabs_use" 1>&6 if test x$glibcpp_cv_func___builtin_fabs_use = x"yes"; then echo $ac_n "checking for __builtin_fabs linkage""... $ac_c" 1>&6 -echo "configure:10772: checking for __builtin_fabs linkage" >&5 +echo "configure:10819: checking for __builtin_fabs linkage" >&5 if test x${glibcpp_cv_func___builtin_fabs_link+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_fabs_link'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10779 "configure" +#line 10826 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_fabs(0); ; return 0; } EOF -if { (eval echo configure:10786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* glibcpp_cv_func___builtin_fabs_link=yes else @@ -10808,7 +10855,7 @@ EOF echo $ac_n "checking for __builtin_fabsl declaration""... $ac_c" 1>&6 -echo "configure:10812: checking for __builtin_fabsl declaration" >&5 +echo "configure:10859: checking for __builtin_fabsl declaration" >&5 if test x${glibcpp_cv_func___builtin_fabsl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_fabsl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10823,14 +10870,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 10827 "configure" +#line 10874 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_fabsl(0); ; return 0; } EOF -if { (eval echo configure:10834: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10881: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func___builtin_fabsl_use=yes else @@ -10854,21 +10901,21 @@ fi echo "$ac_t""$glibcpp_cv_func___builtin_fabsl_use" 1>&6 if test x$glibcpp_cv_func___builtin_fabsl_use = x"yes"; then echo $ac_n "checking for __builtin_fabsl linkage""... $ac_c" 1>&6 -echo "configure:10858: checking for __builtin_fabsl linkage" >&5 +echo "configure:10905: checking for __builtin_fabsl linkage" >&5 if test x${glibcpp_cv_func___builtin_fabsl_link+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_fabsl_link'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10865 "configure" +#line 10912 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_fabsl(0); ; return 0; } EOF -if { (eval echo configure:10872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* glibcpp_cv_func___builtin_fabsl_link=yes else @@ -10894,7 +10941,7 @@ EOF echo $ac_n "checking for __builtin_labs declaration""... $ac_c" 1>&6 -echo "configure:10898: checking for __builtin_labs declaration" >&5 +echo "configure:10945: checking for __builtin_labs declaration" >&5 if test x${glibcpp_cv_func___builtin_labs_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_labs_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10909,14 +10956,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 10913 "configure" +#line 10960 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_labs(0); ; return 0; } EOF -if { (eval echo configure:10920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func___builtin_labs_use=yes else @@ -10940,21 +10987,21 @@ fi echo "$ac_t""$glibcpp_cv_func___builtin_labs_use" 1>&6 if test x$glibcpp_cv_func___builtin_labs_use = x"yes"; then echo $ac_n "checking for __builtin_labs linkage""... $ac_c" 1>&6 -echo "configure:10944: checking for __builtin_labs linkage" >&5 +echo "configure:10991: checking for __builtin_labs linkage" >&5 if test x${glibcpp_cv_func___builtin_labs_link+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_labs_link'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 10951 "configure" +#line 10998 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_labs(0); ; return 0; } EOF -if { (eval echo configure:10958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* glibcpp_cv_func___builtin_labs_link=yes else @@ -10981,7 +11028,7 @@ EOF echo $ac_n "checking for __builtin_sqrtf declaration""... $ac_c" 1>&6 -echo "configure:10985: checking for __builtin_sqrtf declaration" >&5 +echo "configure:11032: checking for __builtin_sqrtf declaration" >&5 if test x${glibcpp_cv_func___builtin_sqrtf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sqrtf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10996,14 +11043,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 11000 "configure" +#line 11047 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_sqrtf(0); ; return 0; } EOF -if { (eval echo configure:11007: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func___builtin_sqrtf_use=yes else @@ -11027,21 +11074,21 @@ fi echo "$ac_t""$glibcpp_cv_func___builtin_sqrtf_use" 1>&6 if test x$glibcpp_cv_func___builtin_sqrtf_use = x"yes"; then echo $ac_n "checking for __builtin_sqrtf linkage""... $ac_c" 1>&6 -echo "configure:11031: checking for __builtin_sqrtf linkage" >&5 +echo "configure:11078: checking for __builtin_sqrtf linkage" >&5 if test x${glibcpp_cv_func___builtin_sqrtf_link+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sqrtf_link'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11038 "configure" +#line 11085 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_sqrtf(0); ; return 0; } EOF -if { (eval echo configure:11045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* glibcpp_cv_func___builtin_sqrtf_link=yes else @@ -11067,7 +11114,7 @@ EOF echo $ac_n "checking for __builtin_sqrt declaration""... $ac_c" 1>&6 -echo "configure:11071: checking for __builtin_sqrt declaration" >&5 +echo "configure:11118: checking for __builtin_sqrt declaration" >&5 if test x${glibcpp_cv_func___builtin_sqrt_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sqrt_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11082,14 +11129,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 11086 "configure" +#line 11133 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_sqrt(0); ; return 0; } EOF -if { (eval echo configure:11093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func___builtin_sqrt_use=yes else @@ -11113,21 +11160,21 @@ fi echo "$ac_t""$glibcpp_cv_func___builtin_sqrt_use" 1>&6 if test x$glibcpp_cv_func___builtin_sqrt_use = x"yes"; then echo $ac_n "checking for __builtin_sqrt linkage""... $ac_c" 1>&6 -echo "configure:11117: checking for __builtin_sqrt linkage" >&5 +echo "configure:11164: checking for __builtin_sqrt linkage" >&5 if test x${glibcpp_cv_func___builtin_sqrt_link+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sqrt_link'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11124 "configure" +#line 11171 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_sqrt(0); ; return 0; } EOF -if { (eval echo configure:11131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11178: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* glibcpp_cv_func___builtin_sqrt_link=yes else @@ -11153,7 +11200,7 @@ EOF echo $ac_n "checking for __builtin_sqrtl declaration""... $ac_c" 1>&6 -echo "configure:11157: checking for __builtin_sqrtl declaration" >&5 +echo "configure:11204: checking for __builtin_sqrtl declaration" >&5 if test x${glibcpp_cv_func___builtin_sqrtl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sqrtl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11168,14 +11215,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 11172 "configure" +#line 11219 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_sqrtl(0); ; return 0; } EOF -if { (eval echo configure:11179: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11226: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func___builtin_sqrtl_use=yes else @@ -11199,21 +11246,21 @@ fi echo "$ac_t""$glibcpp_cv_func___builtin_sqrtl_use" 1>&6 if test x$glibcpp_cv_func___builtin_sqrtl_use = x"yes"; then echo $ac_n "checking for __builtin_sqrtl linkage""... $ac_c" 1>&6 -echo "configure:11203: checking for __builtin_sqrtl linkage" >&5 +echo "configure:11250: checking for __builtin_sqrtl linkage" >&5 if test x${glibcpp_cv_func___builtin_sqrtl_link+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sqrtl_link'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11210 "configure" +#line 11257 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_sqrtl(0); ; return 0; } EOF -if { (eval echo configure:11217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* glibcpp_cv_func___builtin_sqrtl_link=yes else @@ -11240,7 +11287,7 @@ EOF echo $ac_n "checking for __builtin_sinf declaration""... $ac_c" 1>&6 -echo "configure:11244: checking for __builtin_sinf declaration" >&5 +echo "configure:11291: checking for __builtin_sinf declaration" >&5 if test x${glibcpp_cv_func___builtin_sinf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sinf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11255,14 +11302,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 11259 "configure" +#line 11306 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_sinf(0); ; return 0; } EOF -if { (eval echo configure:11266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func___builtin_sinf_use=yes else @@ -11286,21 +11333,21 @@ fi echo "$ac_t""$glibcpp_cv_func___builtin_sinf_use" 1>&6 if test x$glibcpp_cv_func___builtin_sinf_use = x"yes"; then echo $ac_n "checking for __builtin_sinf linkage""... $ac_c" 1>&6 -echo "configure:11290: checking for __builtin_sinf linkage" >&5 +echo "configure:11337: checking for __builtin_sinf linkage" >&5 if test x${glibcpp_cv_func___builtin_sinf_link+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sinf_link'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11297 "configure" +#line 11344 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_sinf(0); ; return 0; } EOF -if { (eval echo configure:11304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* glibcpp_cv_func___builtin_sinf_link=yes else @@ -11326,7 +11373,7 @@ EOF echo $ac_n "checking for __builtin_sin declaration""... $ac_c" 1>&6 -echo "configure:11330: checking for __builtin_sin declaration" >&5 +echo "configure:11377: checking for __builtin_sin declaration" >&5 if test x${glibcpp_cv_func___builtin_sin_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sin_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11341,14 +11388,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 11345 "configure" +#line 11392 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_sin(0); ; return 0; } EOF -if { (eval echo configure:11352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11399: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func___builtin_sin_use=yes else @@ -11372,21 +11419,21 @@ fi echo "$ac_t""$glibcpp_cv_func___builtin_sin_use" 1>&6 if test x$glibcpp_cv_func___builtin_sin_use = x"yes"; then echo $ac_n "checking for __builtin_sin linkage""... $ac_c" 1>&6 -echo "configure:11376: checking for __builtin_sin linkage" >&5 +echo "configure:11423: checking for __builtin_sin linkage" >&5 if test x${glibcpp_cv_func___builtin_sin_link+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sin_link'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11383 "configure" +#line 11430 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_sin(0); ; return 0; } EOF -if { (eval echo configure:11390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* glibcpp_cv_func___builtin_sin_link=yes else @@ -11412,7 +11459,7 @@ EOF echo $ac_n "checking for __builtin_sinl declaration""... $ac_c" 1>&6 -echo "configure:11416: checking for __builtin_sinl declaration" >&5 +echo "configure:11463: checking for __builtin_sinl declaration" >&5 if test x${glibcpp_cv_func___builtin_sinl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sinl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11427,14 +11474,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 11431 "configure" +#line 11478 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_sinl(0); ; return 0; } EOF -if { (eval echo configure:11438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func___builtin_sinl_use=yes else @@ -11458,21 +11505,21 @@ fi echo "$ac_t""$glibcpp_cv_func___builtin_sinl_use" 1>&6 if test x$glibcpp_cv_func___builtin_sinl_use = x"yes"; then echo $ac_n "checking for __builtin_sinl linkage""... $ac_c" 1>&6 -echo "configure:11462: checking for __builtin_sinl linkage" >&5 +echo "configure:11509: checking for __builtin_sinl linkage" >&5 if test x${glibcpp_cv_func___builtin_sinl_link+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_sinl_link'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11469 "configure" +#line 11516 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_sinl(0); ; return 0; } EOF -if { (eval echo configure:11476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* glibcpp_cv_func___builtin_sinl_link=yes else @@ -11499,7 +11546,7 @@ EOF echo $ac_n "checking for __builtin_cosf declaration""... $ac_c" 1>&6 -echo "configure:11503: checking for __builtin_cosf declaration" >&5 +echo "configure:11550: checking for __builtin_cosf declaration" >&5 if test x${glibcpp_cv_func___builtin_cosf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_cosf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11514,14 +11561,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 11518 "configure" +#line 11565 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_cosf(0); ; return 0; } EOF -if { (eval echo configure:11525: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func___builtin_cosf_use=yes else @@ -11545,21 +11592,21 @@ fi echo "$ac_t""$glibcpp_cv_func___builtin_cosf_use" 1>&6 if test x$glibcpp_cv_func___builtin_cosf_use = x"yes"; then echo $ac_n "checking for __builtin_cosf linkage""... $ac_c" 1>&6 -echo "configure:11549: checking for __builtin_cosf linkage" >&5 +echo "configure:11596: checking for __builtin_cosf linkage" >&5 if test x${glibcpp_cv_func___builtin_cosf_link+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_cosf_link'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11556 "configure" +#line 11603 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_cosf(0); ; return 0; } EOF -if { (eval echo configure:11563: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* glibcpp_cv_func___builtin_cosf_link=yes else @@ -11585,7 +11632,7 @@ EOF echo $ac_n "checking for __builtin_cos declaration""... $ac_c" 1>&6 -echo "configure:11589: checking for __builtin_cos declaration" >&5 +echo "configure:11636: checking for __builtin_cos declaration" >&5 if test x${glibcpp_cv_func___builtin_cos_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_cos_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11600,14 +11647,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 11604 "configure" +#line 11651 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_cos(0); ; return 0; } EOF -if { (eval echo configure:11611: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func___builtin_cos_use=yes else @@ -11631,21 +11678,21 @@ fi echo "$ac_t""$glibcpp_cv_func___builtin_cos_use" 1>&6 if test x$glibcpp_cv_func___builtin_cos_use = x"yes"; then echo $ac_n "checking for __builtin_cos linkage""... $ac_c" 1>&6 -echo "configure:11635: checking for __builtin_cos linkage" >&5 +echo "configure:11682: checking for __builtin_cos linkage" >&5 if test x${glibcpp_cv_func___builtin_cos_link+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_cos_link'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11642 "configure" +#line 11689 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_cos(0); ; return 0; } EOF -if { (eval echo configure:11649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* glibcpp_cv_func___builtin_cos_link=yes else @@ -11671,7 +11718,7 @@ EOF echo $ac_n "checking for __builtin_cosl declaration""... $ac_c" 1>&6 -echo "configure:11675: checking for __builtin_cosl declaration" >&5 +echo "configure:11722: checking for __builtin_cosl declaration" >&5 if test x${glibcpp_cv_func___builtin_cosl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_cosl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11686,14 +11733,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 11690 "configure" +#line 11737 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_cosl(0); ; return 0; } EOF -if { (eval echo configure:11697: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func___builtin_cosl_use=yes else @@ -11717,21 +11764,21 @@ fi echo "$ac_t""$glibcpp_cv_func___builtin_cosl_use" 1>&6 if test x$glibcpp_cv_func___builtin_cosl_use = x"yes"; then echo $ac_n "checking for __builtin_cosl linkage""... $ac_c" 1>&6 -echo "configure:11721: checking for __builtin_cosl linkage" >&5 +echo "configure:11768: checking for __builtin_cosl linkage" >&5 if test x${glibcpp_cv_func___builtin_cosl_link+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func___builtin_cosl_link'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11728 "configure" +#line 11775 "configure" #include "confdefs.h" #include <math.h> int main() { __builtin_cosl(0); ; return 0; } EOF -if { (eval echo configure:11735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* glibcpp_cv_func___builtin_cosl_link=yes else @@ -11822,7 +11869,7 @@ EOF CXXFLAGS='-fno-builtins -D_GNU_SOURCE' echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 -echo "configure:11826: checking for sin in -lm" >&5 +echo "configure:11873: checking for sin in -lm" >&5 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11830,7 +11877,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 11834 "configure" +#line 11881 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -11841,7 +11888,7 @@ int main() { sin() ; return 0; } EOF -if { (eval echo configure:11845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11867,7 +11914,7 @@ fi echo $ac_n "checking for isinf declaration""... $ac_c" 1>&6 -echo "configure:11871: checking for isinf declaration" >&5 +echo "configure:11918: checking for isinf declaration" >&5 if test x${glibcpp_cv_func_isinf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_isinf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11882,7 +11929,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 11886 "configure" +#line 11933 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -11893,7 +11940,7 @@ int main() { isinf(0); ; return 0; } EOF -if { (eval echo configure:11897: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11944: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_isinf_use=yes else @@ -11920,12 +11967,12 @@ fi for ac_func in isinf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:11924: checking for $ac_func" >&5 +echo "configure:11971: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 11929 "configure" +#line 11976 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -11948,7 +11995,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:11952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -11975,7 +12022,7 @@ done else echo $ac_n "checking for _isinf declaration""... $ac_c" 1>&6 -echo "configure:11979: checking for _isinf declaration" >&5 +echo "configure:12026: checking for _isinf declaration" >&5 if test x${glibcpp_cv_func__isinf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__isinf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11990,7 +12037,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 11994 "configure" +#line 12041 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -12001,7 +12048,7 @@ int main() { _isinf(0); ; return 0; } EOF -if { (eval echo configure:12005: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12052: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__isinf_use=yes else @@ -12028,12 +12075,12 @@ fi for ac_func in _isinf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12032: checking for $ac_func" >&5 +echo "configure:12079: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12037 "configure" +#line 12084 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -12056,7 +12103,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:12060: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12086,7 +12133,7 @@ done echo $ac_n "checking for isnan declaration""... $ac_c" 1>&6 -echo "configure:12090: checking for isnan declaration" >&5 +echo "configure:12137: checking for isnan declaration" >&5 if test x${glibcpp_cv_func_isnan_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_isnan_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12101,7 +12148,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 12105 "configure" +#line 12152 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -12112,7 +12159,7 @@ int main() { isnan(0); ; return 0; } EOF -if { (eval echo configure:12116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_isnan_use=yes else @@ -12139,12 +12186,12 @@ fi for ac_func in isnan do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12143: checking for $ac_func" >&5 +echo "configure:12190: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12148 "configure" +#line 12195 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -12167,7 +12214,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:12171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12194,7 +12241,7 @@ done else echo $ac_n "checking for _isnan declaration""... $ac_c" 1>&6 -echo "configure:12198: checking for _isnan declaration" >&5 +echo "configure:12245: checking for _isnan declaration" >&5 if test x${glibcpp_cv_func__isnan_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__isnan_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12209,7 +12256,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 12213 "configure" +#line 12260 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -12220,7 +12267,7 @@ int main() { _isnan(0); ; return 0; } EOF -if { (eval echo configure:12224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__isnan_use=yes else @@ -12247,12 +12294,12 @@ fi for ac_func in _isnan do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12251: checking for $ac_func" >&5 +echo "configure:12298: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12256 "configure" +#line 12303 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -12275,7 +12322,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:12279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12305,7 +12352,7 @@ done echo $ac_n "checking for finite declaration""... $ac_c" 1>&6 -echo "configure:12309: checking for finite declaration" >&5 +echo "configure:12356: checking for finite declaration" >&5 if test x${glibcpp_cv_func_finite_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_finite_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12320,7 +12367,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 12324 "configure" +#line 12371 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -12331,7 +12378,7 @@ int main() { finite(0); ; return 0; } EOF -if { (eval echo configure:12335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_finite_use=yes else @@ -12358,12 +12405,12 @@ fi for ac_func in finite do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12362: checking for $ac_func" >&5 +echo "configure:12409: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12367 "configure" +#line 12414 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -12386,7 +12433,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:12390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12437: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12413,7 +12460,7 @@ done else echo $ac_n "checking for _finite declaration""... $ac_c" 1>&6 -echo "configure:12417: checking for _finite declaration" >&5 +echo "configure:12464: checking for _finite declaration" >&5 if test x${glibcpp_cv_func__finite_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__finite_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12428,7 +12475,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 12432 "configure" +#line 12479 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -12439,7 +12486,7 @@ int main() { _finite(0); ; return 0; } EOF -if { (eval echo configure:12443: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__finite_use=yes else @@ -12466,12 +12513,12 @@ fi for ac_func in _finite do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12470: checking for $ac_func" >&5 +echo "configure:12517: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12475 "configure" +#line 12522 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -12494,7 +12541,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:12498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12524,7 +12571,7 @@ done echo $ac_n "checking for copysign declaration""... $ac_c" 1>&6 -echo "configure:12528: checking for copysign declaration" >&5 +echo "configure:12575: checking for copysign declaration" >&5 if test x${glibcpp_cv_func_copysign_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_copysign_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12539,14 +12586,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 12543 "configure" +#line 12590 "configure" #include "confdefs.h" #include <math.h> int main() { copysign(0, 0); ; return 0; } EOF -if { (eval echo configure:12550: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12597: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_copysign_use=yes else @@ -12573,12 +12620,12 @@ fi for ac_func in copysign do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12577: checking for $ac_func" >&5 +echo "configure:12624: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12582 "configure" +#line 12629 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -12601,7 +12648,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:12605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12628,7 +12675,7 @@ done else echo $ac_n "checking for _copysign declaration""... $ac_c" 1>&6 -echo "configure:12632: checking for _copysign declaration" >&5 +echo "configure:12679: checking for _copysign declaration" >&5 if test x${glibcpp_cv_func__copysign_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__copysign_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12643,14 +12690,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 12647 "configure" +#line 12694 "configure" #include "confdefs.h" #include <math.h> int main() { _copysign(0, 0); ; return 0; } EOF -if { (eval echo configure:12654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12701: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__copysign_use=yes else @@ -12677,12 +12724,12 @@ fi for ac_func in _copysign do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12681: checking for $ac_func" >&5 +echo "configure:12728: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12686 "configure" +#line 12733 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -12705,7 +12752,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:12709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12735,7 +12782,7 @@ done echo $ac_n "checking for sincos declaration""... $ac_c" 1>&6 -echo "configure:12739: checking for sincos declaration" >&5 +echo "configure:12786: checking for sincos declaration" >&5 if test x${glibcpp_cv_func_sincos_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_sincos_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12750,14 +12797,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 12754 "configure" +#line 12801 "configure" #include "confdefs.h" #include <math.h> int main() { sincos(0, 0, 0); ; return 0; } EOF -if { (eval echo configure:12761: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_sincos_use=yes else @@ -12784,12 +12831,12 @@ fi for ac_func in sincos do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12788: checking for $ac_func" >&5 +echo "configure:12835: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12793 "configure" +#line 12840 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -12812,7 +12859,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:12816: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12839,7 +12886,7 @@ done else echo $ac_n "checking for _sincos declaration""... $ac_c" 1>&6 -echo "configure:12843: checking for _sincos declaration" >&5 +echo "configure:12890: checking for _sincos declaration" >&5 if test x${glibcpp_cv_func__sincos_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__sincos_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12854,14 +12901,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 12858 "configure" +#line 12905 "configure" #include "confdefs.h" #include <math.h> int main() { _sincos(0, 0, 0); ; return 0; } EOF -if { (eval echo configure:12865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12912: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__sincos_use=yes else @@ -12888,12 +12935,12 @@ fi for ac_func in _sincos do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:12892: checking for $ac_func" >&5 +echo "configure:12939: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 12897 "configure" +#line 12944 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -12916,7 +12963,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:12920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -12946,7 +12993,7 @@ done echo $ac_n "checking for fpclass declaration""... $ac_c" 1>&6 -echo "configure:12950: checking for fpclass declaration" >&5 +echo "configure:12997: checking for fpclass declaration" >&5 if test x${glibcpp_cv_func_fpclass_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_fpclass_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12961,7 +13008,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 12965 "configure" +#line 13012 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -12972,7 +13019,7 @@ int main() { fpclass(0); ; return 0; } EOF -if { (eval echo configure:12976: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_fpclass_use=yes else @@ -12999,12 +13046,12 @@ fi for ac_func in fpclass do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13003: checking for $ac_func" >&5 +echo "configure:13050: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 13008 "configure" +#line 13055 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -13027,7 +13074,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:13031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -13054,7 +13101,7 @@ done else echo $ac_n "checking for _fpclass declaration""... $ac_c" 1>&6 -echo "configure:13058: checking for _fpclass declaration" >&5 +echo "configure:13105: checking for _fpclass declaration" >&5 if test x${glibcpp_cv_func__fpclass_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__fpclass_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13069,7 +13116,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 13073 "configure" +#line 13120 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -13080,7 +13127,7 @@ int main() { _fpclass(0); ; return 0; } EOF -if { (eval echo configure:13084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13131: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__fpclass_use=yes else @@ -13107,12 +13154,12 @@ fi for ac_func in _fpclass do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13111: checking for $ac_func" >&5 +echo "configure:13158: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 13116 "configure" +#line 13163 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -13135,7 +13182,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:13139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -13165,7 +13212,7 @@ done echo $ac_n "checking for qfpclass declaration""... $ac_c" 1>&6 -echo "configure:13169: checking for qfpclass declaration" >&5 +echo "configure:13216: checking for qfpclass declaration" >&5 if test x${glibcpp_cv_func_qfpclass_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_qfpclass_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13180,7 +13227,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 13184 "configure" +#line 13231 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -13191,7 +13238,7 @@ int main() { qfpclass(0); ; return 0; } EOF -if { (eval echo configure:13195: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_qfpclass_use=yes else @@ -13218,12 +13265,12 @@ fi for ac_func in qfpclass do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13222: checking for $ac_func" >&5 +echo "configure:13269: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 13227 "configure" +#line 13274 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -13246,7 +13293,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:13250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -13273,7 +13320,7 @@ done else echo $ac_n "checking for _qfpclass declaration""... $ac_c" 1>&6 -echo "configure:13277: checking for _qfpclass declaration" >&5 +echo "configure:13324: checking for _qfpclass declaration" >&5 if test x${glibcpp_cv_func__qfpclass_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__qfpclass_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13288,7 +13335,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 13292 "configure" +#line 13339 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -13299,7 +13346,7 @@ int main() { _qfpclass(0); ; return 0; } EOF -if { (eval echo configure:13303: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__qfpclass_use=yes else @@ -13326,12 +13373,12 @@ fi for ac_func in _qfpclass do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13330: checking for $ac_func" >&5 +echo "configure:13377: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 13335 "configure" +#line 13382 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -13354,7 +13401,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:13358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -13384,7 +13431,7 @@ done echo $ac_n "checking for hypot declaration""... $ac_c" 1>&6 -echo "configure:13388: checking for hypot declaration" >&5 +echo "configure:13435: checking for hypot declaration" >&5 if test x${glibcpp_cv_func_hypot_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_hypot_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13399,14 +13446,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 13403 "configure" +#line 13450 "configure" #include "confdefs.h" #include <math.h> int main() { hypot(0, 0); ; return 0; } EOF -if { (eval echo configure:13410: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13457: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_hypot_use=yes else @@ -13433,12 +13480,12 @@ fi for ac_func in hypot do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13437: checking for $ac_func" >&5 +echo "configure:13484: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 13442 "configure" +#line 13489 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -13461,7 +13508,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:13465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -13488,7 +13535,7 @@ done else echo $ac_n "checking for _hypot declaration""... $ac_c" 1>&6 -echo "configure:13492: checking for _hypot declaration" >&5 +echo "configure:13539: checking for _hypot declaration" >&5 if test x${glibcpp_cv_func__hypot_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__hypot_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13503,14 +13550,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 13507 "configure" +#line 13554 "configure" #include "confdefs.h" #include <math.h> int main() { _hypot(0, 0); ; return 0; } EOF -if { (eval echo configure:13514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13561: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__hypot_use=yes else @@ -13537,12 +13584,12 @@ fi for ac_func in _hypot do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13541: checking for $ac_func" >&5 +echo "configure:13588: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 13546 "configure" +#line 13593 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -13565,7 +13612,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:13569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -13595,7 +13642,7 @@ done echo $ac_n "checking for float trig functions""... $ac_c" 1>&6 -echo "configure:13599: checking for float trig functions" >&5 +echo "configure:13646: checking for float trig functions" >&5 if eval "test \"`echo '$''{'glibcpp_cv_func_float_trig_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13609,7 +13656,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 13613 "configure" +#line 13660 "configure" #include "confdefs.h" #include <math.h> int main() { @@ -13618,7 +13665,7 @@ int main() { coshf sinhf tanhf; do echo "$x (0);"; done` ; return 0; } EOF -if { (eval echo configure:13622: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_float_trig_use=yes else @@ -13644,12 +13691,12 @@ fi coshf sinhf tanhf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13648: checking for $ac_func" >&5 +echo "configure:13695: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 13653 "configure" +#line 13700 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -13672,7 +13719,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:13676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -13700,7 +13747,7 @@ done echo $ac_n "checking for float round functions""... $ac_c" 1>&6 -echo "configure:13704: checking for float round functions" >&5 +echo "configure:13751: checking for float round functions" >&5 if eval "test \"`echo '$''{'glibcpp_cv_func_float_round_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13714,14 +13761,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 13718 "configure" +#line 13765 "configure" #include "confdefs.h" #include <math.h> int main() { `for x in ceilf floorf; do echo "$x (0);"; done` ; return 0; } EOF -if { (eval echo configure:13725: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13772: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_float_round_use=yes else @@ -13745,12 +13792,12 @@ fi for ac_func in ceilf floorf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13749: checking for $ac_func" >&5 +echo "configure:13796: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 13754 "configure" +#line 13801 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -13773,7 +13820,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:13777: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -13802,7 +13849,7 @@ done echo $ac_n "checking for expf declaration""... $ac_c" 1>&6 -echo "configure:13806: checking for expf declaration" >&5 +echo "configure:13853: checking for expf declaration" >&5 if test x${glibcpp_cv_func_expf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_expf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13817,7 +13864,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 13821 "configure" +#line 13868 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -13828,7 +13875,7 @@ int main() { expf(0); ; return 0; } EOF -if { (eval echo configure:13832: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_expf_use=yes else @@ -13855,12 +13902,12 @@ fi for ac_func in expf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13859: checking for $ac_func" >&5 +echo "configure:13906: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 13864 "configure" +#line 13911 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -13883,7 +13930,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:13887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -13910,7 +13957,7 @@ done else echo $ac_n "checking for _expf declaration""... $ac_c" 1>&6 -echo "configure:13914: checking for _expf declaration" >&5 +echo "configure:13961: checking for _expf declaration" >&5 if test x${glibcpp_cv_func__expf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__expf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13925,7 +13972,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 13929 "configure" +#line 13976 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -13936,7 +13983,7 @@ int main() { _expf(0); ; return 0; } EOF -if { (eval echo configure:13940: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:13987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__expf_use=yes else @@ -13963,12 +14010,12 @@ fi for ac_func in _expf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:13967: checking for $ac_func" >&5 +echo "configure:14014: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 13972 "configure" +#line 14019 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -13991,7 +14038,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:13995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -14021,7 +14068,7 @@ done echo $ac_n "checking for isnanf declaration""... $ac_c" 1>&6 -echo "configure:14025: checking for isnanf declaration" >&5 +echo "configure:14072: checking for isnanf declaration" >&5 if test x${glibcpp_cv_func_isnanf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_isnanf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14036,7 +14083,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 14040 "configure" +#line 14087 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -14047,7 +14094,7 @@ int main() { isnanf(0); ; return 0; } EOF -if { (eval echo configure:14051: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14098: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_isnanf_use=yes else @@ -14074,12 +14121,12 @@ fi for ac_func in isnanf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14078: checking for $ac_func" >&5 +echo "configure:14125: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 14083 "configure" +#line 14130 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -14102,7 +14149,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:14106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -14129,7 +14176,7 @@ done else echo $ac_n "checking for _isnanf declaration""... $ac_c" 1>&6 -echo "configure:14133: checking for _isnanf declaration" >&5 +echo "configure:14180: checking for _isnanf declaration" >&5 if test x${glibcpp_cv_func__isnanf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__isnanf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14144,7 +14191,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 14148 "configure" +#line 14195 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -14155,7 +14202,7 @@ int main() { _isnanf(0); ; return 0; } EOF -if { (eval echo configure:14159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__isnanf_use=yes else @@ -14182,12 +14229,12 @@ fi for ac_func in _isnanf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14186: checking for $ac_func" >&5 +echo "configure:14233: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 14191 "configure" +#line 14238 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -14210,7 +14257,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:14214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -14240,7 +14287,7 @@ done echo $ac_n "checking for isinff declaration""... $ac_c" 1>&6 -echo "configure:14244: checking for isinff declaration" >&5 +echo "configure:14291: checking for isinff declaration" >&5 if test x${glibcpp_cv_func_isinff_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_isinff_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14255,7 +14302,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 14259 "configure" +#line 14306 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -14266,7 +14313,7 @@ int main() { isinff(0); ; return 0; } EOF -if { (eval echo configure:14270: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_isinff_use=yes else @@ -14293,12 +14340,12 @@ fi for ac_func in isinff do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14297: checking for $ac_func" >&5 +echo "configure:14344: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 14302 "configure" +#line 14349 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -14321,7 +14368,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:14325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -14348,7 +14395,7 @@ done else echo $ac_n "checking for _isinff declaration""... $ac_c" 1>&6 -echo "configure:14352: checking for _isinff declaration" >&5 +echo "configure:14399: checking for _isinff declaration" >&5 if test x${glibcpp_cv_func__isinff_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__isinff_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14363,7 +14410,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 14367 "configure" +#line 14414 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -14374,7 +14421,7 @@ int main() { _isinff(0); ; return 0; } EOF -if { (eval echo configure:14378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14425: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__isinff_use=yes else @@ -14401,12 +14448,12 @@ fi for ac_func in _isinff do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14405: checking for $ac_func" >&5 +echo "configure:14452: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 14410 "configure" +#line 14457 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -14429,7 +14476,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:14433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -14459,7 +14506,7 @@ done echo $ac_n "checking for atan2f declaration""... $ac_c" 1>&6 -echo "configure:14463: checking for atan2f declaration" >&5 +echo "configure:14510: checking for atan2f declaration" >&5 if test x${glibcpp_cv_func_atan2f_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_atan2f_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14474,14 +14521,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 14478 "configure" +#line 14525 "configure" #include "confdefs.h" #include <math.h> int main() { atan2f(0, 0); ; return 0; } EOF -if { (eval echo configure:14485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14532: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_atan2f_use=yes else @@ -14508,12 +14555,12 @@ fi for ac_func in atan2f do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14512: checking for $ac_func" >&5 +echo "configure:14559: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 14517 "configure" +#line 14564 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -14536,7 +14583,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:14540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -14563,7 +14610,7 @@ done else echo $ac_n "checking for _atan2f declaration""... $ac_c" 1>&6 -echo "configure:14567: checking for _atan2f declaration" >&5 +echo "configure:14614: checking for _atan2f declaration" >&5 if test x${glibcpp_cv_func__atan2f_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__atan2f_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14578,14 +14625,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 14582 "configure" +#line 14629 "configure" #include "confdefs.h" #include <math.h> int main() { _atan2f(0, 0); ; return 0; } EOF -if { (eval echo configure:14589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__atan2f_use=yes else @@ -14612,12 +14659,12 @@ fi for ac_func in _atan2f do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14616: checking for $ac_func" >&5 +echo "configure:14663: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 14621 "configure" +#line 14668 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -14640,7 +14687,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:14644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -14670,7 +14717,7 @@ done echo $ac_n "checking for fabsf declaration""... $ac_c" 1>&6 -echo "configure:14674: checking for fabsf declaration" >&5 +echo "configure:14721: checking for fabsf declaration" >&5 if test x${glibcpp_cv_func_fabsf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_fabsf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14685,7 +14732,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 14689 "configure" +#line 14736 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -14696,7 +14743,7 @@ int main() { fabsf(0); ; return 0; } EOF -if { (eval echo configure:14700: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_fabsf_use=yes else @@ -14723,12 +14770,12 @@ fi for ac_func in fabsf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14727: checking for $ac_func" >&5 +echo "configure:14774: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 14732 "configure" +#line 14779 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -14751,7 +14798,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:14755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -14778,7 +14825,7 @@ done else echo $ac_n "checking for _fabsf declaration""... $ac_c" 1>&6 -echo "configure:14782: checking for _fabsf declaration" >&5 +echo "configure:14829: checking for _fabsf declaration" >&5 if test x${glibcpp_cv_func__fabsf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__fabsf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14793,7 +14840,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 14797 "configure" +#line 14844 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -14804,7 +14851,7 @@ int main() { _fabsf(0); ; return 0; } EOF -if { (eval echo configure:14808: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__fabsf_use=yes else @@ -14831,12 +14878,12 @@ fi for ac_func in _fabsf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14835: checking for $ac_func" >&5 +echo "configure:14882: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 14840 "configure" +#line 14887 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -14859,7 +14906,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:14863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:14910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -14889,7 +14936,7 @@ done echo $ac_n "checking for fmodf declaration""... $ac_c" 1>&6 -echo "configure:14893: checking for fmodf declaration" >&5 +echo "configure:14940: checking for fmodf declaration" >&5 if test x${glibcpp_cv_func_fmodf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_fmodf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -14904,14 +14951,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 14908 "configure" +#line 14955 "configure" #include "confdefs.h" #include <math.h> int main() { fmodf(0, 0); ; return 0; } EOF -if { (eval echo configure:14915: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14962: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_fmodf_use=yes else @@ -14938,12 +14985,12 @@ fi for ac_func in fmodf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:14942: checking for $ac_func" >&5 +echo "configure:14989: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 14947 "configure" +#line 14994 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -14966,7 +15013,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:14970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -14993,7 +15040,7 @@ done else echo $ac_n "checking for _fmodf declaration""... $ac_c" 1>&6 -echo "configure:14997: checking for _fmodf declaration" >&5 +echo "configure:15044: checking for _fmodf declaration" >&5 if test x${glibcpp_cv_func__fmodf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__fmodf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15008,14 +15055,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 15012 "configure" +#line 15059 "configure" #include "confdefs.h" #include <math.h> int main() { _fmodf(0, 0); ; return 0; } EOF -if { (eval echo configure:15019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15066: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__fmodf_use=yes else @@ -15042,12 +15089,12 @@ fi for ac_func in _fmodf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15046: checking for $ac_func" >&5 +echo "configure:15093: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 15051 "configure" +#line 15098 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -15070,7 +15117,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:15074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15100,7 +15147,7 @@ done echo $ac_n "checking for frexpf declaration""... $ac_c" 1>&6 -echo "configure:15104: checking for frexpf declaration" >&5 +echo "configure:15151: checking for frexpf declaration" >&5 if test x${glibcpp_cv_func_frexpf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_frexpf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15115,14 +15162,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 15119 "configure" +#line 15166 "configure" #include "confdefs.h" #include <math.h> int main() { frexpf(0, 0); ; return 0; } EOF -if { (eval echo configure:15126: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_frexpf_use=yes else @@ -15149,12 +15196,12 @@ fi for ac_func in frexpf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15153: checking for $ac_func" >&5 +echo "configure:15200: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 15158 "configure" +#line 15205 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -15177,7 +15224,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:15181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15204,7 +15251,7 @@ done else echo $ac_n "checking for _frexpf declaration""... $ac_c" 1>&6 -echo "configure:15208: checking for _frexpf declaration" >&5 +echo "configure:15255: checking for _frexpf declaration" >&5 if test x${glibcpp_cv_func__frexpf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__frexpf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15219,14 +15266,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 15223 "configure" +#line 15270 "configure" #include "confdefs.h" #include <math.h> int main() { _frexpf(0, 0); ; return 0; } EOF -if { (eval echo configure:15230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15277: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__frexpf_use=yes else @@ -15253,12 +15300,12 @@ fi for ac_func in _frexpf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15257: checking for $ac_func" >&5 +echo "configure:15304: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 15262 "configure" +#line 15309 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -15281,7 +15328,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:15285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15311,7 +15358,7 @@ done echo $ac_n "checking for hypotf declaration""... $ac_c" 1>&6 -echo "configure:15315: checking for hypotf declaration" >&5 +echo "configure:15362: checking for hypotf declaration" >&5 if test x${glibcpp_cv_func_hypotf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_hypotf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15326,14 +15373,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 15330 "configure" +#line 15377 "configure" #include "confdefs.h" #include <math.h> int main() { hypotf(0, 0); ; return 0; } EOF -if { (eval echo configure:15337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_hypotf_use=yes else @@ -15360,12 +15407,12 @@ fi for ac_func in hypotf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15364: checking for $ac_func" >&5 +echo "configure:15411: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 15369 "configure" +#line 15416 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -15388,7 +15435,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:15392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15415,7 +15462,7 @@ done else echo $ac_n "checking for _hypotf declaration""... $ac_c" 1>&6 -echo "configure:15419: checking for _hypotf declaration" >&5 +echo "configure:15466: checking for _hypotf declaration" >&5 if test x${glibcpp_cv_func__hypotf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__hypotf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15430,14 +15477,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 15434 "configure" +#line 15481 "configure" #include "confdefs.h" #include <math.h> int main() { _hypotf(0, 0); ; return 0; } EOF -if { (eval echo configure:15441: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__hypotf_use=yes else @@ -15464,12 +15511,12 @@ fi for ac_func in _hypotf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15468: checking for $ac_func" >&5 +echo "configure:15515: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 15473 "configure" +#line 15520 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -15492,7 +15539,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:15496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15522,7 +15569,7 @@ done echo $ac_n "checking for ldexpf declaration""... $ac_c" 1>&6 -echo "configure:15526: checking for ldexpf declaration" >&5 +echo "configure:15573: checking for ldexpf declaration" >&5 if test x${glibcpp_cv_func_ldexpf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_ldexpf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15537,14 +15584,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 15541 "configure" +#line 15588 "configure" #include "confdefs.h" #include <math.h> int main() { ldexpf(0, 0); ; return 0; } EOF -if { (eval echo configure:15548: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15595: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_ldexpf_use=yes else @@ -15571,12 +15618,12 @@ fi for ac_func in ldexpf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15575: checking for $ac_func" >&5 +echo "configure:15622: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 15580 "configure" +#line 15627 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -15599,7 +15646,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:15603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15626,7 +15673,7 @@ done else echo $ac_n "checking for _ldexpf declaration""... $ac_c" 1>&6 -echo "configure:15630: checking for _ldexpf declaration" >&5 +echo "configure:15677: checking for _ldexpf declaration" >&5 if test x${glibcpp_cv_func__ldexpf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__ldexpf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15641,14 +15688,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 15645 "configure" +#line 15692 "configure" #include "confdefs.h" #include <math.h> int main() { _ldexpf(0, 0); ; return 0; } EOF -if { (eval echo configure:15652: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15699: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__ldexpf_use=yes else @@ -15675,12 +15722,12 @@ fi for ac_func in _ldexpf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15679: checking for $ac_func" >&5 +echo "configure:15726: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 15684 "configure" +#line 15731 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -15703,7 +15750,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:15707: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15733,7 +15780,7 @@ done echo $ac_n "checking for logf declaration""... $ac_c" 1>&6 -echo "configure:15737: checking for logf declaration" >&5 +echo "configure:15784: checking for logf declaration" >&5 if test x${glibcpp_cv_func_logf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_logf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15748,7 +15795,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 15752 "configure" +#line 15799 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -15759,7 +15806,7 @@ int main() { logf(0); ; return 0; } EOF -if { (eval echo configure:15763: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_logf_use=yes else @@ -15786,12 +15833,12 @@ fi for ac_func in logf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15790: checking for $ac_func" >&5 +echo "configure:15837: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 15795 "configure" +#line 15842 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -15814,7 +15861,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:15818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15841,7 +15888,7 @@ done else echo $ac_n "checking for _logf declaration""... $ac_c" 1>&6 -echo "configure:15845: checking for _logf declaration" >&5 +echo "configure:15892: checking for _logf declaration" >&5 if test x${glibcpp_cv_func__logf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__logf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15856,7 +15903,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 15860 "configure" +#line 15907 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -15867,7 +15914,7 @@ int main() { _logf(0); ; return 0; } EOF -if { (eval echo configure:15871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15918: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__logf_use=yes else @@ -15894,12 +15941,12 @@ fi for ac_func in _logf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15898: checking for $ac_func" >&5 +echo "configure:15945: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 15903 "configure" +#line 15950 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -15922,7 +15969,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:15926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15952,7 +15999,7 @@ done echo $ac_n "checking for log10f declaration""... $ac_c" 1>&6 -echo "configure:15956: checking for log10f declaration" >&5 +echo "configure:16003: checking for log10f declaration" >&5 if test x${glibcpp_cv_func_log10f_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_log10f_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15967,7 +16014,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 15971 "configure" +#line 16018 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -15978,7 +16025,7 @@ int main() { log10f(0); ; return 0; } EOF -if { (eval echo configure:15982: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16029: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_log10f_use=yes else @@ -16005,12 +16052,12 @@ fi for ac_func in log10f do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16009: checking for $ac_func" >&5 +echo "configure:16056: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 16014 "configure" +#line 16061 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -16033,7 +16080,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:16037: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -16060,7 +16107,7 @@ done else echo $ac_n "checking for _log10f declaration""... $ac_c" 1>&6 -echo "configure:16064: checking for _log10f declaration" >&5 +echo "configure:16111: checking for _log10f declaration" >&5 if test x${glibcpp_cv_func__log10f_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__log10f_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16075,7 +16122,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 16079 "configure" +#line 16126 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -16086,7 +16133,7 @@ int main() { _log10f(0); ; return 0; } EOF -if { (eval echo configure:16090: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16137: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__log10f_use=yes else @@ -16113,12 +16160,12 @@ fi for ac_func in _log10f do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16117: checking for $ac_func" >&5 +echo "configure:16164: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 16122 "configure" +#line 16169 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -16141,7 +16188,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:16145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -16171,7 +16218,7 @@ done echo $ac_n "checking for modff declaration""... $ac_c" 1>&6 -echo "configure:16175: checking for modff declaration" >&5 +echo "configure:16222: checking for modff declaration" >&5 if test x${glibcpp_cv_func_modff_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_modff_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16186,14 +16233,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 16190 "configure" +#line 16237 "configure" #include "confdefs.h" #include <math.h> int main() { modff(0, 0); ; return 0; } EOF -if { (eval echo configure:16197: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16244: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_modff_use=yes else @@ -16220,12 +16267,12 @@ fi for ac_func in modff do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16224: checking for $ac_func" >&5 +echo "configure:16271: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 16229 "configure" +#line 16276 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -16248,7 +16295,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:16252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -16275,7 +16322,7 @@ done else echo $ac_n "checking for _modff declaration""... $ac_c" 1>&6 -echo "configure:16279: checking for _modff declaration" >&5 +echo "configure:16326: checking for _modff declaration" >&5 if test x${glibcpp_cv_func__modff_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__modff_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16290,14 +16337,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 16294 "configure" +#line 16341 "configure" #include "confdefs.h" #include <math.h> int main() { _modff(0, 0); ; return 0; } EOF -if { (eval echo configure:16301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__modff_use=yes else @@ -16324,12 +16371,12 @@ fi for ac_func in _modff do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16328: checking for $ac_func" >&5 +echo "configure:16375: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 16333 "configure" +#line 16380 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -16352,7 +16399,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:16356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16403: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -16382,7 +16429,7 @@ done echo $ac_n "checking for powf declaration""... $ac_c" 1>&6 -echo "configure:16386: checking for powf declaration" >&5 +echo "configure:16433: checking for powf declaration" >&5 if test x${glibcpp_cv_func_powf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_powf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16397,14 +16444,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 16401 "configure" +#line 16448 "configure" #include "confdefs.h" #include <math.h> int main() { powf(0, 0); ; return 0; } EOF -if { (eval echo configure:16408: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_powf_use=yes else @@ -16431,12 +16478,12 @@ fi for ac_func in powf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16435: checking for $ac_func" >&5 +echo "configure:16482: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 16440 "configure" +#line 16487 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -16459,7 +16506,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:16463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -16486,7 +16533,7 @@ done else echo $ac_n "checking for _powf declaration""... $ac_c" 1>&6 -echo "configure:16490: checking for _powf declaration" >&5 +echo "configure:16537: checking for _powf declaration" >&5 if test x${glibcpp_cv_func__powf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__powf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16501,14 +16548,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 16505 "configure" +#line 16552 "configure" #include "confdefs.h" #include <math.h> int main() { _powf(0, 0); ; return 0; } EOF -if { (eval echo configure:16512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16559: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__powf_use=yes else @@ -16535,12 +16582,12 @@ fi for ac_func in _powf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16539: checking for $ac_func" >&5 +echo "configure:16586: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 16544 "configure" +#line 16591 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -16563,7 +16610,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:16567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -16593,7 +16640,7 @@ done echo $ac_n "checking for sqrtf declaration""... $ac_c" 1>&6 -echo "configure:16597: checking for sqrtf declaration" >&5 +echo "configure:16644: checking for sqrtf declaration" >&5 if test x${glibcpp_cv_func_sqrtf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_sqrtf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16608,7 +16655,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 16612 "configure" +#line 16659 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -16619,7 +16666,7 @@ int main() { sqrtf(0); ; return 0; } EOF -if { (eval echo configure:16623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16670: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_sqrtf_use=yes else @@ -16646,12 +16693,12 @@ fi for ac_func in sqrtf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16650: checking for $ac_func" >&5 +echo "configure:16697: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 16655 "configure" +#line 16702 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -16674,7 +16721,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:16678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -16701,7 +16748,7 @@ done else echo $ac_n "checking for _sqrtf declaration""... $ac_c" 1>&6 -echo "configure:16705: checking for _sqrtf declaration" >&5 +echo "configure:16752: checking for _sqrtf declaration" >&5 if test x${glibcpp_cv_func__sqrtf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__sqrtf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16716,7 +16763,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 16720 "configure" +#line 16767 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -16727,7 +16774,7 @@ int main() { _sqrtf(0); ; return 0; } EOF -if { (eval echo configure:16731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16778: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__sqrtf_use=yes else @@ -16754,12 +16801,12 @@ fi for ac_func in _sqrtf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16758: checking for $ac_func" >&5 +echo "configure:16805: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 16763 "configure" +#line 16810 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -16782,7 +16829,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:16786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -16812,7 +16859,7 @@ done echo $ac_n "checking for sincosf declaration""... $ac_c" 1>&6 -echo "configure:16816: checking for sincosf declaration" >&5 +echo "configure:16863: checking for sincosf declaration" >&5 if test x${glibcpp_cv_func_sincosf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_sincosf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16827,14 +16874,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 16831 "configure" +#line 16878 "configure" #include "confdefs.h" #include <math.h> int main() { sincosf(0, 0, 0); ; return 0; } EOF -if { (eval echo configure:16838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_sincosf_use=yes else @@ -16861,12 +16908,12 @@ fi for ac_func in sincosf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16865: checking for $ac_func" >&5 +echo "configure:16912: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 16870 "configure" +#line 16917 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -16889,7 +16936,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:16893: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -16916,7 +16963,7 @@ done else echo $ac_n "checking for _sincosf declaration""... $ac_c" 1>&6 -echo "configure:16920: checking for _sincosf declaration" >&5 +echo "configure:16967: checking for _sincosf declaration" >&5 if test x${glibcpp_cv_func__sincosf_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__sincosf_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -16931,14 +16978,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 16935 "configure" +#line 16982 "configure" #include "confdefs.h" #include <math.h> int main() { _sincosf(0, 0, 0); ; return 0; } EOF -if { (eval echo configure:16942: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:16989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__sincosf_use=yes else @@ -16965,12 +17012,12 @@ fi for ac_func in _sincosf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:16969: checking for $ac_func" >&5 +echo "configure:17016: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 16974 "configure" +#line 17021 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -16993,7 +17040,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:16997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -17023,7 +17070,7 @@ done echo $ac_n "checking for finitef declaration""... $ac_c" 1>&6 -echo "configure:17027: checking for finitef declaration" >&5 +echo "configure:17074: checking for finitef declaration" >&5 if test x${glibcpp_cv_func_finitef_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_finitef_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17038,7 +17085,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 17042 "configure" +#line 17089 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -17049,7 +17096,7 @@ int main() { finitef(0); ; return 0; } EOF -if { (eval echo configure:17053: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17100: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_finitef_use=yes else @@ -17076,12 +17123,12 @@ fi for ac_func in finitef do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17080: checking for $ac_func" >&5 +echo "configure:17127: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17085 "configure" +#line 17132 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -17104,7 +17151,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:17108: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -17131,7 +17178,7 @@ done else echo $ac_n "checking for _finitef declaration""... $ac_c" 1>&6 -echo "configure:17135: checking for _finitef declaration" >&5 +echo "configure:17182: checking for _finitef declaration" >&5 if test x${glibcpp_cv_func__finitef_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__finitef_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17146,7 +17193,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 17150 "configure" +#line 17197 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -17157,7 +17204,7 @@ int main() { _finitef(0); ; return 0; } EOF -if { (eval echo configure:17161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17208: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__finitef_use=yes else @@ -17184,12 +17231,12 @@ fi for ac_func in _finitef do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17188: checking for $ac_func" >&5 +echo "configure:17235: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17193 "configure" +#line 17240 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -17212,7 +17259,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:17216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -17242,7 +17289,7 @@ done echo $ac_n "checking for long double trig functions""... $ac_c" 1>&6 -echo "configure:17246: checking for long double trig functions" >&5 +echo "configure:17293: checking for long double trig functions" >&5 if eval "test \"`echo '$''{'glibcpp_cv_func_long_double_trig_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17256,7 +17303,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 17260 "configure" +#line 17307 "configure" #include "confdefs.h" #include <math.h> int main() { @@ -17265,7 +17312,7 @@ int main() { coshl sinhl tanhl; do echo "$x (0);"; done` ; return 0; } EOF -if { (eval echo configure:17269: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17316: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_long_double_trig_use=yes else @@ -17291,12 +17338,12 @@ fi coshl sinhl tanhl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17295: checking for $ac_func" >&5 +echo "configure:17342: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17300 "configure" +#line 17347 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -17319,7 +17366,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:17323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -17347,7 +17394,7 @@ done echo $ac_n "checking for long double round functions""... $ac_c" 1>&6 -echo "configure:17351: checking for long double round functions" >&5 +echo "configure:17398: checking for long double round functions" >&5 if eval "test \"`echo '$''{'glibcpp_cv_func_long_double_round_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17361,14 +17408,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 17365 "configure" +#line 17412 "configure" #include "confdefs.h" #include <math.h> int main() { `for x in ceill floorl; do echo "$x (0);"; done` ; return 0; } EOF -if { (eval echo configure:17372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_long_double_round_use=yes else @@ -17392,12 +17439,12 @@ fi for ac_func in ceill floorl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17396: checking for $ac_func" >&5 +echo "configure:17443: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17401 "configure" +#line 17448 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -17420,7 +17467,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:17424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -17449,7 +17496,7 @@ done echo $ac_n "checking for isnanl declaration""... $ac_c" 1>&6 -echo "configure:17453: checking for isnanl declaration" >&5 +echo "configure:17500: checking for isnanl declaration" >&5 if test x${glibcpp_cv_func_isnanl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_isnanl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17464,7 +17511,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 17468 "configure" +#line 17515 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -17475,7 +17522,7 @@ int main() { isnanl(0); ; return 0; } EOF -if { (eval echo configure:17479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17526: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_isnanl_use=yes else @@ -17502,12 +17549,12 @@ fi for ac_func in isnanl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17506: checking for $ac_func" >&5 +echo "configure:17553: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17511 "configure" +#line 17558 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -17530,7 +17577,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:17534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -17557,7 +17604,7 @@ done else echo $ac_n "checking for _isnanl declaration""... $ac_c" 1>&6 -echo "configure:17561: checking for _isnanl declaration" >&5 +echo "configure:17608: checking for _isnanl declaration" >&5 if test x${glibcpp_cv_func__isnanl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__isnanl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17572,7 +17619,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 17576 "configure" +#line 17623 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -17583,7 +17630,7 @@ int main() { _isnanl(0); ; return 0; } EOF -if { (eval echo configure:17587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__isnanl_use=yes else @@ -17610,12 +17657,12 @@ fi for ac_func in _isnanl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17614: checking for $ac_func" >&5 +echo "configure:17661: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17619 "configure" +#line 17666 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -17638,7 +17685,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:17642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -17668,7 +17715,7 @@ done echo $ac_n "checking for isinfl declaration""... $ac_c" 1>&6 -echo "configure:17672: checking for isinfl declaration" >&5 +echo "configure:17719: checking for isinfl declaration" >&5 if test x${glibcpp_cv_func_isinfl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_isinfl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17683,7 +17730,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 17687 "configure" +#line 17734 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -17694,7 +17741,7 @@ int main() { isinfl(0); ; return 0; } EOF -if { (eval echo configure:17698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_isinfl_use=yes else @@ -17721,12 +17768,12 @@ fi for ac_func in isinfl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17725: checking for $ac_func" >&5 +echo "configure:17772: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17730 "configure" +#line 17777 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -17749,7 +17796,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:17753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -17776,7 +17823,7 @@ done else echo $ac_n "checking for _isinfl declaration""... $ac_c" 1>&6 -echo "configure:17780: checking for _isinfl declaration" >&5 +echo "configure:17827: checking for _isinfl declaration" >&5 if test x${glibcpp_cv_func__isinfl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__isinfl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17791,7 +17838,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 17795 "configure" +#line 17842 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -17802,7 +17849,7 @@ int main() { _isinfl(0); ; return 0; } EOF -if { (eval echo configure:17806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__isinfl_use=yes else @@ -17829,12 +17876,12 @@ fi for ac_func in _isinfl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17833: checking for $ac_func" >&5 +echo "configure:17880: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17838 "configure" +#line 17885 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -17857,7 +17904,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:17861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -17887,7 +17934,7 @@ done echo $ac_n "checking for copysignl declaration""... $ac_c" 1>&6 -echo "configure:17891: checking for copysignl declaration" >&5 +echo "configure:17938: checking for copysignl declaration" >&5 if test x${glibcpp_cv_func_copysignl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_copysignl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -17902,14 +17949,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 17906 "configure" +#line 17953 "configure" #include "confdefs.h" #include <math.h> int main() { copysignl(0, 0); ; return 0; } EOF -if { (eval echo configure:17913: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:17960: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_copysignl_use=yes else @@ -17936,12 +17983,12 @@ fi for ac_func in copysignl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:17940: checking for $ac_func" >&5 +echo "configure:17987: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 17945 "configure" +#line 17992 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -17964,7 +18011,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:17968: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -17991,7 +18038,7 @@ done else echo $ac_n "checking for _copysignl declaration""... $ac_c" 1>&6 -echo "configure:17995: checking for _copysignl declaration" >&5 +echo "configure:18042: checking for _copysignl declaration" >&5 if test x${glibcpp_cv_func__copysignl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__copysignl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -18006,14 +18053,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 18010 "configure" +#line 18057 "configure" #include "confdefs.h" #include <math.h> int main() { _copysignl(0, 0); ; return 0; } EOF -if { (eval echo configure:18017: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__copysignl_use=yes else @@ -18040,12 +18087,12 @@ fi for ac_func in _copysignl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18044: checking for $ac_func" >&5 +echo "configure:18091: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 18049 "configure" +#line 18096 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -18068,7 +18115,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:18072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -18098,7 +18145,7 @@ done echo $ac_n "checking for atan2l declaration""... $ac_c" 1>&6 -echo "configure:18102: checking for atan2l declaration" >&5 +echo "configure:18149: checking for atan2l declaration" >&5 if test x${glibcpp_cv_func_atan2l_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_atan2l_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -18113,14 +18160,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 18117 "configure" +#line 18164 "configure" #include "confdefs.h" #include <math.h> int main() { atan2l(0, 0); ; return 0; } EOF -if { (eval echo configure:18124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_atan2l_use=yes else @@ -18147,12 +18194,12 @@ fi for ac_func in atan2l do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18151: checking for $ac_func" >&5 +echo "configure:18198: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 18156 "configure" +#line 18203 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -18175,7 +18222,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:18179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -18202,7 +18249,7 @@ done else echo $ac_n "checking for _atan2l declaration""... $ac_c" 1>&6 -echo "configure:18206: checking for _atan2l declaration" >&5 +echo "configure:18253: checking for _atan2l declaration" >&5 if test x${glibcpp_cv_func__atan2l_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__atan2l_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -18217,14 +18264,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 18221 "configure" +#line 18268 "configure" #include "confdefs.h" #include <math.h> int main() { _atan2l(0, 0); ; return 0; } EOF -if { (eval echo configure:18228: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__atan2l_use=yes else @@ -18251,12 +18298,12 @@ fi for ac_func in _atan2l do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18255: checking for $ac_func" >&5 +echo "configure:18302: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 18260 "configure" +#line 18307 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -18279,7 +18326,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:18283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -18309,7 +18356,7 @@ done echo $ac_n "checking for expl declaration""... $ac_c" 1>&6 -echo "configure:18313: checking for expl declaration" >&5 +echo "configure:18360: checking for expl declaration" >&5 if test x${glibcpp_cv_func_expl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_expl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -18324,7 +18371,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 18328 "configure" +#line 18375 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -18335,7 +18382,7 @@ int main() { expl(0); ; return 0; } EOF -if { (eval echo configure:18339: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_expl_use=yes else @@ -18362,12 +18409,12 @@ fi for ac_func in expl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18366: checking for $ac_func" >&5 +echo "configure:18413: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 18371 "configure" +#line 18418 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -18390,7 +18437,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:18394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -18417,7 +18464,7 @@ done else echo $ac_n "checking for _expl declaration""... $ac_c" 1>&6 -echo "configure:18421: checking for _expl declaration" >&5 +echo "configure:18468: checking for _expl declaration" >&5 if test x${glibcpp_cv_func__expl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__expl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -18432,7 +18479,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 18436 "configure" +#line 18483 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -18443,7 +18490,7 @@ int main() { _expl(0); ; return 0; } EOF -if { (eval echo configure:18447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18494: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__expl_use=yes else @@ -18470,12 +18517,12 @@ fi for ac_func in _expl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18474: checking for $ac_func" >&5 +echo "configure:18521: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 18479 "configure" +#line 18526 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -18498,7 +18545,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:18502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -18528,7 +18575,7 @@ done echo $ac_n "checking for fabsl declaration""... $ac_c" 1>&6 -echo "configure:18532: checking for fabsl declaration" >&5 +echo "configure:18579: checking for fabsl declaration" >&5 if test x${glibcpp_cv_func_fabsl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_fabsl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -18543,7 +18590,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 18547 "configure" +#line 18594 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -18554,7 +18601,7 @@ int main() { fabsl(0); ; return 0; } EOF -if { (eval echo configure:18558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_fabsl_use=yes else @@ -18581,12 +18628,12 @@ fi for ac_func in fabsl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18585: checking for $ac_func" >&5 +echo "configure:18632: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 18590 "configure" +#line 18637 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -18609,7 +18656,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:18613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -18636,7 +18683,7 @@ done else echo $ac_n "checking for _fabsl declaration""... $ac_c" 1>&6 -echo "configure:18640: checking for _fabsl declaration" >&5 +echo "configure:18687: checking for _fabsl declaration" >&5 if test x${glibcpp_cv_func__fabsl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__fabsl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -18651,7 +18698,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 18655 "configure" +#line 18702 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -18662,7 +18709,7 @@ int main() { _fabsl(0); ; return 0; } EOF -if { (eval echo configure:18666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18713: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__fabsl_use=yes else @@ -18689,12 +18736,12 @@ fi for ac_func in _fabsl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18693: checking for $ac_func" >&5 +echo "configure:18740: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 18698 "configure" +#line 18745 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -18717,7 +18764,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:18721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -18747,7 +18794,7 @@ done echo $ac_n "checking for fmodl declaration""... $ac_c" 1>&6 -echo "configure:18751: checking for fmodl declaration" >&5 +echo "configure:18798: checking for fmodl declaration" >&5 if test x${glibcpp_cv_func_fmodl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_fmodl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -18762,14 +18809,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 18766 "configure" +#line 18813 "configure" #include "confdefs.h" #include <math.h> int main() { fmodl(0, 0); ; return 0; } EOF -if { (eval echo configure:18773: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18820: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_fmodl_use=yes else @@ -18796,12 +18843,12 @@ fi for ac_func in fmodl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18800: checking for $ac_func" >&5 +echo "configure:18847: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 18805 "configure" +#line 18852 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -18824,7 +18871,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:18828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -18851,7 +18898,7 @@ done else echo $ac_n "checking for _fmodl declaration""... $ac_c" 1>&6 -echo "configure:18855: checking for _fmodl declaration" >&5 +echo "configure:18902: checking for _fmodl declaration" >&5 if test x${glibcpp_cv_func__fmodl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__fmodl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -18866,14 +18913,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 18870 "configure" +#line 18917 "configure" #include "confdefs.h" #include <math.h> int main() { _fmodl(0, 0); ; return 0; } EOF -if { (eval echo configure:18877: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18924: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__fmodl_use=yes else @@ -18900,12 +18947,12 @@ fi for ac_func in _fmodl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:18904: checking for $ac_func" >&5 +echo "configure:18951: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 18909 "configure" +#line 18956 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -18928,7 +18975,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:18932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -18958,7 +19005,7 @@ done echo $ac_n "checking for frexpl declaration""... $ac_c" 1>&6 -echo "configure:18962: checking for frexpl declaration" >&5 +echo "configure:19009: checking for frexpl declaration" >&5 if test x${glibcpp_cv_func_frexpl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_frexpl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -18973,14 +19020,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 18977 "configure" +#line 19024 "configure" #include "confdefs.h" #include <math.h> int main() { frexpl(0, 0); ; return 0; } EOF -if { (eval echo configure:18984: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_frexpl_use=yes else @@ -19007,12 +19054,12 @@ fi for ac_func in frexpl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:19011: checking for $ac_func" >&5 +echo "configure:19058: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 19016 "configure" +#line 19063 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -19035,7 +19082,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:19039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -19062,7 +19109,7 @@ done else echo $ac_n "checking for _frexpl declaration""... $ac_c" 1>&6 -echo "configure:19066: checking for _frexpl declaration" >&5 +echo "configure:19113: checking for _frexpl declaration" >&5 if test x${glibcpp_cv_func__frexpl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__frexpl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -19077,14 +19124,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 19081 "configure" +#line 19128 "configure" #include "confdefs.h" #include <math.h> int main() { _frexpl(0, 0); ; return 0; } EOF -if { (eval echo configure:19088: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19135: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__frexpl_use=yes else @@ -19111,12 +19158,12 @@ fi for ac_func in _frexpl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:19115: checking for $ac_func" >&5 +echo "configure:19162: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 19120 "configure" +#line 19167 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -19139,7 +19186,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:19143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -19169,7 +19216,7 @@ done echo $ac_n "checking for hypotl declaration""... $ac_c" 1>&6 -echo "configure:19173: checking for hypotl declaration" >&5 +echo "configure:19220: checking for hypotl declaration" >&5 if test x${glibcpp_cv_func_hypotl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_hypotl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -19184,14 +19231,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 19188 "configure" +#line 19235 "configure" #include "confdefs.h" #include <math.h> int main() { hypotl(0, 0); ; return 0; } EOF -if { (eval echo configure:19195: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_hypotl_use=yes else @@ -19218,12 +19265,12 @@ fi for ac_func in hypotl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:19222: checking for $ac_func" >&5 +echo "configure:19269: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 19227 "configure" +#line 19274 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -19246,7 +19293,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:19250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -19273,7 +19320,7 @@ done else echo $ac_n "checking for _hypotl declaration""... $ac_c" 1>&6 -echo "configure:19277: checking for _hypotl declaration" >&5 +echo "configure:19324: checking for _hypotl declaration" >&5 if test x${glibcpp_cv_func__hypotl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__hypotl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -19288,14 +19335,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 19292 "configure" +#line 19339 "configure" #include "confdefs.h" #include <math.h> int main() { _hypotl(0, 0); ; return 0; } EOF -if { (eval echo configure:19299: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19346: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__hypotl_use=yes else @@ -19322,12 +19369,12 @@ fi for ac_func in _hypotl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:19326: checking for $ac_func" >&5 +echo "configure:19373: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 19331 "configure" +#line 19378 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -19350,7 +19397,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:19354: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -19380,7 +19427,7 @@ done echo $ac_n "checking for ldexpl declaration""... $ac_c" 1>&6 -echo "configure:19384: checking for ldexpl declaration" >&5 +echo "configure:19431: checking for ldexpl declaration" >&5 if test x${glibcpp_cv_func_ldexpl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_ldexpl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -19395,14 +19442,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 19399 "configure" +#line 19446 "configure" #include "confdefs.h" #include <math.h> int main() { ldexpl(0, 0); ; return 0; } EOF -if { (eval echo configure:19406: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_ldexpl_use=yes else @@ -19429,12 +19476,12 @@ fi for ac_func in ldexpl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:19433: checking for $ac_func" >&5 +echo "configure:19480: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 19438 "configure" +#line 19485 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -19457,7 +19504,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:19461: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -19484,7 +19531,7 @@ done else echo $ac_n "checking for _ldexpl declaration""... $ac_c" 1>&6 -echo "configure:19488: checking for _ldexpl declaration" >&5 +echo "configure:19535: checking for _ldexpl declaration" >&5 if test x${glibcpp_cv_func__ldexpl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__ldexpl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -19499,14 +19546,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 19503 "configure" +#line 19550 "configure" #include "confdefs.h" #include <math.h> int main() { _ldexpl(0, 0); ; return 0; } EOF -if { (eval echo configure:19510: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19557: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__ldexpl_use=yes else @@ -19533,12 +19580,12 @@ fi for ac_func in _ldexpl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:19537: checking for $ac_func" >&5 +echo "configure:19584: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 19542 "configure" +#line 19589 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -19561,7 +19608,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:19565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -19591,7 +19638,7 @@ done echo $ac_n "checking for logl declaration""... $ac_c" 1>&6 -echo "configure:19595: checking for logl declaration" >&5 +echo "configure:19642: checking for logl declaration" >&5 if test x${glibcpp_cv_func_logl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_logl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -19606,7 +19653,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 19610 "configure" +#line 19657 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -19617,7 +19664,7 @@ int main() { logl(0); ; return 0; } EOF -if { (eval echo configure:19621: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_logl_use=yes else @@ -19644,12 +19691,12 @@ fi for ac_func in logl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:19648: checking for $ac_func" >&5 +echo "configure:19695: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 19653 "configure" +#line 19700 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -19672,7 +19719,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:19676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -19699,7 +19746,7 @@ done else echo $ac_n "checking for _logl declaration""... $ac_c" 1>&6 -echo "configure:19703: checking for _logl declaration" >&5 +echo "configure:19750: checking for _logl declaration" >&5 if test x${glibcpp_cv_func__logl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__logl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -19714,7 +19761,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 19718 "configure" +#line 19765 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -19725,7 +19772,7 @@ int main() { _logl(0); ; return 0; } EOF -if { (eval echo configure:19729: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19776: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__logl_use=yes else @@ -19752,12 +19799,12 @@ fi for ac_func in _logl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:19756: checking for $ac_func" >&5 +echo "configure:19803: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 19761 "configure" +#line 19808 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -19780,7 +19827,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:19784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19831: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -19810,7 +19857,7 @@ done echo $ac_n "checking for log10l declaration""... $ac_c" 1>&6 -echo "configure:19814: checking for log10l declaration" >&5 +echo "configure:19861: checking for log10l declaration" >&5 if test x${glibcpp_cv_func_log10l_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_log10l_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -19825,7 +19872,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 19829 "configure" +#line 19876 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -19836,7 +19883,7 @@ int main() { log10l(0); ; return 0; } EOF -if { (eval echo configure:19840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19887: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_log10l_use=yes else @@ -19863,12 +19910,12 @@ fi for ac_func in log10l do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:19867: checking for $ac_func" >&5 +echo "configure:19914: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 19872 "configure" +#line 19919 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -19891,7 +19938,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:19895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:19942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -19918,7 +19965,7 @@ done else echo $ac_n "checking for _log10l declaration""... $ac_c" 1>&6 -echo "configure:19922: checking for _log10l declaration" >&5 +echo "configure:19969: checking for _log10l declaration" >&5 if test x${glibcpp_cv_func__log10l_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__log10l_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -19933,7 +19980,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 19937 "configure" +#line 19984 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -19944,7 +19991,7 @@ int main() { _log10l(0); ; return 0; } EOF -if { (eval echo configure:19948: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19995: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__log10l_use=yes else @@ -19971,12 +20018,12 @@ fi for ac_func in _log10l do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:19975: checking for $ac_func" >&5 +echo "configure:20022: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 19980 "configure" +#line 20027 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -19999,7 +20046,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:20003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:20050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -20029,7 +20076,7 @@ done echo $ac_n "checking for modfl declaration""... $ac_c" 1>&6 -echo "configure:20033: checking for modfl declaration" >&5 +echo "configure:20080: checking for modfl declaration" >&5 if test x${glibcpp_cv_func_modfl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_modfl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -20044,14 +20091,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 20048 "configure" +#line 20095 "configure" #include "confdefs.h" #include <math.h> int main() { modfl(0, 0); ; return 0; } EOF -if { (eval echo configure:20055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20102: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_modfl_use=yes else @@ -20078,12 +20125,12 @@ fi for ac_func in modfl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20082: checking for $ac_func" >&5 +echo "configure:20129: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 20087 "configure" +#line 20134 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -20106,7 +20153,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:20110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:20157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -20133,7 +20180,7 @@ done else echo $ac_n "checking for _modfl declaration""... $ac_c" 1>&6 -echo "configure:20137: checking for _modfl declaration" >&5 +echo "configure:20184: checking for _modfl declaration" >&5 if test x${glibcpp_cv_func__modfl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__modfl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -20148,14 +20195,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 20152 "configure" +#line 20199 "configure" #include "confdefs.h" #include <math.h> int main() { _modfl(0, 0); ; return 0; } EOF -if { (eval echo configure:20159: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__modfl_use=yes else @@ -20182,12 +20229,12 @@ fi for ac_func in _modfl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20186: checking for $ac_func" >&5 +echo "configure:20233: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 20191 "configure" +#line 20238 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -20210,7 +20257,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:20214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:20261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -20240,7 +20287,7 @@ done echo $ac_n "checking for powl declaration""... $ac_c" 1>&6 -echo "configure:20244: checking for powl declaration" >&5 +echo "configure:20291: checking for powl declaration" >&5 if test x${glibcpp_cv_func_powl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_powl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -20255,14 +20302,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 20259 "configure" +#line 20306 "configure" #include "confdefs.h" #include <math.h> int main() { powl(0, 0); ; return 0; } EOF -if { (eval echo configure:20266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20313: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_powl_use=yes else @@ -20289,12 +20336,12 @@ fi for ac_func in powl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20293: checking for $ac_func" >&5 +echo "configure:20340: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 20298 "configure" +#line 20345 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -20317,7 +20364,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:20321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:20368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -20344,7 +20391,7 @@ done else echo $ac_n "checking for _powl declaration""... $ac_c" 1>&6 -echo "configure:20348: checking for _powl declaration" >&5 +echo "configure:20395: checking for _powl declaration" >&5 if test x${glibcpp_cv_func__powl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__powl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -20359,14 +20406,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 20363 "configure" +#line 20410 "configure" #include "confdefs.h" #include <math.h> int main() { _powl(0, 0); ; return 0; } EOF -if { (eval echo configure:20370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20417: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__powl_use=yes else @@ -20393,12 +20440,12 @@ fi for ac_func in _powl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20397: checking for $ac_func" >&5 +echo "configure:20444: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 20402 "configure" +#line 20449 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -20421,7 +20468,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:20425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:20472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -20451,7 +20498,7 @@ done echo $ac_n "checking for sqrtl declaration""... $ac_c" 1>&6 -echo "configure:20455: checking for sqrtl declaration" >&5 +echo "configure:20502: checking for sqrtl declaration" >&5 if test x${glibcpp_cv_func_sqrtl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_sqrtl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -20466,7 +20513,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 20470 "configure" +#line 20517 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -20477,7 +20524,7 @@ int main() { sqrtl(0); ; return 0; } EOF -if { (eval echo configure:20481: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20528: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_sqrtl_use=yes else @@ -20504,12 +20551,12 @@ fi for ac_func in sqrtl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20508: checking for $ac_func" >&5 +echo "configure:20555: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 20513 "configure" +#line 20560 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -20532,7 +20579,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:20536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:20583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -20559,7 +20606,7 @@ done else echo $ac_n "checking for _sqrtl declaration""... $ac_c" 1>&6 -echo "configure:20563: checking for _sqrtl declaration" >&5 +echo "configure:20610: checking for _sqrtl declaration" >&5 if test x${glibcpp_cv_func__sqrtl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__sqrtl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -20574,7 +20621,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 20578 "configure" +#line 20625 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -20585,7 +20632,7 @@ int main() { _sqrtl(0); ; return 0; } EOF -if { (eval echo configure:20589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__sqrtl_use=yes else @@ -20612,12 +20659,12 @@ fi for ac_func in _sqrtl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20616: checking for $ac_func" >&5 +echo "configure:20663: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 20621 "configure" +#line 20668 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -20640,7 +20687,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:20644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:20691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -20670,7 +20717,7 @@ done echo $ac_n "checking for sincosl declaration""... $ac_c" 1>&6 -echo "configure:20674: checking for sincosl declaration" >&5 +echo "configure:20721: checking for sincosl declaration" >&5 if test x${glibcpp_cv_func_sincosl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_sincosl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -20685,14 +20732,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 20689 "configure" +#line 20736 "configure" #include "confdefs.h" #include <math.h> int main() { sincosl(0, 0, 0); ; return 0; } EOF -if { (eval echo configure:20696: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20743: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_sincosl_use=yes else @@ -20719,12 +20766,12 @@ fi for ac_func in sincosl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20723: checking for $ac_func" >&5 +echo "configure:20770: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 20728 "configure" +#line 20775 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -20747,7 +20794,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:20751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:20798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -20774,7 +20821,7 @@ done else echo $ac_n "checking for _sincosl declaration""... $ac_c" 1>&6 -echo "configure:20778: checking for _sincosl declaration" >&5 +echo "configure:20825: checking for _sincosl declaration" >&5 if test x${glibcpp_cv_func__sincosl_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__sincosl_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -20789,14 +20836,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 20793 "configure" +#line 20840 "configure" #include "confdefs.h" #include <math.h> int main() { _sincosl(0, 0, 0); ; return 0; } EOF -if { (eval echo configure:20800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__sincosl_use=yes else @@ -20823,12 +20870,12 @@ fi for ac_func in _sincosl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20827: checking for $ac_func" >&5 +echo "configure:20874: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 20832 "configure" +#line 20879 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -20851,7 +20898,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:20855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:20902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -20881,7 +20928,7 @@ done echo $ac_n "checking for finitel declaration""... $ac_c" 1>&6 -echo "configure:20885: checking for finitel declaration" >&5 +echo "configure:20932: checking for finitel declaration" >&5 if test x${glibcpp_cv_func_finitel_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_finitel_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -20896,7 +20943,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 20900 "configure" +#line 20947 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -20907,7 +20954,7 @@ int main() { finitel(0); ; return 0; } EOF -if { (eval echo configure:20911: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:20958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_finitel_use=yes else @@ -20934,12 +20981,12 @@ fi for ac_func in finitel do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:20938: checking for $ac_func" >&5 +echo "configure:20985: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 20943 "configure" +#line 20990 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -20962,7 +21009,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:20966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:21013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -20989,7 +21036,7 @@ done else echo $ac_n "checking for _finitel declaration""... $ac_c" 1>&6 -echo "configure:20993: checking for _finitel declaration" >&5 +echo "configure:21040: checking for _finitel declaration" >&5 if test x${glibcpp_cv_func__finitel_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func__finitel_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -21004,7 +21051,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 21008 "configure" +#line 21055 "configure" #include "confdefs.h" #include <math.h> #ifdef HAVE_IEEEFP_H @@ -21015,7 +21062,7 @@ int main() { _finitel(0); ; return 0; } EOF -if { (eval echo configure:21019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:21066: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__finitel_use=yes else @@ -21042,12 +21089,12 @@ fi for ac_func in _finitel do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:21046: checking for $ac_func" >&5 +echo "configure:21093: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 21051 "configure" +#line 21098 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -21070,7 +21117,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:21074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:21121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -21101,7 +21148,7 @@ done echo $ac_n "checking for _float trig functions""... $ac_c" 1>&6 -echo "configure:21105: checking for _float trig functions" >&5 +echo "configure:21152: checking for _float trig functions" >&5 if eval "test \"`echo '$''{'glibcpp_cv_func__float_trig_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -21115,7 +21162,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 21119 "configure" +#line 21166 "configure" #include "confdefs.h" #include <math.h> int main() { @@ -21124,7 +21171,7 @@ int main() { _coshf _sinhf _tanhf; do echo "$x (0);"; done` ; return 0; } EOF -if { (eval echo configure:21128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:21175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__float_trig_use=yes else @@ -21150,12 +21197,12 @@ fi _coshf _sinhf _tanhf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:21154: checking for $ac_func" >&5 +echo "configure:21201: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 21159 "configure" +#line 21206 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -21178,7 +21225,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:21182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:21229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -21206,7 +21253,7 @@ done echo $ac_n "checking for _float round functions""... $ac_c" 1>&6 -echo "configure:21210: checking for _float round functions" >&5 +echo "configure:21257: checking for _float round functions" >&5 if eval "test \"`echo '$''{'glibcpp_cv_func__float_round_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -21220,14 +21267,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 21224 "configure" +#line 21271 "configure" #include "confdefs.h" #include <math.h> int main() { `for x in _ceilf _floorf; do echo "$x (0);"; done` ; return 0; } EOF -if { (eval echo configure:21231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:21278: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__float_round_use=yes else @@ -21251,12 +21298,12 @@ fi for ac_func in _ceilf _floorf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:21255: checking for $ac_func" >&5 +echo "configure:21302: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 21260 "configure" +#line 21307 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -21279,7 +21326,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:21283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:21330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -21308,7 +21355,7 @@ done echo $ac_n "checking for _long double trig functions""... $ac_c" 1>&6 -echo "configure:21312: checking for _long double trig functions" >&5 +echo "configure:21359: checking for _long double trig functions" >&5 if eval "test \"`echo '$''{'glibcpp_cv_func__long_double_trig_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -21322,7 +21369,7 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 21326 "configure" +#line 21373 "configure" #include "confdefs.h" #include <math.h> int main() { @@ -21331,7 +21378,7 @@ int main() { _coshl _sinhl _tanhl; do echo "$x (0);"; done` ; return 0; } EOF -if { (eval echo configure:21335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:21382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__long_double_trig_use=yes else @@ -21357,12 +21404,12 @@ fi _coshl _sinhl _tanhl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:21361: checking for $ac_func" >&5 +echo "configure:21408: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 21366 "configure" +#line 21413 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -21385,7 +21432,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:21389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:21436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -21413,7 +21460,7 @@ done echo $ac_n "checking for _long double round functions""... $ac_c" 1>&6 -echo "configure:21417: checking for _long double round functions" >&5 +echo "configure:21464: checking for _long double round functions" >&5 if eval "test \"`echo '$''{'glibcpp_cv_func__long_double_round_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -21427,14 +21474,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 21431 "configure" +#line 21478 "configure" #include "confdefs.h" #include <math.h> int main() { `for x in _ceill _floorl; do echo "$x (0);"; done` ; return 0; } EOF -if { (eval echo configure:21438: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:21485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func__long_double_round_use=yes else @@ -21458,12 +21505,12 @@ fi for ac_func in _ceill _floorl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:21462: checking for $ac_func" >&5 +echo "configure:21509: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 21467 "configure" +#line 21514 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -21486,7 +21533,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:21490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:21537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -21518,7 +21565,7 @@ done echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 -echo "configure:21522: checking for main in -lm" >&5 +echo "configure:21569: checking for main in -lm" >&5 ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -21526,14 +21573,14 @@ else ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <<EOF -#line 21530 "configure" +#line 21577 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:21537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:21584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -21563,12 +21610,12 @@ fi for ac_func in nan copysignf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:21567: checking for $ac_func" >&5 +echo "configure:21614: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 21572 "configure" +#line 21619 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -21591,7 +21638,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:21595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:21642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -21620,12 +21667,12 @@ done for ac_func in __signbit do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:21624: checking for $ac_func" >&5 +echo "configure:21671: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 21629 "configure" +#line 21676 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -21648,7 +21695,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:21652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:21699: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -21676,12 +21723,12 @@ done for ac_func in __signbitf do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:21680: checking for $ac_func" >&5 +echo "configure:21727: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 21685 "configure" +#line 21732 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -21704,7 +21751,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:21708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:21755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -21734,12 +21781,12 @@ done for ac_func in __signbitl do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:21738: checking for $ac_func" >&5 +echo "configure:21785: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 21743 "configure" +#line 21790 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -21762,7 +21809,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:21766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:21813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -21792,18 +21839,19 @@ done + enable_wchar_t=no echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 -echo "configure:21798: checking for mbstate_t" >&5 +echo "configure:21846: checking for mbstate_t" >&5 cat > conftest.$ac_ext <<EOF -#line 21800 "configure" +#line 21848 "configure" #include "confdefs.h" #include <wchar.h> int main() { mbstate_t teststate; ; return 0; } EOF -if { (eval echo configure:21807: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:21855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_mbstate_t=yes else @@ -21825,17 +21873,17 @@ EOF do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:21829: checking for $ac_hdr" >&5 +echo "configure:21877: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 21834 "configure" +#line 21882 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:21839: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:21887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -21866,17 +21914,17 @@ done do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:21870: checking for $ac_hdr" >&5 +echo "configure:21918: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 21875 "configure" +#line 21923 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:21880: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:21928: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -21909,16 +21957,16 @@ done test x"$enable_c_mbchar" != xno; then echo $ac_n "checking for WCHAR_MIN and WCHAR_MAX""... $ac_c" 1>&6 -echo "configure:21913: checking for WCHAR_MIN and WCHAR_MAX" >&5 +echo "configure:21961: checking for WCHAR_MIN and WCHAR_MAX" >&5 cat > conftest.$ac_ext <<EOF -#line 21915 "configure" +#line 21963 "configure" #include "confdefs.h" #include <wchar.h> int main() { int i = WCHAR_MIN; int j = WCHAR_MAX; ; return 0; } EOF -if { (eval echo configure:21922: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:21970: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_wchar_minmax=yes else @@ -21931,9 +21979,9 @@ rm -f conftest* echo "$ac_t""$has_wchar_minmax" 1>&6 echo $ac_n "checking for WEOF""... $ac_c" 1>&6 -echo "configure:21935: checking for WEOF" >&5 +echo "configure:21983: checking for WEOF" >&5 cat > conftest.$ac_ext <<EOF -#line 21937 "configure" +#line 21985 "configure" #include "confdefs.h" #include <wchar.h> @@ -21942,7 +21990,7 @@ int main() { wint_t i = WEOF; ; return 0; } EOF -if { (eval echo configure:21946: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:21994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* has_weof=yes else @@ -21958,12 +22006,12 @@ rm -f conftest* for ac_func in wcslen wmemchr wmemcmp wmemcpy wmemmove wmemset do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:21962: checking for $ac_func" >&5 +echo "configure:22010: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 21967 "configure" +#line 22015 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -21986,7 +22034,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:21990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:22038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -22013,7 +22061,7 @@ fi done - for ac_func in btowc wctob fgetwc fgetwc fgetws fputwc fputws fwide \ + for ac_func in btowc wctob fgetwc fgetws fputwc fputws fwide \ fwprintf fwscanf swprintf swscanf vfwprintf vfwscanf vswprintf vswscanf \ vwprintf vwscanf wprintf wscanf getwc getwchar mbsinit mbrlen mbrtowc \ mbsrtowcs wcsrtombs putwc putwchar ungetwc wcrtomb wcstod wcstof wcstol \ @@ -22021,12 +22069,12 @@ done wcscspn wcsspn wcstok wcsftime wcschr wcspbrk wcsrchr wcsstr do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:22025: checking for $ac_func" >&5 +echo "configure:22073: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 22030 "configure" +#line 22078 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -22049,7 +22097,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:22053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:22101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -22077,7 +22125,7 @@ done echo $ac_n "checking for ISO C99 wchar_t support""... $ac_c" 1>&6 -echo "configure:22081: checking for ISO C99 wchar_t support" >&5 +echo "configure:22129: checking for ISO C99 wchar_t support" >&5 if test x"$has_weof" = xyes && test x"$has_wchar_minmax" = xyes && test x"$ac_wfuncs" = xyes; then @@ -22089,17 +22137,17 @@ echo "configure:22081: checking for ISO C99 wchar_t support" >&5 ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 -echo "configure:22093: checking for iconv.h" >&5 +echo "configure:22141: checking for iconv.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 22098 "configure" +#line 22146 "configure" #include "confdefs.h" #include <iconv.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:22103: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:22151: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -22123,17 +22171,17 @@ fi ac_safe=`echo "langinfo.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for langinfo.h""... $ac_c" 1>&6 -echo "configure:22127: checking for langinfo.h" >&5 +echo "configure:22175: checking for langinfo.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 22132 "configure" +#line 22180 "configure" #include "confdefs.h" #include <langinfo.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:22137: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:22185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -22157,7 +22205,7 @@ fi echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 -echo "configure:22161: checking for iconv in -liconv" >&5 +echo "configure:22209: checking for iconv in -liconv" >&5 ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -22165,7 +22213,7 @@ else ac_save_LIBS="$LIBS" LIBS="-liconv $LIBS" cat > conftest.$ac_ext <<EOF -#line 22169 "configure" +#line 22217 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -22176,7 +22224,7 @@ int main() { iconv() ; return 0; } EOF -if { (eval echo configure:22180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:22228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -22202,12 +22250,12 @@ fi for ac_func in iconv_open iconv_close iconv nl_langinfo do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:22206: checking for $ac_func" >&5 +echo "configure:22254: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 22211 "configure" +#line 22259 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -22230,7 +22278,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:22234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:22282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -22260,7 +22308,7 @@ done LIBS="$ac_save_LIBS" echo $ac_n "checking for XPG2 wchar_t support""... $ac_c" 1>&6 -echo "configure:22264: checking for XPG2 wchar_t support" >&5 +echo "configure:22312: checking for XPG2 wchar_t support" >&5 if test x"$ac_has_iconv_h" = xyes && test x"$ac_has_langinfo_h" = xyes && test x"$ac_XPG2funcs" = xyes; then @@ -22270,21 +22318,27 @@ echo "configure:22264: checking for XPG2 wchar_t support" >&5 fi echo "$ac_t""$ac_XPG2_wchar_t" 1>&6 - echo $ac_n "checking for enabled wchar_t specializations""... $ac_c" 1>&6 -echo "configure:22275: checking for enabled wchar_t specializations" >&5 - if test x"$ac_isoC99_wchar_t" = xyes && + if test x"$ac_isoC99_wchar_t" = xyes && test x"$ac_XPG2_wchar_t" = xyes; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define _GLIBCPP_USE_WCHAR_T 1 EOF - echo "$ac_t"""yes"" 1>&6 - else - echo "$ac_t"""no"" 1>&6 + enable_wchar_t=yes fi - else - echo "configure: warning: wchar_t support disabled." 1>&2 fi + echo $ac_n "checking for enabled wchar_t specializations""... $ac_c" 1>&6 +echo "configure:22332: checking for enabled wchar_t specializations" >&5 + echo "$ac_t""$enable_wchar_t" 1>&6 + + +if test "$enable_wchar_t" = yes; then + GLIBCPP_TEST_WCHAR_T_TRUE= + GLIBCPP_TEST_WCHAR_T_FALSE='#' +else + GLIBCPP_TEST_WCHAR_T_TRUE='#' + GLIBCPP_TEST_WCHAR_T_FALSE= +fi ac_test_CXXFLAGS="${CXXFLAGS+set}" @@ -22293,7 +22347,7 @@ EOF echo $ac_n "checking for strtold declaration""... $ac_c" 1>&6 -echo "configure:22297: checking for strtold declaration" >&5 +echo "configure:22351: checking for strtold declaration" >&5 if test x${glibcpp_cv_func_strtold_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_strtold_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -22308,14 +22362,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 22312 "configure" +#line 22366 "configure" #include "confdefs.h" #include <stdlib.h> int main() { strtold(0, 0); ; return 0; } EOF -if { (eval echo configure:22319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:22373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_strtold_use=yes else @@ -22341,12 +22395,12 @@ fi for ac_func in strtold do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:22345: checking for $ac_func" >&5 +echo "configure:22399: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 22350 "configure" +#line 22404 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -22369,7 +22423,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:22373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:22427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -22397,7 +22451,7 @@ done echo $ac_n "checking for strtof declaration""... $ac_c" 1>&6 -echo "configure:22401: checking for strtof declaration" >&5 +echo "configure:22455: checking for strtof declaration" >&5 if test x${glibcpp_cv_func_strtof_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_strtof_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -22412,14 +22466,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 22416 "configure" +#line 22470 "configure" #include "confdefs.h" #include <stdlib.h> int main() { strtof(0, 0); ; return 0; } EOF -if { (eval echo configure:22423: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:22477: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_strtof_use=yes else @@ -22445,12 +22499,12 @@ fi for ac_func in strtof do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:22449: checking for $ac_func" >&5 +echo "configure:22503: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 22454 "configure" +#line 22508 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -22473,7 +22527,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:22477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:22531: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -22502,12 +22556,12 @@ done for ac_func in drand48 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:22506: checking for $ac_func" >&5 +echo "configure:22560: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 22511 "configure" +#line 22565 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -22530,7 +22584,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:22534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:22588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -22564,7 +22618,7 @@ done echo $ac_n "checking for isatty declaration""... $ac_c" 1>&6 -echo "configure:22568: checking for isatty declaration" >&5 +echo "configure:22622: checking for isatty declaration" >&5 if test x${glibcpp_cv_func_isatty_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_isatty_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -22579,14 +22633,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 22583 "configure" +#line 22637 "configure" #include "confdefs.h" #include <unistd.h> int main() { isatty(0); ; return 0; } EOF -if { (eval echo configure:22590: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:22644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_isatty_use=yes else @@ -22612,12 +22666,12 @@ fi for ac_func in isatty do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:22616: checking for $ac_func" >&5 +echo "configure:22670: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 22621 "configure" +#line 22675 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -22640,7 +22694,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:22644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:22698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -22672,17 +22726,17 @@ done ac_safe=`echo "locale.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for locale.h""... $ac_c" 1>&6 -echo "configure:22676: checking for locale.h" >&5 +echo "configure:22730: checking for locale.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 22681 "configure" +#line 22735 "configure" #include "confdefs.h" #include <locale.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:22686: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:22740: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -22700,19 +22754,19 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:22704: checking for LC_MESSAGES" >&5 +echo "configure:22758: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'ac_cv_val_LC_MESSAGES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 22709 "configure" +#line 22763 "configure" #include "confdefs.h" #include <locale.h> int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:22716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:22770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_val_LC_MESSAGES=yes else @@ -22739,7 +22793,7 @@ fi cat > conftest.$ac_ext <<EOF -#line 22743 "configure" +#line 22797 "configure" #include "confdefs.h" #include <setjmp.h> @@ -22748,7 +22802,7 @@ int main() { sigjmp_buf env; while (! sigsetjmp (env, 1)) siglongjmp (env, 1); ; return 0; } EOF -if { (eval echo configure:22752: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:22806: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF #define HAVE_SIGSETJMP 1 @@ -22765,17 +22819,17 @@ rm -f conftest* do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:22769: checking for $ac_hdr" >&5 +echo "configure:22823: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 22774 "configure" +#line 22828 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:22779: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:22833: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -22804,12 +22858,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:22808: checking for $ac_func" >&5 +echo "configure:22862: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 22813 "configure" +#line 22867 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -22832,7 +22886,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:22836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:22890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -22857,7 +22911,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:22861: checking for working mmap" >&5 +echo "configure:22915: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -22865,7 +22919,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <<EOF -#line 22869 "configure" +#line 22923 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. @@ -23018,7 +23072,7 @@ main() } EOF -if { (eval echo configure:23022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:23076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -23049,17 +23103,17 @@ fi do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:23053: checking for $ac_hdr" >&5 +echo "configure:23107: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 23058 "configure" +#line 23112 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:23063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:23117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -23092,7 +23146,7 @@ done # Can't do these in a loop, else the resulting syntax is wrong. cat > conftest.$ac_ext <<EOF -#line 23096 "configure" +#line 23150 "configure" #include "confdefs.h" #include <unistd.h> #include <sys/time.h> @@ -23102,7 +23156,7 @@ int main() { int f = RLIMIT_DATA ; ; return 0; } EOF -if { (eval echo configure:23106: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:23160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_mresult=1 else @@ -23119,7 +23173,7 @@ EOF cat > conftest.$ac_ext <<EOF -#line 23123 "configure" +#line 23177 "configure" #include "confdefs.h" #include <unistd.h> #include <sys/time.h> @@ -23129,7 +23183,7 @@ int main() { int f = RLIMIT_RSS ; ; return 0; } EOF -if { (eval echo configure:23133: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:23187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_mresult=1 else @@ -23146,7 +23200,7 @@ EOF cat > conftest.$ac_ext <<EOF -#line 23150 "configure" +#line 23204 "configure" #include "confdefs.h" #include <unistd.h> #include <sys/time.h> @@ -23156,7 +23210,7 @@ int main() { int f = RLIMIT_VMEM ; ; return 0; } EOF -if { (eval echo configure:23160: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:23214: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_mresult=1 else @@ -23173,7 +23227,7 @@ EOF cat > conftest.$ac_ext <<EOF -#line 23177 "configure" +#line 23231 "configure" #include "confdefs.h" #include <unistd.h> #include <sys/time.h> @@ -23183,7 +23237,7 @@ int main() { int f = RLIMIT_AS ; ; return 0; } EOF -if { (eval echo configure:23187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:23241: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_mresult=1 else @@ -23205,7 +23259,7 @@ EOF else cat > conftest.$ac_ext <<EOF -#line 23209 "configure" +#line 23263 "configure" #include "confdefs.h" #include <unistd.h> #include <sys/time.h> @@ -23215,7 +23269,7 @@ int main() { struct rlimit r; setrlimit(0, &r); ; return 0; } EOF -if { (eval echo configure:23219: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:23273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_setrlimit=yes else @@ -23231,7 +23285,7 @@ fi fi echo $ac_n "checking for testsuite memory limit support""... $ac_c" 1>&6 -echo "configure:23235: checking for testsuite memory limit support" >&5 +echo "configure:23289: checking for testsuite memory limit support" >&5 if test $setrlimit_have_headers = yes && test $ac_setrlimit = yes; then ac_mem_limits=yes cat >> confdefs.h <<\EOF @@ -23247,7 +23301,7 @@ EOF # Look for setenv, so that extended locale tests can be performed. echo $ac_n "checking for setenv declaration""... $ac_c" 1>&6 -echo "configure:23251: checking for setenv declaration" >&5 +echo "configure:23305: checking for setenv declaration" >&5 if test x${glibcpp_cv_func_setenv_use+set} != xset; then if eval "test \"`echo '$''{'glibcpp_cv_func_setenv_use'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -23262,14 +23316,14 @@ ac_link='${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftes cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext <<EOF -#line 23266 "configure" +#line 23320 "configure" #include "confdefs.h" #include <stdlib.h> int main() { setenv(0, 0, 0); ; return 0; } EOF -if { (eval echo configure:23273: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:23327: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* glibcpp_cv_func_setenv_use=yes else @@ -23295,12 +23349,12 @@ fi for ac_func in setenv do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:23299: checking for $ac_func" >&5 +echo "configure:23353: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 23304 "configure" +#line 23358 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -23323,7 +23377,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:23327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:23381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -23394,18 +23448,18 @@ fi # Check to see if libgcc_s exists, indicating that shared libgcc is possible. if test $enable_symvers != no; then echo $ac_n "checking for shared libgcc""... $ac_c" 1>&6 -echo "configure:23398: checking for shared libgcc" >&5 +echo "configure:23452: checking for shared libgcc" >&5 ac_save_CFLAGS="$CFLAGS" CFLAGS=' -lgcc_s' cat > conftest.$ac_ext <<EOF -#line 23402 "configure" +#line 23456 "configure" #include "confdefs.h" int main() { return 0 ; return 0; } EOF -if { (eval echo configure:23409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:23463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* glibcpp_shared_libgcc=yes else @@ -23440,14 +23494,14 @@ if test $enable_symvers = yes ; then echo 'FOO { global: f[a-z]o; local: *; };' > conftest.map cat > conftest.$ac_ext <<EOF -#line 23444 "configure" +#line 23498 "configure" #include "confdefs.h" int foo; int main() { ; return 0; } EOF -if { (eval echo configure:23451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:23505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* enable_symvers=gnu else @@ -23493,7 +23547,7 @@ else GLIBCPP_BUILD_VERSIONED_SHLIB_FALSE= fi echo $ac_n "checking versioning on shared library symbols""... $ac_c" 1>&6 -echo "configure:23497: checking versioning on shared library symbols" >&5 +echo "configure:23551: checking versioning on shared library symbols" >&5 echo "$ac_t""$enable_symvers" 1>&6 @@ -23580,7 +23634,7 @@ glibcpp_prefixdir=${prefix} # Process the option --with-gxx-include-dir=<path to include-files directory> echo $ac_n "checking for --with-gxx-include-dir""... $ac_c" 1>&6 -echo "configure:23584: checking for --with-gxx-include-dir" >&5 +echo "configure:23638: checking for --with-gxx-include-dir" >&5 # Check whether --with-gxx-include-dir or --without-gxx-include-dir was given. if test "${with_gxx_include_dir+set}" = set; then withval="$with_gxx_include_dir" @@ -23604,7 +23658,7 @@ echo "$ac_t""$gxx_include_dir" 1>&6 # Process the option "--enable-version-specific-runtime-libs" echo $ac_n "checking for --enable-version-specific-runtime-libs""... $ac_c" 1>&6 -echo "configure:23608: checking for --enable-version-specific-runtime-libs" >&5 +echo "configure:23662: checking for --enable-version-specific-runtime-libs" >&5 # Check whether --enable-version-specific-runtime-libs or --disable-version-specific-runtime-libs was given. if test "${enable_version_specific_runtime_libs+set}" = set; then enableval="$enable_version_specific_runtime_libs" @@ -23642,15 +23696,16 @@ if test x"$glibcpp_toolexecdir" = x"no"; then if test -n "$with_cross_host" && test x"$with_cross_host" != x"no"; then glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)' - glibcpp_toolexeclibdir='$(toolexecdir)/lib$(MULTISUBDIR)' + glibcpp_toolexeclibdir='$(toolexecdir)/lib' else glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)' - glibcpp_toolexeclibdir='$(libdir)$(MULTISUBDIR)' + glibcpp_toolexeclibdir='$(libdir)' fi + glibcpp_toolexeclibdir=$glibcpp_toolexeclibdir/`$CC -print-multi-os-directory` fi echo $ac_n "checking for install location""... $ac_c" 1>&6 -echo "configure:23654: checking for install location" >&5 +echo "configure:23709: checking for install location" >&5 echo "$ac_t""$gxx_include_dir" 1>&6 @@ -23914,6 +23969,7 @@ s%@USE_NLS@%$USE_NLS%g s%@CLOCALE_H@%$CLOCALE_H%g s%@CCODECVT_H@%$CCODECVT_H%g s%@CMESSAGES_H@%$CMESSAGES_H%g +s%@CTIME_H@%$CTIME_H%g s%@C_INCLUDE_DIR@%$C_INCLUDE_DIR%g s%@GLIBCPP_C_HEADERS_C_TRUE@%$GLIBCPP_C_HEADERS_C_TRUE%g s%@GLIBCPP_C_HEADERS_C_FALSE@%$GLIBCPP_C_HEADERS_C_FALSE%g @@ -23928,6 +23984,8 @@ s%@SECTION_FLAGS@%$SECTION_FLAGS%g s%@SECTION_LDFLAGS@%$SECTION_LDFLAGS%g s%@OPT_LDFLAGS@%$OPT_LDFLAGS%g s%@LIBMATHOBJS@%$LIBMATHOBJS%g +s%@GLIBCPP_TEST_WCHAR_T_TRUE@%$GLIBCPP_TEST_WCHAR_T_TRUE%g +s%@GLIBCPP_TEST_WCHAR_T_FALSE@%$GLIBCPP_TEST_WCHAR_T_FALSE%g s%@WERROR@%$WERROR%g s%@baseline_file@%$baseline_file%g s%@GLIBCPP_BUILD_ABI_CHECK_TRUE@%$GLIBCPP_BUILD_ABI_CHECK_TRUE%g diff --git a/libstdc++-v3/docs/doxygen/tables.html b/libstdc++-v3/docs/doxygen/tables.html index 7c340529352..07e9f3e4b7b 100644 --- a/libstdc++-v3/docs/doxygen/tables.html +++ b/libstdc++-v3/docs/doxygen/tables.html @@ -31,10 +31,6 @@ are also noted or incorporated. </p> -<p class="smallertext">This will probably be incomplete for a while because -filling out the tables is mind-frothingly boring. Also, the HTML table -rendering is ugly. (Update: mozilla 0.9.9 looks MUCH better.)</p> - <hr /> <a name="65"><p> diff --git a/libstdc++-v3/docs/doxygen/user.cfg.in b/libstdc++-v3/docs/doxygen/user.cfg.in index 966d6e855bb..3d1f77ab923 100644 --- a/libstdc++-v3/docs/doxygen/user.cfg.in +++ b/libstdc++-v3/docs/doxygen/user.cfg.in @@ -1,4 +1,4 @@ -# Doxyfile 1.2.18 +# Doxyfile 1.3-rc2 # This file describes the settings to be used by the documentation system # doxygen (www.doxygen.org) for a project @@ -43,12 +43,11 @@ OUTPUT_DIRECTORY = @outdir@ # documentation generated by doxygen is written. Doxygen will use this # information to generate all constant output in the proper language. # The default language is English, other supported languages are: -# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, -# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en -# (Japanese with english messages), Korean, Norwegian, Polish, Portuguese, +# Brazilian, Catalan, Chinese, Chinese-Traditional, Croatian, Czech, Danish, Dutch, +# Finnish, French, German, Greek, Hungarian, Italian, Japanese, Japanese-en +# (Japanese with english messages), Korean, Norwegian, Polish, Portuguese, # Romanian, Russian, Serbian, Slovak, Slovene, Spanish, Swedish and Ukrainian. - OUTPUT_LANGUAGE = English # If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in @@ -68,8 +67,8 @@ EXTRACT_PRIVATE = YES EXTRACT_STATIC = YES -# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) -# defined locally in source files will be included in the documentation. +# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) +# defined locally in source files will be included in the documentation. # If set to NO only classes defined in header files are included. EXTRACT_LOCAL_CLASSES = NO @@ -89,13 +88,20 @@ HIDE_UNDOC_MEMBERS = YES HIDE_UNDOC_CLASSES = YES -# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all -# friend (class|struct|union) declarations. -# If set to NO (the default) these declarations will be included in the +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all +# friend (class|struct|union) declarations. +# If set to NO (the default) these declarations will be included in the # documentation. HIDE_FRIEND_COMPOUNDS = NO +# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any +# documentation blocks found inside the body of a function. +# If set to NO (the default) these blocks will be appended to the +# function's detailed documentation block. + +HIDE_IN_BODY_DOCS = NO + # If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will # include brief member descriptions after the members that are listed in # the file and class documentation (similar to JavaDoc). @@ -104,7 +110,7 @@ HIDE_FRIEND_COMPOUNDS = NO BRIEF_MEMBER_DESC = YES # If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend -# the brief description of a member or function before the detailed description. +# the brief description of a member or function before the detailed description. # Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the # brief descriptions will be completely suppressed. @@ -116,9 +122,9 @@ REPEAT_BRIEF = YES ALWAYS_DETAILED_SEC = YES -# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited -# members of a class in the documentation of that class as if those members were -# ordinary class members. Constructors, destructors and assignment operators of +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all inherited +# members of a class in the documentation of that class as if those members were +# ordinary class members. Constructors, destructors and assignment operators of # the base classes will not be shown. INLINE_INHERITED_MEMB = NO @@ -144,12 +150,6 @@ STRIP_FROM_PATH = INTERNAL_DOCS = NO -# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct -# doxygen to hide any special comment blocks from generated source code -# fragments. Normal C and C++ comments will always remain visible. - -STRIP_CODE_COMMENTS = YES - # If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate # file names in lower case letters. If set to YES upper case letters are also # allowed. This is useful if you have classes or files whose names only differ @@ -190,17 +190,17 @@ SHOW_INCLUDE_FILES = YES JAVADOC_AUTOBRIEF = NO -# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen -# treat a multi-line C++ special comment block (i.e. a block of //! or /// -# comments) as a brief description. This used to be the default behaviour. -# The new default is to treat a multi-line C++ comment block as a detailed +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen +# treat a multi-line C++ special comment block (i.e. a block of //! or /// +# comments) as a brief description. This used to be the default behaviour. +# The new default is to treat a multi-line C++ comment block as a detailed # description. Set this tag to YES if you prefer the old behaviour instead. MULTILINE_CPP_IS_BRIEF = YES -# If the DETAILS_AT_TOP tag is set to YES then Doxygen +# If the DETAILS_AT_TOP tag is set to YES then Doxygen # will output the detailed description near the top, like JavaDoc. -# If set to NO, the detailed description appears after the member +# If set to NO, the detailed description appears after the member # documentation. DETAILS_AT_TOP = NO @@ -253,8 +253,8 @@ GENERATE_TESTLIST = NO GENERATE_BUGLIST = YES -# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or -# disable (NO) the deprecated list. This list is created by putting +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or +# disable (NO) the deprecated list. This list is created by putting # \deprecated commands in the documentation. GENERATE_DEPRECATEDLIST= YES @@ -267,7 +267,7 @@ GENERATE_DEPRECATEDLIST= YES # You can put \n's in the value part of an alias to insert newlines. ALIASES = "doctodo=@todo\nDoc me! See docs/doxygen/TODO and http://gcc.gnu.org/ml/libstdc++/2002-02/msg00003.html for more." \ -"isiosfwd=One of the @link s27_2_iosfwd I/O forward declarations @endlink" + "isiosfwd=One of the @link s27_2_iosfwd I/O forward declarations @endlink" # The ENABLED_SECTIONS tag can be used to enable conditional # documentation sections, marked by \if sectionname ... \endif. @@ -291,9 +291,9 @@ MAX_INITIALIZER_LINES = 0 OPTIMIZE_OUTPUT_FOR_C = NO -# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources -# only. Doxygen will then generate output that is more tailored for Java. -# For instance namespaces will be presented as packages, qualified scopes +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java sources +# only. Doxygen will then generate output that is more tailored for Java. +# For instance namespaces will be presented as packages, qualified scopes # will look different, etc. OPTIMIZE_OUTPUT_JAVA = NO @@ -325,6 +325,13 @@ WARNINGS = NO WARN_IF_UNDOCUMENTED = NO +# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some +# parameters in a documented function, or documenting parameters that +# don't exist or using markup commands wrongly. + +WARN_IF_DOC_ERROR = NO + # The WARN_FORMAT tag determines the format of the warning messages that # doxygen can produce. The string should contain the $file, $line, and $text # tags, which will be replaced by the file and line number from which the @@ -375,9 +382,10 @@ RECURSIVE = YES # excluded from the INPUT source files. This way you can easily exclude a # subdirectory from a directory tree whose root is specified with the INPUT tag. -EXCLUDE = Makefile CVS +EXCLUDE = Makefile \ + CVS -# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories +# The EXCLUDE_SYMLINKS tag can be used select whether or not files or directories # that are symbolic links (a Unix filesystem feature) are excluded from the input. EXCLUDE_SYMLINKS = NO @@ -387,8 +395,8 @@ EXCLUDE_SYMLINKS = NO # certain files from those directories. EXCLUDE_PATTERNS = CVS \ - stamp-* \ - Makefile + stamp-* \ + Makefile # The EXAMPLE_PATH tag can be used to specify one or more files or # directories that contain example code fragments that are included (see @@ -445,6 +453,12 @@ SOURCE_BROWSER = YES INLINE_SOURCES = NO +# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct +# doxygen to hide any special comment blocks from generated source code +# fragments. Normal C and C++ comments will always remain visible. + +STRIP_CODE_COMMENTS = YES + # If the REFERENCED_BY_RELATION tag is set to YES (the default) # then for each documented function all documented # functions referencing it will be listed. @@ -533,19 +547,19 @@ HTML_ALIGN_MEMBERS = YES GENERATE_HTMLHELP = NO -# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can -# be used to specify the file name of the resulting .chm file. You -# can add a path in front of the file if the result should not be +# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can +# be used to specify the file name of the resulting .chm file. You +# can add a path in front of the file if the result should not be # written to the html output dir. -CHM_FILE = +CHM_FILE = -# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can -# be used to specify the location (absolute path including file name) of -# the HTML help compiler (hhc.exe). If non empty doxygen will try to run +# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can +# be used to specify the location (absolute path including file name) of +# the HTML help compiler (hhc.exe). If non empty doxygen will try to run # the html help compiler on the generated index.hhp. -HHC_LOCATION = +HHC_LOCATION = # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag # controls if a separate .chi index file is generated (YES) or that @@ -606,13 +620,13 @@ GENERATE_LATEX = NO LATEX_OUTPUT = latex -# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to -# be invoked. If left blank `latex' will be used as the default command name. +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. If left blank `latex' will be used as the default command name. LATEX_CMD_NAME = latex -# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to -# generate index for LaTeX. If left blank `makeindex' will be used as the +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to +# generate index for LaTeX. If left blank `makeindex' will be used as the # default command name. MAKEINDEX_CMD_NAME = makeindex @@ -723,10 +737,10 @@ MAN_OUTPUT = man MAN_EXTENSION = .3 -# If the MAN_LINKS tag is set to YES and Doxygen generates man output, -# then it will generate one additional man file for each entity -# documented in the real man page(s). These additional files -# only source the real man page, but without them the man command +# If the MAN_LINKS tag is set to YES and Doxygen generates man output, +# then it will generate one additional man file for each entity +# documented in the real man page(s). These additional files +# only source the real man page, but without them the man command # would be unable to find the correct page. The default is NO. MAN_LINKS = NO @@ -743,31 +757,64 @@ MAN_LINKS = NO GENERATE_XML = NO -# The XML_SCHEMA tag can be used to specify an XML schema, -# which can be used by a validating XML parser to check the +# The XML_SCHEMA tag can be used to specify an XML schema, +# which can be used by a validating XML parser to check the # syntax of the XML files. -XML_SCHEMA = +XML_SCHEMA = -# The XML_DTD tag can be used to specify an XML DTD, -# which can be used by a validating XML parser to check the +# The XML_DTD tag can be used to specify an XML DTD, +# which can be used by a validating XML parser to check the # syntax of the XML files. -XML_DTD = +XML_DTD = #--------------------------------------------------------------------------- # configuration options for the AutoGen Definitions output #--------------------------------------------------------------------------- -# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will -# generate an AutoGen Definitions (see autogen.sf.net) file -# that captures the structure of the code including all -# documentation. Note that this feature is still experimental +# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will +# generate an AutoGen Definitions (see autogen.sf.net) file +# that captures the structure of the code including all +# documentation. Note that this feature is still experimental # and incomplete at the moment. GENERATE_AUTOGEN_DEF = NO #--------------------------------------------------------------------------- +# configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES Doxygen will +# generate a Perl module file that captures the structure of +# the code including all documentation. Note that this +# feature is still experimental and incomplete at the +# moment. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES Doxygen will generate +# the necessary Makefile rules, Perl scripts and LaTeX code to be able +# to generate PDF and DVI output from the Perl module output. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be +# nicely formatted so it can be parsed by a human reader. This is useful +# if you want to understand what is going on. On the other hand, if this +# tag is set to NO the size of the Perl module output will be much smaller +# and Perl will parse it just the same. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file +# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. +# This is useful so different doxyrules.make files included by the same +# Makefile don't overwrite each other's variables. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- # Configuration options related to the preprocessor #--------------------------------------------------------------------------- @@ -860,8 +907,8 @@ GENERATE_TAGFILE = ALLEXTERNALS = YES -# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed -# in the modules index. If set to NO, only the current project's groups will +# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will # be listed. EXTERNAL_GROUPS = YES @@ -883,8 +930,8 @@ PERL_PATH = /usr/bin/perl CLASS_DIAGRAMS = YES -# If set to YES, the inheritance and collaboration graphs will hide -# inheritance and usage relations if the target is undocumented +# If set to YES, the inheritance and collaboration graphs will hide +# inheritance and usage relations if the target is undocumented # or is not a class. HIDE_UNDOC_RELATIONS = YES @@ -934,7 +981,7 @@ INCLUDED_BY_GRAPH = YES GRAPHICAL_HIERARCHY = YES -# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images # generated by dot. Possible values are png, jpg, or gif # If left blank png will be used. @@ -1022,6 +1069,3 @@ BIN_ABSPATH = /usr/local/bin/ # the documentation for these projects as well. EXT_DOC_PATHS = - -### End of file. - diff --git a/libstdc++-v3/docs/html/17_intro/howto.html b/libstdc++-v3/docs/html/17_intro/howto.html index 9d10becfad4..9d9bbddb130 100644 --- a/libstdc++-v3/docs/html/17_intro/howto.html +++ b/libstdc++-v3/docs/html/17_intro/howto.html @@ -189,6 +189,9 @@ <p>For each entry, we give the section number of the standard, when applicable. This list is probably incomplet and inkorrekt. </p> + <p><strong>[1.9]/11 #3</strong> If <code>isatty(3)</code> is true, then + interactive stream support is implied. + </p> <p><strong>[17.4.4.5]</strong> Non-reentrant functions are probably best discussed in the various sections on multithreading (see above). </p> diff --git a/libstdc++-v3/docs/html/17_intro/porting.html b/libstdc++-v3/docs/html/17_intro/porting.html index c28f89f407f..7712c4434b4 100644 --- a/libstdc++-v3/docs/html/17_intro/porting.html +++ b/libstdc++-v3/docs/html/17_intro/porting.html @@ -2,60 +2,84 @@ <head> <title>Porting libstdc++-v3</title> <meta http-equiv="Content-Type" content="text/html"> -<meta name=description content="Porting libstdc++-v3"> -<meta name=generator content="makeinfo 4.2"> -<link href="http://www.gnu.org/software/texinfo/" rel=generator-home> +<meta name="description" content="Porting libstdc++-v3"> +<meta name="generator" content="makeinfo 4.3"> +<link href="http://www.gnu.org/software/texinfo/" rel="generator-home"> +<!-- +Copyright © 2000, 2001, 2002 Free Software Foundation, Inc. + + <p>Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU Free Documentation License, Version 1.1 or +any later version published by the Free Software Foundation; with the +Invariant Sections being "GNU General Public License", the Front-Cover +texts being (a) (see below), and with the Back-Cover Texts being (b) +(see below). A copy of the license is included in the section entitled +"GNU Free Documentation License". + + <p>(a) The FSF's Front-Cover Text is: + + <p>A GNU Manual + + <p>(b) The FSF's Back-Cover Text is: + + <p>You have freedom to copy and modify this GNU Manual, like GNU + software. Copies published by the Free Software Foundation raise + funds for GNU development.--> </head> <body> -<h1>Porting libstdc++-v3</h1> +<h1 class="settitle">Porting libstdc++-v3</h1> +<div class="node"> <p><hr> Node:<a name="Top">Top</a>, -Next:<a rel=next accesskey=n href="#Operating%20system">Operating system</a>, -Up:<a rel=up accesskey=u href="#dir">(dir)</a> +Next:<a rel="next" accesskey="n" href="#Operating%20system">Operating system</a>, +Up:<a rel="up" accesskey="u" href="#dir">(dir)</a> <br> +</div> -<h2>Porting libstdc++-v3</h2> +<h2 class="unnumbered">Porting libstdc++-v3</h2> -<p>This document explains how to port libstdc++-v3 (the GNU C++ library) to + <p>This document explains how to port libstdc++-v3 (the GNU C++ library) to a new target. -<p>In order to make the GNU C++ library (libstdc++-v3) work with a new + <p>In order to make the GNU C++ library (libstdc++-v3) work with a new target, you must edit some configuration files and provide some new header files. Unless this is done, libstdc++-v3 will use generic settings which may not be correct for your target; even if they are correct, they will likely be inefficient. -<p>Before you get started, make sure that you have a working C library on + <p>Before you get started, make sure that you have a working C library on your target. The C library need not precisely comply with any particular standard, but should generally conform to the requirements imposed by the ANSI/ISO standard. -<p>In addition, you should try to verify that the C++ compiler generally + <p>In addition, you should try to verify that the C++ compiler generally works. It is difficult to test the C++ compiler without a working library, but you should at least try some minimal test cases. -<p>Here are the primary steps required to port the library: + <p>Here are the primary steps required to port the library: -<ul> -<li><a accesskey=1 href="#Operating%20system">Operating system</a>: Configuring for your operating system. -<li><a accesskey=2 href="#CPU">CPU</a>: Configuring for your processor chip. -<li><a accesskey=3 href="#Character%20types">Character types</a>: Implementing character classification. -<li><a accesskey=4 href="#Thread%20safety">Thread safety</a>: Implementing atomic operations. -<li><a accesskey=5 href="#Numeric%20limits">Numeric limits</a>: Implementing numeric limits. -<li><a accesskey=6 href="#Libtool">Libtool</a>: Using libtool. -<li><a accesskey=7 href="#GNU%20Free%20Documentation%20License">GNU Free Documentation License</a>: How you can copy and share this manual. +<ul class="menu"> +<li><a accesskey="1" href="#Operating%20system">Operating system</a>: Configuring for your operating system. +<li><a accesskey="2" href="#CPU">CPU</a>: Configuring for your processor chip. +<li><a accesskey="3" href="#Character%20types">Character types</a>: Implementing character classification. +<li><a accesskey="4" href="#Thread%20safety">Thread safety</a>: Implementing atomic operations. +<li><a accesskey="5" href="#Numeric%20limits">Numeric limits</a>: Implementing numeric limits. +<li><a accesskey="6" href="#Libtool">Libtool</a>: Using libtool. +<li><a accesskey="7" href="#GNU%20Free%20Documentation%20License">GNU Free Documentation License</a>: How you can copy and share this manual. </ul> +<div class="node"> <p><hr> Node:<a name="Operating%20system">Operating system</a>, -Next:<a rel=next accesskey=n href="#CPU">CPU</a>, -Previous:<a rel=previous accesskey=p href="#Top">Top</a>, -Up:<a rel=up accesskey=u href="#Top">Top</a> +Next:<a rel="next" accesskey="n" href="#CPU">CPU</a>, +Previous:<a rel="previous" accesskey="p" href="#Top">Top</a>, +Up:<a rel="up" accesskey="u" href="#Top">Top</a> <br> +</div> -<h2>Operating system</h2> +<h2 class="chapter">Operating system</h2> -<p>If you are porting to a new operating system (as opposed to a new chip + <p>If you are porting to a new operating system (as opposed to a new chip using an existing operating system), you will need to create a new directory in the <code>config/os</code> hierarchy. For example, the IRIX configuration files are all in <code>config/os/irix</code>. There is no set @@ -68,7 +92,7 @@ directory. The important information is that there needs to be a directory under <code>config/os</code> to store the files for your operating system. -<p>You might have to change the <code>configure.target</code> file to ensure that + <p>You might have to change the <code>configure.target</code> file to ensure that your new directory is activated. Look for the switch statement that sets <code>os_include_dir</code>, and add a pattern to handle your operating system if the default will not suffice. The switch statement switches on only @@ -76,17 +100,17 @@ the OS portion of the standard target triplet; e.g., the <code>solaris2.8</code> in <code>sparc-sun-solaris2.8</code>. If the new directory is named after the OS portion of the triplet (the default), then nothing needs to be changed. -<p>The first file to create in this directory, should be called + <p>The first file to create in this directory, should be called <code>os_defines.h</code>. This file contains basic macro definitions that are required to allow the C++ library to work with your C library. This file should provide macro definitions for <code>__off_t</code>, <code>__off64_t</code>, and <code>__ssize_t</code>. Typically, this just looks like: -<br><pre>#define __off_t off_t -#define __off64_t off64_t -#define __ssize_t ssize_t -</pre> +<pre class="example"> #define __off_t off_t + #define __off64_t off64_t + #define __ssize_t ssize_t + </pre> <p>You don't have to provide these definitions if your system library already defines these types - but the only library known to provide @@ -95,7 +119,7 @@ provide these macros. Note that this file does not have to include a header file that defines <code>off_t</code>, or the other types; you simply have to provide the macros. -<p>In addition, several libstdc++-v3 source files unconditionally define + <p>In addition, several libstdc++-v3 source files unconditionally define the macro <code>_POSIX_SOURCE</code>. On many systems, defining this macro causes large portions of the C library header files to be eliminated at preprocessing time. Therefore, you may have to <code>#undef</code> this @@ -110,71 +134,75 @@ need to define. You will need to add them to the target. It will not work to simply define these macros in <code>os_defines.h</code>. -<p>At this time, there is one libstdc++-v3-specific macro which may be + <p>At this time, there is one libstdc++-v3-specific macro which may be defined. <code>_G_USING_THUNKS</code> may be defined to 0 to express that the port doesn't use thunks (although it is unclear that this is still useful since libio support isn't currently working and the g++ v3 ABI invalidates the assumption that some ports don't use thunks). -<p>Finally, you should bracket the entire file in an include-guard, like + <p>Finally, you should bracket the entire file in an include-guard, like this: -<br><pre>#ifndef _GLIBCPP_OS_DEFINES -#define _GLIBCPP_OS_DEFINES -... -#endif -</pre> +<pre class="example"> #ifndef _GLIBCPP_OS_DEFINES + #define _GLIBCPP_OS_DEFINES + ... + #endif + </pre> -<p>We recommend copying an existing <code>os_defines.h</code> to use as a + <p>We recommend copying an existing <code>os_defines.h</code> to use as a starting point. +<div class="node"> <p><hr> Node:<a name="CPU">CPU</a>, -Next:<a rel=next accesskey=n href="#Character%20types">Character types</a>, -Previous:<a rel=previous accesskey=p href="#Operating%20system">Operating system</a>, -Up:<a rel=up accesskey=u href="#Top">Top</a> +Next:<a rel="next" accesskey="n" href="#Character%20types">Character types</a>, +Previous:<a rel="previous" accesskey="p" href="#Operating%20system">Operating system</a>, +Up:<a rel="up" accesskey="u" href="#Top">Top</a> <br> +</div> -<h2>CPU</h2> +<h2 class="chapter">CPU</h2> -<p>If you are porting to a new chip (as opposed to a new operating system + <p>If you are porting to a new chip (as opposed to a new operating system running on an existing chip), you will need to create a new directory in the <code>config/cpu</code> hierarchy. Much like the <a href="#Operating%20system">Operating system</a> setup, there are no strict rules on how to organize the CPU configuration directory, but careful naming choices will allow the configury to find your setup files without explicit help. -<p>We recommend that for a target triplet <code><CPU>-<vendor>-<OS></code>, you + <p>We recommend that for a target triplet <code><CPU>-<vendor>-<OS></code>, you name your configuration directory <code>config/cpu/<CPU></code>. If you do this, the configury will find the directory itself. Otherwise you will need to edit the <code>configure.target</code> file and, in the switch statement that sets <code>cpu_include_dir</code>, add a pattern to handle your chip. -<p>Note that some chip families share a single configuration directory, for + <p>Note that some chip families share a single configuration directory, for example, <code>alpha</code>, <code>alphaev5</code>, and <code>alphaev6</code> all use the <code>config/cpu/alpha</code> directory, and there is an entry in the <code>configure.target</code> switch statement to handle this. -<p>The <code>cpu_include_dir</code> sets default locations for the files controlling + <p>The <code>cpu_include_dir</code> sets default locations for the files controlling <a href="#Thread%20safety">Thread safety</a> and <a href="#Numeric%20limits">Numeric limits</a>, if the defaults are not appropriate for your chip. +<div class="node"> <p><hr> Node:<a name="Character%20types">Character types</a>, -Next:<a rel=next accesskey=n href="#Thread%20safety">Thread safety</a>, -Previous:<a rel=previous accesskey=p href="#CPU">CPU</a>, -Up:<a rel=up accesskey=u href="#Top">Top</a> +Next:<a rel="next" accesskey="n" href="#Thread%20safety">Thread safety</a>, +Previous:<a rel="previous" accesskey="p" href="#CPU">CPU</a>, +Up:<a rel="up" accesskey="u" href="#Top">Top</a> <br> +</div> -<h2>Character types</h2> +<h2 class="chapter">Character types</h2> -<p>The library requires that you provide three header files to implement + <p>The library requires that you provide three header files to implement character classification, analogous to that provided by the C libraries <code><ctype.h></code> header. You can model these on the files provided in <code>config/os/generic</code>. However, these files will almost certainly need some modification. -<p>The first file to write is <code>ctype_base.h</code>. This file provides + <p>The first file to write is <code>ctype_base.h</code>. This file provides some very basic information about character classification. The libstdc++-v3 library assumes that your C library implements <code><ctype.h></code> by using a table (indexed by character code) containing integers, where each of @@ -184,33 +212,33 @@ file gives the type of the integer, and the values of the various bit masks. You will have to peer at your own <code><ctype.h></code> to figure out how to define the values required by this file. -<p>The <code>ctype_base.h</code> header file does not need include guards. + <p>The <code>ctype_base.h</code> header file does not need include guards. It should contain a single <code>struct</code> definition called <code>ctype_base</code>. This <code>struct</code> should contain two type declarations, and one enumeration declaration, like this example, taken from the IRIX configuration: -<br><pre>struct ctype_base -{ - typedef unsigned int mask; - typedef int* __to_type; - - enum - { - space = _ISspace, - print = _ISprint, - cntrl = _IScntrl, - upper = _ISupper, - lower = _ISlower, - alpha = _ISalpha, - digit = _ISdigit, - punct = _ISpunct, - xdigit = _ISxdigit, - alnum = _ISalnum, - graph = _ISgraph - }; -}; -</pre> +<pre class="example"> struct ctype_base + { + typedef unsigned int mask; + typedef int* __to_type; + + enum + { + space = _ISspace, + print = _ISprint, + cntrl = _IScntrl, + upper = _ISupper, + lower = _ISlower, + alpha = _ISalpha, + digit = _ISdigit, + punct = _ISpunct, + xdigit = _ISxdigit, + alnum = _ISalnum, + graph = _ISgraph + }; + }; + </pre> <p>The <code>mask</code> type is the type of the elements in the table. If your C library uses a table to map lower-case numbers to upper-case numbers, @@ -220,29 +248,29 @@ penalty, or if your library doesn't implement <code>toupper</code> and <code>tolower</code> in this way, you can pick any pointer-to-integer type, but you must still define the type. -<p>The enumeration should give definitions for all the values in the above + <p>The enumeration should give definitions for all the values in the above example, using the values from your native <code><ctype.h></code>. They can be given symbolically (as above), or numerically, if you prefer. You do not have to include <code><ctype.h></code> in this header; it will always be included before <code>ctype_base.h</code> is included. -<p>The next file to write is <code>ctype_noninline.h</code>, which also does + <p>The next file to write is <code>ctype_noninline.h</code>, which also does not require include guards. This file defines a few member functions that will be included in <code>include/bits/locale_facets.h</code>. The first function that must be written is the <code>ctype<char>::ctype</code> constructor. Here is the IRIX example: -<br><pre>ctype<char>::ctype(const mask* __table = 0, bool __del = false, - size_t __refs = 0) - : _Ctype_nois<char>(__refs), _M_del(__table != 0 && __del), - _M_toupper(NULL), - _M_tolower(NULL), - _M_ctable(NULL), - _M_table(!__table - ? (const mask*) (__libc_attr._ctype_tbl->_class + 1) - : __table) - { } -</pre> +<pre class="example"> ctype<char>::ctype(const mask* __table = 0, bool __del = false, + size_t __refs = 0) + : _Ctype_nois<char>(__refs), _M_del(__table != 0 && __del), + _M_toupper(NULL), + _M_tolower(NULL), + _M_ctable(NULL), + _M_table(!__table + ? (const mask*) (__libc_attr._ctype_tbl->_class + 1) + : __table) + { } + </pre> <p>There are two parts of this that you might choose to alter. The first, and most important, is the line involving <code>__libc_attr</code>. That is @@ -253,140 +281,142 @@ operating system's tables to map upper-case letters to lower-case, and vice versa, you should initialize <code>_M_toupper</code> and <code>_M_tolower</code> with those tables, in similar fashion. -<p>Now, you have to write two functions to convert from upper-case to + <p>Now, you have to write two functions to convert from upper-case to lower-case, and vice versa. Here are the IRIX versions: -<br><pre>char -ctype<char>::do_toupper(char __c) const -{ return _toupper(__c); } - -char -ctype<char>::do_tolower(char __c) const -{ return _tolower(__c); } -</pre> +<pre class="example"> char + ctype<char>::do_toupper(char __c) const + { return _toupper(__c); } + + char + ctype<char>::do_tolower(char __c) const + { return _tolower(__c); } + </pre> <p>Your C library provides equivalents to IRIX's <code>_toupper</code> and <code>_tolower</code>. If you initialized <code>_M_toupper</code> and <code>_M_tolower</code> above, then you could use those tables instead. -<p>Finally, you have to provide two utility functions that convert strings + <p>Finally, you have to provide two utility functions that convert strings of characters. The versions provided here will always work - but you could use specialized routines for greater performance if you have machinery to do that on your system: -<br><pre>const char* -ctype<char>::do_toupper(char* __low, const char* __high) const -{ - while (__low < __high) - { - *__low = do_toupper(*__low); - ++__low; - } - return __high; -} - -const char* -ctype<char>::do_tolower(char* __low, const char* __high) const -{ - while (__low < __high) - { - *__low = do_tolower(*__low); - ++__low; - } - return __high; -} -</pre> - -<p>You must also provide the <code>ctype_inline.h</code> file, which +<pre class="example"> const char* + ctype<char>::do_toupper(char* __low, const char* __high) const + { + while (__low < __high) + { + *__low = do_toupper(*__low); + ++__low; + } + return __high; + } + + const char* + ctype<char>::do_tolower(char* __low, const char* __high) const + { + while (__low < __high) + { + *__low = do_tolower(*__low); + ++__low; + } + return __high; + } + </pre> + + <p>You must also provide the <code>ctype_inline.h</code> file, which contains a few more functions. On most systems, you can just copy <code>config/os/generic/ctype_inline.h</code> and use it on your system. -<p>In detail, the functions provided test characters for particular + <p>In detail, the functions provided test characters for particular properties; they are analogous to the functions like <code>isalpha</code> and <code>islower</code> provided by the C library. -<p>The first function is implemented like this on IRIX: + <p>The first function is implemented like this on IRIX: -<br><pre>bool -ctype<char>:: -is(mask __m, char __c) const throw() -{ return (_M_table)[(unsigned char)(__c)] & __m; } -</pre> +<pre class="example"> bool + ctype<char>:: + is(mask __m, char __c) const throw() + { return (_M_table)[(unsigned char)(__c)] & __m; } + </pre> <p>The <code>_M_table</code> is the table passed in above, in the constructor. This is the table that contains the bitmasks for each character. The implementation here should work on all systems. -<p>The next function is: + <p>The next function is: -<br><pre>const char* -ctype<char>:: -is(const char* __low, const char* __high, mask* __vec) const throw() -{ - while (__low < __high) - *__vec++ = (_M_table)[(unsigned char)(*__low++)]; - return __high; -} -</pre> +<pre class="example"> const char* + ctype<char>:: + is(const char* __low, const char* __high, mask* __vec) const throw() + { + while (__low < __high) + *__vec++ = (_M_table)[(unsigned char)(*__low++)]; + return __high; + } + </pre> <p>This function is similar; it copies the masks for all the characters from <code>__low</code> up until <code>__high</code> into the vector given by <code>__vec</code>. -<p>The last two functions again are entirely generic: - -<br><pre>const char* -ctype<char>:: -scan_is(mask __m, const char* __low, const char* __high) const throw() -{ - while (__low < __high && !this->is(__m, *__low)) - ++__low; - return __low; -} - -const char* -ctype<char>:: -scan_not(mask __m, const char* __low, const char* __high) const throw() -{ - while (__low < __high && this->is(__m, *__low)) - ++__low; - return __low; -} -</pre> - + <p>The last two functions again are entirely generic: + +<pre class="example"> const char* + ctype<char>:: + scan_is(mask __m, const char* __low, const char* __high) const throw() + { + while (__low < __high && !this->is(__m, *__low)) + ++__low; + return __low; + } + + const char* + ctype<char>:: + scan_not(mask __m, const char* __low, const char* __high) const throw() + { + while (__low < __high && this->is(__m, *__low)) + ++__low; + return __low; + } + </pre> + +<div class="node"> <p><hr> Node:<a name="Thread%20safety">Thread safety</a>, -Next:<a rel=next accesskey=n href="#Numeric%20limits">Numeric limits</a>, -Previous:<a rel=previous accesskey=p href="#Character%20types">Character types</a>, -Up:<a rel=up accesskey=u href="#Top">Top</a> +Next:<a rel="next" accesskey="n" href="#Numeric%20limits">Numeric limits</a>, +Previous:<a rel="previous" accesskey="p" href="#Character%20types">Character types</a>, +Up:<a rel="up" accesskey="u" href="#Top">Top</a> <br> +</div> -<h2>Thread safety</h2> +<h2 class="chapter">Thread safety</h2> -<p>The C++ library string functionality requires a couple of atomic + <p>The C++ library string functionality requires a couple of atomic operations to provide thread-safety. If you don't take any special action, the library will use stub versions of these functions that are not thread-safe. They will work fine, unless your applications are multi-threaded. -<p>If you want to provide custom, safe, versions of these functions, there + <p>If you want to provide custom, safe, versions of these functions, there are two distinct approaches. One is to provide a version for your CPU, using assembly language constructs. The other is to use the thread-safety primitives in your operating system. In either case, you make a file called <code>atomicity.h</code>, and the variable <code>ATOMICITYH</code> must point to this file. -<p>If you are using the assembly-language approach, put this code in + <p>If you are using the assembly-language approach, put this code in <code>config/cpu/<chip>/atomicity.h</code>, where chip is the name of your processor (see <a href="#CPU">CPU</a>). No additional changes are necessary to locate the file in this case; <code>ATOMICITYH</code> will be set by default. -<p>If you are using the operating system thread-safety primitives approach, + <p>If you are using the operating system thread-safety primitives approach, you can also put this code in the same CPU directory, in which case no more work is needed to locate the file. For examples of this approach, see the <code>atomicity.h</code> file for IRIX or IA64. -<p>Alternatively, if the primitives are more closely related to the OS + <p>Alternatively, if the primitives are more closely related to the OS than they are to the CPU, you can put the <code>atomicity.h</code> file in the <a href="#Operating%20system">Operating system</a> directory instead. In this case, you must edit <code>configure.target</code>, and in the switch statement that handles @@ -394,120 +424,126 @@ operating systems, override the <code>ATOMICITYH</code> variable to point to the appropriate <code>os_include_dir</code>. For examples of this approach, see the <code>atomicity.h</code> file for AIX. -<p>With those bits out of the way, you have to actually write + <p>With those bits out of the way, you have to actually write <code>atomicity.h</code> itself. This file should be wrapped in an include guard named <code>_BITS_ATOMICITY_H</code>. It should define one type, and two functions. -<p>The type is <code>_Atomic_word</code>. Here is the version used on IRIX: + <p>The type is <code>_Atomic_word</code>. Here is the version used on IRIX: -<br><pre>typedef long _Atomic_word; -</pre> +<pre class="example"> typedef long _Atomic_word; + </pre> <p>This type must be a signed integral type supporting atomic operations. If you're using the OS approach, use the same type used by your system's primitives. Otherwise, use the type for which your CPU provides atomic primitives. -<p>Then, you must provide two functions. The bodies of these functions + <p>Then, you must provide two functions. The bodies of these functions must be equivalent to those provided here, but using atomic operations: -<br><pre>static inline _Atomic_word -__attribute__ ((__unused__)) -__exchange_and_add (_Atomic_word* __mem, int __val) -{ - _Atomic_word __result = *__mem; - *__mem += __val; - return __result; -} - -static inline void -__attribute__ ((__unused__)) -__atomic_add (_Atomic_word* __mem, int __val) -{ - *__mem += __val; -} -</pre> - +<pre class="example"> static inline _Atomic_word + __attribute__ ((__unused__)) + __exchange_and_add (_Atomic_word* __mem, int __val) + { + _Atomic_word __result = *__mem; + *__mem += __val; + return __result; + } + + static inline void + __attribute__ ((__unused__)) + __atomic_add (_Atomic_word* __mem, int __val) + { + *__mem += __val; + } + </pre> + +<div class="node"> <p><hr> Node:<a name="Numeric%20limits">Numeric limits</a>, -Next:<a rel=next accesskey=n href="#Libtool">Libtool</a>, -Previous:<a rel=previous accesskey=p href="#Thread%20safety">Thread safety</a>, -Up:<a rel=up accesskey=u href="#Top">Top</a> +Next:<a rel="next" accesskey="n" href="#Libtool">Libtool</a>, +Previous:<a rel="previous" accesskey="p" href="#Thread%20safety">Thread safety</a>, +Up:<a rel="up" accesskey="u" href="#Top">Top</a> <br> +</div> -<h2>Numeric limits</h2> +<h2 class="chapter">Numeric limits</h2> -<p>The C++ library requires information about the fundamental data types, + <p>The C++ library requires information about the fundamental data types, such as the minimum and maximum representable values of each type. You can define each of these values individually, but it is usually easiest just to indicate how many bits are used in each of the data types and let the library do the rest. For information about the macros to define, see the top of <code>include/bits/std_limits.h</code>. -<p>If you need to define any macros, you can do so in <code>os_defines.h</code>. + <p>If you need to define any macros, you can do so in <code>os_defines.h</code>. However, if all operating systems for your CPU are likely to use the same values, you can provide a CPU-specific file instead so that you do not have to provide the same definitions for each operating system. To take that approach, create a new file called <code>cpu_limits.h</code> in your CPU configuration directory (see <a href="#CPU">CPU</a>). +<div class="node"> <p><hr> Node:<a name="Libtool">Libtool</a>, -Next:<a rel=next accesskey=n href="#GNU%20Free%20Documentation%20License">GNU Free Documentation License</a>, -Previous:<a rel=previous accesskey=p href="#Numeric%20limits">Numeric limits</a>, -Up:<a rel=up accesskey=u href="#Top">Top</a> +Next:<a rel="next" accesskey="n" href="#GNU%20Free%20Documentation%20License">GNU Free Documentation License</a>, +Previous:<a rel="previous" accesskey="p" href="#Numeric%20limits">Numeric limits</a>, +Up:<a rel="up" accesskey="u" href="#Top">Top</a> <br> +</div> -<h2>Libtool</h2> +<h2 class="chapter">Libtool</h2> -<p>The C++ library is compiled, archived and linked with libtool. + <p>The C++ library is compiled, archived and linked with libtool. Explaining the full workings of libtool is beyond the scope of this document, but there are a few, particular bits that are necessary for porting. -<p>Some parts of the libstdc++-v3 library are compiled with the libtool + <p>Some parts of the libstdc++-v3 library are compiled with the libtool <code>--tags CXX</code> option (the C++ definitions for libtool). Therefore, <code>ltcf-cxx.sh</code> in the top-level directory needs to have the correct logic to compile and archive objects equivalent to the C version of libtool, <code>ltcf-c.sh</code>. Some libtool targets have definitions for C but not for C++, or C++ definitions which have not been kept up to date. -<p>The C++ run-time library contains initialization code that needs to be + <p>The C++ run-time library contains initialization code that needs to be run as the library is loaded. Often, that requires linking in special object files when the C++ library is built as a shared library, or taking other system-specific actions. -<p>The libstdc++-v3 library is linked with the C version of libtool, even + <p>The libstdc++-v3 library is linked with the C version of libtool, even though it is a C++ library. Therefore, the C version of libtool needs to ensure that the run-time library initializers are run. The usual way to do this is to build the library using <code>gcc -shared</code>. -<p>If you need to change how the library is linked, look at + <p>If you need to change how the library is linked, look at <code>ltcf-c.sh</code> in the top-level directory. Find the switch statement that sets <code>archive_cmds</code>. Here, adjust the setting for your operating system. +<div class="node"> <p><hr> Node:<a name="GNU%20Free%20Documentation%20License">GNU Free Documentation License</a>, -Previous:<a rel=previous accesskey=p href="#Libtool">Libtool</a>, -Up:<a rel=up accesskey=u href="#Top">Top</a> +Previous:<a rel="previous" accesskey="p" href="#Libtool">Libtool</a>, +Up:<a rel="up" accesskey="u" href="#Top">Top</a> <br> +</div> -<h2>GNU Free Documentation License</h2> +<h2 class="unnumbered">GNU Free Documentation License</h2> <div align="center">Version 1.1, March 2000</div> -<br><pre>Copyright © 2000 Free Software Foundation, Inc. -59 Temple Place, Suite 330, Boston, MA 02111-1307, USA +<pre class="display"> Copyright © 2000 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + </pre> -Everyone is permitted to copy and distribute verbatim copies -of this license document, but changing it is not allowed. -</pre> + <ol type=1 start=0> +<li>PREAMBLE -<ol type=1 start=0> -</p><li>PREAMBLE - -<p>The purpose of this License is to make a manual, textbook, or other + <p>The purpose of this License is to make a manual, textbook, or other written document <dfn>free</dfn> in the sense of freedom: to assure everyone the effective freedom to copy and redistribute it, with or without modifying it, either commercially or noncommercially. Secondarily, @@ -515,12 +551,12 @@ this License preserves for the author and publisher a way to get credit for their work, while not being considered responsible for modifications made by others. -<p>This License is a kind of "copyleft", which means that derivative + <p>This License is a kind of "copyleft", which means that derivative works of the document must themselves be free in the same sense. It complements the GNU General Public License, which is a copyleft license designed for free software. -<p>We have designed this License in order to use it for manuals for free + <p>We have designed this License in order to use it for manuals for free software, because free software needs free documentation: a free program should come with manuals providing the same freedoms that the software does. But this License is not limited to software manuals; @@ -528,19 +564,19 @@ it can be used for any textual work, regardless of subject matter or whether it is published as a printed book. We recommend this License principally for works whose purpose is instruction or reference. -</p><li>APPLICABILITY AND DEFINITIONS + </p><li>APPLICABILITY AND DEFINITIONS -<p>This License applies to any manual or other work that contains a + <p>This License applies to any manual or other work that contains a notice placed by the copyright holder saying it can be distributed under the terms of this License. The "Document", below, refers to any such manual or work. Any member of the public is a licensee, and is addressed as "you". -<p>A "Modified Version" of the Document means any work containing the + <p>A "Modified Version" of the Document means any work containing the Document or a portion of it, either copied verbatim, or with modifications and/or translated into another language. -<p>A "Secondary Section" is a named appendix or a front-matter section of + <p>A "Secondary Section" is a named appendix or a front-matter section of the Document that deals exclusively with the relationship of the publishers or authors of the Document to the Document's overall subject (or to related matters) and contains nothing that could fall directly @@ -551,15 +587,15 @@ connection with the subject or with related matters, or of legal, commercial, philosophical, ethical or political position regarding them. -<p>The "Invariant Sections" are certain Secondary Sections whose titles + <p>The "Invariant Sections" are certain Secondary Sections whose titles are designated, as being those of Invariant Sections, in the notice that says that the Document is released under this License. -<p>The "Cover Texts" are certain short passages of text that are listed, + <p>The "Cover Texts" are certain short passages of text that are listed, as Front-Cover Texts or Back-Cover Texts, in the notice that says that the Document is released under this License. -<p>A "Transparent" copy of the Document means a machine-readable copy, + <p>A "Transparent" copy of the Document means a machine-readable copy, represented in a format whose specification is available to the general public, whose contents can be viewed and edited directly and straightforwardly with generic text editors or (for images composed of @@ -571,7 +607,7 @@ format whose markup has been designed to thwart or discourage subsequent modification by readers is not Transparent. A copy that is not "Transparent" is called "Opaque". -<p>Examples of suitable formats for Transparent copies include plain + <p>Examples of suitable formats for Transparent copies include plain <small>ASCII</small> without markup, Texinfo input format, LaTeX input format, <small>SGML</small> or <small>XML</small> using a publicly available <small>DTD</small>, and standard-conforming simple <small>HTML</small> designed @@ -582,16 +618,16 @@ the <small>DTD</small> and/or processing tools are not generally available, and the machine-generated <small>HTML</small> produced by some word processors for output purposes only. -<p>The "Title Page" means, for a printed book, the title page itself, + <p>The "Title Page" means, for a printed book, the title page itself, plus such following pages as are needed to hold, legibly, the material this License requires to appear in the title page. For works in formats which do not have any title page as such, "Title Page" means the text near the most prominent appearance of the work's title, preceding the beginning of the body of the text. -</p><li>VERBATIM COPYING + </p><li>VERBATIM COPYING -<p>You may copy and distribute the Document in any medium, either + <p>You may copy and distribute the Document in any medium, either commercially or noncommercially, provided that this License, the copyright notices, and the license notice saying this License applies to the Document are reproduced in all copies, and that you add no other @@ -601,12 +637,12 @@ copying of the copies you make or distribute. However, you may accept compensation in exchange for copies. If you distribute a large enough number of copies you must also follow the conditions in section 3. -<p>You may also lend copies, under the same conditions stated above, and + <p>You may also lend copies, under the same conditions stated above, and you may publicly display copies. -</p><li>COPYING IN QUANTITY + </p><li>COPYING IN QUANTITY -<p>If you publish printed copies of the Document numbering more than 100, + <p>If you publish printed copies of the Document numbering more than 100, and the Document's license notice requires Cover Texts, you must enclose the copies in covers that carry, clearly and legibly, all these Cover Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on @@ -618,12 +654,12 @@ Copying with changes limited to the covers, as long as they preserve the title of the Document and satisfy these conditions, can be treated as verbatim copying in other respects. -<p>If the required texts for either cover are too voluminous to fit + <p>If the required texts for either cover are too voluminous to fit legibly, you should put the first ones listed (as many as fit reasonably) on the actual cover, and continue the rest onto adjacent pages. -<p>If you publish or distribute Opaque copies of the Document numbering + <p>If you publish or distribute Opaque copies of the Document numbering more than 100, you must either include a machine-readable Transparent copy along with each Opaque copy, or state in or with each Opaque copy a publicly-accessible computer-network location containing a complete @@ -637,49 +673,49 @@ until at least one year after the last time you distribute an Opaque copy (directly or through your agents or retailers) of that edition to the public. -<p>It is requested, but not required, that you contact the authors of the + <p>It is requested, but not required, that you contact the authors of the Document well before redistributing any large number of copies, to give them a chance to provide you with an updated version of the Document. -</p><li>MODIFICATIONS + </p><li>MODIFICATIONS -<p>You may copy and distribute a Modified Version of the Document under + <p>You may copy and distribute a Modified Version of the Document under the conditions of sections 2 and 3 above, provided that you release the Modified Version under precisely this License, with the Modified Version filling the role of the Document, thus licensing distribution and modification of the Modified Version to whoever possesses a copy of it. In addition, you must do these things in the Modified Version: -<ol type=A start=1> -</p><li>Use in the Title Page (and on the covers, if any) a title distinct + <ol type=A start=1> +<li>Use in the Title Page (and on the covers, if any) a title distinct from that of the Document, and from those of previous versions (which should, if there were any, be listed in the History section of the Document). You may use the same title as a previous version if the original publisher of that version gives permission. -<li>List on the Title Page, as authors, one or more persons or entities + <li>List on the Title Page, as authors, one or more persons or entities responsible for authorship of the modifications in the Modified Version, together with at least five of the principal authors of the Document (all of its principal authors, if it has less than five). -<li>State on the Title page the name of the publisher of the + <li>State on the Title page the name of the publisher of the Modified Version, as the publisher. -<li>Preserve all the copyright notices of the Document. + <li>Preserve all the copyright notices of the Document. -<li>Add an appropriate copyright notice for your modifications + <li>Add an appropriate copyright notice for your modifications adjacent to the other copyright notices. -<li>Include, immediately after the copyright notices, a license notice + <li>Include, immediately after the copyright notices, a license notice giving the public permission to use the Modified Version under the terms of this License, in the form shown in the Addendum below. -<li>Preserve in that license notice the full lists of Invariant Sections + <li>Preserve in that license notice the full lists of Invariant Sections and required Cover Texts given in the Document's license notice. -<li>Include an unaltered copy of this License. + <li>Include an unaltered copy of this License. -<li>Preserve the section entitled "History", and its title, and add to + <li>Preserve the section entitled "History", and its title, and add to it an item stating at least the title, year, new authors, and publisher of the Modified Version as given on the Title Page. If there is no section entitled "History" in the Document, create one @@ -687,7 +723,7 @@ stating the title, year, authors, and publisher of the Document as given on its Title Page, then add an item describing the Modified Version as stated in the previous sentence. -<li>Preserve the network location, if any, given in the Document for + <li>Preserve the network location, if any, given in the Document for public access to a Transparent copy of the Document, and likewise the network locations given in the Document for previous versions it was based on. These may be placed in the "History" section. @@ -695,36 +731,36 @@ You may omit a network location for a work that was published at least four years before the Document itself, or if the original publisher of the version it refers to gives permission. -<li>In any section entitled "Acknowledgments" or "Dedications", + <li>In any section entitled "Acknowledgments" or "Dedications", preserve the section's title, and preserve in the section all the substance and tone of each of the contributor acknowledgments and/or dedications given therein. -<li>Preserve all the Invariant Sections of the Document, + <li>Preserve all the Invariant Sections of the Document, unaltered in their text and in their titles. Section numbers or the equivalent are not considered part of the section titles. -<li>Delete any section entitled "Endorsements". Such a section + <li>Delete any section entitled "Endorsements". Such a section may not be included in the Modified Version. -<li>Do not retitle any existing section as "Endorsements" + <li>Do not retitle any existing section as "Endorsements" or to conflict in title with any Invariant Section. -</ol> + </ol> -<p>If the Modified Version includes new front-matter sections or + <p>If the Modified Version includes new front-matter sections or appendices that qualify as Secondary Sections and contain no material copied from the Document, you may at your option designate some or all of these sections as invariant. To do this, add their titles to the list of Invariant Sections in the Modified Version's license notice. These titles must be distinct from any other section titles. -<p>You may add a section entitled "Endorsements", provided it contains + <p>You may add a section entitled "Endorsements", provided it contains nothing but endorsements of your Modified Version by various parties--for example, statements of peer review or that the text has been approved by an organization as the authoritative definition of a standard. -<p>You may add a passage of up to five words as a Front-Cover Text, and a + <p>You may add a passage of up to five words as a Front-Cover Text, and a passage of up to 25 words as a Back-Cover Text, to the end of the list of Cover Texts in the Modified Version. Only one passage of Front-Cover Text and one of Back-Cover Text may be added by (or @@ -734,20 +770,20 @@ by arrangement made by the same entity you are acting on behalf of, you may not add another; but you may replace the old one, on explicit permission from the previous publisher that added the old one. -<p>The author(s) and publisher(s) of the Document do not by this License + <p>The author(s) and publisher(s) of the Document do not by this License give permission to use their names for publicity for or to assert or imply endorsement of any Modified Version. -</p><li>COMBINING DOCUMENTS + </p><li>COMBINING DOCUMENTS -<p>You may combine the Document with other documents released under this + <p>You may combine the Document with other documents released under this License, under the terms defined in section 4 above for modified versions, provided that you include in the combination all of the Invariant Sections of all of the original documents, unmodified, and list them all as Invariant Sections of your combined work in its license notice. -<p>The combined work need only contain one copy of this License, and + <p>The combined work need only contain one copy of this License, and multiple identical Invariant Sections may be replaced with a single copy. If there are multiple Invariant Sections with the same name but different contents, make the title of each such section unique by @@ -756,28 +792,28 @@ author or publisher of that section if known, or else a unique number. Make the same adjustment to the section titles in the list of Invariant Sections in the license notice of the combined work. -<p>In the combination, you must combine any sections entitled "History" + <p>In the combination, you must combine any sections entitled "History" in the various original documents, forming one section entitled "History"; likewise combine any sections entitled "Acknowledgments", and any sections entitled "Dedications". You must delete all sections entitled "Endorsements." -</p><li>COLLECTIONS OF DOCUMENTS + </p><li>COLLECTIONS OF DOCUMENTS -<p>You may make a collection consisting of the Document and other documents + <p>You may make a collection consisting of the Document and other documents released under this License, and replace the individual copies of this License in the various documents with a single copy that is included in the collection, provided that you follow the rules of this License for verbatim copying of each of the documents in all other respects. -<p>You may extract a single document from such a collection, and distribute + <p>You may extract a single document from such a collection, and distribute it individually under this License, provided you insert a copy of this License into the extracted document, and follow this License in all other respects regarding verbatim copying of that document. -</p><li>AGGREGATION WITH INDEPENDENT WORKS + </p><li>AGGREGATION WITH INDEPENDENT WORKS -<p>A compilation of the Document or its derivatives with other separate + <p>A compilation of the Document or its derivatives with other separate and independent documents or works, in or on a volume of a storage or distribution medium, does not as a whole count as a Modified Version of the Document, provided no compilation copyright is claimed for the @@ -786,15 +822,15 @@ License does not apply to the other self-contained works thus compiled with the Document, on account of their being thus compiled, if they are not themselves derivative works of the Document. -<p>If the Cover Text requirement of section 3 is applicable to these + <p>If the Cover Text requirement of section 3 is applicable to these copies of the Document, then if the Document is less than one quarter of the entire aggregate, the Document's Cover Texts may be placed on covers that surround only the Document within the aggregate. Otherwise they must appear on covers around the whole aggregate. -</p><li>TRANSLATION + </p><li>TRANSLATION -<p>Translation is considered a kind of modification, so you may + <p>Translation is considered a kind of modification, so you may distribute translations of the Document under the terms of section 4. Replacing Invariant Sections with translations requires special permission from their copyright holders, but you may include @@ -805,9 +841,9 @@ original English version of this License. In case of a disagreement between the translation and the original English version of this License, the original English version will prevail. -</p><li>TERMINATION + </p><li>TERMINATION -<p>You may not copy, modify, sublicense, or distribute the Document except + <p>You may not copy, modify, sublicense, or distribute the Document except as expressly provided for under this License. Any other attempt to copy, modify, sublicense or distribute the Document is void, and will automatically terminate your rights under this License. However, @@ -815,15 +851,15 @@ parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. -</p><li>FUTURE REVISIONS OF THIS LICENSE + </p><li>FUTURE REVISIONS OF THIS LICENSE -<p>The Free Software Foundation may publish new, revised versions + <p>The Free Software Foundation may publish new, revised versions of the GNU Free Documentation License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. See <a href="http://www.gnu.org/copyleft/">http://www.gnu.org/copyleft/</a>. -<p>Each version of the License is given a distinguishing version number. + <p>Each version of the License is given a distinguishing version number. If the Document specifies that a particular numbered version of this License "or any later version" applies to it, you have the option of following the terms and conditions either of that specified version or @@ -831,57 +867,51 @@ of any later version that has been published (not as a draft) by the Free Software Foundation. If the Document does not specify a version number of this License, you may choose any version ever published (not as a draft) by the Free Software Foundation. -</ol> + </ol> -<h3>ADDENDUM: How to use this License for your documents</h3> +<h3 class="unnumberedsec">ADDENDUM: How to use this License for your documents</h3> -<p>To use this License in a document you have written, include a copy of + <p>To use this License in a document you have written, include a copy of the License in the document and put the following copyright and license notices just after the title page: -<br><pre> Copyright (C) <var>year</var> <var>your name</var>. - Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU Free Documentation License, Version 1.1 - or any later version published by the Free Software Foundation; - with the Invariant Sections being <var>list their titles</var>, with the - Front-Cover Texts being <var>list</var>, and with the Back-Cover Texts being <var>list</var>. - A copy of the license is included in the section entitled ``GNU - Free Documentation License''. -</pre> - -<p>If you have no Invariant Sections, write "with no Invariant Sections" +<pre class="smallexample"> Copyright (C) <var>year</var> <var>your name</var>. + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.1 + or any later version published by the Free Software Foundation; + with the Invariant Sections being <var>list their titles</var>, with the + Front-Cover Texts being <var>list</var>, and with the Back-Cover Texts being <var>list</var>. + A copy of the license is included in the section entitled ``GNU + Free Documentation License''. + </pre> + + <p>If you have no Invariant Sections, write "with no Invariant Sections" instead of saying which ones are invariant. If you have no Front-Cover Texts, write "no Front-Cover Texts" instead of "Front-Cover Texts being <var>list</var>"; likewise for Back-Cover Texts. -<p>If your document contains nontrivial examples of program code, we + <p>If your document contains nontrivial examples of program code, we recommend releasing these examples in parallel under your choice of free software license, such as the GNU General Public License, to permit their use in free software. +<div class="contents"> <h2>Table of Contents</h2> <ul> -<li><a name="toc_Top"></a> - <a href="#Top">Porting libstdc++-v3</a> -<li><a name="toc_Operating%20system"></a> - <a href="#Operating%20system">Operating system</a> -<li><a name="toc_CPU"></a> - <a href="#CPU">CPU</a> -<li><a name="toc_Character%20types"></a> - <a href="#Character%20types">Character types</a> -<li><a name="toc_Thread%20safety"></a> - <a href="#Thread%20safety">Thread safety</a> -<li><a name="toc_Numeric%20limits"></a> - <a href="#Numeric%20limits">Numeric limits</a> -<li><a name="toc_Libtool"></a> - <a href="#Libtool">Libtool</a> -<li><a name="toc_GNU%20Free%20Documentation%20License"></a> - <a href="#GNU%20Free%20Documentation%20License">GNU Free Documentation License</a> +<li><a name="toc_Top" href="#Top">Porting libstdc++-v3</a> +<li><a name="toc_Operating%20system" href="#Operating%20system">Operating system</a> +<li><a name="toc_CPU" href="#CPU">CPU</a> +<li><a name="toc_Character%20types" href="#Character%20types">Character types</a> +<li><a name="toc_Thread%20safety" href="#Thread%20safety">Thread safety</a> +<li><a name="toc_Numeric%20limits" href="#Numeric%20limits">Numeric limits</a> +<li><a name="toc_Libtool" href="#Libtool">Libtool</a> +<li><a name="toc_GNU%20Free%20Documentation%20License" href="#GNU%20Free%20Documentation%20License">GNU Free Documentation License</a> <ul> <li><a href="#GNU%20Free%20Documentation%20License">ADDENDUM: How to use this License for your documents</a> -</ul> -</ul> +</li></ul> +</li></ul> +</div> -</body></html> + </body></html> diff --git a/libstdc++-v3/docs/html/17_intro/porting.texi b/libstdc++-v3/docs/html/17_intro/porting.texi index 6c6ec1f7f48..24ab682a55c 100644 --- a/libstdc++-v3/docs/html/17_intro/porting.texi +++ b/libstdc++-v3/docs/html/17_intro/porting.texi @@ -8,22 +8,7 @@ @settitle Porting libstdc++-v3 @setchapternewpage odd -@ifinfo -This file explains how to port libstdc++-v3 (the GNU C++ library) to -a new target. - -Copyright (c) 2000, 2001, 2002 Free Software Foundation, Inc. -@end ifinfo - -@c --------------------------------------------------------------------- -@c Titlepage -@c --------------------------------------------------------------------- - -@titlepage -@title Porting libstdc++-v3 -@author Mark Mitchell -@page -@vskip 0pt plus 1filll +@copying Copyright @copyright{} 2000, 2001, 2002 Free Software Foundation, Inc. Permission is granted to copy, distribute and/or modify this document @@ -43,6 +28,25 @@ texts being (a) (see below), and with the Back-Cover Texts being (b) You have freedom to copy and modify this GNU Manual, like GNU software. Copies published by the Free Software Foundation raise funds for GNU development. +@end copying + +@ifinfo +This file explains how to port libstdc++-v3 (the GNU C++ library) to +a new target. + +@insertcopying +@end ifinfo + +@c --------------------------------------------------------------------- +@c Titlepage +@c --------------------------------------------------------------------- + +@titlepage +@title Porting libstdc++-v3 +@author Mark Mitchell +@page +@vskip 0pt plus 1filll +@insertcopying @end titlepage @c --------------------------------------------------------------------- diff --git a/libstdc++-v3/docs/html/19_diagnostics/howto.html b/libstdc++-v3/docs/html/19_diagnostics/howto.html index d1d759d5a43..dbfcc9cb054 100644 --- a/libstdc++-v3/docs/html/19_diagnostics/howto.html +++ b/libstdc++-v3/docs/html/19_diagnostics/howto.html @@ -169,6 +169,13 @@ %</pre> <p>The 'Aborted' line comes from the call to abort(), of course. </p> + <p><strong>UPDATE:</strong> Starting with GCC 3.4, this is the default + termination handler; nothing need be done to use it. To go back to + the previous "silent death" method, simply include + <code><exception><code> and <code><cstdlib><code>, and call + </p> + <pre> + std::set_terminate (std::abort);</pre> <p>Return <a href="#top">to top of page</a> or <a href="../faq/index.html">to the FAQ</a>. </p> diff --git a/libstdc++-v3/docs/html/configopts.html b/libstdc++-v3/docs/html/configopts.html index eab9864f330..aec70a60271 100644 --- a/libstdc++-v3/docs/html/configopts.html +++ b/libstdc++-v3/docs/html/configopts.html @@ -76,23 +76,11 @@ options</a></h1> <dd><p>Adds support for named libstdc++ include directory. For instance, the following puts all the libstdc++ headers into a directory called "2.97-20001008" instead of the usual - "g++-v3". + "c++/(version)". </p> <pre> --with-gxx-include-dir=/foo/H-x86-gcc-3-c-gxx-inc/include/2.97-20001008</pre> </dd> - <dt><code>--enable-debug </code></dt> - <dd><p>The configure script will automatically detect the highest - level of optimization that the compiler in use can use. - This --enable flag will disable all optimizations and instruct - the compiler to emit as much extra debugging information as it - can, for use inside GDB. Note this make command, executed in - the build directory, will do much the same thing, without the - configuration difference: - <code>make CXXFLAGS='-g -O0' all</code> - </p> - </dd> - <dt><code>--enable-cstdio </code></dt> <dd><p>This is an abbreviated form of <code>'--enable-cstdio=stdio'</code> (described next). This option can change the library ABI. @@ -157,6 +145,34 @@ options</a></h1> </p> </dd> + <dt><code>--enable-debug </code></dt> + <dd><p>Build separate debug libraries in addition to what is normally built. + By default, the debug libraries are compiled with + <code> CXXFLAGS='-g3 -O0'</code> + , are installed in <code>${libdir}/debug</code>, and have the + same names and versioning information as the non-debug + libraries. This option is off by default. + <p> + Note this make command, executed in + the build directory, will do much the same thing, without the + configuration difference and without building everything twice: + <code>make CXXFLAGS='-g3 -O0' all</code> + </p> + </p> + </dd> + + <dt><code>--enable-debug-flags=FLAGS</code></dt> + + <dd><p>This option is only valid when <code> --enable-debug </code> + is also specified, and applies to the debug builds only. With + this option, you can pass a specific string of flags to the + compiler to use when building the debug versions of libstdc++. + FLAGS is a quoted string of options, like + </p> + <pre> + --enable-debug-flags='-g3 -O1 -gdwarf-2'</pre> + </dd> + <dt><code>--enable-cxx-flags=FLAGS</code></dt> <dd><p>With this option, you can pass a string of -f (functionality) flags to the compiler to use when building libstdc++. This @@ -238,12 +254,13 @@ options</a></h1> </dd> <dt><code>--enable-symvers[=style] </code></dt> - <dd><p>In 3.1, tries to turn on symbol versioning in the shared library (if a - shared library has been requested). The only 'style' currently - supported is 'gnu' which requires that a recent version of the GNU - linker be in use. With no style given, the configure script will - try to guess if the 'gnu' style can be used, and if so, will turn it - on. Hopefully people will volunteer to do other 'style' options. + <dd><p>In 3.1 and later, tries to turn on symbol versioning in the + shared library (if a shared library has been requested). The + only 'style' currently supported is 'gnu' which requires that + a recent version of the GNU linker be in use. With no style + given, the configure script will try to guess if the 'gnu' + style can be used, and if so, will turn it on. Hopefully + people will volunteer to do other 'style' options. </p> </dd> </dl> diff --git a/libstdc++-v3/docs/html/debug.html b/libstdc++-v3/docs/html/debug.html new file mode 100644 index 00000000000..ff20d249c36 --- /dev/null +++ b/libstdc++-v3/docs/html/debug.html @@ -0,0 +1,218 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE html + PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> + +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + <meta name="AUTHOR" content="bkoz@gcc.gnu.org (Benjamin Kosnik)" /> + <meta name="KEYWORDS" content="c++, libstdc++, gdb, g++, debug" /> + <meta name="DESCRIPTION" content="Debugging C++ binaries" /> + <meta name="GENERATOR" content="vi and ten fingers" /> + <title>Debugging schemes and strategies</title> +<link rel="StyleSheet" href="lib3styles.css" /> +</head> +<body> + +<h1 class="centered"><a name="top">Debugging schemes and strategies</a></h1> + +<p class="fineprint"><em> +<p>The latest version of this document is always available at + <a href="http://gcc.gnu.org/onlinedocs/libstdc++/debug.html"> + http://gcc.gnu.org/onlinedocs/libstdc++/debug.html</a>. +</p> + +<p>To the <a href="http://gcc.gnu.org/libstdc++/">libstdc++-v3 homepage</a>. +</p> +</em></p> + +<!-- ####################################################### --> +<hr /> +<p>There are numerous things that can be done to improve the ease with + which C++ binaries are debugged when using the GNU C++ + tool chain. Here are some things to keep in mind when debugging C++ + code with GNU tools. +</p> + +<h3 class="left"><a name="g++">Compiler flags determine debug info</a></h3> +<p>The default optimizations and debug flags for a libstdc++ build are + <code>-g -O2</code>. However, both debug and optimization flags can + be varied to change debugging characteristics. For instance, + turning off all optimization via the <code>-g -O0</code> flag will + disable inlining, so that stepping through all functions, including + inlined constructors and destructors, is possible. Or, the debug + format that the compiler and debugger use to communicate + information about source constructs can be changed via <code> + -gdwarf-2 </code> or <code> -gstabs </code> flags: some debugging + formats permit more expressive type and scope information to be + shown in gdb. + The default debug information for a particular platform can be + identified via the value set by the PREFERRED_DEBUGGING_TYPE macro + in the gcc sources. +</p> + +<p>Many other options are available: please see +<a href=http://gcc.gnu.org/onlinedocs/gcc/Debugging-Options.html#Debugging%20Options> "Options for Debugging Your Program" </a> + in Using the GNU Compiler Collection (GCC) for a complete list. +</p> + + +<h3 class="left"><a name="lib">Using special flags to make a debug binary</a></h3> +<p>There are two ways to build libstdc++ with debug flags. The first + is to run make from the toplevel in a freshly-configured tree with + specialized debug <code>CXXFLAGS</code>, as in <dd> <code> make + CXXFLAGS='-g3 -O0' all </code></dd> +</p> + +<p>This quick and dirty approach is often sufficient for quick + debugging tasks, but the lack of state can be confusing in the long + term. +</p> + +<p>A second approach is to use the configuration flags +</p> + + <dd><code>--enable-debug</code></dd> + +<p>and perhaps</p> + + <dd><code>--enable-debug-flags='...'</code></dd> + +<p>to create a separate debug build. Both the normal build and the + debug build will persist, without having to specify + <code>CXXFLAGS</code>, and the debug library will be installed in a + separate directory tree, in <code>(prefix)/lib/debug</code>. For + more information, look at the configuration options document +<a href=http://gcc.gnu.org/onlinedocs/libstdc++/configopts.html>here</a> +</p> + + +<h3 class="left"><a name="mem">Tips for memory leak hunting</a></h3> + +<p>There are various third party memory tracing and debug utilities + that can be used to provide detailed memory allocation information + about C++ code. An exhaustive list of tools is not going to be + attempted, but include <code>mtrace</code>, <code>valgrind</code>, + <code>mudflap</code>, and <code>purify</code>. Also highly + recommended are <code>libcwd</code> and some other one that I + forget right now. +</p> + +<p>Regardless of the memory debugging tool being used, there is one + thing of great importance to keep in mind when debugging C++ code + that uses <code>new</code> and <code>delete</code>: + there are different kinds of allocation schemes that can be used by + <code> std::allocator </code>. For implementation details, see this + <a href=http://gcc.gnu.org/onlinedocs/libstdc++/ext/howto.html#3> + document </a> and look specifically for <code>GLIBCPP_FORCE_NEW</code>. +</p> + +<p>In a nutshell, the default allocator used by <code> + std::allocator</code> is a high-performance pool allocator, and can + give the mistaken impression that memory is being leaked, when in + reality the memory is reclaimed after program termination. +</p> + +<p>For valgrind, there are some specific items to keep in mind. First + of all, use a version of valgrind that will work with current GNU + C++ tools: the first that can do this is valgrind 1.0.4, but later + versions should work at least as well. Second of all, use a + completely unoptimized build to avoid confusing valgrind. Third, + use GLIBCPP_FORCE_NEW to keep extraneous pool allocation noise from + cluttering debug information. +</p> + +<p>Fourth, it may be necessary to force deallocation in other + libraries as well, namely the "C" library. On linux, this can be + accomplished with the appropriate use of the + <code>__cxa_atexit</code> or <code>atexit</code> functions. +</p> + +<pre> + #include <cstdlib> + + extern "C" void __libc_freeres(void); + + void do_something() { } + + int main() + { + atexit(__libc_freeres); + do_something(); + return 0; + } +</pre> + + +<p>or, using <code>__cxa_atexit</code>:</p> + +<pre> + extern "C" void __libc_freeres(void); + extern "C" int __cxa_atexit(void (*func) (void *), void *arg, void *d); + + void do_something() { } + + int main() + { + extern void* __dso_handle __attribute__ ((__weak__)); + __cxa_atexit((void (*) (void *)) __libc_freeres, NULL, + &__dso_handle ? __dso_handle : NULL); + do_test(); + return 0; + } +</pre> + +<p>Suggested valgrind flags, given the suggestions above about setting + up the runtime environment, library, and test file, might be: + + <dd><code>valgrind -v --num-callers=20 --leak-check=yes + --leak-resolution=high --show-reachable=yes a.out</code></dd> +</p> + + +<h3 class="left"><a name="gdb">Some gdb strategies</a></h3> +<p>Many options are available for gdb itself: please see <a + href=http://sources.redhat.com/gdb/current/onlinedocs/gdb_13.html#SEC109> + "GDB features for C++" </a> in the gdb documentation. Also + recommended: the other parts of this manual. +</p> + +<p>These settings can either be switched on in at the gdb command + line, or put into a .gdbint file to establish default debugging + characteristics, like so: +</p> + +<pre> + set print pretty on + set print object on + set print static-members on + set print vtbl on + set print demangle on + set demangle-style gnu-v3 +</pre> + + +<h3 class="left"><a name="verbterm">Tracking uncaught exceptions</a></h3> +<p>The <a href="19_diagnostics/howto.html#4">verbose termination handler</a> + gives information about uncaught exceptions which are killing the + program. It is described in the linked-to page. +</p> + + +<p>Return <a href="#top">to the top of the page</a> or + <a href="http://gcc.gnu.org/libstdc++/">to the libstdc++ homepage</a>. +</p> + + +<!-- ####################################################### --> + +<hr /> +<p class="fineprint"><em> +See <a href="17_intro/license.html">license.html</a> for copying conditions. +Comments and suggestions are welcome, and may be sent to +<a href="mailto:libstdc++@gcc.gnu.org">the libstdc++ mailing list</a>. +</em></p> + + +</body> +</html> diff --git a/libstdc++-v3/docs/html/documentation.html b/libstdc++-v3/docs/html/documentation.html index 0dc25bedfa0..c0e3cdb112d 100644 --- a/libstdc++-v3/docs/html/documentation.html +++ b/libstdc++-v3/docs/html/documentation.html @@ -39,6 +39,8 @@ - latest version info, recent changes and news</li> <li><a href="17_intro/TODO">TODO</a> - tasks yet undone</li> + <li><a href="faq/index.html">FAQ (HTML)</a>, + <a href="faq/index.txt">FAQ (text)</a></li> </ul> <hr /> @@ -47,6 +49,7 @@ <ul> <li><a href="configopts.html">Configure options</a></li> <li><a href="install.html">Getting started: configure, build, install</a> + <li><a href="debug.html">Debugging schemes and strategies</a> </li> </ul> diff --git a/libstdc++-v3/docs/html/ext/sgiexts.html b/libstdc++-v3/docs/html/ext/sgiexts.html index 3f65aa340bb..b35ecaf20eb 100644 --- a/libstdc++-v3/docs/html/ext/sgiexts.html +++ b/libstdc++-v3/docs/html/ext/sgiexts.html @@ -29,7 +29,7 @@ libstdc++-v3</a></h1> for a description). Not every chapter may have extensions, and the extensions may come and go. Also, this page is incomplete because the author is pressed for time. Check back often; the latest change was on - $Date: 2002/10/07 18:11:22 $ (UTC). + $Date: 2002/12/16 18:22:57 $ (UTC). </p> <p>Descriptions range from the scanty to the verbose. You should also check diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index da7646aed05..09b106c8fc3 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -53,6 +53,7 @@ bits_headers = \ ${bits_srcdir}/ios_base.h \ ${bits_srcdir}/istream.tcc \ ${bits_srcdir}/list.tcc \ + ${bits_srcdir}/locale_classes.h \ ${bits_srcdir}/locale_facets.h \ ${bits_srcdir}/locale_facets.tcc \ ${bits_srcdir}/localefwd.h \ @@ -319,6 +320,7 @@ target_headers_extra = \ ${target_builddir}/c++io.h \ ${target_builddir}/c++locale.h \ ${target_builddir}/messages_members.h \ + ${target_builddir}/time_members.h \ ${target_builddir}/codecvt_specializations.h thread_target_headers = \ @@ -408,6 +410,7 @@ ${target_builddir}/stamp-target: ${target_headers} stamp-${target_alias} @LN_S@ ${glibcpp_srcdir}/@CSTDIO_H@ c++io.h || true ;\ @LN_S@ ${glibcpp_srcdir}/@CLOCALE_H@ c++locale.h || true ;\ @LN_S@ ${glibcpp_srcdir}/@CMESSAGES_H@ messages_members.h || true ;\ + @LN_S@ ${glibcpp_srcdir}/@CTIME_H@ time_members.h || true ;\ @LN_S@ ${glibcpp_srcdir}/@CCODECVT_H@ codecvt_specializations.h || true ;\ echo `date` > stamp-target; \ fi @@ -464,32 +467,32 @@ ${target_builddir}/gthr-default.h: ${toplevel_srcdir}/gcc/${glibcpp_thread_h} \ # the rest are taken from the original source tree. gxx_include_dir = @gxx_include_dir@ install-data-local: - $(mkinstalldirs) ${gxx_include_dir} - $(mkinstalldirs) ${gxx_include_dir}/${bits_builddir} + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir} + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${bits_builddir} for file in ${bits_headers}; do \ - $(INSTALL_DATA) $${file} ${gxx_include_dir}/${bits_builddir}; done - $(mkinstalldirs) ${gxx_include_dir}/${backward_builddir} + $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${bits_builddir}; done + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${backward_builddir} for file in ${backward_headers}; do \ - $(INSTALL_DATA) $${file} ${gxx_include_dir}/${backward_builddir}; done - $(mkinstalldirs) ${gxx_include_dir}/${ext_builddir} + $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${backward_builddir}; done + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${ext_builddir} for file in ${ext_headers}; do \ - $(INSTALL_DATA) $${file} ${gxx_include_dir}/${ext_builddir}; done - $(mkinstalldirs) ${gxx_include_dir}/${c_base_builddir} + $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${ext_builddir}; done + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${c_base_builddir} for file in ${c_base_headers_rename}; do \ - $(INSTALL_DATA) ${c_base_builddir}/$${file} ${gxx_include_dir}; done + $(INSTALL_DATA) ${c_base_builddir}/$${file} $(DESTDIR)${gxx_include_dir}/${c_base_builddir}; done c_base_headers_extra_install='$(c_base_headers_extra)';\ for file in $$c_base_headers_extra_install; do \ - $(INSTALL_DATA) $$file ${gxx_include_dir}/${bits_builddir}; done + $(INSTALL_DATA) $$file $(DESTDIR)${gxx_include_dir}/${bits_builddir}; done c_compatibility_headers_install='$(c_compatibility_headers_extra)';\ for file in $$c_compatibility_headers_install; do \ - $(INSTALL_DATA) $$file ${gxx_include_dir}; done - $(mkinstalldirs) ${gxx_include_dir}/${std_builddir} + $(INSTALL_DATA) $$file $(DESTDIR)${gxx_include_dir}; done + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${std_builddir} for file in ${std_headers_rename}; do \ - $(INSTALL_DATA) ${std_builddir}/$${file} ${gxx_include_dir}; done - $(mkinstalldirs) ${gxx_include_dir}/${target_builddir} + $(INSTALL_DATA) ${std_builddir}/$${file} $(DESTDIR)${gxx_include_dir}/${std_builddir}; done + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${target_builddir} for file in ${target_headers} ${target_headers_extra} \ ${thread_target_headers}; do \ - $(INSTALL_DATA) $${file} ${gxx_include_dir}/${target_builddir}; done + $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${target_builddir}; done # By adding these files here, automake will remove them for 'make clean' #CLEANFILES = ${allstamps} diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 5441e974d4f..a57db629287 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -75,6 +75,7 @@ CLOCALE_H = @CLOCALE_H@ CMESSAGES_H = @CMESSAGES_H@ CPP = @CPP@ CSTDIO_H = @CSTDIO_H@ +CTIME_H = @CTIME_H@ CXXCPP = @CXXCPP@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ DEBUG_FLAGS = @DEBUG_FLAGS@ @@ -159,6 +160,7 @@ bits_headers = \ ${bits_srcdir}/ios_base.h \ ${bits_srcdir}/istream.tcc \ ${bits_srcdir}/list.tcc \ + ${bits_srcdir}/locale_classes.h \ ${bits_srcdir}/locale_facets.h \ ${bits_srcdir}/locale_facets.tcc \ ${bits_srcdir}/localefwd.h \ @@ -422,6 +424,7 @@ target_headers_extra = \ ${target_builddir}/c++io.h \ ${target_builddir}/c++locale.h \ ${target_builddir}/messages_members.h \ + ${target_builddir}/time_members.h \ ${target_builddir}/codecvt_specializations.h @@ -628,6 +631,7 @@ ${target_builddir}/stamp-target: ${target_headers} stamp-${target_alias} @LN_S@ ${glibcpp_srcdir}/@CSTDIO_H@ c++io.h || true ;\ @LN_S@ ${glibcpp_srcdir}/@CLOCALE_H@ c++locale.h || true ;\ @LN_S@ ${glibcpp_srcdir}/@CMESSAGES_H@ messages_members.h || true ;\ + @LN_S@ ${glibcpp_srcdir}/@CTIME_H@ time_members.h || true ;\ @LN_S@ ${glibcpp_srcdir}/@CCODECVT_H@ codecvt_specializations.h || true ;\ echo `date` > stamp-target; \ fi @@ -670,32 +674,32 @@ ${target_builddir}/gthr-default.h: ${toplevel_srcdir}/gcc/${glibcpp_thread_h} \ -e 's,^#include "\(.*\)",#include <bits/\1>,g' \ < ${toplevel_srcdir}/gcc/${glibcpp_thread_h} > $@ install-data-local: - $(mkinstalldirs) ${gxx_include_dir} - $(mkinstalldirs) ${gxx_include_dir}/${bits_builddir} + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir} + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${bits_builddir} for file in ${bits_headers}; do \ - $(INSTALL_DATA) $${file} ${gxx_include_dir}/${bits_builddir}; done - $(mkinstalldirs) ${gxx_include_dir}/${backward_builddir} + $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${bits_builddir}; done + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${backward_builddir} for file in ${backward_headers}; do \ - $(INSTALL_DATA) $${file} ${gxx_include_dir}/${backward_builddir}; done - $(mkinstalldirs) ${gxx_include_dir}/${ext_builddir} + $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${backward_builddir}; done + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${ext_builddir} for file in ${ext_headers}; do \ - $(INSTALL_DATA) $${file} ${gxx_include_dir}/${ext_builddir}; done - $(mkinstalldirs) ${gxx_include_dir}/${c_base_builddir} + $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${ext_builddir}; done + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${c_base_builddir} for file in ${c_base_headers_rename}; do \ - $(INSTALL_DATA) ${c_base_builddir}/$${file} ${gxx_include_dir}; done + $(INSTALL_DATA) ${c_base_builddir}/$${file} $(DESTDIR)${gxx_include_dir}/${c_base_builddir}; done c_base_headers_extra_install='$(c_base_headers_extra)';\ for file in $$c_base_headers_extra_install; do \ - $(INSTALL_DATA) $$file ${gxx_include_dir}/${bits_builddir}; done + $(INSTALL_DATA) $$file $(DESTDIR)${gxx_include_dir}/${bits_builddir}; done c_compatibility_headers_install='$(c_compatibility_headers_extra)';\ for file in $$c_compatibility_headers_install; do \ - $(INSTALL_DATA) $$file ${gxx_include_dir}; done - $(mkinstalldirs) ${gxx_include_dir}/${std_builddir} + $(INSTALL_DATA) $$file $(DESTDIR)${gxx_include_dir}; done + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${std_builddir} for file in ${std_headers_rename}; do \ - $(INSTALL_DATA) ${std_builddir}/$${file} ${gxx_include_dir}; done - $(mkinstalldirs) ${gxx_include_dir}/${target_builddir} + $(INSTALL_DATA) ${std_builddir}/$${file} $(DESTDIR)${gxx_include_dir}/${std_builddir}; done + $(mkinstalldirs) $(DESTDIR)${gxx_include_dir}/${target_builddir} for file in ${target_headers} ${target_headers_extra} \ ${thread_target_headers}; do \ - $(INSTALL_DATA) $${file} ${gxx_include_dir}/${target_builddir}; done + $(INSTALL_DATA) $${file} $(DESTDIR)${gxx_include_dir}/${target_builddir}; done # By adding these files here, automake will remove them for 'make clean' #CLEANFILES = ${allstamps} diff --git a/libstdc++-v3/include/bits/basic_ios.h b/libstdc++-v3/include/bits/basic_ios.h index b6ef89ba8b0..59378301799 100644 --- a/libstdc++-v3/include/bits/basic_ios.h +++ b/libstdc++-v3/include/bits/basic_ios.h @@ -38,6 +38,8 @@ #pragma GCC system_header #include <bits/streambuf_iterator.h> +#include <bits/localefwd.h> +#include <bits/locale_classes.h> #include <bits/locale_facets.h> namespace std diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index 8dbbd9fb823..eddcaacd38e 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -34,7 +34,7 @@ #include <bits/os_defines.h> // The current version of the C++ library in compressed ISO date format. -#define __GLIBCPP__ 20021213 +#define __GLIBCPP__ 20030131 // This is necessary until GCC supports separate template // compilation. diff --git a/libstdc++-v3/include/bits/codecvt.h b/libstdc++-v3/include/bits/codecvt.h index 92b0f0e8a7d..9ab9f94e71d 100644 --- a/libstdc++-v3/include/bits/codecvt.h +++ b/libstdc++-v3/include/bits/codecvt.h @@ -1,6 +1,6 @@ // Locale support (codecvt) -*- C++ -*- -// Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -164,9 +164,6 @@ typedef _ExternT extern_type; typedef _StateT state_type; - protected: - __c_locale _M_c_locale_codecvt; - public: static locale::id id; @@ -174,9 +171,6 @@ codecvt(size_t __refs = 0) : __codecvt_abstract_base<_InternT, _ExternT, _StateT> (__refs) { } - explicit - codecvt(__c_locale __cloc, size_t __refs = 0); - protected: virtual ~codecvt() { } @@ -225,18 +219,12 @@ typedef char extern_type; typedef mbstate_t state_type; - protected: - __c_locale _M_c_locale_codecvt; - public: static locale::id id; explicit codecvt(size_t __refs = 0); - explicit - codecvt(__c_locale __cloc, size_t __refs = 0); - protected: virtual ~codecvt(); @@ -283,18 +271,12 @@ typedef char extern_type; typedef mbstate_t state_type; - protected: - __c_locale _M_c_locale_codecvt; - public: static locale::id id; explicit codecvt(size_t __refs = 0); - explicit - codecvt(__c_locale __cloc, size_t __refs = 0); - protected: virtual ~codecvt(); @@ -338,13 +320,8 @@ { public: explicit - codecvt_byname(const char* __s, size_t __refs = 0) - : codecvt<_InternT, _ExternT, _StateT>(__refs) - { - if (_M_c_locale_codecvt != _S_c_locale) - _S_destroy_c_locale(_M_c_locale_codecvt); - _S_create_c_locale(_M_c_locale_codecvt, __s); - } + codecvt_byname(const char*, size_t __refs = 0) + : codecvt<_InternT, _ExternT, _StateT>(__refs) { } protected: virtual diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc index 387f099ae98..ff7ccbae877 100644 --- a/libstdc++-v3/include/bits/fstream.tcc +++ b/libstdc++-v3/include/bits/fstream.tcc @@ -1,6 +1,6 @@ // File based streams -*- C++ -*- -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -471,10 +471,7 @@ namespace std bool __testbeg = gptr() == eback() && pptr() == pbase(); if (__testbeg && _M_buf_locale != __loc) - { - _M_buf_locale = __loc; - _M_buf_locale_init = true; - } + _M_buf_locale = __loc; // NB this may require the reconversion of previously // converted chars. This in turn may cause the reconstruction diff --git a/libstdc++-v3/include/bits/ios_base.h b/libstdc++-v3/include/bits/ios_base.h index 1f085d9e4e7..93d832ec724 100644 --- a/libstdc++-v3/include/bits/ios_base.h +++ b/libstdc++-v3/include/bits/ios_base.h @@ -1,6 +1,6 @@ // Iostreams base classes -*- C++ -*- -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -43,6 +43,8 @@ #pragma GCC system_header #include <bits/atomicity.h> +#include <bits/localefwd.h> +#include <bits/locale_classes.h> namespace std { @@ -638,7 +640,7 @@ namespace std * Destroys local storage and * [XXX does something with callbacks]. */ - virtual ~ios_base(); + ~ios_base(); protected: ios_base(); diff --git a/libstdc++-v3/include/bits/locale_classes.h b/libstdc++-v3/include/bits/locale_classes.h new file mode 100644 index 00000000000..f36c8d4dea4 --- /dev/null +++ b/libstdc++-v3/include/bits/locale_classes.h @@ -0,0 +1,374 @@ +// Locale support -*- C++ -*- + +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 +// Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// As a special exception, you may use this file as part of a free software +// library without restriction. Specifically, if other files instantiate +// templates or use macros or inline functions from this file, or you compile +// this file and link it with other files to produce an executable, this +// file does not by itself cause the resulting executable to be covered by +// the GNU General Public License. This exception does not however +// invalidate any other reasons why the executable file might be covered by +// the GNU General Public License. + +// +// ISO C++ 14882: 22.1 Locales +// + +/** @file localefwd.h + * This is an internal header file, included by other library headers. + * You should not attempt to use it directly. + */ + +#ifndef _CPP_BITS_LOCALE_CLASSES_H +#define _CPP_BITS_LOCALE_CLASSES_H 1 + +#pragma GCC system_header + +#include <bits/localefwd.h> +#include <cstring> // For strcmp. +#include <string> +#include <bits/atomicity.h> + +namespace std +{ + // 22.1.1 Class locale + class locale + { + public: + // Types: + typedef unsigned int category; + + // Forward decls and friends: + class facet; + class id; + class _Impl; + + friend class facet; + friend class _Impl; + + template<typename _Facet> + friend const _Facet& + use_facet(const locale&); + + template<typename _Facet> + friend bool + has_facet(const locale&) throw(); + + // Category values: + // NB: Order must match _S_facet_categories definition in locale.cc + static const category none = 0; + static const category ctype = 1L << 0; + static const category numeric = 1L << 1; + static const category collate = 1L << 2; + static const category time = 1L << 3; + static const category monetary = 1L << 4; + static const category messages = 1L << 5; + static const category all = (ctype | numeric | collate | + time | monetary | messages); + + // Construct/copy/destroy: + locale() throw(); + + locale(const locale& __other) throw(); + + explicit + locale(const char* __s); + + locale(const locale& __base, const char* __s, category __cat); + + locale(const locale& __base, const locale& __add, category __cat); + + template<typename _Facet> + locale(const locale& __other, _Facet* __f); + + ~locale() throw(); + + const locale& + operator=(const locale& __other) throw(); + + template<typename _Facet> + locale + combine(const locale& __other) const; + + // Locale operations: + string + name() const; + + bool + operator==(const locale& __other) const throw (); + + inline bool + operator!=(const locale& __other) const throw () + { return !(this->operator==(__other)); } + + template<typename _Char, typename _Traits, typename _Alloc> + bool + operator()(const basic_string<_Char, _Traits, _Alloc>& __s1, + const basic_string<_Char, _Traits, _Alloc>& __s2) const; + + // Global locale objects: + static locale + global(const locale&); + + static const locale& + classic(); + + private: + // The (shared) implementation + _Impl* _M_impl; + + // The "C" reference locale + static _Impl* _S_classic; + + // Current global locale + static _Impl* _S_global; + + // Number of standard categories. For C++, these categories are + // collate, ctype, monetary, numeric, time, and messages. These + // directly correspond to ISO C99 macros LC_COLLATE, LC_CTYPE, + // LC_MONETARY, LC_NUMERIC, and LC_TIME. In addition, POSIX (IEEE + // 1003.1-2001) specifies LC_MESSAGES. + static const size_t _S_categories_size = 6; + + // In addition to the standard categories, the underlying + // operating system is allowed to define extra LC_* + // macros. For GNU systems, the following are also valid: + // LC_PAPER, LC_NAME, LC_ADDRESS, LC_TELEPHONE, LC_MEASUREMENT, + // and LC_IDENTIFICATION. + static const size_t _S_extra_categories_size = _GLIBCPP_NUM_CATEGORIES; + + // Names of underlying locale categories. + // NB: locale::global() has to know how to modify all the + // underlying categories, not just the ones required by the C++ + // standard. + static const char* _S_categories[_S_categories_size + + _S_extra_categories_size]; + + explicit + locale(_Impl*) throw(); + + static inline void + _S_initialize() + { + if (!_S_classic) + classic(); + } + + static category + _S_normalize_category(category); + + void + _M_coalesce(const locale& __base, const locale& __add, category __cat); + }; + + + // Implementation object for locale + class locale::_Impl + { + public: + // Friends. + friend class locale; + friend class locale::facet; + + template<typename _Facet> + friend const _Facet& + use_facet(const locale&); + + template<typename _Facet> + friend bool + has_facet(const locale&) throw(); + + private: + // Data Members. + _Atomic_word _M_references; + facet** _M_facets; + size_t _M_facets_size; + + char* _M_names[_S_categories_size + + _S_extra_categories_size]; + static const locale::id* const _S_id_ctype[]; + static const locale::id* const _S_id_numeric[]; + static const locale::id* const _S_id_collate[]; + static const locale::id* const _S_id_time[]; + static const locale::id* const _S_id_monetary[]; + static const locale::id* const _S_id_messages[]; + static const locale::id* const* const _S_facet_categories[]; + + inline void + _M_add_reference() throw() + { __atomic_add(&_M_references, 1); } + + inline void + _M_remove_reference() throw() + { + if (__exchange_and_add(&_M_references, -1) == 1) + { + try + { delete this; } + catch(...) + { } + } + } + + _Impl(const _Impl&, size_t); + _Impl(const char*, size_t); + _Impl(facet**, size_t, bool); + + ~_Impl() throw(); + + _Impl(const _Impl&); // Not defined. + + void + operator=(const _Impl&); // Not defined. + + inline bool + _M_check_same_name() + { + bool __ret = true; + for (size_t __i = 0; + __ret && __i < _S_categories_size + _S_extra_categories_size - 1; + ++__i) + __ret &= (strcmp(_M_names[__i], _M_names[__i + 1]) == 0); + return __ret; + } + + void + _M_replace_categories(const _Impl*, category); + + void + _M_replace_category(const _Impl*, const locale::id* const*); + + void + _M_replace_facet(const _Impl*, const locale::id*); + + void + _M_install_facet(const locale::id*, facet*); + + template<typename _Facet> + inline void + _M_init_facet(_Facet* __facet) + { _M_install_facet(&_Facet::id, __facet); } + }; + + template<typename _Facet> + locale::locale(const locale& __other, _Facet* __f) + { + _M_impl = new _Impl(*__other._M_impl, 1); + _M_impl->_M_install_facet(&_Facet::id, __f); + for (size_t __i = 0; + __i < _S_categories_size + _S_extra_categories_size; ++__i) + { + delete [] _M_impl->_M_names[__i]; + char* __new = new char[2]; + strcpy(__new, "*"); + _M_impl->_M_names[__i] = __new; + } + } + + + // 22.1.1.1.2 Class locale::facet + class locale::facet + { + private: + friend class locale; + friend class locale::_Impl; + + _Atomic_word _M_references; + + protected: + // Contains data from the underlying "C" library for the classic locale. + static __c_locale _S_c_locale; + + // String literal for the name of the classic locale. + static char _S_c_name[2]; + + explicit + facet(size_t __refs = 0) throw(); + + virtual + ~facet(); + + static void + _S_create_c_locale(__c_locale& __cloc, const char* __s, + __c_locale __old = 0); + + static __c_locale + _S_clone_c_locale(__c_locale& __cloc); + + static void + _S_destroy_c_locale(__c_locale& __cloc); + + private: + void + _M_add_reference() throw(); + + void + _M_remove_reference() throw(); + + facet(const facet&); // Not defined. + + void + operator=(const facet&); // Not defined. + }; + + + // 22.1.1.1.3 Class locale::id + class locale::id + { + private: + friend class locale; + friend class locale::_Impl; + template<typename _Facet> + friend const _Facet& + use_facet(const locale&); + template<typename _Facet> + friend bool + has_facet(const locale&) throw (); + + // NB: There is no accessor for _M_index because it may be used + // before the constructor is run; the effect of calling a member + // function (even an inline) would be undefined. + mutable size_t _M_index; + + // Last id number assigned. + static _Atomic_word _S_highwater; + + void + operator=(const id&); // Not defined. + + id(const id&); // Not defined. + + public: + // NB: This class is always a static data member, and thus can be + // counted on to be zero-initialized. + id(); + + inline size_t + _M_id() const + { + if (!_M_index) + _M_index = 1 + __exchange_and_add(&_S_highwater, 1); + return _M_index - 1; + } + }; +} // namespace std + +#endif diff --git a/libstdc++-v3/include/bits/locale_facets.h b/libstdc++-v3/include/bits/locale_facets.h index 660bad3c11a..45591248a30 100644 --- a/libstdc++-v3/include/bits/locale_facets.h +++ b/libstdc++-v3/include/bits/locale_facets.h @@ -1,6 +1,6 @@ // Locale support -*- C++ -*- -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -44,7 +44,9 @@ #include <ctime> // For struct tm #include <cwctype> // For wctype_t -#include <ios> // For ios_base +#include <iosfwd> +#include <bits/ios_base.h> // For ios_base, ios_base::iostate +#include <streambuf> namespace std { @@ -55,8 +57,72 @@ namespace std # define _GLIBCPP_NUM_FACETS 14 #endif + // Convert string to numeric value of type _Tv and store results. + // NB: This is specialized for all required types, there is no + // generic definition. + template<typename _Tv> + void + __convert_to_v(const char* __in, _Tv& __out, ios_base::iostate& __err, + const __c_locale& __cloc, int __base = 10); + + // Explicit specializations for required types. + template<> + void + __convert_to_v(const char*, long&, ios_base::iostate&, + const __c_locale&, int); + + template<> + void + __convert_to_v(const char*, unsigned long&, ios_base::iostate&, + const __c_locale&, int); + +#ifdef _GLIBCPP_USE_LONG_LONG + template<> + void + __convert_to_v(const char*, long long&, ios_base::iostate&, + const __c_locale&, int); + + template<> + void + __convert_to_v(const char*, unsigned long long&, ios_base::iostate&, + const __c_locale&, int); +#endif + + template<> + void + __convert_to_v(const char*, float&, ios_base::iostate&, + const __c_locale&, int); + + template<> + void + __convert_to_v(const char*, double&, ios_base::iostate&, + const __c_locale&, int); + + template<> + void + __convert_to_v(const char*, long double&, ios_base::iostate&, + const __c_locale&, int); + + template<typename _CharT, typename _Traits> - struct __pad; + struct __pad + { + static void + _S_pad(ios_base& __io, _CharT __fill, _CharT* __news, + const _CharT* __olds, const streamsize __newlen, + const streamsize __oldlen, const bool __num); + }; + + template<typename _CharT> + bool + __verify_grouping(const basic_string<_CharT>& __grouping, + basic_string<_CharT>& __grouping_tmp); + + template<typename _CharT> + _CharT* + __add_grouping(_CharT* __s, _CharT __sep, + const char* __gbeg, const char* __gend, + const _CharT* __first, const _CharT* __last); // 22.2.1.1 Template class ctype // Include host and configuration specific ctype enums for ctype_base. @@ -1011,22 +1077,10 @@ namespace std public: explicit - __timepunct(size_t __refs = 0) - : locale::facet(__refs) - { - _M_name_timepunct = new char[2]; - strcpy(_M_name_timepunct, "C"); - _M_initialize_timepunct(); - } + __timepunct(size_t __refs = 0); explicit - __timepunct(__c_locale __cloc, const char* __s, size_t __refs = 0) - : locale::facet(__refs) - { - _M_name_timepunct = new char[strlen(__s) + 1]; - strcpy(_M_name_timepunct, __s); - _M_initialize_timepunct(__cloc); - } + __timepunct(__c_locale __cloc, const char* __s, size_t __refs = 0); void _M_put(_CharT* __s, size_t __maxlen, const _CharT* __format, @@ -1123,11 +1177,7 @@ namespace std protected: virtual - ~__timepunct() - { - delete [] _M_name_timepunct; - _S_destroy_c_locale(_M_c_locale_timepunct); - } + ~__timepunct(); // For use at construction time only. void @@ -1169,6 +1219,8 @@ namespace std template<typename _CharT> const _CharT* __timepunct<_CharT>::_S_timezones[14]; + // Include host and configuration specific timepunct functions. + #include <bits/time_members.h> template<typename _CharT, typename _InIter> class time_get : public locale::facet, public time_base @@ -1628,32 +1680,17 @@ namespace std // Underlying "C" library locale information saved from // initialization, needed by messages_byname as well. __c_locale _M_c_locale_messages; -#if 1 - // Only needed if glibc < 2.3 char* _M_name_messages; -#endif public: static locale::id id; explicit - messages(size_t __refs = 0) - : locale::facet(__refs) - { - _M_name_messages = new char[2]; - strcpy(_M_name_messages, "C"); - _M_c_locale_messages = _S_c_locale; - } + messages(size_t __refs = 0); // Non-standard. explicit - messages(__c_locale __cloc, const char* __s, size_t __refs = 0) - : locale::facet(__refs) - { - _M_name_messages = new char[strlen(__s) + 1]; - strcpy(_M_name_messages, __s); - _M_c_locale_messages = _S_clone_c_locale(__cloc); - } + messages(__c_locale __cloc, const char* __s, size_t __refs = 0); catalog open(const basic_string<char>& __s, const locale& __loc) const @@ -1673,11 +1710,7 @@ namespace std protected: virtual - ~messages() - { - delete [] _M_name_messages; - _S_destroy_c_locale(_M_c_locale_messages); - } + ~messages(); virtual catalog do_open(const basic_string<char>&, const locale&) const; @@ -1751,9 +1784,6 @@ namespace std messages<wchar_t>::do_get(catalog, int, int, const wstring&) const; #endif - // Include host and configuration specific messages virtual functions. - #include <bits/messages_members.h> - template<typename _CharT> class messages_byname : public messages<_CharT> { @@ -1762,15 +1792,7 @@ namespace std typedef basic_string<_CharT> string_type; explicit - messages_byname(const char* __s, size_t __refs = 0) - : messages<_CharT>(__refs) - { - delete [] _M_name_messages; - _M_name_messages = new char[strlen(__s) + 1]; - strcpy(_M_name_messages, __s); - _S_destroy_c_locale(_M_c_locale_messages); - _S_create_c_locale(_M_c_locale_messages, __s); - } + messages_byname(const char* __s, size_t __refs = 0); protected: virtual @@ -1778,6 +1800,9 @@ namespace std { } }; + // Include host and configuration specific messages functions. + #include <bits/messages_members.h> + // Subclause convenience interfaces, inlines. // NB: These are inline because, when used in a loop, some compilers diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index ce6f3d7d5ff..29e6e0bc050 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -1,6 +1,6 @@ // Locale support -*- C++ -*- -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -36,13 +36,13 @@ #pragma GCC system_header #include <cerrno> -#include <clocale> // For localeconv -#include <cstdlib> // For strof, strtold -#include <cmath> // For ceil -#include <cctype> // For isspace -#include <limits> // For numeric_limits +#include <clocale> // For localeconv +#include <cstdlib> // For strof, strtold +#include <cmath> // For ceil +#include <cctype> // For isspace +#include <limits> // For numeric_limits +#include <typeinfo> // For bad_cast. #include <bits/streambuf_iterator.h> -#include <typeinfo> // For bad_cast. namespace std { @@ -622,9 +622,14 @@ namespace std _M_convert_float(_OutIter __s, ios_base& __io, _CharT __fill, char __mod, _ValueT __v) const { - // Note: digits10 is rounded down. We need to add 1 to ensure + // Note: digits10 is rounded down: we need to add 1 to ensure // we get the full available precision. - const int __max_digits = numeric_limits<_ValueT>::digits10 + 1; + // Then, in general, one more 1 needs to be added since, when the + // %{g,G} conversion specifiers are chosen inside _S_format_float, the + // precision field is "the maximum number of significant digits", *not* + // the "number of digits to appear after the decimal point", as happens + // for %{e,E,f,F} (C99, 7.19.6.1,4). + const int __max_digits = numeric_limits<_ValueT>::digits10 + 2; streamsize __prec = __io.precision(); if (__prec > static_cast<streamsize>(__max_digits)) @@ -1628,7 +1633,7 @@ namespace std // Find smallest matching string. size_t __minlen = 10; for (size_t __i2 = 0; __i2 < __nmatches; ++__i2) - __minlen = min(__minlen, + __minlen = min(__minlen, __traits_type::length(__names[__matches[__i2]])); if (__pos < __minlen && __beg != __end) @@ -1960,22 +1965,6 @@ namespace std return static_cast<long>(__val); } - // Convert string to numeric value of type _Tv and store results. - // NB: This is specialized for all required types, there is no - // generic definition. - template<typename _Tv> - void - __convert_to_v(const char* __in, _Tv& __out, ios_base::iostate& __err, - const __c_locale& __cloc, int __base = 10); - - // Convert numeric value of type _Tv to string and return length of string. - // If snprintf is available use it, otherwise fall back to the unsafe sprintf - // which, in general, can be dangerous and should be avoided. - template<typename _Tv> - int - __convert_from_v(char* __out, const int __size, const char* __fmt, - _Tv __v, const __c_locale&, int __prec = -1); - // Construct correctly padded string, as per 22.2.2.2.2 // Assumes // __newlen > __oldlen @@ -1988,15 +1977,6 @@ namespace std // NB: Of the two parameters, _CharT can be deduced from the // function arguments. The other (_Traits) has to be explicitly specified. template<typename _CharT, typename _Traits> - struct __pad - { - static void - _S_pad(ios_base& __io, _CharT __fill, _CharT* __news, - const _CharT* __olds, const streamsize __newlen, - const streamsize __oldlen, const bool __num); - }; - - template<typename _CharT, typename _Traits> void __pad<_CharT, _Traits>::_S_pad(ios_base& __io, _CharT __fill, _CharT* __news, const _CharT* __olds, diff --git a/libstdc++-v3/include/bits/localefwd.h b/libstdc++-v3/include/bits/localefwd.h index 76279609921..ac9e1a95425 100644 --- a/libstdc++-v3/include/bits/localefwd.h +++ b/libstdc++-v3/include/bits/localefwd.h @@ -1,6 +1,6 @@ // Locale support -*- C++ -*- -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -37,18 +37,15 @@ * You should not attempt to use it directly. */ -#ifndef _CPP_BITS_LOCCORE_H -#define _CPP_BITS_LOCCORE_H 1 +#ifndef _CPP_BITS_LOCALE_FWD_H +#define _CPP_BITS_LOCALE_FWD_H 1 #pragma GCC system_header #include <bits/c++config.h> #include <bits/c++locale.h> // Defines __c_locale, config-specific includes -#include <climits> // For CHAR_BIT -#include <cctype> // For isspace, etc. -#include <string> // For string. +#include <iosfwd> // For ostreambuf_iterator, istreambuf_iterator #include <bits/functexcept.h> -#include <bits/atomicity.h> namespace std { @@ -108,7 +105,6 @@ namespace std inline _CharT tolower(_CharT, const locale&); - // 22.2.1 and 22.2.1.3 ctype class ctype_base; template<typename _CharT> @@ -175,324 +171,6 @@ namespace std template<typename _CharT> class messages_byname; - // 22.1.1 Class locale - class locale - { - public: - // Types: - typedef unsigned int category; - - // Forward decls and friends: - class facet; - class id; - class _Impl; - - friend class facet; - friend class _Impl; - - template<typename _Facet> - friend const _Facet& - use_facet(const locale&); - - template<typename _Facet> - friend bool - has_facet(const locale&) throw(); - - // Category values: - // NB: Order must match _S_facet_categories definition in locale.cc - static const category none = 0; - static const category ctype = 1L << 0; - static const category numeric = 1L << 1; - static const category collate = 1L << 2; - static const category time = 1L << 3; - static const category monetary = 1L << 4; - static const category messages = 1L << 5; - static const category all = (ctype | numeric | collate | - time | monetary | messages); - - // Construct/copy/destroy: - locale() throw(); - - locale(const locale& __other) throw(); - - explicit - locale(const char* __s); - - locale(const locale& __base, const char* __s, category __cat); - - locale(const locale& __base, const locale& __add, category __cat); - - template<typename _Facet> - locale(const locale& __other, _Facet* __f); - - ~locale() throw(); - - const locale& - operator=(const locale& __other) throw(); - - template<typename _Facet> - locale - combine(const locale& __other) const; - - // Locale operations: - string - name() const; - - bool - operator==(const locale& __other) const throw (); - - inline bool - operator!=(const locale& __other) const throw () - { return !(this->operator==(__other)); } - - template<typename _Char, typename _Traits, typename _Alloc> - bool - operator()(const basic_string<_Char, _Traits, _Alloc>& __s1, - const basic_string<_Char, _Traits, _Alloc>& __s2) const; - - // Global locale objects: - static locale - global(const locale&); - - static const locale& - classic(); - - private: - // The (shared) implementation - _Impl* _M_impl; - - // The "C" reference locale - static _Impl* _S_classic; - - // Current global reference locale - static _Impl* _S_global; - - // Number of standard categories. For C++, these categories are - // collate, ctype, monetary, numeric, time, and messages. These - // directly correspond to ISO C99 macros LC_COLLATE, LC_CTYPE, - // LC_MONETARY, LC_NUMERIC, and LC_TIME. In addition, POSIX (IEEE - // 1003.1-2001) specifies LC_MESSAGES. - static const size_t _S_categories_size = 6; - - // In addition to the standard categories, the underlying - // operating system is allowed to define extra LC_* - // macros. For GNU systems, the following are also valid: - // LC_PAPER, LC_NAME, LC_ADDRESS, LC_TELEPHONE, LC_MEASUREMENT, - // and LC_IDENTIFICATION. - static const size_t _S_extra_categories_size = _GLIBCPP_NUM_CATEGORIES; - - // Names of underlying locale categories. - // NB: locale::global() has to know how to modify all the - // underlying categories, not just the ones required by the C++ - // standard. - static const char* _S_categories[_S_categories_size - + _S_extra_categories_size]; - - explicit - locale(_Impl*) throw(); - - static inline void - _S_initialize() - { - if (!_S_classic) - classic(); - } - - static category - _S_normalize_category(category); - - void - _M_coalesce(const locale& __base, const locale& __add, category __cat); - }; - - - // Implementation object for locale - class locale::_Impl - { - public: - // Friends. - friend class locale; - friend class locale::facet; - - template<typename _Facet> - friend const _Facet& - use_facet(const locale&); - - template<typename _Facet> - friend bool - has_facet(const locale&) throw(); - - private: - // Data Members. - _Atomic_word _M_references; - facet** _M_facets; - size_t _M_facets_size; - - char* _M_names[_S_categories_size - + _S_extra_categories_size]; - static const locale::id* const _S_id_ctype[]; - static const locale::id* const _S_id_numeric[]; - static const locale::id* const _S_id_collate[]; - static const locale::id* const _S_id_time[]; - static const locale::id* const _S_id_monetary[]; - static const locale::id* const _S_id_messages[]; - static const locale::id* const* const _S_facet_categories[]; - - inline void - _M_add_reference() throw() - { __atomic_add(&_M_references, 1); } - - inline void - _M_remove_reference() throw() - { - if (__exchange_and_add(&_M_references, -1) == 1) - { - try - { delete this; } - catch(...) - { } - } - } - - _Impl(const _Impl&, size_t); - _Impl(const char*, size_t); - _Impl(facet**, size_t, bool); - - ~_Impl() throw(); - - _Impl(const _Impl&); // Not defined. - - void - operator=(const _Impl&); // Not defined. - - inline bool - _M_check_same_name() - { - bool __ret = true; - for (size_t __i = 0; - __ret && __i < _S_categories_size + _S_extra_categories_size - 1; - ++__i) - __ret &= (strcmp(_M_names[__i], _M_names[__i + 1]) == 0); - return __ret; - } - - void - _M_replace_categories(const _Impl*, category); - - void - _M_replace_category(const _Impl*, const locale::id* const*); - - void - _M_replace_facet(const _Impl*, const locale::id*); - - void - _M_install_facet(const locale::id*, facet*); - - template<typename _Facet> - inline void - _M_init_facet(_Facet* __facet) - { _M_install_facet(&_Facet::id, __facet); } - }; - - template<typename _Facet> - locale::locale(const locale& __other, _Facet* __f) - { - _M_impl = new _Impl(*__other._M_impl, 1); - _M_impl->_M_install_facet(&_Facet::id, __f); - for (size_t __i = 0; - __i < _S_categories_size + _S_extra_categories_size; ++__i) - { - delete [] _M_impl->_M_names[__i]; - char* __new = new char[2]; - strcpy(__new, "*"); - _M_impl->_M_names[__i] = __new; - } - } - - // 22.1.1.1.2 Class locale::facet - class locale::facet - { - private: - friend class locale; - friend class locale::_Impl; - - _Atomic_word _M_references; - - protected: - // Contains data from the underlying "C" library for default "C" - // or "POSIX" locale. - static __c_locale _S_c_locale; - - explicit - facet(size_t __refs = 0) throw(); - - virtual - ~facet(); - - static void - _S_create_c_locale(__c_locale& __cloc, const char* __s, - __c_locale __old = 0); - - static __c_locale - _S_clone_c_locale(__c_locale& __cloc); - - static void - _S_destroy_c_locale(__c_locale& __cloc); - - private: - void - _M_add_reference() throw(); - - void - _M_remove_reference() throw(); - - facet(const facet&); // Not defined. - - void - operator=(const facet&); // Not defined. - }; - - - // 22.1.1.1.3 Class locale::id - class locale::id - { - private: - friend class locale; - friend class locale::_Impl; - template<typename _Facet> - friend const _Facet& - use_facet(const locale&); - template<typename _Facet> - friend bool - has_facet(const locale&) throw (); - - // NB: There is no accessor for _M_index because it may be used - // before the constructor is run; the effect of calling a member - // function (even an inline) would be undefined. - mutable size_t _M_index; - - // Last id number assigned. - static _Atomic_word _S_highwater; - - void - operator=(const id&); // Not defined. - - id(const id&); // Not defined. - - public: - // NB: This class is always a static data member, and thus can be - // counted on to be zero-initialized. - id(); - - inline size_t - _M_id() const - { - if (!_M_index) - _M_index = 1 + __exchange_and_add(&_S_highwater, 1); - return _M_index - 1; - } - }; - template<typename _Facet> const _Facet& use_facet(const locale& __loc); diff --git a/libstdc++-v3/include/bits/stl_alloc.h b/libstdc++-v3/include/bits/stl_alloc.h index bab39fb7150..90078822c74 100644 --- a/libstdc++-v3/include/bits/stl_alloc.h +++ b/libstdc++-v3/include/bits/stl_alloc.h @@ -1,6 +1,6 @@ // Allocators -*- C++ -*- -// Copyright (C) 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -129,9 +129,7 @@ namespace std { private: static void* _S_oom_malloc(size_t); -#ifdef _GLIBCPP_DEPRECATED static void* _S_oom_realloc(void*, size_t); -#endif static void (* __malloc_alloc_oom_handler)(); public: @@ -148,7 +146,6 @@ namespace std deallocate(void* __p, size_t /* __n */) { free(__p); } -#ifdef _GLIBCPP_DEPRECATED static void* reallocate(void* __p, size_t /* old_sz */, size_t __new_sz) { @@ -157,7 +154,6 @@ namespace std __result = _S_oom_realloc(__p, __new_sz); return __result; } -#endif static void (* __set_malloc_handler(void (*__f)()))() { @@ -191,7 +187,6 @@ namespace std } } -#ifdef _GLIBCPP_DEPRECATED template<int __inst> void* __malloc_alloc_template<__inst>:: @@ -211,7 +206,6 @@ namespace std return __result; } } -#endif // Should not be referenced within the library anymore. typedef __new_alloc __mem_interface; @@ -293,7 +287,6 @@ namespace std _Alloc::deallocate(__real_p, __n + (int) _S_extra); } -#ifdef _GLIBCPP_DEPRECATED static void* reallocate(void* __p, size_t __old_sz, size_t __new_sz) { @@ -305,7 +298,6 @@ namespace std *(size_t*)__result = __new_sz; return __result + (int) _S_extra; } -#endif }; @@ -456,10 +448,8 @@ namespace std } } -#ifdef _GLIBCPP_DEPRECATED static void* reallocate(void* __p, size_t __old_sz, size_t __new_sz); -#endif }; template<bool __threads, int __inst> _Atomic_word @@ -591,7 +581,6 @@ namespace std } -#ifdef _GLIBCPP_DEPRECATED template<bool threads, int inst> void* __default_alloc_template<threads, inst>:: @@ -610,7 +599,6 @@ namespace std deallocate(__p, __old_sz); return __result; } -#endif template<bool __threads, int __inst> _STL_mutex_lock diff --git a/libstdc++-v3/include/std/std_bitset.h b/libstdc++-v3/include/std/std_bitset.h index e938662b4ee..ebe16504d18 100644 --- a/libstdc++-v3/include/std/std_bitset.h +++ b/libstdc++-v3/include/std/std_bitset.h @@ -219,7 +219,7 @@ namespace std void _Base_bitset<_Nw>::_M_do_left_shift(size_t __shift) { - if (__shift != 0) + if (__builtin_expect(__shift != 0, 1)) { const size_t __wshift = __shift / _GLIBCPP_BITSET_BITS_PER_WORD; const size_t __offset = __shift % _GLIBCPP_BITSET_BITS_PER_WORD; @@ -244,7 +244,7 @@ namespace std void _Base_bitset<_Nw>::_M_do_right_shift(size_t __shift) { - if (__shift != 0) + if (__builtin_expect(__shift != 0, 1)) { const size_t __wshift = __shift / _GLIBCPP_BITSET_BITS_PER_WORD; const size_t __offset = __shift % _GLIBCPP_BITSET_BITS_PER_WORD; @@ -570,6 +570,7 @@ namespace std struct _Sanitize<0> { static void _S_do_sanitize(unsigned long) { } }; + /** * @brief The %bitset class represents a @e fixed-size sequence of bits. * @@ -578,17 +579,19 @@ namespace std * (Note that %bitset does @e not meet the formal requirements of a * <a href="tables.html#65">container</a>. Mainly, it lacks iterators.) * - * The template argument, @a _Nb, may be any non-negative number of type - * size_t. + * The template argument, @a Nb, may be any non-negative number, + * specifying the number of bits (e.g., "0", "12", "1024*1024"). * - * A %bitset of size N has N % (sizeof(unsigned long) * CHAR_BIT) unused - * bits. (They are the high-order bits in the highest word.) It is - * a class invariant that those unused bits are always zero. + * In the general unoptimized case, storage is allocated in word-sized + * blocks. Let B be the number of bits in a word, then (Nb+(B-1))/B + * words will be used for storage. B - Nb%B bits are unused. (They are + * the high-order bits in the highest word.) It is a class invariant + * that those unused bits are always zero. * * If you think of %bitset as "a simple array of bits," be aware that * your mental picture is reversed: a %bitset behaves the same way as * bits in integers do, with the bit at index 0 in the "least significant - * / right-hand" position, and the bit at index N-1 in the "most + * / right-hand" position, and the bit at index Nb-1 in the "most * significant / left-hand" position. Thus, unlike other containers, a * %bitset's index "counts from right to left," to put it very loosely. * @@ -619,6 +622,7 @@ namespace std * @endcode * * Also see http://gcc.gnu.org/onlinedocs/libstdc++/ext/sgiexts.html#ch23 + * for a description of extensions. * * @if maint * Most of the actual code isn't contained in %bitset<> itself, but in the @@ -805,16 +809,26 @@ namespace std bitset<_Nb>& operator<<=(size_t __pos) { - this->_M_do_left_shift(__pos); - this->_M_do_sanitize(); + if (__builtin_expect(__pos < _Nb, 1)) + { + this->_M_do_left_shift(__pos); + this->_M_do_sanitize(); + } + else + this->_M_do_reset(); return *this; } bitset<_Nb>& operator>>=(size_t __pos) { - this->_M_do_right_shift(__pos); - this->_M_do_sanitize(); + if (__builtin_expect(__pos < _Nb, 1)) + { + this->_M_do_right_shift(__pos); + this->_M_do_sanitize(); + } + else + this->_M_do_reset(); return *this; } //@} @@ -1183,6 +1197,7 @@ namespace std typename basic_istream<_CharT, _Traits>::sentry __sentry(__is); if (__sentry) { + ios_base::iostate __state = ios_base::goodbit; basic_streambuf<_CharT, _Traits>* __buf = __is.rdbuf(); for (size_t __i = 0; __i < _Nb; ++__i) { @@ -1191,7 +1206,7 @@ namespace std typename _Traits::int_type __c1 = __buf->sbumpc(); if (_Traits::eq_int_type(__c1, __eof)) { - __is.setstate(ios_base::eofbit); + __state |= ios_base::eofbit; break; } else @@ -1201,19 +1216,21 @@ namespace std if (__c == '0' || __c == '1') __tmp.push_back(__c); - else if (_Traits::eq_int_type(__buf->sputbackc(__c2), - __eof)) + else if (_Traits::eq_int_type(__buf->sputbackc(__c2), __eof)) { - __is.setstate(ios_base::failbit); + __state |= ios_base::failbit; break; } } } if (__tmp.empty() && !_Nb) - __is.setstate(ios_base::failbit); + __state |= ios_base::failbit; else __x._M_copy_from_string(__tmp, static_cast<size_t>(0), _Nb); + + if (__state != ios_base::goodbit) + __is.setstate(__state); // may throw an exception } return __is; diff --git a/libstdc++-v3/include/std/std_fstream.h b/libstdc++-v3/include/std/std_fstream.h index 685a38dd944..bbb74c6c5eb 100644 --- a/libstdc++-v3/include/std/std_fstream.h +++ b/libstdc++-v3/include/std/std_fstream.h @@ -234,11 +234,11 @@ namespace std // [documentation is inherited] virtual int_type - underflow() { return _M_underflow_common(false); } + underflow(); // [documentation is inherited] virtual int_type - uflow() { return _M_underflow_common(true); } + uflow(); // [documentation is inherited] virtual int_type @@ -431,7 +431,7 @@ namespace std } }; - // Explicit specializations, defined in src/fstream.cc. + // Explicit specialization declarations, defined in src/fstream.cc. template<> basic_filebuf<char>::int_type basic_filebuf<char>::_M_underflow_common(bool __bump); @@ -442,6 +442,18 @@ namespace std basic_filebuf<wchar_t>::_M_underflow_common(bool __bump); #endif + // Generic definitions. + template <typename _CharT, typename _Traits> + basic_filebuf<_CharT, _Traits>::int_type + basic_filebuf<_CharT, _Traits>::underflow() + { return _M_underflow_common(false); } + + template <typename _CharT, typename _Traits> + basic_filebuf<_CharT, _Traits>::int_type + basic_filebuf<_CharT, _Traits>::uflow() + { return _M_underflow_common(true); } + + // [27.8.1.5] Template class basic_ifstream /** * @brief Controlling input for files. diff --git a/libstdc++-v3/include/std/std_iosfwd.h b/libstdc++-v3/include/std/std_iosfwd.h index 124c8ffc5ff..55b0e0b19fa 100644 --- a/libstdc++-v3/include/std/std_iosfwd.h +++ b/libstdc++-v3/include/std/std_iosfwd.h @@ -1,6 +1,7 @@ // Forwarding declarations -*- C++ -*- -// Copyright (C) 1997, 1998, 1999, 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003 +// Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -42,7 +43,9 @@ #pragma GCC system_header #include <bits/c++config.h> -#include <bits/stringfwd.h> // For string forward declarations. +#include <bits/c++locale.h> +#include <cctype> // For isspace, etc. +#include <bits/stringfwd.h> // For string forward declarations. #include <bits/fpos.h> #include <bits/functexcept.h> diff --git a/libstdc++-v3/include/std/std_limits.h b/libstdc++-v3/include/std/std_limits.h index be4b5f2a90b..9be69477958 100644 --- a/libstdc++-v3/include/std/std_limits.h +++ b/libstdc++-v3/include/std/std_limits.h @@ -508,7 +508,7 @@ namespace std static short denorm_min() throw() { return short(); } - static const bool is_iec559 = true; + static const bool is_iec559 = false; static const bool is_bounded = true; static const bool is_modulo = true; @@ -558,7 +558,7 @@ namespace std static unsigned short denorm_min() throw() { return static_cast<unsigned short>(0); } - static const bool is_iec559 = true; + static const bool is_iec559 = false; static const bool is_bounded = true; static const bool is_modulo = true; @@ -608,7 +608,7 @@ namespace std static int denorm_min() throw() { return static_cast<int>(0); } - static const bool is_iec559 = true; + static const bool is_iec559 = false; static const bool is_bounded = true; static const bool is_modulo = true; @@ -658,7 +658,7 @@ namespace std static unsigned int denorm_min() throw() { return static_cast<unsigned int>(0); } - static const bool is_iec559 = true; + static const bool is_iec559 = false; static const bool is_bounded = true; static const bool is_modulo = true; @@ -708,7 +708,7 @@ namespace std static long denorm_min() throw() { return static_cast<long>(0); } - static const bool is_iec559 = true; + static const bool is_iec559 = false; static const bool is_bounded = true; static const bool is_modulo = true; @@ -758,7 +758,7 @@ namespace std static unsigned long denorm_min() throw() { return static_cast<unsigned long>(0); } - static const bool is_iec559 = true; + static const bool is_iec559 = false; static const bool is_bounded = true; static const bool is_modulo = true; @@ -808,7 +808,7 @@ namespace std static long long denorm_min() throw() { return static_cast<long long>(0); } - static const bool is_iec559 = true; + static const bool is_iec559 = false; static const bool is_bounded = true; static const bool is_modulo = true; @@ -858,7 +858,7 @@ namespace std static unsigned long long denorm_min() throw() { return static_cast<unsigned long long>(0); } - static const bool is_iec559 = true; + static const bool is_iec559 = false; static const bool is_bounded = true; static const bool is_modulo = true; diff --git a/libstdc++-v3/include/std/std_locale.h b/libstdc++-v3/include/std/std_locale.h index 9c46b96bc2f..29602560766 100644 --- a/libstdc++-v3/include/std/std_locale.h +++ b/libstdc++-v3/include/std/std_locale.h @@ -1,6 +1,6 @@ // Locale support -*- C++ -*- -// Copyright (C) 1997, 1998, 1999, 2002 Free Software Foundation, Inc. +// Copyright (C) 1997, 1998, 1999, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -42,11 +42,8 @@ #pragma GCC system_header #include <bits/localefwd.h> +#include <bits/locale_classes.h> #include <bits/locale_facets.h> #include <bits/locale_facets.tcc> #endif - -// Local Variables: -// mode:c++ -// End: diff --git a/libstdc++-v3/include/std/std_streambuf.h b/libstdc++-v3/include/std/std_streambuf.h index 883401bf6ee..28aa84fe1bd 100644 --- a/libstdc++-v3/include/std/std_streambuf.h +++ b/libstdc++-v3/include/std/std_streambuf.h @@ -1,6 +1,6 @@ // Stream buffer classes -*- C++ -*- -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -364,7 +364,6 @@ namespace std _M_buf_size = 0; _M_buf_size_opt = 0; _M_mode = ios_base::openmode(0); - _M_buf_locale_init = false; } // [27.5.2.2.1] locales @@ -393,12 +392,7 @@ namespace std */ locale getloc() const - { - if (_M_buf_locale_init) - return _M_buf_locale; - else - return locale(); - } + { return _M_buf_locale; } // [27.5.2.2.2] buffer management and positioning //@{ @@ -584,7 +578,7 @@ namespace std _M_buf_unified(false), _M_in_beg(0), _M_in_cur(0), _M_in_end(0), _M_out_beg(0), _M_out_cur(0), _M_out_end(0), _M_mode(ios_base::openmode(0)), _M_buf_locale(locale()), - _M_buf_locale_init(false), _M_pback_cur_save(0), _M_pback_end_save(0), + _M_pback_cur_save(0), _M_pback_end_save(0), _M_pback_init(false) { } @@ -700,7 +694,6 @@ namespace std virtual void imbue(const locale& __loc) { - _M_buf_locale_init = true; if (_M_buf_locale != __loc) _M_buf_locale = __loc; } diff --git a/libstdc++-v3/libio/Makefile.in b/libstdc++-v3/libio/Makefile.in index 08c71d94d1b..1c05a73efe3 100644 --- a/libstdc++-v3/libio/Makefile.in +++ b/libstdc++-v3/libio/Makefile.in @@ -75,6 +75,7 @@ CLOCALE_H = @CLOCALE_H@ CMESSAGES_H = @CMESSAGES_H@ CPP = @CPP@ CSTDIO_H = @CSTDIO_H@ +CTIME_H = @CTIME_H@ CXX = @CXX@ CXXCPP = @CXXCPP@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ diff --git a/libstdc++-v3/libmath/Makefile.in b/libstdc++-v3/libmath/Makefile.in index 09f2df1f77d..38d8863e3d0 100644 --- a/libstdc++-v3/libmath/Makefile.in +++ b/libstdc++-v3/libmath/Makefile.in @@ -75,6 +75,7 @@ CLOCALE_H = @CLOCALE_H@ CMESSAGES_H = @CMESSAGES_H@ CPP = @CPP@ CSTDIO_H = @CSTDIO_H@ +CTIME_H = @CTIME_H@ CXX = @CXX@ CXXCPP = @CXXCPP@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am index 160e79f714e..703c0db3560 100644 --- a/libstdc++-v3/libsupc++/Makefile.am +++ b/libstdc++-v3/libsupc++/Makefile.am @@ -49,7 +49,7 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@ # or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS # NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden. CONFIG_CXXFLAGS = \ - @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @DEBUG_FLAGS@ + @SECTION_FLAGS@ @EXTRA_CXX_FLAGS@ @DEBUG_FLAGS@ # Warning flags to use. WARN_CXXFLAGS = \ diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index b517b458dd8..7075ac7f07e 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -74,6 +74,7 @@ CLOCALE_H = @CLOCALE_H@ CMESSAGES_H = @CMESSAGES_H@ CPP = @CPP@ CSTDIO_H = @CSTDIO_H@ +CTIME_H = @CTIME_H@ CXXCPP = @CXXCPP@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ DEBUG_FLAGS = @DEBUG_FLAGS@ @@ -153,7 +154,7 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@ # or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS # NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden. CONFIG_CXXFLAGS = \ - @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @DEBUG_FLAGS@ + @SECTION_FLAGS@ @EXTRA_CXX_FLAGS@ @DEBUG_FLAGS@ # Warning flags to use. diff --git a/libstdc++-v3/libsupc++/tinfo.cc b/libstdc++-v3/libsupc++/tinfo.cc index adafc25e377..d6e465e0a38 100644 --- a/libstdc++-v3/libsupc++/tinfo.cc +++ b/libstdc++-v3/libsupc++/tinfo.cc @@ -1,5 +1,5 @@ // Methods for type_info for -*- C++ -*- Run Time Type Identification. -// Copyright (C) 1994, 1996, 1998, 1999, 2000, 2001, 2002 +// Copyright (C) 1994, 1996, 1998, 1999, 2000, 2001, 2002, 2003 // Free Software Foundation // // This file is part of GNU CC. @@ -482,8 +482,9 @@ __do_dyncast (ptrdiff_t src2dst, result.whole2dst = __sub_kind (result.whole2dst | result2.whole2dst); } - else if ((result.dst_ptr != 0 | result_ambig) - && (result2.dst_ptr != 0 | result2_ambig)) + else if ((result.dst_ptr != 0 & result2.dst_ptr != 0) + || (result.dst_ptr != 0 & result2_ambig) + || (result2.dst_ptr != 0 & result_ambig)) { // Found two different DST_TYPE bases, or a valid one and a set of // ambiguous ones, must disambiguate. See whether SRC_PTR is diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in index 7ebb03291f3..dfae5497cd5 100644 --- a/libstdc++-v3/po/Makefile.in +++ b/libstdc++-v3/po/Makefile.in @@ -75,6 +75,7 @@ CLOCALE_H = @CLOCALE_H@ CMESSAGES_H = @CMESSAGES_H@ CPP = @CPP@ CSTDIO_H = @CSTDIO_H@ +CTIME_H = @CTIME_H@ CXX = @CXX@ CXXCPP = @CXXCPP@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 4592168f48d..9b6897ec7e4 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -41,7 +41,7 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@ # or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS # NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden. CONFIG_CXXFLAGS = \ - @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @DEBUG_FLAGS@ + @SECTION_FLAGS@ @EXTRA_CXX_FLAGS@ @DEBUG_FLAGS@ # Warning flags to use. WARN_CXXFLAGS = \ diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 0974449aaa1..c09b5400eac 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -74,6 +74,7 @@ CLOCALE_H = @CLOCALE_H@ CMESSAGES_H = @CMESSAGES_H@ CPP = @CPP@ CSTDIO_H = @CSTDIO_H@ +CTIME_H = @CTIME_H@ CXXCPP = @CXXCPP@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ DEBUG_FLAGS = @DEBUG_FLAGS@ @@ -143,7 +144,7 @@ OPTIMIZE_CXXFLAGS = @OPTIMIZE_CXXFLAGS@ # or configure.in to see how they are set. See GLIBCPP_EXPORT_FLAGS # NB: DEBUGFLAGS have to be at the end so that -O2 can be overridden. CONFIG_CXXFLAGS = \ - @EXTRA_CXX_FLAGS@ @SECTION_FLAGS@ @DEBUG_FLAGS@ + @SECTION_FLAGS@ @EXTRA_CXX_FLAGS@ @DEBUG_FLAGS@ # Warning flags to use. diff --git a/libstdc++-v3/src/codecvt.cc b/libstdc++-v3/src/codecvt.cc index b9575cf70bc..bc5508a4f40 100644 --- a/libstdc++-v3/src/codecvt.cc +++ b/libstdc++-v3/src/codecvt.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2000, 2002 Free Software Foundation, Inc. +// Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -46,26 +46,22 @@ namespace std codecvt<char, char, mbstate_t>:: codecvt(size_t __refs) : __codecvt_abstract_base<char, char, mbstate_t>(__refs) - { _M_c_locale_codecvt = _S_c_locale; } - - codecvt<char, char, mbstate_t>:: - codecvt(__c_locale __cloc, size_t __refs) - : __codecvt_abstract_base<char, char, mbstate_t>(__refs) - { _M_c_locale_codecvt = _S_clone_c_locale(__cloc); } + { } codecvt<char, char, mbstate_t>:: ~codecvt() - { _S_destroy_c_locale(_M_c_locale_codecvt); } + { } codecvt_base::result codecvt<char, char, mbstate_t>:: do_out(state_type&, const intern_type* __from, - const intern_type* __from_end, const intern_type*& __from_next, - extern_type* __to, extern_type* __to_end, + const intern_type*, const intern_type*& __from_next, + extern_type* __to, extern_type*, extern_type*& __to_next) const { - size_t __len = min(__from_end - __from, __to_end - __to); - memcpy(__to, __from, __len); + // _GLIBCPP_RESOLVE_LIB_DEFECTS + // According to the resolution of DR19, "If returns noconv [...] + // there are no changes to the values in [to, to_limit)." __from_next = __from; __to_next = __to; return noconv; @@ -83,12 +79,13 @@ namespace std codecvt_base::result codecvt<char, char, mbstate_t>:: do_in(state_type&, const extern_type* __from, - const extern_type* __from_end, const extern_type*& __from_next, - intern_type* __to, intern_type* __to_end, + const extern_type*, const extern_type*& __from_next, + intern_type* __to, intern_type*, intern_type*& __to_next) const - { - size_t __len = min(__from_end - __from, __to_end - __to); - memcpy(__to, __from, __len); + { + // _GLIBCPP_RESOLVE_LIB_DEFECTS + // According to the resolution of DR19, "If returns noconv [...] + // there are no changes to the values in [to, to_limit)." __from_next = __from; __to_next = __to; return noconv; @@ -120,16 +117,11 @@ namespace std codecvt<wchar_t, char, mbstate_t>:: codecvt(size_t __refs) : __codecvt_abstract_base<wchar_t, char, mbstate_t>(__refs) - { _M_c_locale_codecvt = _S_c_locale; } - - codecvt<wchar_t, char, mbstate_t>:: - codecvt(__c_locale __cloc, size_t __refs) - : __codecvt_abstract_base<wchar_t, char, mbstate_t>(__refs) - { _M_c_locale_codecvt = _S_clone_c_locale(__cloc); } + { } codecvt<wchar_t, char, mbstate_t>:: ~codecvt() - { _S_destroy_c_locale(_M_c_locale_codecvt); } + { } codecvt_base::result codecvt<wchar_t, char, mbstate_t>:: diff --git a/libstdc++-v3/src/concept-inst.cc b/libstdc++-v3/src/concept-inst.cc index d0129e5f940..e173549105d 100644 --- a/libstdc++-v3/src/concept-inst.cc +++ b/libstdc++-v3/src/concept-inst.cc @@ -1,6 +1,6 @@ // Concept checking instantiations -*- C++ -*- -// Copyright (C) 2001, 2002 Free Software Foundation +// Copyright (C) 2001, 2002, 2003 Free Software Foundation // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -39,6 +39,7 @@ #ifdef _GLIBCPP_CONCEPT_CHECKS #include <memory> +#include <iterator> #include <ostream> #define _Instantiate(...) template void __function_requires< __VA_ARGS__ > () diff --git a/libstdc++-v3/src/locale.cc b/libstdc++-v3/src/locale.cc index c5c6dd8a049..3b6302ea28d 100644 --- a/libstdc++-v3/src/locale.cc +++ b/libstdc++-v3/src/locale.cc @@ -1,4 +1,4 @@ -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -449,6 +449,8 @@ namespace std __c_locale locale::facet::_S_c_locale; + char locale::facet::_S_c_name[2]; + locale::facet:: ~facet() { } diff --git a/libstdc++-v3/src/localename.cc b/libstdc++-v3/src/localename.cc index 892a951ce0d..7f1a51917da 100644 --- a/libstdc++-v3/src/localename.cc +++ b/libstdc++-v3/src/localename.cc @@ -1,4 +1,4 @@ -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002m 2003 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -170,7 +170,7 @@ namespace std // Construct all standard facets and add them to _M_facets. _M_init_facet(new std::ctype<char>(__cloc, 0, false)); - _M_init_facet(new codecvt<char, char, mbstate_t>(__cloc)); + _M_init_facet(new codecvt<char, char, mbstate_t>); _M_init_facet(new numpunct<char>(__cloc)); _M_init_facet(new num_get<char>); _M_init_facet(new num_put<char>); @@ -186,7 +186,7 @@ namespace std #ifdef _GLIBCPP_USE_WCHAR_T _M_init_facet(new std::ctype<wchar_t>(__cloc)); - _M_init_facet(new codecvt<wchar_t, char, mbstate_t>(__cloc)); + _M_init_facet(new codecvt<wchar_t, char, mbstate_t>); _M_init_facet(new numpunct<wchar_t>(__cloc)); _M_init_facet(new num_get<wchar_t>); _M_init_facet(new num_put<wchar_t>); @@ -209,7 +209,10 @@ namespace std : _M_references(__refs), _M_facets_size(_GLIBCPP_NUM_FACETS) { // Initialize the underlying locale model. - locale::facet::_S_create_c_locale(locale::facet::_S_c_locale, "C"); + locale::facet::_S_c_name[0] = 'C'; + locale::facet::_S_c_name[1] = '\0'; + locale::facet::_S_create_c_locale(locale::facet::_S_c_locale, + locale::facet::_S_c_name); _M_facets = new(&facet_vec) facet*[_M_facets_size]; for (size_t __i = 0; __i < _M_facets_size; ++__i) @@ -220,7 +223,7 @@ namespace std __i < _S_categories_size + _S_extra_categories_size; ++__i) { _M_names[__i] = new (&facet_name[__i]) char[2]; - strcpy(_M_names[__i], "C"); + strcpy(_M_names[__i], locale::facet::_S_c_name); } // This is needed as presently the C++ version of "C" locales diff --git a/libstdc++-v3/testsuite/18_support/numeric_limits.cc b/libstdc++-v3/testsuite/18_support/numeric_limits.cc index 4a1c498bb2d..540b4b7759f 100644 --- a/libstdc++-v3/testsuite/18_support/numeric_limits.cc +++ b/libstdc++-v3/testsuite/18_support/numeric_limits.cc @@ -289,12 +289,33 @@ bool test03() return test; } +// libstdc++/8949 +bool test04() +{ + bool test = true; + + VERIFY( !std::numeric_limits<short>::is_iec559 ); + VERIFY( !std::numeric_limits<unsigned short>::is_iec559 ); + VERIFY( !std::numeric_limits<int>::is_iec559 ); + VERIFY( !std::numeric_limits<unsigned int>::is_iec559 ); + VERIFY( !std::numeric_limits<long>::is_iec559 ); + VERIFY( !std::numeric_limits<unsigned long>::is_iec559 ); + VERIFY( !std::numeric_limits<long long>::is_iec559 ); + VERIFY( !std::numeric_limits<unsigned long long>::is_iec559 ); + +#ifdef DEBUG_ASSERT + assert(test); +#endif + + return test; +} int main() { test01(); test02(); test03(); + test04(); test_extrema<char>(); test_extrema<signed char>(); diff --git a/libstdc++-v3/testsuite/21_strings/ctor_copy_dtor.cc b/libstdc++-v3/testsuite/21_strings/ctor_copy_dtor.cc index c45e66a4cd4..28e9d8ef160 100644 --- a/libstdc++-v3/testsuite/21_strings/ctor_copy_dtor.cc +++ b/libstdc++-v3/testsuite/21_strings/ctor_copy_dtor.cc @@ -1,6 +1,6 @@ // 1999-06-04 bkoz -// Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -230,7 +230,7 @@ void test05() int main() { - __set_testsuite_memlimit(); + __gnu_cxx_test::set_memory_limits(); test01(); test02(); test03(); diff --git a/libstdc++-v3/testsuite/21_strings/insert.cc b/libstdc++-v3/testsuite/21_strings/insert.cc index e6140ac2e9b..5e1eda86959 100644 --- a/libstdc++-v3/testsuite/21_strings/insert.cc +++ b/libstdc++-v3/testsuite/21_strings/insert.cc @@ -1,6 +1,6 @@ // 1999-06-03 bkoz -// Copyright (C) 1999 Free Software Foundation, Inc. +// Copyright (C) 1999, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -246,7 +246,7 @@ int test02(void) int main() { - __set_testsuite_memlimit(); + __gnu_cxx_test::set_memory_limits(); test01(); test02(); return 0; diff --git a/libstdc++-v3/testsuite/22_locale/codecvt_members_char_char.cc b/libstdc++-v3/testsuite/22_locale/codecvt_members_char_char.cc index 9cf4e7d5c70..b2acb675351 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt_members_char_char.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt_members_char_char.cc @@ -36,25 +36,33 @@ void test01() const char* from_next; int size = 25; char* c_arr = new char[size]; + char* c_ref = new char[size]; char* to_next; locale loc; c_codecvt::state_type state; const c_codecvt* cvt = &use_facet<c_codecvt>(loc); + // According to the resolution of DR19 (see also libstd++/9168), in + // case of degenerate conversion ('noconv'), "there are no changes to + // the values in [to, to_limit)." + memset(c_ref, 'X', size); + // in + memset(c_arr, 'X', size); result r1 = cvt->in(state, c_lit, c_lit + size, from_next, c_arr, c_arr + size, to_next); VERIFY( r1 == codecvt_base::noconv ); - VERIFY( !strcmp(c_arr, c_lit) ); + VERIFY( !memcmp(c_arr, c_ref, size) ); VERIFY( from_next == c_lit ); VERIFY( to_next == c_arr ); // out + memset(c_arr, 'X', size); result r2 = cvt->out(state, c_lit, c_lit + size, from_next, c_arr, c_arr + size, to_next); VERIFY( r2 == codecvt_base::noconv ); - VERIFY( !strcmp(c_arr, c_lit) ); + VERIFY( !memcmp(c_arr, c_ref, size) ); VERIFY( from_next == c_lit ); VERIFY( to_next == c_arr ); @@ -77,6 +85,7 @@ void test01() VERIFY( k == 1 ); delete [] c_arr; + delete [] c_ref; } // libstdc++/5280 diff --git a/libstdc++-v3/testsuite/23_containers/bitset_members.cc b/libstdc++-v3/testsuite/23_containers/bitset_members.cc index 30e0ab6e063..054018df662 100644 --- a/libstdc++-v3/testsuite/23_containers/bitset_members.cc +++ b/libstdc++-v3/testsuite/23_containers/bitset_members.cc @@ -22,6 +22,7 @@ #include <bitset> #include <stdexcept> +#include <sstream> #include <testsuite_hooks.h> void @@ -52,9 +53,26 @@ void test02() bs.count(); } +void test03() +{ + std::bitset<5> b; + std::stringstream ss ("101"); + + ss.exceptions(std::ios_base::eofbit); + + try + { + ss >> b; + } + catch (std::exception&) {} + + VERIFY( b.to_ulong() == 5 ); +} + int main() { test01(); test02(); + test03(); return 0; } diff --git a/libstdc++-v3/testsuite/23_containers/bitset_shift.cc b/libstdc++-v3/testsuite/23_containers/bitset_shift.cc index 35531bf5b4c..01fdd2fbc4b 100644 --- a/libstdc++-v3/testsuite/23_containers/bitset_shift.cc +++ b/libstdc++-v3/testsuite/23_containers/bitset_shift.cc @@ -106,9 +106,25 @@ test01() { return test; } +bool +test02() +{ + bool test = true; + + std::bitset<66> b; + b <<= 400; + VERIFY( b.count() == 0 ); + +#ifdef DEBUG_ASSERT + assert(test); +#endif + return test; +} + int main() { test01(); + test02(); return 0; } diff --git a/libstdc++-v3/testsuite/23_containers/deque_ctor.cc b/libstdc++-v3/testsuite/23_containers/deque_ctor.cc index 7df103405eb..50a813368bb 100644 --- a/libstdc++-v3/testsuite/23_containers/deque_ctor.cc +++ b/libstdc++-v3/testsuite/23_containers/deque_ctor.cc @@ -1,6 +1,6 @@ // 2001-12-27 pme // -// Copyright (C) 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -26,7 +26,15 @@ #include <testsuite_allocator.h> #include <testsuite_hooks.h> -typedef std::deque<gnu_counting_struct> gdeque; +using __gnu_cxx_test::copy_tracker; +using __gnu_cxx_test::allocation_tracker; +using __gnu_cxx_test::tracker_alloc; +using __gnu_cxx_test::copy_constructor; +using __gnu_cxx_test::assignment_operator; +using __gnu_cxx_test::counter; +using __gnu_cxx_test::destructor; + +typedef std::deque<counter> gdeque; bool test = true; @@ -133,10 +141,10 @@ void defaultConstructorCheck() { // setup - typedef gnu_copy_tracker T; + typedef copy_tracker T; typedef std::deque<T> X; - gnu_copy_tracker::reset(); + copy_tracker::reset(); // run test const X u; @@ -171,7 +179,7 @@ void copyConstructorCheck() { // setup - typedef gnu_copy_tracker T; + typedef copy_tracker T; typedef std::deque<T> X; const int copyBaseSize = 17; // arbitrary @@ -179,7 +187,7 @@ copyConstructorCheck() X a; for (int i = 0; i < copyBaseSize; ++i) a.push_back(i); - gnu_copy_tracker::reset(); + copy_tracker::reset(); // assert preconditions VERIFY(!a.empty()); @@ -192,7 +200,7 @@ copyConstructorCheck() // assert postconditions VERIFY(u == a); - VERIFY(copyBaseSize == gnu_copy_constructor::count()); + VERIFY(copyBaseSize == copy_constructor::count()); // teardown } @@ -212,20 +220,20 @@ void fillConstructorCheck() { // setup - typedef gnu_copy_tracker T; + typedef copy_tracker T; typedef std::deque<T> X; const X::size_type n(23); const X::value_type t(111); - gnu_copy_tracker::reset(); + copy_tracker::reset(); // run test X a(n, t); // assert postconditions VERIFY(n == a.size()); - VERIFY(n == gnu_copy_constructor::count()); + VERIFY(n == copy_constructor::count()); // teardown } @@ -239,18 +247,18 @@ fillConstructorCheck() void fillConstructorCheck2() { - typedef gnu_copy_tracker T; + typedef copy_tracker T; typedef std::deque<T> X; const int f = 23; const int l = 111; - gnu_copy_tracker::reset(); + copy_tracker::reset(); X a(f, l); VERIFY(f == a.size()); - VERIFY(f == gnu_copy_constructor::count()); + VERIFY(f == copy_constructor::count()); } @@ -265,7 +273,7 @@ void rangeConstructorCheckForwardIterator() { // setup - typedef gnu_copy_tracker T; + typedef copy_tracker T; typedef std::deque<T> X; const X::size_type n(726); @@ -275,14 +283,14 @@ rangeConstructorCheckForwardIterator() X::iterator j = source.end(); X::size_type rangeSize = std::distance(i, j); - gnu_copy_tracker::reset(); + copy_tracker::reset(); // test X a(i, j); // assert postconditions VERIFY(rangeSize == a.size()); - VERIFY(gnu_copy_constructor::count() <= rangeSize); + VERIFY(copy_constructor::count() <= rangeSize); } @@ -295,7 +303,7 @@ rangeConstructorCheckForwardIterator() void rangeConstructorCheckInputIterator() { - typedef gnu_copy_tracker T; + typedef copy_tracker T; typedef std::deque<T> X; std::istringstream ibuf("1234567890123456789"); @@ -303,12 +311,12 @@ rangeConstructorCheckInputIterator() std::istream_iterator<char> i(ibuf); std::istream_iterator<char> j; - gnu_copy_tracker::reset(); + copy_tracker::reset(); X a(i, j); VERIFY(rangeSize == a.size()); - VERIFY(gnu_copy_constructor::count() <= (2 * rangeSize)); + VERIFY(copy_constructor::count() <= (2 * rangeSize)); } @@ -316,7 +324,7 @@ rangeConstructorCheckInputIterator() void copyAssignmentCheck() { - typedef gnu_copy_tracker T; + typedef copy_tracker T; typedef std::deque<T> X; const X::size_type n(18); @@ -324,12 +332,12 @@ copyAssignmentCheck() X a(n, t); X r; - gnu_copy_tracker::reset(); + copy_tracker::reset(); r = a; VERIFY(r == a); - VERIFY(n == gnu_copy_constructor::count()); + VERIFY(n == copy_constructor::count()); } @@ -343,7 +351,7 @@ copyAssignmentCheck() void fillAssignmentCheck() { - typedef gnu_copy_tracker T; + typedef copy_tracker T; typedef std::deque<T> X; const X::size_type starting_size(10); @@ -352,7 +360,7 @@ fillAssignmentCheck() const X::value_type t(111); X a(starting_size, starting_value); - gnu_copy_tracker::reset(); + copy_tracker::reset(); // preconditions VERIFY(starting_size == a.size()); @@ -362,8 +370,8 @@ fillAssignmentCheck() // postconditions VERIFY(n == a.size()); - VERIFY(n == (gnu_copy_constructor::count() + gnu_assignment_operator::count())); - VERIFY(starting_size == (gnu_destructor::count() + gnu_assignment_operator::count())); + VERIFY(n == (copy_constructor::count() + assignment_operator::count())); + VERIFY(starting_size == (destructor::count() + assignment_operator::count())); } @@ -391,7 +399,7 @@ fillAssignmentCheck() void rangeAssignmentCheck() { - typedef gnu_copy_tracker T; + typedef copy_tracker T; typedef std::deque<T> X; const X::size_type source_size(726); @@ -407,13 +415,13 @@ rangeAssignmentCheck() X a(starting_size, starting_value); VERIFY(starting_size == a.size()); - gnu_copy_tracker::reset(); + copy_tracker::reset(); a.assign(i, j); VERIFY(source == a); - VERIFY(rangeSize == (gnu_copy_constructor::count() + gnu_assignment_operator::count())); - VERIFY(starting_size == (gnu_destructor::count() + gnu_assignment_operator::count())); + VERIFY(rangeSize == (copy_constructor::count() + assignment_operator::count())); + VERIFY(starting_size == (destructor::count() + assignment_operator::count())); } @@ -423,7 +431,7 @@ void rangeAssignmentCheckWithException() { // setup - typedef gnu_copy_tracker T; + typedef copy_tracker T; typedef std::deque<T> X; // test @@ -436,7 +444,7 @@ void fillAssignmentCheck2() { // setup - typedef gnu_copy_tracker T; + typedef copy_tracker T; typedef std::deque<T> X; // test @@ -449,12 +457,12 @@ void test_default_ctor_exception_safety() { // setup - typedef gnu_copy_tracker T; - typedef std::deque<T, gnu_new_allocator<T> > X; + typedef copy_tracker T; + typedef std::deque<T, tracker_alloc<T> > X; T::reset(); - gnu_copy_constructor::throw_on(3); - gnu_allocator_tracker::resetCounts(); + copy_constructor::throw_on(3); + allocation_tracker::resetCounts(); // test try @@ -467,7 +475,7 @@ test_default_ctor_exception_safety() } // assert postconditions - VERIFY(gnu_allocator_tracker::allocationTotal() == gnu_allocator_tracker::deallocationTotal()); + VERIFY(allocation_tracker::allocationTotal() == allocation_tracker::deallocationTotal()); // teardown } @@ -477,14 +485,14 @@ void test_copy_ctor_exception_safety() { // setup - typedef gnu_copy_tracker T; - typedef std::deque<T, gnu_new_allocator<T> > X; + typedef copy_tracker T; + typedef std::deque<T, tracker_alloc<T> > X; - gnu_allocator_tracker::resetCounts(); + allocation_tracker::resetCounts(); { X a(7); T::reset(); - gnu_copy_constructor::throw_on(3); + copy_constructor::throw_on(3); // test @@ -499,7 +507,7 @@ test_copy_ctor_exception_safety() } // assert postconditions - VERIFY(gnu_allocator_tracker::allocationTotal() == gnu_allocator_tracker::deallocationTotal()); + VERIFY(allocation_tracker::allocationTotal() == allocation_tracker::deallocationTotal()); // teardown } diff --git a/libstdc++-v3/testsuite/23_containers/list_modifiers.cc b/libstdc++-v3/testsuite/23_containers/list_modifiers.cc index 14b53657e05..213fc41f17d 100644 --- a/libstdc++-v3/testsuite/23_containers/list_modifiers.cc +++ b/libstdc++-v3/testsuite/23_containers/list_modifiers.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2001 Free Software Foundation, Inc. +// Copyright (C) 2001, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -21,7 +21,7 @@ #include <list> #include <testsuite_hooks.h> -typedef gnu_copy_tracker T; +typedef __gnu_cxx_test::copy_tracker T; bool test = true; diff --git a/libstdc++-v3/testsuite/23_containers/vector_capacity.cc b/libstdc++-v3/testsuite/23_containers/vector_capacity.cc index 621ef7e373f..b6e347de309 100644 --- a/libstdc++-v3/testsuite/23_containers/vector_capacity.cc +++ b/libstdc++-v3/testsuite/23_containers/vector_capacity.cc @@ -1,7 +1,7 @@ // 1999-05-07 // bkoz -// Copyright (C) 1999, 2002 Free Software Foundation, Inc. +// Copyright (C) 1999, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -26,6 +26,13 @@ #include <testsuite_allocator.h> #include <testsuite_hooks.h> +using __gnu_cxx_test::copy_tracker; +using __gnu_cxx_test::allocation_tracker; +using __gnu_cxx_test::tracker_alloc; +using __gnu_cxx_test::copy_constructor; +using __gnu_cxx_test::assignment_operator; +using __gnu_cxx_test::destructor; + template<typename T> struct A { }; @@ -58,7 +65,6 @@ void test01() void test02() { bool test = true; - { std::vector<int> array; const std::size_t size = array.max_size(); @@ -100,34 +106,15 @@ void test02() } } -void test03() -{ - bool test = true; - std::vector<int> v; - try - { - v.resize(v.max_size()); - v[v.max_size() - 1] = 2002; - } - catch (const std::bad_alloc& error) - { - test = true; - } - catch (...) - { - test = false; - } - VERIFY( test ); -} - // Verifies basic functionality of reserve() with forced reallocation. void test_reserve() { - typedef gnu_copy_tracker T; - typedef std::vector<T, gnu_new_allocator<T> > X; + bool test = true; + typedef copy_tracker T; + typedef std::vector<T, tracker_alloc<T> > X; - gnu_allocator_tracker::resetCounts(); + allocation_tracker::resetCounts(); { X a(3); const X::size_type old_size = a.size(); @@ -141,11 +128,11 @@ test_reserve() VERIFY(new_capacity <= a.capacity()); // [23.2.4.1 (3)] VERIFY(old_size == a.size()); - VERIFY(gnu_copy_constructor::count() <= old_size); - VERIFY(gnu_destructor::count() <= old_size); + VERIFY(copy_constructor::count() <= old_size); + VERIFY(destructor::count() <= old_size); } // check for memory leaks - VERIFY(gnu_allocator_tracker::allocationTotal() == gnu_allocator_tracker::deallocationTotal()); + VERIFY(allocation_tracker::allocationTotal() == allocation_tracker::deallocationTotal()); } // Verifies that reserve() with reallocation offers the strong @@ -153,17 +140,18 @@ test_reserve() void test_reserve_exception_guarantee() { - typedef gnu_copy_tracker T; - typedef std::vector<T, gnu_new_allocator<T> > X; + bool test = true; + typedef copy_tracker T; + typedef std::vector<T, tracker_alloc<T> > X; - gnu_allocator_tracker::resetCounts(); + allocation_tracker::resetCounts(); { X a(7); const X::size_type old_size = a.size(); const X::size_type old_capacity = a.capacity(); const X::size_type new_capacity = old_capacity + 10; T::reset(); - gnu_copy_constructor::throw_on(3); + copy_constructor::throw_on(3); try { @@ -175,16 +163,15 @@ test_reserve_exception_guarantee() } VERIFY(old_capacity == a.capacity()); - VERIFY(gnu_copy_constructor::count() == gnu_destructor::count()+1); + VERIFY(copy_constructor::count() == destructor::count()+1); } - VERIFY(gnu_allocator_tracker::allocationTotal() == gnu_allocator_tracker::deallocationTotal()); + VERIFY(allocation_tracker::allocationTotal() == allocation_tracker::deallocationTotal()); } int main() { test01(); test02(); - test03(); test_reserve(); test_reserve_exception_guarantee(); return 0; diff --git a/libstdc++-v3/testsuite/23_containers/vector_ctor.cc b/libstdc++-v3/testsuite/23_containers/vector_ctor.cc index d8789f57146..8b93207606e 100644 --- a/libstdc++-v3/testsuite/23_containers/vector_ctor.cc +++ b/libstdc++-v3/testsuite/23_containers/vector_ctor.cc @@ -1,6 +1,6 @@ // 1999-06-29 bkoz -// Copyright (C) 1999-2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 1999-2001, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -25,6 +25,12 @@ #include <testsuite_allocator.h> #include <testsuite_hooks.h> +using __gnu_cxx_test::copy_tracker; +using __gnu_cxx_test::allocation_tracker; +using __gnu_cxx_test::tracker_alloc; +using __gnu_cxx_test::copy_constructor; +using __gnu_cxx_test::assignment_operator; + template<typename T> struct A { }; @@ -32,7 +38,6 @@ struct B { }; void test01() { - // 1 bool test = true; std::vector< A<B> > vec01; @@ -62,22 +67,22 @@ void test02() void test03() { - const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17}; - const int B[] = {7, 7, 7, 7, 7}; - const int N = sizeof(A) / sizeof(int); - const int M = sizeof(B) / sizeof(int); - bool test = true; - - std::vector<int> v3(A, A + N); - VERIFY(std::equal(v3.begin(), v3.end(), A)); - - std::vector<int> v4(v3.begin(), v3.end()); - VERIFY(std::equal(v4.begin(), v4.end(), A)); - - std::vector<int> v5(M, 7); - VERIFY(std::equal(v5.begin(), v5.end(), B)); - VERIFY(std::equal(B, B + M, v5.begin())); - + bool test = true; + const int A[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17}; + const int B[] = {7, 7, 7, 7, 7}; + const int N = sizeof(A) / sizeof(int); + const int M = sizeof(B) / sizeof(int); + + std::vector<int> v3(A, A + N); + VERIFY(std::equal(v3.begin(), v3.end(), A)); + + std::vector<int> v4(v3.begin(), v3.end()); + VERIFY(std::equal(v4.begin(), v4.end(), A)); + + std::vector<int> v5(M, 7); + VERIFY(std::equal(v5.begin(), v5.end(), B)); + VERIFY(std::equal(B, B + M, v5.begin())); + #ifdef DEBUG_ASSERT assert(test); #endif @@ -105,12 +110,13 @@ void test_default_ctor_exception_gurantee() { // setup - typedef gnu_copy_tracker T; - typedef std::vector<T, gnu_new_allocator<T> > X; + bool test = true; + typedef copy_tracker T; + typedef std::vector<T, tracker_alloc<T> > X; - gnu_copy_tracker::reset(); - gnu_copy_constructor::throw_on(3); - gnu_allocator_tracker::resetCounts(); + copy_tracker::reset(); + copy_constructor::throw_on(3); + allocation_tracker::resetCounts(); // run test try @@ -124,7 +130,7 @@ test_default_ctor_exception_gurantee() // assert postconditions VERIFY(("memory leak detected:", - gnu_allocator_tracker::allocationTotal() == gnu_allocator_tracker::deallocationTotal())); + allocation_tracker::allocationTotal() == allocation_tracker::deallocationTotal())); // teardown } @@ -137,14 +143,15 @@ void test_copy_ctor_exception_gurantee() { // setup - typedef gnu_copy_tracker T; - typedef std::vector<T, gnu_new_allocator<T> > X; + bool test = true; + typedef copy_tracker T; + typedef std::vector<T, tracker_alloc<T> > X; - gnu_allocator_tracker::resetCounts(); + allocation_tracker::resetCounts(); { X a(7); - gnu_copy_tracker::reset(); - gnu_copy_constructor::throw_on(3); + copy_tracker::reset(); + copy_constructor::throw_on(3); // run test try @@ -158,11 +165,11 @@ test_copy_ctor_exception_gurantee() } // assert postconditions - VERIFY(gnu_allocator_tracker::allocationTotal() == gnu_allocator_tracker::deallocationTotal()); + VERIFY(allocation_tracker::allocationTotal() == allocation_tracker::deallocationTotal()); // teardown - gnu_copy_tracker::reset(); - gnu_allocator_tracker::resetCounts(); + copy_tracker::reset(); + allocation_tracker::resetCounts(); } // operator=() @@ -175,13 +182,14 @@ void test_assignment_operator_1() { // setup - typedef gnu_copy_tracker T; - typedef std::vector<T, gnu_new_allocator<T> > X; + bool test = true; + typedef copy_tracker T; + typedef std::vector<T, tracker_alloc<T> > X; X r(9); X a(r.size() - 2); - gnu_copy_tracker::reset(); - gnu_allocator_tracker::resetCounts(); + copy_tracker::reset(); + allocation_tracker::resetCounts(); // preconditions VERIFY(r.size() > a.size()); @@ -191,25 +199,26 @@ test_assignment_operator_1() // assert postconditions VERIFY(r == a); - VERIFY(gnu_allocator_tracker::allocationTotal() == 0); + VERIFY(allocation_tracker::allocationTotal() == 0); // teardown - gnu_copy_tracker::reset(); - gnu_allocator_tracker::resetCounts(); + copy_tracker::reset(); + allocation_tracker::resetCounts(); } void test_assignment_operator_2() { // setup - typedef gnu_copy_tracker T; - typedef std::vector<T, gnu_new_allocator<T> > X; + bool test = true; + typedef copy_tracker T; + typedef std::vector<T, tracker_alloc<T> > X; X r(1); r.reserve(17); X a(r.size() + 7); - gnu_copy_tracker::reset(); - gnu_allocator_tracker::resetCounts(); + copy_tracker::reset(); + allocation_tracker::resetCounts(); // preconditions VERIFY(r.size() < a.size()); @@ -220,25 +229,26 @@ test_assignment_operator_2() // assert postconditions VERIFY(r == a); - VERIFY(gnu_allocator_tracker::allocationTotal() == 0); + VERIFY(allocation_tracker::allocationTotal() == 0); // teardown - gnu_copy_tracker::reset(); - gnu_allocator_tracker::resetCounts(); + copy_tracker::reset(); + allocation_tracker::resetCounts(); } void test_assignment_operator_3() { // setup - typedef gnu_copy_tracker T; - typedef std::vector<T, gnu_new_allocator<T> > X; + bool test = true; + typedef copy_tracker T; + typedef std::vector<T, tracker_alloc<T> > X; - gnu_allocator_tracker::resetCounts(); + allocation_tracker::resetCounts(); { X r(1); X a(r.capacity() + 7); - gnu_copy_tracker::reset(); + copy_tracker::reset(); // preconditions VERIFY(r.capacity() < a.size()); @@ -249,26 +259,27 @@ test_assignment_operator_3() // assert postconditions VERIFY(r == a); } - VERIFY(gnu_allocator_tracker::allocationTotal() == gnu_allocator_tracker::deallocationTotal()); + VERIFY(allocation_tracker::allocationTotal() == allocation_tracker::deallocationTotal()); // teardown - gnu_copy_tracker::reset(); - gnu_allocator_tracker::resetCounts(); + copy_tracker::reset(); + allocation_tracker::resetCounts(); } void test_assignment_operator_3_exception_guarantee() { // setup - typedef gnu_copy_tracker T; - typedef std::vector<T, gnu_new_allocator<T> > X; + bool test = true; + typedef copy_tracker T; + typedef std::vector<T, tracker_alloc<T> > X; - gnu_allocator_tracker::resetCounts(); + allocation_tracker::resetCounts(); { X r(1); X a(r.capacity() + 7); - gnu_copy_tracker::reset(); - gnu_copy_constructor::throw_on(3); + copy_tracker::reset(); + copy_constructor::throw_on(3); // preconditions VERIFY(r.capacity() < a.size()); @@ -285,11 +296,11 @@ test_assignment_operator_3_exception_guarantee() } // assert postconditions - VERIFY(gnu_allocator_tracker::allocationTotal() == gnu_allocator_tracker::deallocationTotal()); + VERIFY(allocation_tracker::allocationTotal() == allocation_tracker::deallocationTotal()); // teardown - gnu_copy_tracker::reset(); - gnu_allocator_tracker::resetCounts(); + copy_tracker::reset(); + allocation_tracker::resetCounts(); } // fill assign() @@ -304,35 +315,37 @@ void test_fill_assign_1() { // setup - typedef gnu_copy_tracker T; - typedef std::vector<T, gnu_new_allocator<T> > X; + bool test = true; + typedef copy_tracker T; + typedef std::vector<T, tracker_alloc<T> > X; X a(7); X::size_type old_size = a.size(); X::size_type new_size = old_size - 2; const T t; - gnu_copy_tracker::reset(); - gnu_allocator_tracker::resetCounts(); + copy_tracker::reset(); + allocation_tracker::resetCounts(); // run test a.assign(new_size, t); // assert postconditions VERIFY(a.size() == new_size); - VERIFY(gnu_allocator_tracker::allocationTotal() == 0); + VERIFY(allocation_tracker::allocationTotal() == 0); // teardown - gnu_copy_tracker::reset(); - gnu_allocator_tracker::resetCounts(); + copy_tracker::reset(); + allocation_tracker::resetCounts(); } void test_fill_assign_2() { // setup - typedef gnu_copy_tracker T; - typedef std::vector<T, gnu_new_allocator<T> > X; + bool test = true; + typedef copy_tracker T; + typedef std::vector<T, tracker_alloc<T> > X; X a(7); a.reserve(11); @@ -341,8 +354,8 @@ test_fill_assign_2() X::size_type new_size = old_size + 2; const T t; - gnu_copy_tracker::reset(); - gnu_allocator_tracker::resetCounts(); + copy_tracker::reset(); + allocation_tracker::resetCounts(); // assert preconditions VERIFY(old_size < new_size); @@ -353,21 +366,22 @@ test_fill_assign_2() // assert postconditions VERIFY(a.size() == new_size); - VERIFY(gnu_allocator_tracker::allocationTotal() == 0); + VERIFY(allocation_tracker::allocationTotal() == 0); // teardown - gnu_copy_tracker::reset(); - gnu_allocator_tracker::resetCounts(); + copy_tracker::reset(); + allocation_tracker::resetCounts(); } void test_fill_assign_3() { // setup - typedef gnu_copy_tracker T; - typedef std::vector<T, gnu_new_allocator<T> > X; + bool test = true; + typedef copy_tracker T; + typedef std::vector<T, tracker_alloc<T> > X; - gnu_allocator_tracker::resetCounts(); + allocation_tracker::resetCounts(); { X a(7); X::size_type old_size = a.size(); @@ -375,7 +389,7 @@ test_fill_assign_3() X::size_type new_size = old_capacity + 4; const T t; - gnu_copy_tracker::reset(); + copy_tracker::reset(); // assert preconditions VERIFY(new_size > old_capacity); @@ -387,22 +401,23 @@ test_fill_assign_3() VERIFY(a.size() == new_size); } - VERIFY(gnu_allocator_tracker::allocationTotal() > 0); - VERIFY(gnu_allocator_tracker::allocationTotal() == gnu_allocator_tracker::deallocationTotal()); + VERIFY(allocation_tracker::allocationTotal() > 0); + VERIFY(allocation_tracker::allocationTotal() == allocation_tracker::deallocationTotal()); // teardown - gnu_copy_tracker::reset(); - gnu_allocator_tracker::resetCounts(); + copy_tracker::reset(); + allocation_tracker::resetCounts(); } void test_fill_assign_3_exception_guarantee() { // setup - typedef gnu_copy_tracker T; - typedef std::vector<T, gnu_new_allocator<T> > X; + bool test = true; + typedef copy_tracker T; + typedef std::vector<T, tracker_alloc<T> > X; - gnu_allocator_tracker::resetCounts(); + allocation_tracker::resetCounts(); { X a(7); X::size_type old_size = a.size(); @@ -410,8 +425,8 @@ test_fill_assign_3_exception_guarantee() X::size_type new_size = old_capacity + 4; const T t; - gnu_copy_tracker::reset(); - gnu_copy_constructor::throw_on(3); + copy_tracker::reset(); + copy_constructor::throw_on(3); // assert preconditions VERIFY(new_size > old_capacity); @@ -431,39 +446,40 @@ test_fill_assign_3_exception_guarantee() VERIFY(a.capacity() == old_capacity); } - VERIFY(gnu_allocator_tracker::allocationTotal() > 0); - VERIFY(gnu_allocator_tracker::allocationTotal() == gnu_allocator_tracker::deallocationTotal()); + VERIFY(allocation_tracker::allocationTotal() > 0); + VERIFY(allocation_tracker::allocationTotal() == allocation_tracker::deallocationTotal()); // teardown - gnu_copy_tracker::reset(); - gnu_allocator_tracker::resetCounts(); + copy_tracker::reset(); + allocation_tracker::resetCounts(); } void test_fill_assign_4() { // setup - typedef gnu_copy_tracker T; - typedef std::vector<T, gnu_new_allocator<T> > X; + bool test = true; + typedef copy_tracker T; + typedef std::vector<T, tracker_alloc<T> > X; X a(7); X::size_type old_size = a.size(); X::size_type new_size = old_size - 2; X::size_type new_value = 117; - gnu_copy_tracker::reset(); - gnu_allocator_tracker::resetCounts(); + copy_tracker::reset(); + allocation_tracker::resetCounts(); // run test a.assign(new_size, new_value); // assert postconditions VERIFY(a.size() == new_size); - VERIFY(gnu_allocator_tracker::allocationTotal() == 0); + VERIFY(allocation_tracker::allocationTotal() == 0); // teardown - gnu_copy_tracker::reset(); - gnu_allocator_tracker::resetCounts(); + copy_tracker::reset(); + allocation_tracker::resetCounts(); } // range assign() @@ -486,15 +502,16 @@ void test_range_assign_2() { // setup - typedef gnu_copy_tracker T; - typedef std::vector<T, gnu_new_allocator<T> > X; + bool test = true; + typedef copy_tracker T; + typedef std::vector<T, tracker_alloc<T> > X; X a(7); X b(3); X::size_type old_size = a.size(); - gnu_copy_tracker::reset(); - gnu_allocator_tracker::resetCounts(); + copy_tracker::reset(); + allocation_tracker::resetCounts(); // assert preconditions VERIFY(b.size() < a.capacity()); @@ -505,27 +522,28 @@ test_range_assign_2() // assert postconditions VERIFY(a.size() == b.size()); VERIFY(a == b); - VERIFY(gnu_allocator_tracker::allocationTotal() == 0); + VERIFY(allocation_tracker::allocationTotal() == 0); // teardown - gnu_copy_tracker::reset(); - gnu_allocator_tracker::resetCounts(); + copy_tracker::reset(); + allocation_tracker::resetCounts(); } void test_range_assign_3() { // setup - typedef gnu_copy_tracker T; - typedef std::vector<T, gnu_new_allocator<T> > X; + bool test = true; + typedef copy_tracker T; + typedef std::vector<T, tracker_alloc<T> > X; X a(7); a.reserve(a.size() + 7); X b(a.size() + 3); X::size_type old_size = a.size(); - gnu_copy_tracker::reset(); - gnu_allocator_tracker::resetCounts(); + copy_tracker::reset(); + allocation_tracker::resetCounts(); // assert preconditions VERIFY(a.size() < b.size()); @@ -537,27 +555,28 @@ test_range_assign_3() // assert postconditions VERIFY(a.size() == b.size()); VERIFY(a == b); - VERIFY(gnu_allocator_tracker::allocationTotal() == 0); + VERIFY(allocation_tracker::allocationTotal() == 0); // teardown - gnu_copy_tracker::reset(); - gnu_allocator_tracker::resetCounts(); + copy_tracker::reset(); + allocation_tracker::resetCounts(); } void test_range_assign_4() { // setup - typedef gnu_copy_tracker T; - typedef std::vector<T, gnu_new_allocator<T> > X; + bool test = true; + typedef copy_tracker T; + typedef std::vector<T, tracker_alloc<T> > X; - gnu_allocator_tracker::resetCounts(); + allocation_tracker::resetCounts(); { X a(7); X b(a.capacity() + 7); X::size_type old_size = a.size(); - gnu_copy_tracker::reset(); + copy_tracker::reset(); // assert preconditions VERIFY(b.size() > a.capacity()); @@ -569,29 +588,30 @@ test_range_assign_4() VERIFY(a.size() == b.size()); VERIFY(a == b); } - VERIFY(gnu_allocator_tracker::allocationTotal() > 0); - VERIFY(gnu_allocator_tracker::allocationTotal() == gnu_allocator_tracker::deallocationTotal()); + VERIFY(allocation_tracker::allocationTotal() > 0); + VERIFY(allocation_tracker::allocationTotal() == allocation_tracker::deallocationTotal()); // teardown - gnu_copy_tracker::reset(); - gnu_allocator_tracker::resetCounts(); + copy_tracker::reset(); + allocation_tracker::resetCounts(); } void test_range_assign_4_exception_guarantee() { // setup - typedef gnu_copy_tracker T; - typedef std::vector<T, gnu_new_allocator<T> > X; + bool test = true; + typedef copy_tracker T; + typedef std::vector<T, tracker_alloc<T> > X; - gnu_allocator_tracker::resetCounts(); + allocation_tracker::resetCounts(); { X a(7); X b(a.capacity() + 7); X::size_type old_size = a.size(); - gnu_copy_tracker::reset(); - gnu_copy_constructor::throw_on(3); + copy_tracker::reset(); + copy_constructor::throw_on(3); // assert preconditions VERIFY(b.size() > a.capacity()); @@ -608,12 +628,12 @@ test_range_assign_4_exception_guarantee() } // assert postconditions - VERIFY(gnu_allocator_tracker::allocationTotal() > 0); - VERIFY(gnu_allocator_tracker::allocationTotal() == gnu_allocator_tracker::deallocationTotal()); + VERIFY(allocation_tracker::allocationTotal() > 0); + VERIFY(allocation_tracker::allocationTotal() == allocation_tracker::deallocationTotal()); // teardown - gnu_copy_tracker::reset(); - gnu_allocator_tracker::resetCounts(); + copy_tracker::reset(); + allocation_tracker::resetCounts(); } diff --git a/libstdc++-v3/testsuite/23_containers/vector_resize.cc b/libstdc++-v3/testsuite/23_containers/vector_resize.cc new file mode 100644 index 00000000000..3cc6c57ed42 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/vector_resize.cc @@ -0,0 +1,57 @@ +// 1999-05-07 +// bkoz + +// Copyright (C) 1999, 2002 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 23.2.4.2 vector capacity + +// XXX This test will not work for irix6 because of bug(s) in libc malloc +// XXX for very large allocations. However -lmalloc seems to work. +// See http://gcc.gnu.org/ml/libstdc++/2002-12/msg00131.html +// { dg-options "-lmalloc" { target mips*-*-irix6* } } + +#include <vector> +#include <stdexcept> +#include <testsuite_hooks.h> + +void test01() +{ + bool test = true; + std::vector<int> v; + try + { + v.resize(v.max_size()); + v[v.max_size() - 1] = 2002; + } + catch (const std::bad_alloc& error) + { + test = true; + } + catch (...) + { + test = false; + } + VERIFY( test ); +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/26_numerics/complex_value.cc b/libstdc++-v3/testsuite/26_numerics/complex_value.cc index 99f477a5fa1..ebdd71a2c71 100644 --- a/libstdc++-v3/testsuite/26_numerics/complex_value.cc +++ b/libstdc++-v3/testsuite/26_numerics/complex_value.cc @@ -1,7 +1,8 @@ +// { dg-options "-O0" } // 2000-11-20 // Benjamin Kosnik bkoz@redhat.com -// Copyright (C) 2000 Free Software Foundation, Inc. +// Copyright (C) 2000, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the diff --git a/libstdc++-v3/testsuite/27_io/filebuf.cc b/libstdc++-v3/testsuite/27_io/filebuf.cc index e72f2ca8f6f..ab873be82b5 100644 --- a/libstdc++-v3/testsuite/27_io/filebuf.cc +++ b/libstdc++-v3/testsuite/27_io/filebuf.cc @@ -1,6 +1,6 @@ // 1999-01-17 bkoz test functionality of basic_filebuf for char_type == char -// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 +// Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003 // Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free @@ -45,9 +45,10 @@ void test01() namespace test { using namespace std; + using __gnu_cxx_test::pod_char; typedef short type_t; template class basic_filebuf<type_t, char_traits<type_t> >; - template class basic_filebuf<gnu_char, char_traits<gnu_char> >; + template class basic_filebuf<pod_char, char_traits<pod_char> >; } // test diff --git a/libstdc++-v3/testsuite/27_io/filebuf_virtuals.cc b/libstdc++-v3/testsuite/27_io/filebuf_virtuals.cc index 0a92788296a..c02e1a77be9 100644 --- a/libstdc++-v3/testsuite/27_io/filebuf_virtuals.cc +++ b/libstdc++-v3/testsuite/27_io/filebuf_virtuals.cc @@ -1,6 +1,6 @@ // 2001-05-21 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -21,6 +21,7 @@ // 27.8.1.4 Overridden virtual functions #include <fstream> +#include <locale> #include <testsuite_hooks.h> // @require@ %-*.tst %-*.txt @@ -514,6 +515,28 @@ void test06() VERIFY( buffer[0] == 'a' ); } +// libstdc++/9322 +void test07() +{ + using std::locale; + bool test = true; + + locale loc; + std::filebuf ob; + VERIFY( ob.getloc() == loc ); + + locale::global(locale("en_US")); + VERIFY( ob.getloc() == loc ); + + locale loc_de ("de_DE"); + locale ret = ob.pubimbue(loc_de); + VERIFY( ob.getloc() == loc_de ); + VERIFY( ret == loc ); + + locale::global(loc); + VERIFY( ob.getloc() == loc_de ); +} + main() { test01(); @@ -524,5 +547,6 @@ main() test05(); test06(); + test07(); return 0; } diff --git a/libstdc++-v3/testsuite/27_io/fstream.cc b/libstdc++-v3/testsuite/27_io/fstream.cc index 276294d9c9d..c37be6bbfcb 100644 --- a/libstdc++-v3/testsuite/27_io/fstream.cc +++ b/libstdc++-v3/testsuite/27_io/fstream.cc @@ -1,6 +1,6 @@ // 2002-07-25 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2002 Free Software Foundation, Inc. +// Copyright (C) 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -50,9 +50,10 @@ void test01() namespace test { using namespace std; + using __gnu_cxx_test::pod_char; typedef short type_t; template class basic_fstream<type_t, char_traits<type_t> >; - template class basic_fstream<gnu_char, char_traits<gnu_char> >; + template class basic_fstream<pod_char, char_traits<pod_char> >; } // test int main() diff --git a/libstdc++-v3/testsuite/27_io/ios_base_storage.cc b/libstdc++-v3/testsuite/27_io/ios_base_storage.cc index c39d0302716..a02eacba166 100644 --- a/libstdc++-v3/testsuite/27_io/ios_base_storage.cc +++ b/libstdc++-v3/testsuite/27_io/ios_base_storage.cc @@ -20,6 +20,12 @@ // 27.4.2.5 ios_base storage functions +// XXX This test will not work for some versions of irix6 because of +// XXX bug(s) in libc malloc for very large allocations. However +// XXX -lmalloc seems to work. +// See http://gcc.gnu.org/ml/gcc/2002-05/msg01012.html +// { dg-options "-lmalloc" { target mips*-*-irix6* } } + #include <sstream> #include <iostream> diff --git a/libstdc++-v3/testsuite/27_io/istream.cc b/libstdc++-v3/testsuite/27_io/istream.cc index 6cec904eb67..c8146ea9236 100644 --- a/libstdc++-v3/testsuite/27_io/istream.cc +++ b/libstdc++-v3/testsuite/27_io/istream.cc @@ -1,6 +1,6 @@ // 1999-09-20 bkoz -// Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -50,9 +50,10 @@ void test01() namespace test { using namespace std; + using __gnu_cxx_test::pod_char; typedef short type_t; template class basic_istream<type_t, char_traits<type_t> >; - template class basic_istream<gnu_char, char_traits<gnu_char> >; + template class basic_istream<pod_char, char_traits<pod_char> >; } // test int main() diff --git a/libstdc++-v3/testsuite/27_io/istream_extractor_arith.cc b/libstdc++-v3/testsuite/27_io/istream_extractor_arith.cc deleted file mode 100644 index c184b3fade2..00000000000 --- a/libstdc++-v3/testsuite/27_io/istream_extractor_arith.cc +++ /dev/null @@ -1,611 +0,0 @@ -// 1999-04-12 bkoz - -// Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc. -// -// This file is part of the GNU ISO C++ Library. This library is free -// software; you can redistribute it and/or modify it under the -// terms of the GNU General Public License as published by the -// Free Software Foundation; either version 2, or (at your option) -// any later version. - -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. - -// You should have received a copy of the GNU General Public License along -// with this library; see the file COPYING. If not, write to the Free -// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -// USA. - -// 27.6.1.2.2 arithmetic extractors - -#include <cstdio> // for printf -#include <istream> -#include <ostream> -#include <sstream> -#include <locale> -#include <testsuite_hooks.h> - -std::string str_01; -std::string str_02("true false 0 1 110001"); -std::string str_03("-19999999 777777 -234234 233 -234 33 1 66300.25 .315 1.5"); -std::string str_04("0123"); - -std::stringbuf isbuf_01(std::ios_base::in); -std::stringbuf isbuf_02(str_02, std::ios_base::in); -std::stringbuf isbuf_03(str_03, std::ios_base::in); -std::stringbuf isbuf_04(str_04, std::ios_base::in); - -std::istream is_01(NULL); -std::istream is_02(&isbuf_02); -std::istream is_03(&isbuf_03); -std::istream is_04(&isbuf_04); -std::stringstream ss_01(str_01); - -// minimal sanity check -bool test01() { - - bool test = true; - - // Integral Types: - bool b1 = false; - bool b2 = false; - short s1 = 0; - int i1 = 0; - long l1 = 0; - unsigned short us1 = 0; - unsigned int ui1 = 0; - unsigned long ul1 = 0; - - // Floating-point Types: - float f1 = 0; - double d1 = 0; - long double ld1 = 0; - - // process alphanumeric versions of bool values - std::ios_base::fmtflags fmt = is_02.flags(); - bool testfmt = fmt & std::ios_base::boolalpha; - is_02.setf(std::ios_base::boolalpha); - fmt = is_02.flags(); - testfmt = fmt & std::ios_base::boolalpha; - is_02 >> b1; - VERIFY( b1 == 1 ); - is_02 >> b1; - VERIFY( b1 == 0 ); - - // process numeric versions of of bool values - is_02.unsetf(std::ios_base::boolalpha); - fmt = is_02.flags(); - testfmt = fmt & std::ios_base::boolalpha; - is_02 >> b1; - VERIFY( b1 == 0 ); - is_02 >> b1; - VERIFY( b1 == 1 ); - - // is_03 == "-19999999 777777 -234234 233 -234 33 1 66300.25 .315 1.5" - is_03 >> l1; - VERIFY( l1 == -19999999 ); - is_03 >> ul1; - VERIFY( ul1 == 777777 ); - is_03 >> i1; - VERIFY( i1 == -234234 ); - is_03 >> ui1; - VERIFY( ui1 == 233 ); - is_03 >> s1; - VERIFY( s1 == -234 ); - is_03 >> us1; - VERIFY( us1 == 33 ); - is_03 >> b1; - VERIFY( b1 == 1 ); - is_03 >> ld1; - VERIFY( ld1 == 66300.25 ); - is_03 >> d1; - VERIFY( d1 == .315 ); - is_03 >> f1; - VERIFY( f1 == 1.5 ); - - is_04 >> std::hex >> i1; - std::printf ("%d %d %d\n", i1, i1 == 0x123, test); - VERIFY( i1 == 0x123 ); - std::printf ("%d %d %d\n", i1, i1 == 0x123, test); - - // test void pointers - int i = 55; - void* po = &i; - void* pi; - - ss_01 << po; - ss_01 >> pi; - std::printf ("%x %x\n", pi, po); - VERIFY( po == pi ); - -#ifdef DEBUG_ASSERT - assert(test); -#endif - - return test; -} - -// elaborated test for ints -bool test02() { - - bool test = true; - const std::string str_01("20000AB"); - std::stringbuf strb_01(str_01, std::ios_base::in); - std::istream is(&strb_01); - - int n = 15; - is >> n; - VERIFY( n == 20000 ); - char c = is.peek(); - VERIFY( c == 65 ); - -#ifdef DEBUG_ASSERT - assert(test); -#endif - - return test; -} - -bool test03() -{ - std::stringbuf sbuf; - std::istream istr(&sbuf); - std::ostream ostr(&sbuf); - - bool test = true; - long l01; - ostr << "12220101"; - istr >> l01; // _M_in_end set completely incorrectly here. - VERIFY( l01 == 12220101 ); - VERIFY( istr.rdstate() == std::ios_base::eofbit ); - -#ifdef DEBUG_ASSERT - assert(test); -#endif - - return test; -} - -// http://gcc.gnu.org/ml/libstdc++/2000-q1/msg00081.html -// Jim Parsons -void test06() -{ - // default locale, grouping is turned off - bool test = true; - unsigned int h4, h3, h2; - char c; - std::string s("205,199,144"); - std::istringstream is(s); - - is >> h4; // 205 - VERIFY( h4 == 205 ); - is >> c; // ',' - VERIFY( c == ',' ); - - is >> h4; // 199 - VERIFY( h4 == 199 ); - is >> c; // ',' - VERIFY( c == ',' ); - - is >> h4; // 144 - VERIFY( is.rdstate() == std::ios_base::eofbit ); - VERIFY( h4 == 144 ); - is >> c; // EOF - VERIFY( c == ',' ); - VERIFY( static_cast<bool>(is.rdstate() & std::ios_base::failbit) ); - -#ifdef DEBUG_ASSERT - assert(test); -#endif -} - -namespace std { - class test_numpunct1 : public numpunct<char> - { - protected: - string - do_grouping() const - { return string(1, '\003'); } - }; -} // namespace std - -void test07() -{ - // manufactured locale, grouping is turned on - bool test = true; - unsigned int h4 = 0, h3 = 0, h2 = 0; - float f1 = 0.0; - const std::string s1("205,199 23,445.25 1,024,365 123,22,24"); - std::istringstream is(s1); - is.imbue(std::locale(std::locale(), new std::test_numpunct1)); - - // Basic operation. - is >> h4; - VERIFY( h4 == 205199 ); - VERIFY( is.good() ); - - is.clear(); - is >> f1; - VERIFY( f1 == 23445.25 ); - VERIFY( is.good() ); - - is.clear(); - is >> h3; - VERIFY( h3 == 1024365 ); - VERIFY( is.good() ); - - is.clear(); - is >> h2; - VERIFY( h2 == 0 ); - VERIFY( static_cast<bool>(is.rdstate() & std::ios_base::failbit) ); - VERIFY( static_cast<bool>(is.rdstate() & std::ios_base::eofbit) ); - - // Stress tests for explicit errors in grouping corner cases. The - // validity of these tests and results have been hammered out in - // private email between bkoz and ncm between Jan 25 and Jan 27, 2000. - // Thanks nate -- benjamin - const std::string s2(",111 4,,4 0.25,345 5..25 156,, 1,000000 1000000 1234,567"); - h3 = h4 = h2 = 0; - f1 = 0.0; - const char c_control = '?'; - char c = c_control; - is.clear(); - is.str(s2); - - is >> h4; - VERIFY( h4 == 0 ); - VERIFY( static_cast<bool>(is.rdstate() & std::ios_base::failbit) ); - is.clear(); - is >> c; - VERIFY( c == ',' ); - VERIFY( is.good() ); - - is.ignore(3); - is >> f1; - VERIFY( f1 == 0.0 ); - VERIFY( static_cast<bool>(is.rdstate() & std::ios_base::failbit) ); - is.clear(); - is >> c; - VERIFY( c == ',' ); - is >> c; - VERIFY( c == '4' ); - VERIFY( is.good() ); - - is >> f1; - VERIFY( f1 == 0.25 ); - VERIFY( is.good() ); - is >> c; - VERIFY( c == ',' ); - is >> h2; - VERIFY( h2 == 345 ); - VERIFY( is.good() ); - f1 = 0.0; - h2 = 0; - - is >> f1; - VERIFY( f1 == 5.0 ); - VERIFY( is.good() ); - is >> f1; - VERIFY( f1 == .25 ); - VERIFY( is.good() ); - - is >> h3; - VERIFY( h3 == 0 ); - VERIFY( static_cast<bool>(is.rdstate() & std::ios_base::failbit) ); - is.clear(); - is >> c; - VERIFY( c == ',' ); // second one - VERIFY( is.good() ); - - is >> h2; - VERIFY( h2 == 0 ); - VERIFY( static_cast<bool>(is.rdstate() & std::ios_base::failbit) ); - is.clear(); - - is >> h2; - VERIFY( h2 == 1000000 ); - VERIFY( is.good() ); - h2 = 0; - - is >> h2; - VERIFY( h2 == 0 ); - VERIFY( static_cast<bool>(is.rdstate() & std::ios_base::failbit) ); - VERIFY( static_cast<bool>(is.rdstate() & std::ios_base::eofbit) ); - is.clear(); - -#ifdef DEBUG_ASSERT - assert(test); -#endif -} - -namespace std { - class test_numpunct2 : public numpunct<char> - { - protected: - string - do_grouping() const - { return string("\002\003"); } - }; -} // namespace std - -void test08() -{ - // manufactured locale, grouping is turned on - bool test = true; - unsigned int h4 = 0, h3 = 0, h2 = 0; - float f1 = 0.0; - const std::string s1("1,22 205,19 22,123,22"); - const std::string s2("1,220 2050,19 202,123,22"); - - std::istringstream is(s1); - is.imbue(std::locale(std::locale(), new std::test_numpunct2)); - - // Basic operation. - is >> h4; - VERIFY( h4 == 122 ); - VERIFY( is.good() ); - - is.clear(); - is >> h3; - VERIFY( h3 == 20519 ); - VERIFY( is.good() ); - - is.clear(); - is >> h2; - VERIFY( h2 == 2212322 ); - VERIFY( static_cast<bool>(is.rdstate() & std::ios_base::eofbit) ); - - -#ifdef DEBUG_ASSERT - assert(test); -#endif -} - - -bool test09() -{ - bool test = true; - - std::string st("2.456e3-+0.567e-2"); - std::stringbuf sb(st); - std::istream is(&sb); - double f1 = 0, f2 = 0; - char c; - (is>>std::ws) >> f1; - (is>>std::ws) >> c; - (is>>std::ws) >> f2; - test = f1 == 2456; - VERIFY( f2 == 0.00567 ); - VERIFY( c == '-' ); -#ifdef DEBUG_ASSERT - assert(test); -#endif - - return test; -} - -bool test10() { - std::string str_01("0 00 000 +0 +0 -0"); - std::stringbuf isbuf_01(str_01); - std::istream is_01(&isbuf_01); - - bool test = true; - - int n = 365; - is_01 >> n; - VERIFY( n == 0 ); - n = 364; - is_01 >> n; - VERIFY( n == 0 ); - n = 363; - is_01 >> n; - VERIFY( n == 0 ); - n = 362; - is_01 >> n; - VERIFY( n == 0 ); - n = 361; - is_01 >> n; - VERIFY( n == 0 ); - n = 360; - is_01 >> n; - VERIFY( n == 0 ); - VERIFY( is_01.rdstate() == std::ios_base::eofbit ); - - std::string str_02("0x32 0X33 033 33"); - std::stringbuf isbuf_02(str_02); - std::istream is_02(&isbuf_02); - is_02.unsetf(std::ios_base::basefield); - is_02 >> n; - VERIFY( n == 50 ); - is_02 >> n; - VERIFY( n == 51 ); - is_02 >> n; - VERIFY( n == 27 ); - is_02 >> n; - VERIFY( n == 33 ); - VERIFY( is_02.rdstate() == std::ios_base::eofbit ); - - std::stringbuf isbuf_03(str_02); - std::istream is_03(&isbuf_03); - char c; - int m; - - is_03 >> std::dec >> n >> c >> m; - VERIFY( n == 0 ); - VERIFY( c == 'x' ); - VERIFY( m == 32 ); - - is_03 >> std::oct >> m >> c >> n; - VERIFY( m == 0 ); - VERIFY( c == 'X' ); - VERIFY( n == 27 ); - - is_03 >> std::dec >> m >> n; - VERIFY( m == 33 ); - VERIFY( n == 33 ); - VERIFY( is_03.rdstate() == std::ios_base::eofbit ); - - std::string str_04("3. 4.5E+2a5E-3 .6E1"); - std::stringbuf isbuf_04(str_04); - std::istream is_04(&isbuf_04); - - double f; - is_04 >> f; - VERIFY( f == 3.0 ); - is_04 >> f; - VERIFY( f == 450.0 ); - is_04.ignore(); - is_04 >> f; - VERIFY( f == 0.005 ); - is_04 >> f; - VERIFY( f == 6 ); - VERIFY( is_03.rdstate() == std::ios_base::eofbit ); - - std::string str_05("0E20 5Ea E16"); - std::stringbuf isbuf_05(str_05); - std::istream is_05(&isbuf_05); - - is_05 >> f; - VERIFY( f == 0 ); - is_05 >> f; - VERIFY( f == 0 ); - VERIFY( is_05.rdstate() == std::ios_base::failbit ); - is_05.clear(); - is_05 >> c; - VERIFY( c == 'a' ); - is_05 >> f; - VERIFY( f == 0 ); - VERIFY( is_05.rdstate() == std::ios_base::failbit ); - is_05.clear(); - is_05.ignore(); - is_05 >> n; - VERIFY( n == 16 ); - -#ifdef DEBUG_ASSERT - assert(test); -#endif - - return test; -} - -// In the presence of no fmtflags, the input operator should behave -// like strtol(x, y, 0) -// libstdc++/90 -bool test11() -{ - bool test = true; - const char* cstrlit = "0x2a"; - - // sanity check via 'C' library call - char* err; - long l = std::strtol(cstrlit, &err, 0); - - std::istringstream iss(cstrlit); - iss.setf(std::ios::fmtflags(0), std::ios::basefield); - int i; - iss >> i; - - VERIFY (!iss.fail()); - VERIFY (l == i); - - return test; -} - -// libstdc++/3720 -// excess input should not cause a core dump -template<typename T> -bool test12_aux(bool integer_type) -{ - bool test = true; - - int digits_overflow; - if (integer_type) - // This many digits will overflow integer types in base 10. - digits_overflow = std::numeric_limits<T>::digits10 + 2; - else - // This might do it, unsure. - digits_overflow = std::numeric_limits<T>::max_exponent10 + 1; - - std::string st; - std::string part = "1234567890123456789012345678901234567890"; - for (int i = 0; i < digits_overflow / part.size() + 1; ++i) - st += part; - std::stringbuf sb(st); - std::istream is(&sb); - T t; - is >> t; - VERIFY(is.fail()); - return test; -} - -bool test12() -{ - bool test = true; - VERIFY(test12_aux<short>(true)); - VERIFY(test12_aux<int>(true)); - VERIFY(test12_aux<long>(true)); - VERIFY(test12_aux<float>(false)); - VERIFY(test12_aux<double>(false)); - VERIFY(test12_aux<long double>(false)); - return test; -} - -// libstdc++/3720 part two -void test13() -{ - using namespace std; - bool test = true; - const char* l1 = "12345678901234567890123456789012345678901234567890123456"; - const char* l2 = "1.2345678901234567890123456789012345678901234567890123456" - " " - "1246.9"; - - // 1 - // used to core. - double d; - istringstream iss1(l2); - iss1 >> d; - iss1 >> d; - VERIFY (d > 1246 && d < 1247); - - // 2 - // quick test for failbit on maximum length extraction. - int i; - int max_digits = numeric_limits<int>::digits10 + 1; - string digits; - for (int j = 0; j < max_digits; ++j) - digits += '1'; - istringstream iss2(digits); - iss2 >> i; - VERIFY( !iss2.fail() ); - - digits += '1'; - i = 0; - iss2.str(digits); - iss2.clear(); - iss2 >> i; - VERIFY( i == 0 ); - VERIFY( iss2.fail() ); -} - -int main() -{ - test01(); - test02(); - test03(); - - test06(); - test07(); - test08(); - test09(); - test10(); - - test11(); - test12(); - test13(); - return 0; -} - -// paul miller was right on with riddim warfare! diff --git a/libstdc++-v3/testsuite/27_io/istream_extractor_arith/01.cc b/libstdc++-v3/testsuite/27_io/istream_extractor_arith/01.cc new file mode 100644 index 00000000000..b2fdd2691e7 --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/istream_extractor_arith/01.cc @@ -0,0 +1,134 @@ +// 1999-04-12 bkoz + +// Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 27.6.1.2.2 arithmetic extractors + +#include <cstdio> // for printf +#include <istream> +#include <ostream> +#include <sstream> +#include <locale> +#include <testsuite_hooks.h> + +std::string str_01; +std::string str_02("true false 0 1 110001"); +std::string str_03("-19999999 777777 -234234 233 -234 33 1 66300.25 .315 1.5"); +std::string str_04("0123"); + +std::stringbuf isbuf_01(std::ios_base::in); +std::stringbuf isbuf_02(str_02, std::ios_base::in); +std::stringbuf isbuf_03(str_03, std::ios_base::in); +std::stringbuf isbuf_04(str_04, std::ios_base::in); + +std::istream is_01(NULL); +std::istream is_02(&isbuf_02); +std::istream is_03(&isbuf_03); +std::istream is_04(&isbuf_04); +std::stringstream ss_01(str_01); + +// minimal sanity check +bool test01() { + + bool test = true; + + // Integral Types: + bool b1 = false; + bool b2 = false; + short s1 = 0; + int i1 = 0; + long l1 = 0; + unsigned short us1 = 0; + unsigned int ui1 = 0; + unsigned long ul1 = 0; + + // Floating-point Types: + float f1 = 0; + double d1 = 0; + long double ld1 = 0; + + // process alphanumeric versions of bool values + std::ios_base::fmtflags fmt = is_02.flags(); + bool testfmt = fmt & std::ios_base::boolalpha; + is_02.setf(std::ios_base::boolalpha); + fmt = is_02.flags(); + testfmt = fmt & std::ios_base::boolalpha; + is_02 >> b1; + VERIFY( b1 == 1 ); + is_02 >> b1; + VERIFY( b1 == 0 ); + + // process numeric versions of of bool values + is_02.unsetf(std::ios_base::boolalpha); + fmt = is_02.flags(); + testfmt = fmt & std::ios_base::boolalpha; + is_02 >> b1; + VERIFY( b1 == 0 ); + is_02 >> b1; + VERIFY( b1 == 1 ); + + // is_03 == "-19999999 777777 -234234 233 -234 33 1 66300.25 .315 1.5" + is_03 >> l1; + VERIFY( l1 == -19999999 ); + is_03 >> ul1; + VERIFY( ul1 == 777777 ); + is_03 >> i1; + VERIFY( i1 == -234234 ); + is_03 >> ui1; + VERIFY( ui1 == 233 ); + is_03 >> s1; + VERIFY( s1 == -234 ); + is_03 >> us1; + VERIFY( us1 == 33 ); + is_03 >> b1; + VERIFY( b1 == 1 ); + is_03 >> ld1; + VERIFY( ld1 == 66300.25 ); + is_03 >> d1; + VERIFY( d1 == .315 ); + is_03 >> f1; + VERIFY( f1 == 1.5 ); + + is_04 >> std::hex >> i1; + std::printf ("%d %d %d\n", i1, i1 == 0x123, test); + VERIFY( i1 == 0x123 ); + std::printf ("%d %d %d\n", i1, i1 == 0x123, test); + + // test void pointers + int i = 55; + void* po = &i; + void* pi; + + ss_01 << po; + ss_01 >> pi; + std::printf ("%x %x\n", pi, po); + VERIFY( po == pi ); + +#ifdef DEBUG_ASSERT + assert(test); +#endif + + return test; +} + +int main() +{ + test01(); + return 0; +} diff --git a/libstdc++-v3/testsuite/27_io/istream_extractor_arith/02.cc b/libstdc++-v3/testsuite/27_io/istream_extractor_arith/02.cc new file mode 100644 index 00000000000..374fbd8e0c7 --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/istream_extractor_arith/02.cc @@ -0,0 +1,71 @@ +// 1999-04-12 bkoz + +// Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 27.6.1.2.2 arithmetic extractors + +#include <cstdio> // for printf +#include <istream> +#include <ostream> +#include <sstream> +#include <locale> +#include <testsuite_hooks.h> + +std::string str_01; +std::string str_02("true false 0 1 110001"); +std::string str_03("-19999999 777777 -234234 233 -234 33 1 66300.25 .315 1.5"); +std::string str_04("0123"); + +std::stringbuf isbuf_01(std::ios_base::in); +std::stringbuf isbuf_02(str_02, std::ios_base::in); +std::stringbuf isbuf_03(str_03, std::ios_base::in); +std::stringbuf isbuf_04(str_04, std::ios_base::in); + +std::istream is_01(NULL); +std::istream is_02(&isbuf_02); +std::istream is_03(&isbuf_03); +std::istream is_04(&isbuf_04); +std::stringstream ss_01(str_01); + +// elaborated test for ints +bool test02() { + + bool test = true; + const std::string str_01("20000AB"); + std::stringbuf strb_01(str_01, std::ios_base::in); + std::istream is(&strb_01); + + int n = 15; + is >> n; + VERIFY( n == 20000 ); + char c = is.peek(); + VERIFY( c == 65 ); + +#ifdef DEBUG_ASSERT + assert(test); +#endif + + return test; +} + +int main() +{ + test02(); + return 0; +} diff --git a/libstdc++-v3/testsuite/27_io/istream_extractor_arith/03.cc b/libstdc++-v3/testsuite/27_io/istream_extractor_arith/03.cc new file mode 100644 index 00000000000..869d828b091 --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/istream_extractor_arith/03.cc @@ -0,0 +1,70 @@ +// 1999-04-12 bkoz + +// Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 27.6.1.2.2 arithmetic extractors + +#include <cstdio> // for printf +#include <istream> +#include <ostream> +#include <sstream> +#include <locale> +#include <testsuite_hooks.h> + +std::string str_01; +std::string str_02("true false 0 1 110001"); +std::string str_03("-19999999 777777 -234234 233 -234 33 1 66300.25 .315 1.5"); +std::string str_04("0123"); + +std::stringbuf isbuf_01(std::ios_base::in); +std::stringbuf isbuf_02(str_02, std::ios_base::in); +std::stringbuf isbuf_03(str_03, std::ios_base::in); +std::stringbuf isbuf_04(str_04, std::ios_base::in); + +std::istream is_01(NULL); +std::istream is_02(&isbuf_02); +std::istream is_03(&isbuf_03); +std::istream is_04(&isbuf_04); +std::stringstream ss_01(str_01); + +bool test03() +{ + std::stringbuf sbuf; + std::istream istr(&sbuf); + std::ostream ostr(&sbuf); + + bool test = true; + long l01; + ostr << "12220101"; + istr >> l01; // _M_in_end set completely incorrectly here. + VERIFY( l01 == 12220101 ); + VERIFY( istr.rdstate() == std::ios_base::eofbit ); + +#ifdef DEBUG_ASSERT + assert(test); +#endif + + return test; +} + +int main() +{ + test03(); + return 0; +} diff --git a/libstdc++-v3/testsuite/27_io/istream_extractor_arith/06.cc b/libstdc++-v3/testsuite/27_io/istream_extractor_arith/06.cc new file mode 100644 index 00000000000..de92bcd52cb --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/istream_extractor_arith/06.cc @@ -0,0 +1,83 @@ +// 1999-04-12 bkoz + +// Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 27.6.1.2.2 arithmetic extractors + +#include <cstdio> // for printf +#include <istream> +#include <ostream> +#include <sstream> +#include <locale> +#include <testsuite_hooks.h> + +std::string str_01; +std::string str_02("true false 0 1 110001"); +std::string str_03("-19999999 777777 -234234 233 -234 33 1 66300.25 .315 1.5"); +std::string str_04("0123"); + +std::stringbuf isbuf_01(std::ios_base::in); +std::stringbuf isbuf_02(str_02, std::ios_base::in); +std::stringbuf isbuf_03(str_03, std::ios_base::in); +std::stringbuf isbuf_04(str_04, std::ios_base::in); + +std::istream is_01(NULL); +std::istream is_02(&isbuf_02); +std::istream is_03(&isbuf_03); +std::istream is_04(&isbuf_04); +std::stringstream ss_01(str_01); + +// http://gcc.gnu.org/ml/libstdc++/2000-q1/msg00081.html +// Jim Parsons +void test06() +{ + // default locale, grouping is turned off + bool test = true; + unsigned int h4, h3, h2; + char c; + std::string s("205,199,144"); + std::istringstream is(s); + + is >> h4; // 205 + VERIFY( h4 == 205 ); + is >> c; // ',' + VERIFY( c == ',' ); + + is >> h4; // 199 + VERIFY( h4 == 199 ); + is >> c; // ',' + VERIFY( c == ',' ); + + is >> h4; // 144 + VERIFY( is.rdstate() == std::ios_base::eofbit ); + VERIFY( h4 == 144 ); + is >> c; // EOF + VERIFY( c == ',' ); + VERIFY( static_cast<bool>(is.rdstate() & std::ios_base::failbit) ); + +#ifdef DEBUG_ASSERT + assert(test); +#endif +} + +int main() +{ + test06(); + return 0; +} diff --git a/libstdc++-v3/testsuite/27_io/istream_extractor_arith/07.cc b/libstdc++-v3/testsuite/27_io/istream_extractor_arith/07.cc new file mode 100644 index 00000000000..118668ea1d9 --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/istream_extractor_arith/07.cc @@ -0,0 +1,169 @@ +// 1999-04-12 bkoz + +// Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 27.6.1.2.2 arithmetic extractors + +#include <cstdio> // for printf +#include <istream> +#include <ostream> +#include <sstream> +#include <locale> +#include <testsuite_hooks.h> + +std::string str_01; +std::string str_02("true false 0 1 110001"); +std::string str_03("-19999999 777777 -234234 233 -234 33 1 66300.25 .315 1.5"); +std::string str_04("0123"); + +std::stringbuf isbuf_01(std::ios_base::in); +std::stringbuf isbuf_02(str_02, std::ios_base::in); +std::stringbuf isbuf_03(str_03, std::ios_base::in); +std::stringbuf isbuf_04(str_04, std::ios_base::in); + +std::istream is_01(NULL); +std::istream is_02(&isbuf_02); +std::istream is_03(&isbuf_03); +std::istream is_04(&isbuf_04); +std::stringstream ss_01(str_01); + +namespace std { + class test_numpunct1 : public numpunct<char> + { + protected: + string + do_grouping() const + { return string(1, '\003'); } + }; +} // namespace std + +void test07() +{ + // manufactured locale, grouping is turned on + bool test = true; + unsigned int h4 = 0, h3 = 0, h2 = 0; + float f1 = 0.0; + const std::string s1("205,199 23,445.25 1,024,365 123,22,24"); + std::istringstream is(s1); + is.imbue(std::locale(std::locale(), new std::test_numpunct1)); + + // Basic operation. + is >> h4; + VERIFY( h4 == 205199 ); + VERIFY( is.good() ); + + is.clear(); + is >> f1; + VERIFY( f1 == 23445.25 ); + VERIFY( is.good() ); + + is.clear(); + is >> h3; + VERIFY( h3 == 1024365 ); + VERIFY( is.good() ); + + is.clear(); + is >> h2; + VERIFY( h2 == 0 ); + VERIFY( static_cast<bool>(is.rdstate() & std::ios_base::failbit) ); + VERIFY( static_cast<bool>(is.rdstate() & std::ios_base::eofbit) ); + + // Stress tests for explicit errors in grouping corner cases. The + // validity of these tests and results have been hammered out in + // private email between bkoz and ncm between Jan 25 and Jan 27, 2000. + // Thanks nate -- benjamin + const std::string s2(",111 4,,4 0.25,345 5..25 156,, 1,000000 1000000 1234,567"); + h3 = h4 = h2 = 0; + f1 = 0.0; + const char c_control = '?'; + char c = c_control; + is.clear(); + is.str(s2); + + is >> h4; + VERIFY( h4 == 0 ); + VERIFY( static_cast<bool>(is.rdstate() & std::ios_base::failbit) ); + is.clear(); + is >> c; + VERIFY( c == ',' ); + VERIFY( is.good() ); + + is.ignore(3); + is >> f1; + VERIFY( f1 == 0.0 ); + VERIFY( static_cast<bool>(is.rdstate() & std::ios_base::failbit) ); + is.clear(); + is >> c; + VERIFY( c == ',' ); + is >> c; + VERIFY( c == '4' ); + VERIFY( is.good() ); + + is >> f1; + VERIFY( f1 == 0.25 ); + VERIFY( is.good() ); + is >> c; + VERIFY( c == ',' ); + is >> h2; + VERIFY( h2 == 345 ); + VERIFY( is.good() ); + f1 = 0.0; + h2 = 0; + + is >> f1; + VERIFY( f1 == 5.0 ); + VERIFY( is.good() ); + is >> f1; + VERIFY( f1 == .25 ); + VERIFY( is.good() ); + + is >> h3; + VERIFY( h3 == 0 ); + VERIFY( static_cast<bool>(is.rdstate() & std::ios_base::failbit) ); + is.clear(); + is >> c; + VERIFY( c == ',' ); // second one + VERIFY( is.good() ); + + is >> h2; + VERIFY( h2 == 0 ); + VERIFY( static_cast<bool>(is.rdstate() & std::ios_base::failbit) ); + is.clear(); + + is >> h2; + VERIFY( h2 == 1000000 ); + VERIFY( is.good() ); + h2 = 0; + + is >> h2; + VERIFY( h2 == 0 ); + VERIFY( static_cast<bool>(is.rdstate() & std::ios_base::failbit) ); + VERIFY( static_cast<bool>(is.rdstate() & std::ios_base::eofbit) ); + is.clear(); + +#ifdef DEBUG_ASSERT + assert(test); +#endif +} + +int main() +{ + test07(); + return 0; +} diff --git a/libstdc++-v3/testsuite/27_io/istream_extractor_arith/08.cc b/libstdc++-v3/testsuite/27_io/istream_extractor_arith/08.cc new file mode 100644 index 00000000000..f8491612ddf --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/istream_extractor_arith/08.cc @@ -0,0 +1,93 @@ +// 1999-04-12 bkoz + +// Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 27.6.1.2.2 arithmetic extractors + +#include <cstdio> // for printf +#include <istream> +#include <ostream> +#include <sstream> +#include <locale> +#include <testsuite_hooks.h> + +std::string str_01; +std::string str_02("true false 0 1 110001"); +std::string str_03("-19999999 777777 -234234 233 -234 33 1 66300.25 .315 1.5"); +std::string str_04("0123"); + +std::stringbuf isbuf_01(std::ios_base::in); +std::stringbuf isbuf_02(str_02, std::ios_base::in); +std::stringbuf isbuf_03(str_03, std::ios_base::in); +std::stringbuf isbuf_04(str_04, std::ios_base::in); + +std::istream is_01(NULL); +std::istream is_02(&isbuf_02); +std::istream is_03(&isbuf_03); +std::istream is_04(&isbuf_04); +std::stringstream ss_01(str_01); + +namespace std { + class test_numpunct2 : public numpunct<char> + { + protected: + string + do_grouping() const + { return string("\002\003"); } + }; +} // namespace std + +void test08() +{ + // manufactured locale, grouping is turned on + bool test = true; + unsigned int h4 = 0, h3 = 0, h2 = 0; + float f1 = 0.0; + const std::string s1("1,22 205,19 22,123,22"); + const std::string s2("1,220 2050,19 202,123,22"); + + std::istringstream is(s1); + is.imbue(std::locale(std::locale(), new std::test_numpunct2)); + + // Basic operation. + is >> h4; + VERIFY( h4 == 122 ); + VERIFY( is.good() ); + + is.clear(); + is >> h3; + VERIFY( h3 == 20519 ); + VERIFY( is.good() ); + + is.clear(); + is >> h2; + VERIFY( h2 == 2212322 ); + VERIFY( static_cast<bool>(is.rdstate() & std::ios_base::eofbit) ); + + +#ifdef DEBUG_ASSERT + assert(test); +#endif +} + +int main() +{ + test08(); + return 0; +} diff --git a/libstdc++-v3/testsuite/27_io/istream_extractor_arith/09.cc b/libstdc++-v3/testsuite/27_io/istream_extractor_arith/09.cc new file mode 100644 index 00000000000..37e175e6f7c --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/istream_extractor_arith/09.cc @@ -0,0 +1,72 @@ +// 1999-04-12 bkoz + +// Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 27.6.1.2.2 arithmetic extractors + +#include <cstdio> // for printf +#include <istream> +#include <ostream> +#include <sstream> +#include <locale> +#include <testsuite_hooks.h> + +std::string str_01; +std::string str_02("true false 0 1 110001"); +std::string str_03("-19999999 777777 -234234 233 -234 33 1 66300.25 .315 1.5"); +std::string str_04("0123"); + +std::stringbuf isbuf_01(std::ios_base::in); +std::stringbuf isbuf_02(str_02, std::ios_base::in); +std::stringbuf isbuf_03(str_03, std::ios_base::in); +std::stringbuf isbuf_04(str_04, std::ios_base::in); + +std::istream is_01(NULL); +std::istream is_02(&isbuf_02); +std::istream is_03(&isbuf_03); +std::istream is_04(&isbuf_04); +std::stringstream ss_01(str_01); + +bool test09() +{ + bool test = true; + + std::string st("2.456e3-+0.567e-2"); + std::stringbuf sb(st); + std::istream is(&sb); + double f1 = 0, f2 = 0; + char c; + (is>>std::ws) >> f1; + (is>>std::ws) >> c; + (is>>std::ws) >> f2; + test = f1 == 2456; + VERIFY( f2 == 0.00567 ); + VERIFY( c == '-' ); +#ifdef DEBUG_ASSERT + assert(test); +#endif + + return test; +} + +int main() +{ + test09(); + return 0; +} diff --git a/libstdc++-v3/testsuite/27_io/istream_extractor_arith/10.cc b/libstdc++-v3/testsuite/27_io/istream_extractor_arith/10.cc new file mode 100644 index 00000000000..bc67190533f --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/istream_extractor_arith/10.cc @@ -0,0 +1,154 @@ +// 1999-04-12 bkoz + +// Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 27.6.1.2.2 arithmetic extractors + +#include <cstdio> // for printf +#include <istream> +#include <ostream> +#include <sstream> +#include <locale> +#include <testsuite_hooks.h> + +std::string str_01; +std::string str_02("true false 0 1 110001"); +std::string str_03("-19999999 777777 -234234 233 -234 33 1 66300.25 .315 1.5"); +std::string str_04("0123"); + +std::stringbuf isbuf_01(std::ios_base::in); +std::stringbuf isbuf_02(str_02, std::ios_base::in); +std::stringbuf isbuf_03(str_03, std::ios_base::in); +std::stringbuf isbuf_04(str_04, std::ios_base::in); + +std::istream is_01(NULL); +std::istream is_02(&isbuf_02); +std::istream is_03(&isbuf_03); +std::istream is_04(&isbuf_04); +std::stringstream ss_01(str_01); + +bool test10() { + std::string str_01("0 00 000 +0 +0 -0"); + std::stringbuf isbuf_01(str_01); + std::istream is_01(&isbuf_01); + + bool test = true; + + int n = 365; + is_01 >> n; + VERIFY( n == 0 ); + n = 364; + is_01 >> n; + VERIFY( n == 0 ); + n = 363; + is_01 >> n; + VERIFY( n == 0 ); + n = 362; + is_01 >> n; + VERIFY( n == 0 ); + n = 361; + is_01 >> n; + VERIFY( n == 0 ); + n = 360; + is_01 >> n; + VERIFY( n == 0 ); + VERIFY( is_01.rdstate() == std::ios_base::eofbit ); + + std::string str_02("0x32 0X33 033 33"); + std::stringbuf isbuf_02(str_02); + std::istream is_02(&isbuf_02); + is_02.unsetf(std::ios_base::basefield); + is_02 >> n; + VERIFY( n == 50 ); + is_02 >> n; + VERIFY( n == 51 ); + is_02 >> n; + VERIFY( n == 27 ); + is_02 >> n; + VERIFY( n == 33 ); + VERIFY( is_02.rdstate() == std::ios_base::eofbit ); + + std::stringbuf isbuf_03(str_02); + std::istream is_03(&isbuf_03); + char c; + int m; + + is_03 >> std::dec >> n >> c >> m; + VERIFY( n == 0 ); + VERIFY( c == 'x' ); + VERIFY( m == 32 ); + + is_03 >> std::oct >> m >> c >> n; + VERIFY( m == 0 ); + VERIFY( c == 'X' ); + VERIFY( n == 27 ); + + is_03 >> std::dec >> m >> n; + VERIFY( m == 33 ); + VERIFY( n == 33 ); + VERIFY( is_03.rdstate() == std::ios_base::eofbit ); + + std::string str_04("3. 4.5E+2a5E-3 .6E1"); + std::stringbuf isbuf_04(str_04); + std::istream is_04(&isbuf_04); + + double f; + is_04 >> f; + VERIFY( f == 3.0 ); + is_04 >> f; + VERIFY( f == 450.0 ); + is_04.ignore(); + is_04 >> f; + VERIFY( f == 0.005 ); + is_04 >> f; + VERIFY( f == 6 ); + VERIFY( is_03.rdstate() == std::ios_base::eofbit ); + + std::string str_05("0E20 5Ea E16"); + std::stringbuf isbuf_05(str_05); + std::istream is_05(&isbuf_05); + + is_05 >> f; + VERIFY( f == 0 ); + is_05 >> f; + VERIFY( f == 0 ); + VERIFY( is_05.rdstate() == std::ios_base::failbit ); + is_05.clear(); + is_05 >> c; + VERIFY( c == 'a' ); + is_05 >> f; + VERIFY( f == 0 ); + VERIFY( is_05.rdstate() == std::ios_base::failbit ); + is_05.clear(); + is_05.ignore(); + is_05 >> n; + VERIFY( n == 16 ); + +#ifdef DEBUG_ASSERT + assert(test); +#endif + + return test; +} + +int main() +{ + test10(); + return 0; +} diff --git a/libstdc++-v3/testsuite/27_io/istream_extractor_arith/11.cc b/libstdc++-v3/testsuite/27_io/istream_extractor_arith/11.cc new file mode 100644 index 00000000000..309875dfc54 --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/istream_extractor_arith/11.cc @@ -0,0 +1,73 @@ +// 1999-04-12 bkoz + +// Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 27.6.1.2.2 arithmetic extractors + +#include <cstdio> // for printf +#include <istream> +#include <ostream> +#include <sstream> +#include <locale> +#include <testsuite_hooks.h> + +std::string str_01; +std::string str_02("true false 0 1 110001"); +std::string str_03("-19999999 777777 -234234 233 -234 33 1 66300.25 .315 1.5"); +std::string str_04("0123"); + +std::stringbuf isbuf_01(std::ios_base::in); +std::stringbuf isbuf_02(str_02, std::ios_base::in); +std::stringbuf isbuf_03(str_03, std::ios_base::in); +std::stringbuf isbuf_04(str_04, std::ios_base::in); + +std::istream is_01(NULL); +std::istream is_02(&isbuf_02); +std::istream is_03(&isbuf_03); +std::istream is_04(&isbuf_04); +std::stringstream ss_01(str_01); + +// In the presence of no fmtflags, the input operator should behave +// like strtol(x, y, 0) +// libstdc++/90 +bool test11() +{ + bool test = true; + const char* cstrlit = "0x2a"; + + // sanity check via 'C' library call + char* err; + long l = std::strtol(cstrlit, &err, 0); + + std::istringstream iss(cstrlit); + iss.setf(std::ios::fmtflags(0), std::ios::basefield); + int i; + iss >> i; + + VERIFY (!iss.fail()); + VERIFY (l == i); + + return test; +} + +int main() +{ + test11(); + return 0; +} diff --git a/libstdc++-v3/testsuite/27_io/istream_extractor_arith/12.cc b/libstdc++-v3/testsuite/27_io/istream_extractor_arith/12.cc new file mode 100644 index 00000000000..64795c05812 --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/istream_extractor_arith/12.cc @@ -0,0 +1,94 @@ +// 1999-04-12 bkoz + +// Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 27.6.1.2.2 arithmetic extractors + +// XXX This test fails on sparc-solaris2 because of a bug in libc +// XXX sscanf for very long input. See: +// XXX http://gcc.gnu.org/ml/gcc/2002-12/msg01422.html +// { dg-do run { xfail sparc*-*-solaris2* } } + +#include <cstdio> // for printf +#include <istream> +#include <ostream> +#include <sstream> +#include <locale> +#include <testsuite_hooks.h> + +std::string str_01; +std::string str_02("true false 0 1 110001"); +std::string str_03("-19999999 777777 -234234 233 -234 33 1 66300.25 .315 1.5"); +std::string str_04("0123"); + +std::stringbuf isbuf_01(std::ios_base::in); +std::stringbuf isbuf_02(str_02, std::ios_base::in); +std::stringbuf isbuf_03(str_03, std::ios_base::in); +std::stringbuf isbuf_04(str_04, std::ios_base::in); + +std::istream is_01(NULL); +std::istream is_02(&isbuf_02); +std::istream is_03(&isbuf_03); +std::istream is_04(&isbuf_04); +std::stringstream ss_01(str_01); + +// libstdc++/3720 +// excess input should not cause a core dump +template<typename T> +bool test12_aux(bool integer_type) +{ + bool test = true; + + int digits_overflow; + if (integer_type) + // This many digits will overflow integer types in base 10. + digits_overflow = std::numeric_limits<T>::digits10 + 2; + else + // This might do it, unsure. + digits_overflow = std::numeric_limits<T>::max_exponent10 + 1; + + std::string st; + std::string part = "1234567890123456789012345678901234567890"; + for (int i = 0; i < digits_overflow / part.size() + 1; ++i) + st += part; + std::stringbuf sb(st); + std::istream is(&sb); + T t; + is >> t; + VERIFY(is.fail()); + return test; +} + +bool test12() +{ + bool test = true; + VERIFY(test12_aux<short>(true)); + VERIFY(test12_aux<int>(true)); + VERIFY(test12_aux<long>(true)); + VERIFY(test12_aux<float>(false)); + VERIFY(test12_aux<double>(false)); + VERIFY(test12_aux<long double>(false)); + return test; +} + +int main() +{ + test12(); + return 0; +} diff --git a/libstdc++-v3/testsuite/27_io/istream_extractor_arith/13.cc b/libstdc++-v3/testsuite/27_io/istream_extractor_arith/13.cc new file mode 100644 index 00000000000..935d456f448 --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/istream_extractor_arith/13.cc @@ -0,0 +1,88 @@ +// 1999-04-12 bkoz + +// Copyright (C) 1999, 2000, 2002, 2003 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 2, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING. If not, write to the Free +// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, +// USA. + +// 27.6.1.2.2 arithmetic extractors + +#include <cstdio> // for printf +#include <istream> +#include <ostream> +#include <sstream> +#include <locale> +#include <testsuite_hooks.h> + +std::string str_01; +std::string str_02("true false 0 1 110001"); +std::string str_03("-19999999 777777 -234234 233 -234 33 1 66300.25 .315 1.5"); +std::string str_04("0123"); + +std::stringbuf isbuf_01(std::ios_base::in); +std::stringbuf isbuf_02(str_02, std::ios_base::in); +std::stringbuf isbuf_03(str_03, std::ios_base::in); +std::stringbuf isbuf_04(str_04, std::ios_base::in); + +std::istream is_01(NULL); +std::istream is_02(&isbuf_02); +std::istream is_03(&isbuf_03); +std::istream is_04(&isbuf_04); +std::stringstream ss_01(str_01); + +// libstdc++/3720 part two +void test13() +{ + using namespace std; + bool test = true; + const char* l1 = "12345678901234567890123456789012345678901234567890123456"; + const char* l2 = "1.2345678901234567890123456789012345678901234567890123456" + " " + "1246.9"; + + // 1 + // used to core. + double d; + istringstream iss1(l2); + iss1 >> d; + iss1 >> d; + VERIFY (d > 1246 && d < 1247); + + // 2 + // quick test for failbit on maximum length extraction. + int i; + int max_digits = numeric_limits<int>::digits10 + 1; + string digits; + for (int j = 0; j < max_digits; ++j) + digits += '1'; + istringstream iss2(digits); + iss2 >> i; + VERIFY( !iss2.fail() ); + + digits += '1'; + i = 0; + iss2.str(digits); + iss2.clear(); + iss2 >> i; + VERIFY( i == 0 ); + VERIFY( iss2.fail() ); +} + +int main() +{ + test13(); + return 0; +} diff --git a/libstdc++-v3/testsuite/27_io/ostream.cc b/libstdc++-v3/testsuite/27_io/ostream.cc index ee764f9d697..7efd65381a3 100644 --- a/libstdc++-v3/testsuite/27_io/ostream.cc +++ b/libstdc++-v3/testsuite/27_io/ostream.cc @@ -1,6 +1,6 @@ // 1999-09-20 bkoz -// Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -50,9 +50,10 @@ void test01() namespace test { using namespace std; + using __gnu_cxx_test::pod_char; typedef short type_t; template class basic_ostream<type_t, char_traits<type_t> >; - template class basic_ostream<gnu_char, char_traits<gnu_char> >; + template class basic_ostream<pod_char, char_traits<pod_char> >; } // test int main() diff --git a/libstdc++-v3/testsuite/27_io/ostream_inserter_arith.cc b/libstdc++-v3/testsuite/27_io/ostream_inserter_arith.cc index 041f3149011..e4e618d68d8 100644 --- a/libstdc++-v3/testsuite/27_io/ostream_inserter_arith.cc +++ b/libstdc++-v3/testsuite/27_io/ostream_inserter_arith.cc @@ -368,7 +368,26 @@ test05() istringstream istr (sval); double d; istr >> d; - VERIFY (abs(pi-d)/pi < DBL_EPSILON); + VERIFY( abs(pi-d)/pi < DBL_EPSILON ); + return 0; +} + + +// libstdc++/9151 +int +test06() +{ + int prec = numeric_limits<double>::digits10 + 2; + double oval = numeric_limits<double>::min(); + + stringstream ostr; + ostr.precision(prec); + ostr << oval; + string sval = ostr.str(); + istringstream istr (sval); + double ival; + istr >> ival; + VERIFY( abs(oval-ival)/oval < DBL_EPSILON ); return 0; } @@ -380,6 +399,7 @@ main() test03(); test04(); test05(); + test06(); #ifdef TEST_NUMPUT_VERBOSE cout << "Test passed!" << endl; #endif diff --git a/libstdc++-v3/testsuite/27_io/streambuf.cc b/libstdc++-v3/testsuite/27_io/streambuf.cc index 102ff60c260..29c771b9074 100644 --- a/libstdc++-v3/testsuite/27_io/streambuf.cc +++ b/libstdc++-v3/testsuite/27_io/streambuf.cc @@ -1,6 +1,6 @@ // 2002-07-25 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2002 Free Software Foundation, Inc. +// Copyright (C) 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -50,9 +50,10 @@ void test01() namespace test { using namespace std; + using __gnu_cxx_test::pod_char; typedef short type_t; template class basic_streambuf<type_t, char_traits<type_t> >; - template class basic_streambuf<gnu_char, char_traits<gnu_char> >; + template class basic_streambuf<pod_char, char_traits<pod_char> >; } // test int main() diff --git a/libstdc++-v3/testsuite/27_io/streambuf_members.cc b/libstdc++-v3/testsuite/27_io/streambuf_members.cc index 3f9a3192b7e..aaad07dc47f 100644 --- a/libstdc++-v3/testsuite/27_io/streambuf_members.cc +++ b/libstdc++-v3/testsuite/27_io/streambuf_members.cc @@ -1,6 +1,6 @@ // 1999-10-11 bkoz -// Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -364,6 +364,28 @@ test07() VERIFY(out.good()); } +// libstdc++/9322 +void test08() +{ + using std::locale; + bool test = true; + + locale loc; + testbuf2 ob; + VERIFY( ob.getloc() == loc ); + + locale::global(locale("en_US")); + VERIFY( ob.getloc() == loc ); + + locale loc_de ("de_DE"); + locale ret = ob.pubimbue(loc_de); + VERIFY( ob.getloc() == loc_de ); + VERIFY( ret == loc ); + + locale::global(loc); + VERIFY( ob.getloc() == loc_de ); +} + int main() { test01(); @@ -374,5 +396,6 @@ int main() test05(); test07(); + test08(); return 0; } diff --git a/libstdc++-v3/testsuite/27_io/stringbuf.cc b/libstdc++-v3/testsuite/27_io/stringbuf.cc index 3cfd5af605c..a91deab2f1d 100644 --- a/libstdc++-v3/testsuite/27_io/stringbuf.cc +++ b/libstdc++-v3/testsuite/27_io/stringbuf.cc @@ -1,6 +1,6 @@ // 2002-07-25 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2002 Free Software Foundation, Inc. +// Copyright (C) 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -50,9 +50,10 @@ void test01() namespace test { using namespace std; + using __gnu_cxx_test::pod_char; typedef short type_t; template class basic_stringbuf<type_t, char_traits<type_t> >; - template class basic_stringbuf<gnu_char, char_traits<gnu_char> >; + template class basic_stringbuf<pod_char, char_traits<pod_char> >; } // test int main() diff --git a/libstdc++-v3/testsuite/27_io/stringbuf_virtuals.cc b/libstdc++-v3/testsuite/27_io/stringbuf_virtuals.cc index 318bb72fa8a..8a6add9dfc5 100644 --- a/libstdc++-v3/testsuite/27_io/stringbuf_virtuals.cc +++ b/libstdc++-v3/testsuite/27_io/stringbuf_virtuals.cc @@ -1,6 +1,6 @@ // 2001-05-21 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -70,6 +70,28 @@ void test02(std::stringbuf& in, bool pass) VERIFY( p == bad ); } +// libstdc++/9322 +void test08() +{ + using std::locale; + bool test = true; + + locale loc; + std::stringbuf ob; + VERIFY( ob.getloc() == loc ); + + locale::global(locale("en_US")); + VERIFY( ob.getloc() == loc ); + + locale loc_de ("de_DE"); + locale ret = ob.pubimbue(loc_de); + VERIFY( ob.getloc() == loc_de ); + VERIFY( ret == loc ); + + locale::global(loc); + VERIFY( ob.getloc() == loc_de ); +} + int main() { using namespace std; @@ -83,5 +105,6 @@ int main() test02(in2, false); test02(in3, false); + test08(); return 0; } diff --git a/libstdc++-v3/testsuite/27_io/stringstream.cc b/libstdc++-v3/testsuite/27_io/stringstream.cc index cb9e39d9588..576b72d5282 100644 --- a/libstdc++-v3/testsuite/27_io/stringstream.cc +++ b/libstdc++-v3/testsuite/27_io/stringstream.cc @@ -1,6 +1,6 @@ // 2002-07-25 Benjamin Kosnik <bkoz@redhat.com> -// Copyright (C) 2002 Free Software Foundation, Inc. +// Copyright (C) 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -50,9 +50,10 @@ void test01() namespace test { using namespace std; + using __gnu_cxx_test::pod_char; typedef short type_t; template class basic_stringstream<type_t, char_traits<type_t> >; - template class basic_stringstream<gnu_char, char_traits<gnu_char> >; + template class basic_stringstream<pod_char, char_traits<pod_char> >; } // test int main() diff --git a/libstdc++-v3/testsuite/Makefile.am b/libstdc++-v3/testsuite/Makefile.am index d85fae7d8d9..7380035af3f 100644 --- a/libstdc++-v3/testsuite/Makefile.am +++ b/libstdc++-v3/testsuite/Makefile.am @@ -1,6 +1,6 @@ ## Makefile for the testsuite subdirectory of the GNU C++ Standard library. ## -## Copyright (C) 2001, 2002 Free Software Foundation, Inc. +## Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. ## ## This file is part of the libstdc++ version 3 distribution. ## Process this file with automake to produce Makefile.in. @@ -61,3 +61,18 @@ else noinst_PROGRAMS = endif abi_check_SOURCES = abi_check.cc + +# Enable wchar_t tests if capable. +if GLIBCPP_TEST_WCHAR_T +all-local: stamp_wchar +else +all-local: +endif + +stamp_wchar: + touch testsuite_wchar_t + +# By adding these files here, automake will remove them for 'make clean' +CLEANFILES = *.txt *.tst *.exe core* filebuf_* tmp ostream_* *.log *.sum \ + testsuite_files testsuite_wchar_t \ + site.exp abi_check diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index f3d94e4b9b6..ee06f25f327 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -75,6 +75,7 @@ CLOCALE_H = @CLOCALE_H@ CMESSAGES_H = @CMESSAGES_H@ CPP = @CPP@ CSTDIO_H = @CSTDIO_H@ +CTIME_H = @CTIME_H@ CXXCPP = @CXXCPP@ C_INCLUDE_DIR = @C_INCLUDE_DIR@ DEBUG_FLAGS = @DEBUG_FLAGS@ @@ -166,6 +167,12 @@ libv3test_a_SOURCES = testsuite_hooks.cc testsuite_allocator.cc @GLIBCPP_BUILD_ABI_CHECK_TRUE@noinst_PROGRAMS = @GLIBCPP_BUILD_ABI_CHECK_TRUE@abi_check @GLIBCPP_BUILD_ABI_CHECK_FALSE@noinst_PROGRAMS = abi_check_SOURCES = abi_check.cc + +# By adding these files here, automake will remove them for 'make clean' +CLEANFILES = *.txt *.tst *.exe core* filebuf_* tmp ostream_* *.log *.sum \ + testsuite_files testsuite_wchar_t \ + site.exp abi_check + mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -388,7 +395,7 @@ install-am: all-am install: install-am uninstall-am: uninstall: uninstall-am -all-am: Makefile $(LIBRARIES) $(PROGRAMS) +all-am: Makefile $(LIBRARIES) $(PROGRAMS) all-local all-redirect: all-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install @@ -398,6 +405,7 @@ installdirs: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -rm -f Makefile $(CONFIG_CLEAN_FILES) @@ -442,11 +450,18 @@ maintainer-clean-noinstPROGRAMS tags mostlyclean-tags distclean-tags \ clean-tags maintainer-clean-tags distdir check-DEJAGNU info-am info \ dvi-am dvi check check-am installcheck-am installcheck install-info-am \ install-info install-exec-am install-exec install-data-am install-data \ -install-am install uninstall-am uninstall all-redirect all-am all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ +install-am install uninstall-am uninstall all-local all-redirect all-am \ +all installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean +# Enable wchar_t tests if capable. +@GLIBCPP_TEST_WCHAR_T_TRUE@all-local: stamp_wchar +@GLIBCPP_TEST_WCHAR_T_FALSE@all-local: + +stamp_wchar: + touch testsuite_wchar_t + # 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/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp b/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp index fd95a0d9253..b64274bea93 100644 --- a/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp +++ b/libstdc++-v3/testsuite/lib/libstdc++-v3-dg.exp @@ -1,4 +1,4 @@ -# Copyright (C) 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -54,8 +54,8 @@ proc libstdc++-v3-init { args } { set dg-do-what-default run # Copy any required data files. - libstdc++-v3-copy-files [glob -nocomplain "$srcdir/*/*.tst"] $outdir - libstdc++-v3-copy-files [glob -nocomplain "$srcdir/*/*.txt"] $outdir + libstdc++-v3-copy-files [glob -nocomplain "$srcdir/{,*/}*/*.tst"] $outdir + libstdc++-v3-copy-files [glob -nocomplain "$srcdir/{,*/}*/*.txt"] $outdir # set LD_LIBRARY_PATH so that libgcc_s, libstdc++ binaries can be found. # locate libgcc.a so we don't need to account for different values of @@ -233,13 +233,30 @@ proc libstdc++-v3-list-sourcefiles { } { set f [open $files_file "w"] set where_we_were [pwd] cd $srcdir - foreach s [lsort [glob -nocomplain */*.cc]] { + foreach s [lsort [glob -nocomplain "*/*.cc" "*/*/*.cc" "{,*/}*/*/*/*.cc" ]] { lappend sfiles ${srcdir}/${s} puts $f $s } cd $where_we_were } close $f - return $sfiles -} + # Disable wchar_t tests if library not configured to support + # wchar_t testing. + set wchar_file "${outdir}/testsuite_wchar_t" + if { [file exists $wchar_file] } { + return $sfiles + } else { + # Remove wchar_t tests files from list. + set res {} + foreach w $sfiles { + if [regexp "wchar_t" $w] { + verbose "element out list is $w" + } else { + verbose "element in list is $w" + lappend res $w + } + } + return $res + } +} diff --git a/libstdc++-v3/testsuite/libstdc++-v3.dg/dg.exp b/libstdc++-v3/testsuite/libstdc++-v3.dg/dg.exp index 4e0dd07dbaa..bad12dc31dc 100644 --- a/libstdc++-v3/testsuite/libstdc++-v3.dg/dg.exp +++ b/libstdc++-v3/testsuite/libstdc++-v3.dg/dg.exp @@ -1,4 +1,4 @@ -# Copyright (C) 2001, 2002 Free Software Foundation, Inc. +# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -22,23 +22,13 @@ load_lib libstdc++-v3-dg.exp # If a testcase doesn't have special options, use these. global DEFAULT_CXXFLAGS if ![info exists DEFAULT_CXXFLAGS] then { - set DEFAULT_CXXFLAGS " -DDEBUG_ASSERT" + set DEFAULT_CXXFLAGS "-g -O2 -DDEBUG_ASSERT" } # Initialize 'dg' last or dejagnu exits with an error... libstdc++-v3-init dg-init - -## Set ulimits. -## This should normally be handled on a per-test basis through @xxx@-keywords. -## The following limit is expressed in kilobytes. For history, have a -## look at http://gcc.gnu.org/ml/libstdc++/2000-10/msg00029.html -set maximum-memory-usage 16384 -set shell-ulimit-command ulimit -remote_exec host ${shell-ulimit-command} "-d ${maximum-memory-usage}" -remote_exec host ${shell-ulimit-command} "-v ${maximum-memory-usage}" - # Main loop. dg-runtest [libstdc++-v3-list-sourcefiles] "" $DEFAULT_CXXFLAGS diff --git a/libstdc++-v3/testsuite/testsuite_allocator.cc b/libstdc++-v3/testsuite/testsuite_allocator.cc index a4f287e008b..775b2535026 100644 --- a/libstdc++-v3/testsuite/testsuite_allocator.cc +++ b/libstdc++-v3/testsuite/testsuite_allocator.cc @@ -1,5 +1,7 @@ +// -*- C++ -*- +// Testing allocator for the C++ library testsuite. // -// Copyright (C) 2002 Free Software Foundation, Inc. +// Copyright (C) 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -28,8 +30,11 @@ #include <testsuite_allocator.h> -gnu_allocator_tracker::size_type gnu_allocator_tracker::allocationTotal_ = 0; -gnu_allocator_tracker::size_type gnu_allocator_tracker::deallocationTotal_ = 0; -int gnu_allocator_tracker::constructCount_ = 0; -int gnu_allocator_tracker::destructCount_ = 0; +namespace __gnu_cxx_test +{ + allocation_tracker::size_type allocation_tracker::allocationTotal_ = 0; + allocation_tracker::size_type allocation_tracker::deallocationTotal_ = 0; + int allocation_tracker::constructCount_ = 0; + int allocation_tracker::destructCount_ = 0; +}; // namespace __cxx_test diff --git a/libstdc++-v3/testsuite/testsuite_allocator.h b/libstdc++-v3/testsuite/testsuite_allocator.h index 1387b5af0ec..3c77260f5d5 100644 --- a/libstdc++-v3/testsuite/testsuite_allocator.h +++ b/libstdc++-v3/testsuite/testsuite_allocator.h @@ -1,6 +1,7 @@ +// -*- C++ -*- // Testing allocator for the C++ library testsuite. // -// Copyright (C) 2002 Free Software Foundation, Inc. +// Copyright (C) 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -37,71 +38,66 @@ #include <cstddef> #include <limits> -class gnu_allocator_tracker +namespace __gnu_cxx_test { - public: - typedef std::size_t size_type; - - static void* - allocate(size_type blocksize) + class allocation_tracker { - allocationTotal_ += blocksize; - return ::operator new(blocksize); - } - - static void - construct() - { constructCount_++; } - - static void - destroy() - { destructCount_++; } - - static void - deallocate(void* p, size_type blocksize) - { - ::operator delete(p); - deallocationTotal_ += blocksize; - } - - static size_type - allocationTotal() - { return allocationTotal_; } + public: + typedef std::size_t size_type; + + static void* + allocate(size_type blocksize) + { + allocationTotal_ += blocksize; + return ::operator new(blocksize); + } + + static void + construct() { constructCount_++; } - static size_type - deallocationTotal() - { return deallocationTotal_; } + static void + destroy() { destructCount_++; } - static int - constructCount() - { return constructCount_; } + static void + deallocate(void* p, size_type blocksize) + { + ::operator delete(p); + deallocationTotal_ += blocksize; + } + + static size_type + allocationTotal() { return allocationTotal_; } + + static size_type + deallocationTotal() { return deallocationTotal_; } + + static int + constructCount() { return constructCount_; } - static int - destructCount() - { return destructCount_; } + static int + destructCount() { return destructCount_; } - static void - resetCounts() - { - allocationTotal_ = 0; - deallocationTotal_ = 0; - constructCount_ = 0; + static void + resetCounts() + { + allocationTotal_ = 0; + deallocationTotal_ = 0; + constructCount_ = 0; destructCount_ = 0; - } + } private: - static size_type allocationTotal_; - static size_type deallocationTotal_; - static int constructCount_; - static int destructCount_; -}; - -// A simple basic allocator that just forwards to the -// gnu_allocator_tracker to fulfill memory requests. This class is -// templated on the target object type, but gnu_allocator_tracker -// isn't. -template<class T> - class gnu_new_allocator + static size_type allocationTotal_; + static size_type deallocationTotal_; + static int constructCount_; + static int destructCount_; + }; + + // A simple basic allocator that just forwards to the + // allocation_tracker to fulfill memory requests. This class is + // templated on the target object type, but tracker isn't. + template<class T> + class tracker_alloc { public: typedef T value_type; @@ -112,7 +108,7 @@ template<class T> typedef std::size_t size_type; typedef std::ptrdiff_t difference_type; - template<class U> struct rebind { typedef gnu_new_allocator<U> other; }; + template<class U> struct rebind { typedef tracker_alloc<U> other; }; pointer address(reference value) const @@ -122,17 +118,17 @@ template<class T> address(const_reference value) const { return &value; } - gnu_new_allocator() throw() + tracker_alloc() throw() { } - gnu_new_allocator(const gnu_new_allocator&) throw() + tracker_alloc(const tracker_alloc&) throw() { } template<class U> - gnu_new_allocator(const gnu_new_allocator<U>&) throw() + tracker_alloc(const tracker_alloc<U>&) throw() { } - ~gnu_new_allocator() throw() + ~tracker_alloc() throw() { } size_type @@ -140,42 +136,40 @@ template<class T> { return std::numeric_limits<std::size_t>::max() / sizeof(T); } pointer - allocate(size_type num, const void* = 0) + allocate(size_type n, const void* = 0) { - return static_cast<pointer>(gnu_allocator_tracker::allocate(num * - sizeof(T))); + return static_cast<pointer>(allocation_tracker::allocate(n * sizeof(T))); } void construct(pointer p, const T& value) { new (p) T(value); - gnu_allocator_tracker::construct(); + allocation_tracker::construct(); } void destroy(pointer p) { p->~T(); - gnu_allocator_tracker::destroy(); + allocation_tracker::destroy(); } void deallocate(pointer p, size_type num) - { gnu_allocator_tracker::deallocate(p, num * sizeof(T)); } + { allocation_tracker::deallocate(p, num * sizeof(T)); } }; -template<class T1, class T2> - bool - operator==(const gnu_new_allocator<T1>&, - const gnu_new_allocator<T2>&) throw() - { return true; } - -template<class T1, class T2> - bool - operator!=(const gnu_new_allocator<T1>&, - const gnu_new_allocator<T2>&) throw() - { return false; } + template<class T1, class T2> + bool + operator==(const tracker_alloc<T1>&, const tracker_alloc<T2>&) throw() + { return true; } + + template<class T1, class T2> + bool + operator!=(const tracker_alloc<T1>&, const tracker_alloc<T2>&) throw() + { return false; } +}; // namespace __gnu_cxx_test #endif // _GLIBCPP_TESTSUITE_ALLOCATOR_H diff --git a/libstdc++-v3/testsuite/testsuite_hooks.cc b/libstdc++-v3/testsuite/testsuite_hooks.cc index 931dd378193..4e714fa6cba 100644 --- a/libstdc++-v3/testsuite/testsuite_hooks.cc +++ b/libstdc++-v3/testsuite/testsuite_hooks.cc @@ -1,6 +1,7 @@ -// Utility subroutines for the C++ library testsuite. +// -*- C++ -*- +// Utility subroutines for the C++ library testsuite. // -// Copyright (C) 2002 Free Software Foundation, Inc. +// Copyright (C) 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -33,14 +34,22 @@ #include <unistd.h> #include <sys/time.h> #include <sys/resource.h> +#endif +#include <list> +#include <string> +#include <stdexcept> +#include <clocale> +#include <locale> -void -__set_testsuite_memlimit(float __size) +namespace __gnu_cxx_test { +#ifdef _GLIBCPP_MEM_LIMITS + void + set_memory_limits(float size) + { struct rlimit r; // Cater to the absence of rlim_t. - __typeof__ (r.rlim_cur) limit - = (__typeof__ (r.rlim_cur))(__size * 1048576); + __typeof__ (r.rlim_cur) limit = (__typeof__ (r.rlim_cur))(size * 1048576); // Heap size, seems to be common. #if _GLIBCPP_HAVE_MEMLIMIT_DATA @@ -69,19 +78,90 @@ __set_testsuite_memlimit(float __size) r.rlim_cur = limit; setrlimit(RLIMIT_AS, &r); #endif -} + } + #else -void -__set_testsuite_memlimit(float) { } -#endif /* _GLIBCPP_MEM_LIMITS */ + void + set_memory_limits(float) { } +#endif + + // Useful exceptions. + class locale_data : public std::runtime_error + { + public: + explicit + locale_data(const std::string& __arg) : runtime_error(__arg) { } + }; + class environment_variable: public std::runtime_error + { + public: + explicit + environment_variable(const std::string& __arg) : runtime_error(__arg) { } + }; -gnu_counting_struct::size_type gnu_counting_struct::count = 0; + class not_found : public std::runtime_error + { + public: + explicit + not_found(const std::string& __arg) : runtime_error(__arg) { } + }; -unsigned int gnu_copy_constructor::count_ = 0; -unsigned int gnu_copy_constructor::throw_on_ = 0; -unsigned int gnu_assignment_operator::count_ = 0; -unsigned int gnu_assignment_operator::throw_on_ = 0; -unsigned int gnu_destructor::count_ = 0; -int gnu_copy_tracker::next_id_ = 0; + void + run_tests_wrapped_locale(const char* name, const func_callback& l) + { + using namespace std; + bool test = true; + + // Set the global locale. + locale loc_name(name); + locale orig = locale::global(loc_name); + + const char* res = setlocale(LC_ALL, name); + if (res != NULL) + { + string preLC_ALL = res; + for (func_callback::const_iterator i = l.begin(); i != l.end(); ++i) + (*i)(); + string postLC_ALL= setlocale(LC_ALL, NULL); + VERIFY( preLC_ALL == postLC_ALL ); + } + else + throw environment_variable(string("LC_ALL for") + string(name)); + } + + void + run_tests_wrapped_env(const char* name, const char* env, + const func_callback& l) + { + using namespace std; + bool test = true; + +#ifdef _GLIBCPP_HAVE_SETENV + // Set the global locale. + locale loc_name(name); + locale orig = locale::global(loc_name); + + // Set environment variable env to value in name. + const char* oldENV = getenv(env); + if (!setenv(env, name, 1)) + { + for (func_callback::const_iterator i = l.begin(); i != l.end(); ++i) + (*i)(); + setenv(env, oldENV ? oldENV : "", 1); + } + else + throw environment_variable(string(env) + string(" to ") + string(name)); +#else + throw not_found("setenv"); +#endif + } + counter::size_type counter::count = 0; + unsigned int copy_constructor::count_ = 0; + unsigned int copy_constructor::throw_on_ = 0; + unsigned int assignment_operator::count_ = 0; + unsigned int assignment_operator::throw_on_ = 0; + unsigned int destructor::_M_count = 0; + int copy_tracker::next_id_ = 0; +}; // namespace __cxx_test diff --git a/libstdc++-v3/testsuite/testsuite_hooks.h b/libstdc++-v3/testsuite/testsuite_hooks.h index 9f89b03a772..cd05443dacd 100644 --- a/libstdc++-v3/testsuite/testsuite_hooks.h +++ b/libstdc++-v3/testsuite/testsuite_hooks.h @@ -1,6 +1,7 @@ -// Utility subroutines for the C++ library testsuite. +// -*- C++ -*- +// Utility subroutines for the C++ library testsuite. // -// Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. +// Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -34,25 +35,25 @@ // #define(able) assert() behavior for debugging/testing. It may be // a suitable location for other furry woodland creatures as well. // -// 2) __set_testsuite_memlimit() -// __set_testsuite_memlimit() uses setrlimit() to restrict dynamic memory +// 2) set_memory_limits() +// set_memory_limits() uses setrlimit() to restrict dynamic memory // allocation. We provide a default memory limit if none is passed by the -// calling application. The argument to __set_testsuite_memlimit() is the +// calling application. The argument to set_memory_limits() is the // limit in megabytes (a floating-point number). If _GLIBCPP_MEM_LIMITS is // not #defined before including this header, then no limiting is attempted. // -// 3) gnu_counting_struct +// 3) counter // This is a POD with a static data member, gnu_counting_struct::count, // which starts at zero, increments on instance construction, and decrements // on instance destruction. "assert_count(n)" can be called to VERIFY() // that the count equals N. // -// 4) gnu_copy_tracker, from Stephen M. Webb <stephen@bregmasoft.com>. +// 4) copy_tracker, from Stephen M. Webb <stephen@bregmasoft.com>. // A class with nontrivial ctor/dtor that provides the ability to track the // number of copy ctors and dtors, and will throw on demand during copy. // -// 5) gnu_char, gnu_char_traits, abstract character classes and -// char_traits specializations for testing instantiations. +// 5) pod_char, pod_int, , abstract character classes and +// char_traits specializations for testing instantiations. #ifndef _GLIBCPP_TESTSUITE_HOOKS_H #define _GLIBCPP_TESTSUITE_HOOKS_H @@ -60,185 +61,206 @@ #include <bits/c++config.h> #include <bits/functexcept.h> #include <cstddef> - #ifdef DEBUG_ASSERT # include <cassert> # define VERIFY(fn) assert(fn) #else # define VERIFY(fn) test &= (fn) #endif +#include <list> -// Defined in GLIBCPP_CONFIGURE_TESTSUITE. -#ifndef _GLIBCPP_MEM_LIMITS -// Don't do memory limits. -extern void -__set_testsuite_memlimit(float x = 0); +namespace __gnu_cxx_test +{ + // All macros are defined in GLIBCPP_CONFIGURE_TESTSUITE and imported + // from c++config.h + // Set memory limits if possible, if not set to 0. +#ifndef _GLIBCPP_MEM_LIMITS +# define MEMLIMIT_MB 0 #else - -// Do memory limits. -#ifndef MEMLIMIT_MB -#define MEMLIMIT_MB 16.0 +# ifndef MEMLIMIT_MB +# define MEMLIMIT_MB 16.0 +# endif #endif + extern void + set_memory_limits(float __size = MEMLIMIT_MB); -extern void -__set_testsuite_memlimit(float __size = MEMLIMIT_MB); -#endif + // Simple callback structure for variable numbers of tests (all with + // same signature). Assume all unit tests are of the signature + // void test01(); + typedef void (*test_func) (void); + typedef std::list<test_func> func_callback; + // Run select unit tests after setting global locale. + void + run_tests_wrapped_locale(const char*, const func_callback&); -struct gnu_counting_struct -{ + // Run select unit tests after setting environment variables. + void + run_tests_wrapped_env(const char*, const char*, const func_callback&); + + // Test data types. + struct pod_char + { + unsigned char c; + }; + + struct pod_int + { + int i; + }; + + struct pod_unsigned_int + { + unsigned int i; + }; + + struct pod_long + { + unsigned long i; + }; + + struct state + { + unsigned long l; + unsigned long l2; + }; + + // Counting. + struct counter + { // Specifically and glaringly-obviously marked 'signed' so that when // COUNT mistakenly goes negative, we can track the patterns of // deletions more easily. typedef signed int size_type; static size_type count; - gnu_counting_struct() { ++count; } - gnu_counting_struct (const gnu_counting_struct&) { ++count; } - ~gnu_counting_struct() { --count; } -}; - -#define assert_count(n) VERIFY(gnu_counting_struct::count == n) - -// A (static) class for counting copy constructors and possibly throwing an -// exception on a desired count. -class gnu_copy_constructor -{ -public: - static unsigned int - count() - { return count_; } - - static void - mark_call() + counter() { ++count; } + counter (const counter&) { ++count; } + ~counter() { --count; } + }; + +#define assert_count(n) VERIFY(__gnu_cxx_test::counter::count == n) + + // A (static) class for counting copy constructors and possibly throwing an + // exception on a desired count. + class copy_constructor { - count_++; - if (count_ == throw_on_) + public: + static unsigned int + count() { return count_; } + + static void + mark_call() { - __throw_exception_again "copy constructor exception"; + count_++; + if (count_ == throw_on_) + __throw_exception_again "copy constructor exception"; } - } + + static void + reset() + { + count_ = 0; + throw_on_ = 0; + } + + static void + throw_on(unsigned int count) { throw_on_ = count; } - static void - reset() + private: + static unsigned int count_; + static unsigned int throw_on_; + }; + + // A (static) class for counting assignment operator calls and + // possibly throwing an exception on a desired count. + class assignment_operator { - count_ = 0; - throw_on_ = 0; - } - - static void - throw_on(unsigned int count) - { throw_on_ = count; } - -private: - static unsigned int count_; - static unsigned int throw_on_; -}; - -// A (static) class for counting assignment operator calls and possibly -// throwing an exception on a desired count. -class gnu_assignment_operator -{ -public: - static unsigned int - count() - { return count_; } + public: + static unsigned int + count() { return count_; } + + static void + mark_call() + { + count_++; + if (count_ == throw_on_) + __throw_exception_again "assignment operator exception"; + } - static void - mark_call() - { - count_++; - if (count_ == throw_on_) + static void + reset() { - __throw_exception_again "assignment operator exception"; + count_ = 0; + throw_on_ = 0; } - } - static void - reset() - { - count_ = 0; - throw_on_ = 0; - } + static void + throw_on(unsigned int count) { throw_on_ = count; } - static void - throw_on(unsigned int count) - { throw_on_ = count; } + private: + static unsigned int count_; + static unsigned int throw_on_; + }; + + // A (static) class for tracking calls to an object's destructor. + class destructor + { + public: + static unsigned int + count() { return _M_count; } + + static void + mark_call() { _M_count++; } -private: - static unsigned int count_; - static unsigned int throw_on_; -}; + static void + reset() { _M_count = 0; } -// A (static) class for tracking calls to an object's destructor. -class gnu_destructor -{ -public: - static unsigned int - count() - { return count_; } - - static void - mark_call() - { count_++; } - - static void - reset() - { count_ = 0; } - -private: - static unsigned int count_; -}; - -// An class of objects that can be used for validating various behaviours and -// guarantees of containers and algorithms defined in the standard library. -class gnu_copy_tracker -{ + private: + static unsigned int _M_count; + }; + + // An class of objects that can be used for validating various + // behaviours and guarantees of containers and algorithms defined in + // the standard library. + class copy_tracker + { public: - // Creates a copy-tracking object with the given ID number. - // If "throw_on_copy" is set, an exception will be thrown if - // an attempt is made to copy this object. - gnu_copy_tracker(int id = next_id_--, bool throw_on_copy = false) - : id_(id) - , throw_on_copy_(throw_on_copy) - { - } + // Creates a copy-tracking object with the given ID number. If + // "throw_on_copy" is set, an exception will be thrown if an + // attempt is made to copy this object. + copy_tracker(int id = next_id_--, bool throw_on_copy = false) + : id_(id) , throw_on_copy_(throw_on_copy) { } // Copy-constructs the object, marking a call to the copy // constructor and forcing an exception if indicated. - gnu_copy_tracker(const gnu_copy_tracker& rhs) + copy_tracker(const copy_tracker& rhs) : id_(rhs.id()), throw_on_copy_(rhs.throw_on_copy_) { int kkk = throw_on_copy_; if (throw_on_copy_) - { - gnu_copy_constructor::throw_on(gnu_copy_constructor::count() + 1); - } - gnu_copy_constructor::mark_call(); + copy_constructor::throw_on(copy_constructor::count() + 1); + copy_constructor::mark_call(); } // Assigns the value of another object to this one, tracking the // number of times this member function has been called and if the // other object is supposed to throw an exception when it is // copied, well, make it so. - gnu_copy_tracker& - operator=(const gnu_copy_tracker& rhs) + copy_tracker& + operator=(const copy_tracker& rhs) { id_ = rhs.id(); if (rhs.throw_on_copy_) - { - gnu_assignment_operator::throw_on(gnu_assignment_operator::count() - + 1); - } - gnu_assignment_operator::mark_call(); + assignment_operator::throw_on(assignment_operator::count() + 1); + assignment_operator::mark_call(); } - ~gnu_copy_tracker() - { gnu_destructor::mark_call(); } + ~copy_tracker() + { destructor::mark_call(); } int - id() const - { return id_; } + id() const { return id_; } private: int id_; @@ -248,59 +270,44 @@ class gnu_copy_tracker static void reset() { - gnu_copy_constructor::reset(); - gnu_assignment_operator::reset(); - gnu_destructor::reset(); + copy_constructor::reset(); + assignment_operator::reset(); + destructor::reset(); } // for backwards-compatibility static int copyCount() - { return gnu_copy_constructor::count(); } + { return copy_constructor::count(); } // for backwards-compatibility static int dtorCount() - { return gnu_destructor::count(); } + { return destructor::count(); } private: static int next_id_; -}; - -inline bool -operator==(const gnu_copy_tracker& lhs, const gnu_copy_tracker& rhs) -{ return lhs.id() == rhs.id(); } - -struct gnu_char -{ - unsigned long c; -}; + }; -struct gnu_int -{ - unsigned long i; -}; - -struct gnu_state -{ - unsigned long l; - unsigned long l2; -}; + inline bool + operator==(const copy_tracker& lhs, const copy_tracker& rhs) + { return lhs.id() == rhs.id(); } +}; // namespace __gnu_cxx_test -// char_traits specialization namespace std { template<class _CharT> struct char_traits; + // char_traits specialization template<> - struct char_traits<gnu_char> + struct char_traits<__gnu_cxx_test::pod_char> { - typedef gnu_char char_type; - typedef gnu_int int_type; - typedef long pos_type; - typedef unsigned long off_type; - typedef gnu_state state_type; + typedef __gnu_cxx_test::pod_char char_type; + typedef __gnu_cxx_test::pod_int int_type; + typedef long pos_type; + typedef unsigned long off_type; + typedef __gnu_cxx_test::state state_type; static void assign(char_type& __c1, const char_type& __c2); diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj index f146d17bf52..492dbb610b5 100644 --- a/zlib/ChangeLog.gcj +++ b/zlib/ChangeLog.gcj @@ -1,3 +1,10 @@ +2003-01-27 Alexandre Oliva <aoliva@redhat.com> + + * configure.in (toolexecdir, toolexeclibdir): Set and AC_SUBST. + Remove USE_LIBDIR conditional. + * Makefile.am (toolexecdir, toolexeclibdir): Don't override. + * Makefile.in, configure: Rebuilt. + 2002-09-22 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> * Makefile.am (all-multi): Fix multilib parallel build. diff --git a/zlib/Makefile.am b/zlib/Makefile.am index 46ac3de4ec9..a42bb3be7f9 100644 --- a/zlib/Makefile.am +++ b/zlib/Makefile.am @@ -10,15 +10,6 @@ MULTISUBDIR = MULTIDO = true MULTICLEAN = true -## Install a library built with a cross compiler in tooldir, not -## libdir. -if USE_LIBDIR -toolexeclibdir = $(libdir)$(MULTISUBDIR) -else -toolexecdir = $(exec_prefix)/$(target_alias) -toolexeclibdir = $(toolexecdir)/lib$(MULTISUBDIR) -endif - ZLIB_SOURCES = adler32.c compress.c crc32.c deflate.c deflate.h \ gzio.c infblock.c infblock.h infcodes.c infcodes.h inffast.c inffast.h \ inffixed.h inflate.c inftrees.c inftrees.h infutil.c infutil.h trees.c \ diff --git a/zlib/Makefile.in b/zlib/Makefile.in index 59d8ff76e68..7fcd38798cc 100644 --- a/zlib/Makefile.in +++ b/zlib/Makefile.in @@ -85,6 +85,8 @@ STRIP = @STRIP@ VERSION = @VERSION@ mkinstalldirs = @mkinstalldirs@ target_all = @target_all@ +toolexecdir = @toolexecdir@ +toolexeclibdir = @toolexeclibdir@ zlib_basedir = @zlib_basedir@ AUTOMAKE_OPTIONS = cygnus @@ -96,9 +98,6 @@ MULTIDIRS = MULTISUBDIR = MULTIDO = true MULTICLEAN = true -@USE_LIBDIR_TRUE@toolexeclibdir = @USE_LIBDIR_TRUE@$(libdir)$(MULTISUBDIR) -@USE_LIBDIR_FALSE@toolexeclibdir = @USE_LIBDIR_FALSE@$(toolexecdir)/lib$(MULTISUBDIR) -@USE_LIBDIR_FALSE@toolexecdir = @USE_LIBDIR_FALSE@$(exec_prefix)/$(target_alias) ZLIB_SOURCES = adler32.c compress.c crc32.c deflate.c deflate.h \ gzio.c infblock.c infblock.h infcodes.c infcodes.h inffast.c inffast.h \ @@ -106,11 +105,8 @@ inffixed.h inflate.c inftrees.c inftrees.h infutil.c infutil.h trees.c \ trees.h uncompr.c zconf.h zlib.h zutil.c zutil.h -# toolexeclib_LTLIBRARIES = @target_all@ -# EXTRA_LTLIBRARIES = libzgcj.la @TARGET_LIBRARY_TRUE@noinst_LTLIBRARIES = @TARGET_LIBRARY_TRUE@libzgcj_convenience.la @TARGET_LIBRARY_TRUE@libzgcj_convenience_la_SOURCES = @TARGET_LIBRARY_TRUE@$(ZLIB_SOURCES) -# libzgcj_la_LDFLAGS = -version-info 0:0:0 -rpath $(toolexeclibdir) @TARGET_LIBRARY_FALSE@toolexeclib_LIBRARIES = @TARGET_LIBRARY_FALSE@libz.a @TARGET_LIBRARY_FALSE@libz_a_SOURCES = @TARGET_LIBRARY_FALSE@$(ZLIB_SOURCES) diff --git a/zlib/configure b/zlib/configure index 319b2a0581c..0d2faac9a86 100755 --- a/zlib/configure +++ b/zlib/configure @@ -52,7 +52,6 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= -sitefile= srcdir= target=NONE verbose= @@ -167,7 +166,6 @@ Configuration: --help print this message --no-create do not create output files --quiet, --silent do not print \`checking...' messages - --site-file=FILE use FILE as the site file --version print the version of autoconf that created configure Directory and file names: --prefix=PREFIX install architecture-independent files in PREFIX @@ -338,11 +336,6 @@ EOF -site=* | --site=* | --sit=*) site="$ac_optarg" ;; - -site-file | --site-file | --site-fil | --site-fi | --site-f) - ac_prev=sitefile ;; - -site-file=* | --site-file=* | --site-fil=* | --site-fi=* | --site-f=*) - sitefile="$ac_optarg" ;; - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) ac_prev=srcdir ;; -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) @@ -508,16 +501,12 @@ fi srcdir=`echo "${srcdir}" | sed 's%\([^/]\)/*$%\1%'` # Prefer explicitly selected file to automatically selected ones. -if test -z "$sitefile"; then - if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" fi -else - CONFIG_SITE="$sitefile" fi for ac_site_file in $CONFIG_SITE; do if test -r "$ac_site_file"; then @@ -646,7 +635,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:650: checking host system type" >&5 +echo "configure:639: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -667,7 +656,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:671: checking target system type" >&5 +echo "configure:660: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -685,7 +674,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:689: checking build system type" >&5 +echo "configure:678: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -724,7 +713,7 @@ mkinstalldirs="`cd $ac_aux_dir && ${PWDCMD-pwd}`/mkinstalldirs" # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:728: checking for a BSD compatible install" >&5 +echo "configure:717: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -777,7 +766,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether build environment is sane""... $ac_c" 1>&6 -echo "configure:781: checking whether build environment is sane" >&5 +echo "configure:770: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -834,7 +823,7 @@ test "$program_suffix" != NONE && test "$program_transform_name" = "" && program_transform_name="s,x,x," echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:838: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:827: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -880,7 +869,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:884: checking for working aclocal" >&5 +echo "configure:873: checking for working aclocal" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -893,7 +882,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:897: checking for working autoconf" >&5 +echo "configure:886: checking for working autoconf" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -906,7 +895,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:910: checking for working automake" >&5 +echo "configure:899: checking for working automake" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -919,7 +908,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:923: checking for working autoheader" >&5 +echo "configure:912: checking for working autoheader" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -932,7 +921,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:936: checking for working makeinfo" >&5 +echo "configure:925: checking for working makeinfo" >&5 # Run test in a subshell; some versions of sh will print an error if # an executable is not found, even if stderr is redirected. # Redirect stdin to placate older versions of autoconf. Sigh. @@ -947,7 +936,7 @@ fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:951: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:940: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. if test "${enable_maintainer_mode+set}" = set; then enableval="$enable_maintainer_mode" @@ -1006,7 +995,7 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1010: checking for $ac_word" >&5 +echo "configure:999: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1036,7 +1025,7 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1040: checking for $ac_word" >&5 +echo "configure:1029: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1085,7 +1074,7 @@ fi fi echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1089: checking whether we are using GNU C" >&5 +echo "configure:1078: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1094,7 +1083,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1087: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1109,7 +1098,7 @@ if test $ac_cv_prog_gcc = yes; then ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1113: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1102: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1149,12 +1138,12 @@ if false; then # were not for the `:' below. : echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:1153: checking for Cygwin environment" >&5 +echo "configure:1142: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1158 "configure" +#line 1147 "configure" #include "confdefs.h" int main() { @@ -1165,7 +1154,7 @@ int main() { return __CYGWIN__; ; return 0; } EOF -if { (eval echo configure:1169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -1182,19 +1171,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 -echo "configure:1186: checking for mingw32 environment" >&5 +echo "configure:1175: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1191 "configure" +#line 1180 "configure" #include "confdefs.h" int main() { return __MINGW32__; ; return 0; } EOF -if { (eval echo configure:1198: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -1213,7 +1202,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=yes echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1217: checking for executable suffix" >&5 +echo "configure:1206: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1223,10 +1212,10 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then for file in conftest.*; do case $file in - *.c | *.o | *.obj | *.ilk | *.pdb) ;; + *.c | *.o | *.obj) ;; *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; esac done @@ -1325,7 +1314,7 @@ ac_prog=ld if test "$GCC" = yes; then # Check if gcc -print-prog-name=ld gives a path. echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6 -echo "configure:1329: checking for ld used by GCC" >&5 +echo "configure:1318: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1355,10 +1344,10 @@ echo "configure:1329: checking for ld used by GCC" >&5 esac elif test "$with_gnu_ld" = yes; then echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 -echo "configure:1359: checking for GNU ld" >&5 +echo "configure:1348: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1362: checking for non-GNU ld" >&5 +echo "configure:1351: checking for non-GNU ld" >&5 fi if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1393,7 +1382,7 @@ else fi test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; } echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6 -echo "configure:1397: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1386: checking if the linker ($LD) is GNU ld" >&5 if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1410,7 +1399,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 -echo "configure:1414: checking for $LD option to reload object files" >&5 +echo "configure:1403: checking for $LD option to reload object files" >&5 if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1422,7 +1411,7 @@ reload_flag=$lt_cv_ld_reload_flag test -n "$reload_flag" && reload_flag=" $reload_flag" echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 -echo "configure:1426: checking for BSD-compatible nm" >&5 +echo "configure:1415: checking for BSD-compatible nm" >&5 if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1460,7 +1449,7 @@ NM="$lt_cv_path_NM" echo "$ac_t""$NM" 1>&6 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:1464: checking whether ln -s works" >&5 +echo "configure:1453: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1481,7 +1470,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:1485: checking how to recognise dependant libraries" >&5 +echo "configure:1474: checking how to recognise dependant libraries" >&5 if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1654,13 +1643,13 @@ file_magic_cmd=$lt_cv_file_magic_cmd deplibs_check_method=$lt_cv_deplibs_check_method echo $ac_n "checking for object suffix""... $ac_c" 1>&6 -echo "configure:1658: checking for object suffix" >&5 +echo "configure:1647: checking for object suffix" >&5 if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else rm -f conftest* echo 'int i = 1;' > conftest.$ac_ext -if { (eval echo configure:1664: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1653: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1690,7 +1679,7 @@ case $deplibs_check_method in file_magic*) if test "$file_magic_cmd" = '$MAGIC_CMD'; then echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 -echo "configure:1694: checking for ${ac_tool_prefix}file" >&5 +echo "configure:1683: checking for ${ac_tool_prefix}file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1752,7 +1741,7 @@ fi if test -z "$lt_cv_path_MAGIC_CMD"; then if test -n "$ac_tool_prefix"; then echo $ac_n "checking for file""... $ac_c" 1>&6 -echo "configure:1756: checking for file" >&5 +echo "configure:1745: checking for file" >&5 if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1823,7 +1812,7 @@ esac # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1827: checking for $ac_word" >&5 +echo "configure:1816: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1855,7 +1844,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1859: checking for $ac_word" >&5 +echo "configure:1848: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1890,7 +1879,7 @@ fi # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. set dummy ${ac_tool_prefix}strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1894: checking for $ac_word" >&5 +echo "configure:1883: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1922,7 +1911,7 @@ if test -n "$ac_tool_prefix"; then # Extract the first word of "strip", so it can be a program name with args. set dummy strip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1926: checking for $ac_word" >&5 +echo "configure:1915: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1989,8 +1978,8 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 1993 "configure"' > conftest.$ac_ext - if { (eval echo configure:1994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 1982 "configure"' > conftest.$ac_ext + if { (eval echo configure:1983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2009,7 +1998,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2022,12 +2011,54 @@ ia64-*-hpux*) rm -rf conftest* ;; +x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext + if { (eval echo configure:2018: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + case "`/usr/bin/file conftest.o`" in + *32-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_i386" + ;; + ppc64-*linux*) + LD="${LD-ld} -m elf32ppclinux" + ;; + s390x-*linux*) + LD="${LD-ld} -m elf_s390" + ;; + sparc64-*linux*) + LD="${LD-ld} -m elf32_sparc" + ;; + esac + ;; + *64-bit*) + case $host in + x86_64-*linux*) + LD="${LD-ld} -m elf_x86_64" + ;; + ppc*-*linux*|powerpc*-*linux*) + LD="${LD-ld} -m elf64ppc" + ;; + s390*-*linux*) + LD="${LD-ld} -m elf64_s390" + ;; + sparc*-*linux*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + ;; + esac + fi + rm -rf conftest* + ;; + *-*-sco3.2v5*) # On SCO OpenServer 5, we need -belf to get full-featured binaries. SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2031: checking whether the C compiler needs -belf" >&5 +echo "configure:2062: checking whether the C compiler needs -belf" >&5 if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2040,14 +2071,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$a cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext <<EOF -#line 2044 "configure" +#line 2075 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* lt_cv_cc_needs_belf=yes else @@ -2173,7 +2204,7 @@ fi # Find CPP now so that any conditional tests below won't do it and # thereby make the resulting definitions conditional. echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2177: checking how to run the C preprocessor" >&5 +echo "configure:2208: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2188,13 +2219,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 2192 "configure" +#line 2223 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2198: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2229: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2205,13 +2236,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 2209 "configure" +#line 2240 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2222,13 +2253,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 2226 "configure" +#line 2257 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2232: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -2272,21 +2303,21 @@ EOF # We ignore --with-system-zlib in this case. target_all=libzgcj.la else - for ac_hdr in unistd.h + for ac_hdr in stdlib.h unistd.h sys/stat.h sys/types.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2280: checking for $ac_hdr" >&5 +echo "configure:2311: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2285 "configure" +#line 2316 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2290: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2321: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2315,12 +2346,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2319: checking for $ac_func" >&5 +echo "configure:2350: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2324 "configure" +#line 2355 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2343,7 +2374,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2368,7 +2399,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:2372: checking for working mmap" >&5 +echo "configure:2403: checking for working mmap" >&5 if eval "test \"`echo '$''{'ac_cv_func_mmap_fixed_mapped'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2376,7 +2407,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext <<EOF -#line 2380 "configure" +#line 2411 "configure" #include "confdefs.h" /* Thanks to Mike Haertel and Jim Avera for this test. @@ -2404,11 +2435,24 @@ else #include <fcntl.h> #include <sys/mman.h> +#if HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif + +#if HAVE_STDLIB_H +# include <stdlib.h> +#endif + +#if HAVE_SYS_STAT_H +# include <sys/stat.h> +#endif + +#if HAVE_UNISTD_H +# include <unistd.h> +#endif + /* This mess was copied from the GNU getpagesize.h. */ #ifndef HAVE_GETPAGESIZE -# ifdef HAVE_UNISTD_H -# include <unistd.h> -# endif /* Assume that all systems that can run configure have sys/param.h. */ # ifndef HAVE_SYS_PARAM_H @@ -2516,7 +2560,7 @@ main() } EOF -if { (eval echo configure:2520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_mmap_fixed_mapped=yes else @@ -2541,12 +2585,12 @@ fi for ac_func in memcpy strerror do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:2545: checking for $ac_func" >&5 +echo "configure:2589: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2550 "configure" +#line 2594 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -2569,7 +2613,7 @@ $ac_func(); ; return 0; } EOF -if { (eval echo configure:2573: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -2596,7 +2640,7 @@ done if test "$with_system_zlib" = yes; then echo $ac_n "checking for deflate in -lz""... $ac_c" 1>&6 -echo "configure:2600: checking for deflate in -lz" >&5 +echo "configure:2644: checking for deflate in -lz" >&5 ac_lib_var=`echo z'_'deflate | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -2604,7 +2648,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lz $LIBS" cat > conftest.$ac_ext <<EOF -#line 2608 "configure" +#line 2652 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -2615,7 +2659,7 @@ int main() { deflate() ; return 0; } EOF -if { (eval echo configure:2619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -2647,17 +2691,17 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2651: checking for $ac_hdr" >&5 +echo "configure:2695: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 2656 "configure" +#line 2700 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2705: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -2684,15 +2728,18 @@ fi done - - -if test -z "$with_cross_host"; then - USE_LIBDIR_TRUE= - USE_LIBDIR_FALSE='#' +if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + toolexecdir='$(exec_prefix)/$(target_alias)' + toolexeclibdir='$(toolexecdir)/lib' else - USE_LIBDIR_TRUE='#' - USE_LIBDIR_FALSE= + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' fi +toolexeclibdir=$toolexeclibdir/`$CC -print-multi-os-directory 2>/dev/null || echo .` + + + if test -n "$with_target_subdir"; then @@ -2775,15 +2822,34 @@ trap 'rm -f $CONFIG_STATUS conftest*; exit 1' 1 2 15 # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. -cat > conftest.defs <<\EOF -s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g -s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g -s%\[%\\&%g -s%\]%\\&%g -s%\$%$$%g -EOF -DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` -rm -f conftest.defs +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then we branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +cat >confdef2opt.sed <<\_ACEOF +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +t quote +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +t quote +d +: quote +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,\[,\\&,g +s,\],\\&,g +s,\$,$$,g +p +_ACEOF +# We use echo to avoid assuming a particular line-breaking character. +# The extra dot is to prevent the shell from consuming trailing +# line-breaks from the sub-command output. A line-break within +# single-quotes doesn't work because, if this script is created in a +# platform that uses two characters for line-breaks (e.g., DOS), tr +# would break. +ac_LF_and_DOT=`echo; echo .` +DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +rm -f confdef2opt.sed # Without the "./", some shells look in PATH for config.status. @@ -2895,8 +2961,8 @@ s%@LIBTOOL@%$LIBTOOL%g s%@COMPPATH@%$COMPPATH%g s%@CPP@%$CPP%g s%@target_all@%$target_all%g -s%@USE_LIBDIR_TRUE@%$USE_LIBDIR_TRUE%g -s%@USE_LIBDIR_FALSE@%$USE_LIBDIR_FALSE%g +s%@toolexecdir@%$toolexecdir%g +s%@toolexeclibdir@%$toolexeclibdir%g s%@TARGET_LIBRARY_TRUE@%$TARGET_LIBRARY_TRUE%g s%@TARGET_LIBRARY_FALSE@%$TARGET_LIBRARY_FALSE%g diff --git a/zlib/configure.in b/zlib/configure.in index d5f9a1edb8d..8d8c3a9e97a 100644 --- a/zlib/configure.in +++ b/zlib/configure.in @@ -113,7 +113,18 @@ AC_SUBST(target_all) AC_CHECK_HEADERS(unistd.h) -AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host") +if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + toolexecdir='$(exec_prefix)/$(target_alias)' + toolexeclibdir='$(toolexecdir)/lib' +else + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' +fi +toolexeclibdir=$toolexeclibdir/`$CC -print-multi-os-directory 2>/dev/null || echo .` +AC_SUBST(toolexecdir) +AC_SUBST(toolexeclibdir) + AM_CONDITIONAL(TARGET_LIBRARY, test -n "$with_target_subdir") if test "${multilib}" = "yes"; then |