From 2d92cb7d27c686aafda2ebae33fe131f035896d7 Mon Sep 17 00:00:00 2001 From: Alexandre Oliva Date: Fri, 8 Feb 2002 06:39:01 +0000 Subject: [PATCH] Contribute sh64-elf. 2002-01-24 Alexandre Oliva * emulparams/shelf32.sh (STACK_ADDR): Define as formerly defined in OTHER_RELOCATABLE_SECTIONS. 2002-01-18 Alexandre Oliva * emulparams/shelf32.sh (STACK_ADDR): Define. (OTHER_RELOCATABLE_SECTIONS): Renamed to... (OTHER_SECTIONS): this. Removed stack settings. * emulparams/shelf64.sh (OTHER_RELOCATABLE_SECTIONS): Do not set. (OTHER_SECTIONS): Reset after sourcing shelf32.sh. 2001-03-12 DJ Delorie * emultempl/sh64elf.em (sh64_elf_$_before_allocation): Disable relaxing if any shmedia or mixed sections are found. 2001-03-07 DJ Delorie * emultempl/sh64elf.em (sh64_elf_before_allocation): Pass f to einfo. Gracefully decline to output to non-elf formats. 2001-03-06 Hans-Peter Nilsson * emulparams/shelf64.sh (OTHER_RELOCATING_SECTIONS) <.stack>: Default to _end aligned to next multiple of 0x40000, plus 0x40000. * emulparams/shelf32.sh: Ditto. 2001-01-14 Hans-Peter Nilsson * emulparams/shelf32.sh (OTHER_RELOCATING_SECTIONS): Tweak comment. 2001-01-10 Ben Elliston * emulparams/shelf32.sh (OTHER_RELOCATING_SECTIONS): Avoid non-portable shell constructs. From Hans-Peter Nilsson. 2001-01-09 Hans-Peter Nilsson * emulparams/shelf64.sh (EXTRA_EM_FILE): Define empty. * Makefile.am (eshelf64.c, eshlelf64.c, eshlelf32.c): Adjust dependencies to the shell script include chain. * Makefile.in: Regenerate. 2001-01-06 Hans-Peter Nilsson * emultempl/sh64elf.em: Update and tweak comments. (sh64_elf_${EMULATION_NAME}_after_allocation): Always allocate and make a .cranges section SEC_IN_MEMORY. 2000-12-30 Hans-Peter Nilsson * emultempl/sh64elf.em (sh64_elf_${EMULATION_NAME}_before_allocation): Don't stop when .cranges section found to be necessary; continue and set stored section contents flags for sections with non-mixed contents. Use a struct sh64_section_data container and sh64_elf_section_data to store contents-type flags. Remove unused update of "isec". (sh64_elf_${EMULATION_NAME}_after_allocation): Only process sections marked SHF_SH5_ISA32_MIXED. Use sh64_elf_section_data to access contents-type flags. Assert that the associated container is initialized. Use that container, not elf_gp_size, to hold size of linker-generated cranges contents. 2000-12-18 Hans-Peter Nilsson * emultempl/sh64elf.em (sh64_elf_${EMULATION_NAME}_before_allocation): Exit early if there's already a .cranges section. When section flag difference is found, don't NULL-check cranges a second time. Tweak comments. (sh64_elf_${EMULATION_NAME}_after_allocation): Use size after merging, not max size, as size of ld-generated .cranges contents. Don't set ELF section flags in output section. When checking for needed .cranges descriptors, don't use a variable; compare incoming ELF section flags directly to SHF_SH5_ISA32_MIXED. Tweak comments. 2000-12-18 Hans-Peter Nilsson * emultempl/sh64elf.em: New file. * Makefile.am (eshelf32.c, eshlelf32.c): Adjust dependencies. * Makefile.in: Regenerate. * emulparams/shelf32.sh (OUTPUT_FORMAT): Only set if not set. (OTHER_RELOCATING_SECTIONS): Ditto. (EXTRA_EM_FILE): New, set to sh64elf if not set. * emulparams/shlelf32.sh: Stub out all settings except OUTPUT_FORMAT. Source shelf32.sh. * emulparams/shelf64.sh: Similar, but also keep ELF_SIZE and OTHER_RELOCATING_SECTIONS. (OTHER_RELOCATING_SECTIONS): Remove .cranges. * emulparams/shlelf64.sh: Stub out all settings except OUTPUT_FORMAT. Source shelf64.sh. 2000-12-15 Hans-Peter Nilsson * emulparams/shelf64.sh (OTHER_RELOCATING_SECTIONS): Include .cranges section. (DATA_START_SYMBOLS): Define, provide ___data. (OTHER_READONLY_SYMBOLS): Define, provide ___rodata and align to 8 for consecutive .data section. (OTHER_GOT_SECTIONS): Define, align to 8 for consecutive .bss section after .data section. * emulparams/shlelf64.sh: Ditto. * emulparams/shelf32.sh: Ditto. (ALIGNMENT): Define to 8. * emulparams/shelf32.sh: Ditto. 2000-12-12 Hans-Peter Nilsson * configure.tgt (sh64-*-elf*): Assign targ_extra_libpath to get built-in linker scripts. 2000-11-30 Hans-Peter Nilsson * emulparams/shlelf64.sh: New. * emulparams/shelf64.sh: New. * configure.tgt (sh64-*-elf*): Add shelf64 and shlelf64 to targ_extra_emuls. * Makefile.am: Add support for shlelf64 and shelf64. * Makefile.in: Regenerate. 2000-11-29 Hans-Peter Nilsson * configure.tgt (sh64-*-elf*): Add shelf as default. Add shlelf to targ_extra_emuls. 2000-11-24 Hans-Peter Nilsson * emulparams/shelf32.sh: New file. * emulparams/shlelf32.sh: New file. * Makefile.am: Add support for shlelf32 and shelf32. * configure.tgt: Map sh64-*-elf* to shlelf32 and shelf32. * Makefile.in: Regenerate. --- ld/ChangeLog | 107 +++++++++ ld/Makefile.am | 21 ++ ld/Makefile.in | 29 ++- ld/config.in | 212 +++++++++-------- ld/configure | 446 ++++++++++++++++++------------------ ld/configure.tgt | 5 + ld/emulparams/shelf32.sh | 43 ++++ ld/emulparams/shelf64.sh | 9 + ld/emulparams/shlelf32.sh | 2 + ld/emulparams/shlelf64.sh | 2 + ld/emultempl/sh64elf.em | 568 ++++++++++++++++++++++++++++++++++++++++++++++ ld/po/ld.pot | 120 +++++----- 12 files changed, 1168 insertions(+), 396 deletions(-) create mode 100644 ld/emulparams/shelf32.sh create mode 100644 ld/emulparams/shelf64.sh create mode 100644 ld/emulparams/shlelf32.sh create mode 100644 ld/emulparams/shlelf64.sh create mode 100644 ld/emultempl/sh64elf.em diff --git a/ld/ChangeLog b/ld/ChangeLog index ea8abc5..9fb5a6f 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,110 @@ +2002-02-08 Alexandre Oliva + + Contribute sh64-elf. + 2002-01-24 Alexandre Oliva + * emulparams/shelf32.sh (STACK_ADDR): Define as formerly defined + in OTHER_RELOCATABLE_SECTIONS. + 2002-01-18 Alexandre Oliva + * emulparams/shelf32.sh (STACK_ADDR): Define. + (OTHER_RELOCATABLE_SECTIONS): Renamed to... + (OTHER_SECTIONS): this. Removed stack settings. + * emulparams/shelf64.sh (OTHER_RELOCATABLE_SECTIONS): Do not set. + (OTHER_SECTIONS): Reset after sourcing shelf32.sh. + 2001-03-12 DJ Delorie + * emultempl/sh64elf.em (sh64_elf_$_before_allocation): Disable + relaxing if any shmedia or mixed sections are found. + 2001-03-07 DJ Delorie + * emultempl/sh64elf.em (sh64_elf_before_allocation): Pass f to + einfo. Gracefully decline to output to non-elf formats. + 2001-03-06 Hans-Peter Nilsson + * emulparams/shelf64.sh (OTHER_RELOCATING_SECTIONS) <.stack>: + Default to _end aligned to next multiple of 0x40000, plus 0x40000. + * emulparams/shelf32.sh: Ditto. + 2001-01-14 Hans-Peter Nilsson + * emulparams/shelf32.sh (OTHER_RELOCATING_SECTIONS): Tweak + comment. + 2001-01-10 Ben Elliston + * emulparams/shelf32.sh (OTHER_RELOCATING_SECTIONS): Avoid + non-portable shell constructs. From Hans-Peter Nilsson. + 2001-01-09 Hans-Peter Nilsson + * emulparams/shelf64.sh (EXTRA_EM_FILE): Define empty. + * Makefile.am (eshelf64.c, eshlelf64.c, eshlelf32.c): Adjust + dependencies to the shell script include chain. + * Makefile.in: Regenerate. + 2001-01-06 Hans-Peter Nilsson + * emultempl/sh64elf.em: Update and tweak comments. + (sh64_elf_${EMULATION_NAME}_after_allocation): Always allocate and + make a .cranges section SEC_IN_MEMORY. + 2000-12-30 Hans-Peter Nilsson + * emultempl/sh64elf.em + (sh64_elf_${EMULATION_NAME}_before_allocation): Don't stop when + .cranges section found to be necessary; continue and set stored + section contents flags for sections with non-mixed contents. + Use a struct sh64_section_data container and sh64_elf_section_data + to store contents-type flags. + Remove unused update of "isec". + (sh64_elf_${EMULATION_NAME}_after_allocation): Only process + sections marked SHF_SH5_ISA32_MIXED. Use sh64_elf_section_data to + access contents-type flags. Assert that the associated container + is initialized. Use that container, not elf_gp_size, to hold size + of linker-generated cranges contents. + 2000-12-18 Hans-Peter Nilsson + * emultempl/sh64elf.em + (sh64_elf_${EMULATION_NAME}_before_allocation): Exit early if + there's already a .cranges section. When section flag difference + is found, don't NULL-check cranges a second time. Tweak comments. + (sh64_elf_${EMULATION_NAME}_after_allocation): Use size after + merging, not max size, as size of ld-generated .cranges contents. + Don't set ELF section flags in output section. When checking for + needed .cranges descriptors, don't use a variable; compare + incoming ELF section flags directly to SHF_SH5_ISA32_MIXED. Tweak + comments. + 2000-12-18 Hans-Peter Nilsson + * emultempl/sh64elf.em: New file. + * Makefile.am (eshelf32.c, eshlelf32.c): Adjust dependencies. + * Makefile.in: Regenerate. + * emulparams/shelf32.sh (OUTPUT_FORMAT): Only set if not set. + (OTHER_RELOCATING_SECTIONS): Ditto. + (EXTRA_EM_FILE): New, set to sh64elf if not set. + * emulparams/shlelf32.sh: Stub out all settings except + OUTPUT_FORMAT. Source shelf32.sh. + * emulparams/shelf64.sh: Similar, but also keep ELF_SIZE and + OTHER_RELOCATING_SECTIONS. + (OTHER_RELOCATING_SECTIONS): Remove .cranges. + * emulparams/shlelf64.sh: Stub out all settings except + OUTPUT_FORMAT. Source shelf64.sh. + 2000-12-15 Hans-Peter Nilsson + * emulparams/shelf64.sh (OTHER_RELOCATING_SECTIONS): Include + .cranges section. + (DATA_START_SYMBOLS): Define, provide ___data. + (OTHER_READONLY_SYMBOLS): Define, provide ___rodata and align to 8 + for consecutive .data section. + (OTHER_GOT_SECTIONS): Define, align to 8 for consecutive .bss + section after .data section. + * emulparams/shlelf64.sh: Ditto. + * emulparams/shelf32.sh: Ditto. + (ALIGNMENT): Define to 8. + * emulparams/shelf32.sh: Ditto. + 2000-12-12 Hans-Peter Nilsson + * configure.tgt (sh64-*-elf*): Assign targ_extra_libpath to get + built-in linker scripts. + 2000-11-30 Hans-Peter Nilsson + * emulparams/shlelf64.sh: New. + * emulparams/shelf64.sh: New. + * configure.tgt (sh64-*-elf*): Add shelf64 and shlelf64 to + targ_extra_emuls. + * Makefile.am: Add support for shlelf64 and shelf64. + * Makefile.in: Regenerate. + 2000-11-29 Hans-Peter Nilsson + * configure.tgt (sh64-*-elf*): Add shelf as default. + Add shlelf to targ_extra_emuls. + 2000-11-24 Hans-Peter Nilsson + * emulparams/shelf32.sh: New file. + * emulparams/shlelf32.sh: New file. + * Makefile.am: Add support for shlelf32 and shelf32. + * configure.tgt: Map sh64-*-elf* to shlelf32 and shelf32. + * Makefile.in: Regenerate. + 2002-02-05 Hans-Peter Nilsson * ldlang.c (lang_reset_memory_regions): Rename from diff --git a/ld/Makefile.am b/ld/Makefile.am index 38fe602..292d0cd 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -237,6 +237,8 @@ ALL_EMULATIONS = \ eriscix.o \ esa29200.o \ esh.o \ + eshelf32.o \ + eshlelf32.o \ eshelf.o \ eshelf_linux.o \ eshlelf_linux.o \ @@ -266,6 +268,8 @@ ALL_EMULATIONS = \ ALL_64_EMULATIONS = \ eelf64_aix.o \ eelf64_ia64.o \ + eshelf64.o \ + eshlelf64.o \ eelf_x86_64.o \ eelf64_s390.o \ eelf64_sparc.o \ @@ -840,6 +844,14 @@ esh.c: $(srcdir)/emulparams/sh.sh \ eshelf.c: $(srcdir)/emulparams/shelf.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} shelf "$(tdir_shelf)" +eshelf32.c: $(srcdir)/emulparams/shelf32.sh \ + $(BFDDIR)/libbfd.h $(INCDIR)/libiberty.h \ + $(srcdir)/emultempl/sh64elf.em $(INCDIR)/elf/sh.h $(BFDDIR)/elf-bfd.h \ + $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + ${GENSCRIPTS} shelf32 "$(tdir_shelf32)" +eshelf64.c: $(srcdir)/emulparams/shelf64.sh $(srcdir)/emulparams/shelf32.sh \ + $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + ${GENSCRIPTS} shelf64 "$(tdir_shelf64)" eshelf_linux.c: $(srcdir)/emulparams/shelf_linux.sh \ $(srcdir)/emulparams/shlelf_linux.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} @@ -860,6 +872,15 @@ eshlelf.c: $(srcdir)/emulparams/shlelf.sh \ $(srcdir)/emulparams/shelf.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} shlelf "$(tdir_shlelf)" +eshlelf32.c: $(srcdir)/emulparams/shlelf32.sh \ + $(BFDDIR)/libbfd.h $(INCDIR)/libiberty.h $(srcdir)/emulparams/shelf32.sh \ + $(srcdir)/emultempl/sh64elf.em $(INCDIR)/elf/sh.h $(BFDDIR)/elf-bfd.h \ + $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + ${GENSCRIPTS} shlelf32 "$(tdir_shlelf32)" +eshlelf64.c: $(srcdir)/emulparams/shlelf64.sh \ + $(srcdir)/emulparams/shelf64.sh $(srcdir)/emulparams/shelf32.sh \ + $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + ${GENSCRIPTS} shlelf64 "$(tdir_shlelf64)" eshl.c: $(srcdir)/emulparams/shl.sh \ $(srcdir)/emulparams/sh.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sh.sc ${GEN_DEPENDS} diff --git a/ld/Makefile.in b/ld/Makefile.in index d38180c..7b9327f 100644 --- a/ld/Makefile.in +++ b/ld/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. @@ -346,6 +346,8 @@ ALL_EMULATIONS = \ eriscix.o \ esa29200.o \ esh.o \ + eshelf32.o \ + eshlelf32.o \ eshelf.o \ eshelf_linux.o \ eshlelf_linux.o \ @@ -376,6 +378,8 @@ ALL_EMULATIONS = \ ALL_64_EMULATIONS = \ eelf64_aix.o \ eelf64_ia64.o \ + eshelf64.o \ + eshlelf64.o \ eelf_x86_64.o \ eelf64_s390.o \ eelf64_sparc.o \ @@ -684,7 +688,7 @@ uninstall-info: else ii=; fi; \ list='$(INFO_DEPS)'; \ for file in $$list; do \ - test -z "$$ii" \ + test -z "$ii" \ || install-info --info-dir=$(DESTDIR)$(infodir) --remove $$file; \ done @$(NORMAL_UNINSTALL) @@ -797,7 +801,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//`; \ @@ -1561,6 +1565,14 @@ esh.c: $(srcdir)/emulparams/sh.sh \ eshelf.c: $(srcdir)/emulparams/shelf.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} shelf "$(tdir_shelf)" +eshelf32.c: $(srcdir)/emulparams/shelf32.sh \ + $(BFDDIR)/libbfd.h $(INCDIR)/libiberty.h \ + $(srcdir)/emultempl/sh64elf.em $(INCDIR)/elf/sh.h $(BFDDIR)/elf-bfd.h \ + $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + ${GENSCRIPTS} shelf32 "$(tdir_shelf32)" +eshelf64.c: $(srcdir)/emulparams/shelf64.sh $(srcdir)/emulparams/shelf32.sh \ + $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + ${GENSCRIPTS} shelf64 "$(tdir_shelf64)" eshelf_linux.c: $(srcdir)/emulparams/shelf_linux.sh \ $(srcdir)/emulparams/shlelf_linux.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} @@ -1581,6 +1593,15 @@ eshlelf.c: $(srcdir)/emulparams/shlelf.sh \ $(srcdir)/emulparams/shelf.sh \ $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} ${GENSCRIPTS} shlelf "$(tdir_shlelf)" +eshlelf32.c: $(srcdir)/emulparams/shlelf32.sh \ + $(BFDDIR)/libbfd.h $(INCDIR)/libiberty.h $(srcdir)/emulparams/shelf32.sh \ + $(srcdir)/emultempl/sh64elf.em $(INCDIR)/elf/sh.h $(BFDDIR)/elf-bfd.h \ + $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + ${GENSCRIPTS} shlelf32 "$(tdir_shlelf32)" +eshlelf64.c: $(srcdir)/emulparams/shlelf64.sh \ + $(srcdir)/emulparams/shelf64.sh $(srcdir)/emulparams/shelf32.sh \ + $(srcdir)/emultempl/elf32.em $(srcdir)/scripttempl/elf.sc ${GEN_DEPENDS} + ${GENSCRIPTS} shlelf64 "$(tdir_shlelf64)" eshl.c: $(srcdir)/emulparams/shl.sh \ $(srcdir)/emulparams/sh.sh \ $(srcdir)/emultempl/generic.em $(srcdir)/scripttempl/sh.sc ${GEN_DEPENDS} diff --git a/ld/config.in b/ld/config.in index c6c80ee..87c5fe6 100644 --- a/ld/config.in +++ b/ld/config.in @@ -1,175 +1,171 @@ /* config.in. Generated automatically from configure.in by autoheader. */ -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -#undef CRAY_STACKSEG_END - -/* Define if using `alloca.c'. */ +/* Define if using alloca.c. */ #undef C_ALLOCA -/* Define to 1 if NLS is requested */ -#undef ENABLE_NLS +/* Define to empty if the keyword does not work. */ +#undef const -/* Additional extension a shared object might have. */ -#undef EXTRA_SHLIB_EXTENSION +/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. + This function is required for alloca.c support on those systems. */ +#undef CRAY_STACKSEG_END -/* Define if you have `alloca', as a function or macro. */ +/* Define if you have alloca, as a function or macro. */ #undef HAVE_ALLOCA -/* Define if you have and it should be used (not on Ultrix). */ +/* Define if you have and it should be used (not on Ultrix). */ #undef HAVE_ALLOCA_H -/* Define if you have the header file. */ -#undef HAVE_ARGZ_H +/* Define if you have a working `mmap' system call. */ +#undef HAVE_MMAP -/* Define if you have the `dcgettext' function. */ -#undef HAVE_DCGETTEXT +/* Define as __inline if that's what the C compiler calls it. */ +#undef inline -/* Define if you have the header file, and it defines `DIR'. */ -#undef HAVE_DIRENT_H +/* Define to `long' if doesn't define. */ +#undef off_t -/* Define if you have the `getcwd' function. */ -#undef HAVE_GETCWD +/* Define to `unsigned' if doesn't define. */ +#undef size_t -/* Define if you have the `getpagesize' function. */ -#undef HAVE_GETPAGESIZE +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at run-time. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown + */ +#undef STACK_DIRECTION -/* Define as 1 if you have gettext and don't want to use GNU gettext. */ -#undef HAVE_GETTEXT +/* Define if you have the ANSI C header files. */ +#undef STDC_HEADERS -/* Define if you have the header file. */ -#undef HAVE_INTTYPES_H +/* Define if lex declares yytext as a char * by default, not a char[]. */ +#undef YYTEXT_POINTER -/* Define if your locale.h file contains LC_MESSAGES. */ -#undef HAVE_LC_MESSAGES +/* Define if you have the __argz_count function. */ +#undef HAVE___ARGZ_COUNT -/* Define if you have the header file. */ -#undef HAVE_LIMITS_H +/* Define if you have the __argz_next function. */ +#undef HAVE___ARGZ_NEXT -/* Define if you have the header file. */ -#undef HAVE_LOCALE_H +/* Define if you have the __argz_stringify function. */ +#undef HAVE___ARGZ_STRINGIFY -/* Define if you have the header file. */ -#undef HAVE_MALLOC_H +/* Define if you have the dcgettext function. */ +#undef HAVE_DCGETTEXT -/* Define if you have the header file. */ -#undef HAVE_MEMORY_H +/* Define if you have the getcwd function. */ +#undef HAVE_GETCWD -/* Define if you have a working `mmap' system call. */ -#undef HAVE_MMAP +/* Define if you have the getpagesize function. */ +#undef HAVE_GETPAGESIZE -/* Define if you have the `munmap' function. */ +/* Define if you have the munmap function. */ #undef HAVE_MUNMAP -/* Define if you have the header file, and it defines `DIR'. */ -#undef HAVE_NDIR_H - -/* Define if you have the header file. */ -#undef HAVE_NL_TYPES_H - -/* Define if you have the `putenv' function. */ +/* Define if you have the putenv function. */ #undef HAVE_PUTENV -/* Define if you have the `sbrk' function. */ +/* Define if you have the sbrk function. */ #undef HAVE_SBRK -/* Define if you have the `setenv' function. */ +/* Define if you have the setenv function. */ #undef HAVE_SETENV -/* Define if you have the `setlocale' function. */ +/* Define if you have the setlocale function. */ #undef HAVE_SETLOCALE -/* Define if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define if you have the stpcpy function */ +/* Define if you have the stpcpy function. */ #undef HAVE_STPCPY -/* Define if you have the `strcasecmp' function. */ +/* Define if you have the strcasecmp function. */ #undef HAVE_STRCASECMP -/* Define if you have the `strchr' function. */ +/* Define if you have the strchr function. */ #undef HAVE_STRCHR -/* Define if you have the header file. */ -#undef HAVE_STRINGS_H +/* Define if you have the header file. */ +#undef HAVE_ARGZ_H -/* Define if you have the header file. */ -#undef HAVE_STRING_H +/* Define if you have the header file. */ +#undef HAVE_DIRENT_H -/* Define if you have the header file, and it defines `DIR'. */ -#undef HAVE_SYS_DIR_H +/* Define if you have the header file. */ +#undef HAVE_LIMITS_H -/* Define if you have the header file, and it defines `DIR'. */ -#undef HAVE_SYS_NDIR_H +/* Define if you have the header file. */ +#undef HAVE_LOCALE_H -/* Define if you have the header file. */ -#undef HAVE_SYS_PARAM_H +/* Define if you have the header file. */ +#undef HAVE_MALLOC_H -/* Define if you have the header file. */ -#undef HAVE_UNISTD_H +/* Define if you have the header file. */ +#undef HAVE_NDIR_H -/* Define if you have the header file. */ -#undef HAVE_VALUES_H +/* Define if you have the header file. */ +#undef HAVE_NL_TYPES_H -/* Define if you have the `__argz_count' function. */ -#undef HAVE___ARGZ_COUNT +/* Define if you have the header file. */ +#undef HAVE_STDLIB_H -/* Define if you have the `__argz_next' function. */ -#undef HAVE___ARGZ_NEXT +/* Define if you have the header file. */ +#undef HAVE_STRING_H -/* Define if you have the `__argz_stringify' function. */ -#undef HAVE___ARGZ_STRINGIFY +/* Define if you have the header file. */ +#undef HAVE_STRINGS_H -/* Define if environ is not declared in system header files. */ -#undef NEED_DECLARATION_ENVIRON +/* Define if you have the header file. */ +#undef HAVE_SYS_DIR_H -/* Define if free is not declared in system header files. */ -#undef NEED_DECLARATION_FREE +/* Define if you have the header file. */ +#undef HAVE_SYS_NDIR_H -/* Define if getenv is not declared in system header files. */ -#undef NEED_DECLARATION_GETENV +/* Define if you have the header file. */ +#undef HAVE_SYS_PARAM_H -/* Define if sbrk is not declared in system header files. */ -#undef NEED_DECLARATION_SBRK +/* Define if you have the header file. */ +#undef HAVE_UNISTD_H -/* Define if strstr is not declared in system header files. */ -#undef NEED_DECLARATION_STRSTR +/* Define if you have the header file. */ +#undef HAVE_VALUES_H /* Name of package */ #undef PACKAGE -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ -#undef STACK_DIRECTION +/* Version number of package */ +#undef VERSION -/* Define if you have the ANSI C header files. */ -#undef STDC_HEADERS +/* Define if you have the stpcpy function */ +#undef HAVE_STPCPY + +/* Define if your locale.h file contains LC_MESSAGES. */ +#undef HAVE_LC_MESSAGES + +/* Define to 1 if NLS is requested */ +#undef ENABLE_NLS + +/* Define as 1 if you have gettext and don't want to use GNU gettext. */ +#undef HAVE_GETTEXT /* Use b modifier when opening binary files? */ #undef USE_BINARY_FOPEN -/* Version number of package */ -#undef VERSION +/* Define if strstr is not declared in system header files. */ +#undef NEED_DECLARATION_STRSTR -/* Define if `lex' declares `yytext' as a `char *' by default, not a `char[]'. - */ -#undef YYTEXT_POINTER +/* Define if free is not declared in system header files. */ +#undef NEED_DECLARATION_FREE -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const +/* Define if sbrk is not declared in system header files. */ +#undef NEED_DECLARATION_SBRK -/* Define as `__inline' if that's what the C compiler calls it, or to nothing - if it is not supported. */ -#undef inline +/* Define if getenv is not declared in system header files. */ +#undef NEED_DECLARATION_GETENV -/* Define to `long' if does not define. */ -#undef off_t +/* Define if environ is not declared in system header files. */ +#undef NEED_DECLARATION_ENVIRON + +/* Additional extension a shared object might have. */ +#undef EXTRA_SHLIB_EXTENSION -/* Define to `unsigned' if does not define. */ -#undef size_t diff --git a/ld/configure b/ld/configure index c69c7b0..c310a0d 100755 --- a/ld/configure +++ b/ld/configure @@ -53,6 +53,7 @@ program_suffix=NONE program_transform_name=s,x,x, silent= site= +sitefile= srcdir= target=NONE verbose= @@ -167,6 +168,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 @@ -337,6 +339,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=*) @@ -502,12 +509,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 @@ -546,12 +557,12 @@ else fi echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 -echo "configure:550: checking for Cygwin environment" >&5 +echo "configure:561: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else @@ -579,19 +590,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:583: checking for mingw32 environment" >&5 +echo "configure:594: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else @@ -656,7 +667,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:660: checking host system type" >&5 +echo "configure:671: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -677,7 +688,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:681: checking target system type" >&5 +echo "configure:692: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -695,7 +706,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:699: checking build system type" >&5 +echo "configure:710: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -719,7 +730,7 @@ test "$host_alias" != "$target_alias" && echo $ac_n "checking for strerror in -lcposix""... $ac_c" 1>&6 -echo "configure:723: checking for strerror in -lcposix" >&5 +echo "configure:734: checking for strerror in -lcposix" >&5 ac_lib_var=`echo cposix'_'strerror | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -727,7 +738,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lcposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:753: \"$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 @@ -774,7 +785,7 @@ BFD_VERSION=`sed -n -e 's/^.._INIT_AUTOMAKE.*,[ ]*\([^ ]*\)[ ]*).*/\1/p' < ${ # 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:778: checking for a BSD compatible install" >&5 +echo "configure:789: 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 @@ -827,7 +838,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:831: checking whether build environment is sane" >&5 +echo "configure:842: checking whether build environment is sane" >&5 # Just in case sleep 1 echo timestamp > conftestfile @@ -884,7 +895,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:888: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:899: 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 @@ -930,7 +941,7 @@ EOF missing_dir=`cd $ac_aux_dir && pwd` echo $ac_n "checking for working aclocal""... $ac_c" 1>&6 -echo "configure:934: checking for working aclocal" >&5 +echo "configure:945: 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. @@ -943,7 +954,7 @@ else fi echo $ac_n "checking for working autoconf""... $ac_c" 1>&6 -echo "configure:947: checking for working autoconf" >&5 +echo "configure:958: 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. @@ -956,7 +967,7 @@ else fi echo $ac_n "checking for working automake""... $ac_c" 1>&6 -echo "configure:960: checking for working automake" >&5 +echo "configure:971: 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. @@ -969,7 +980,7 @@ else fi echo $ac_n "checking for working autoheader""... $ac_c" 1>&6 -echo "configure:973: checking for working autoheader" >&5 +echo "configure:984: 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. @@ -982,7 +993,7 @@ else fi echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6 -echo "configure:986: checking for working makeinfo" >&5 +echo "configure:997: 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. @@ -1068,7 +1079,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:1072: 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 @@ -1098,7 +1109,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:1102: checking for $ac_word" >&5 +echo "configure:1113: 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 @@ -1149,7 +1160,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:1153: checking for $ac_word" >&5 +echo "configure:1164: 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 @@ -1181,7 +1192,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1185: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1196: 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. @@ -1192,12 +1203,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 1196 "configure" +#line 1207 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1212: \"$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 @@ -1223,12 +1234,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:1227: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1238: 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:1232: checking whether we are using GNU C" >&5 +echo "configure:1243: 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 @@ -1237,7 +1248,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1241: \"$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:1252: \"$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 @@ -1256,7 +1267,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:1260: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1271: 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 @@ -1299,7 +1310,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:1303: checking for ld used by GCC" >&5 +echo "configure:1314: checking for ld used by GCC" >&5 case $host in *-*-mingw*) # gcc leaves a trailing carriage return which upsets mingw @@ -1329,10 +1340,10 @@ echo "configure:1303: 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:1333: checking for GNU ld" >&5 +echo "configure:1344: checking for GNU ld" >&5 else echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 -echo "configure:1336: checking for non-GNU ld" >&5 +echo "configure:1347: 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 @@ -1367,7 +1378,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:1371: checking if the linker ($LD) is GNU ld" >&5 +echo "configure:1382: 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 @@ -1384,7 +1395,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:1388: checking for $LD option to reload object files" >&5 +echo "configure:1399: 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 @@ -1396,7 +1407,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:1400: checking for BSD-compatible nm" >&5 +echo "configure:1411: 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 @@ -1434,7 +1445,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:1438: checking whether ln -s works" >&5 +echo "configure:1449: 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 @@ -1455,7 +1466,7 @@ else fi echo $ac_n "checking how to recognise dependant libraries""... $ac_c" 1>&6 -echo "configure:1459: checking how to recognise dependant libraries" >&5 +echo "configure:1470: 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 @@ -1628,13 +1639,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:1632: checking for object suffix" >&5 +echo "configure:1643: 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:1638: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then for ac_file in conftest.*; do case $ac_file in *.c) ;; @@ -1654,7 +1665,7 @@ ac_objext=$ac_cv_objext echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:1658: checking for executable suffix" >&5 +echo "configure:1669: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1664,10 +1675,10 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:1668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:1679: \"$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 @@ -1697,7 +1708,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:1701: checking for ${ac_tool_prefix}file" >&5 +echo "configure:1712: 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 @@ -1759,7 +1770,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:1763: checking for file" >&5 +echo "configure:1774: 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 @@ -1830,7 +1841,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:1834: checking for $ac_word" >&5 +echo "configure:1845: 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 @@ -1862,7 +1873,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:1866: checking for $ac_word" >&5 +echo "configure:1877: 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 @@ -1897,7 +1908,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:1901: checking for $ac_word" >&5 +echo "configure:1912: 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 @@ -1929,7 +1940,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:1933: checking for $ac_word" >&5 +echo "configure:1944: 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 @@ -1996,8 +2007,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 2000 "configure"' > conftest.$ac_ext - if { (eval echo configure:2001: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + echo '#line 2011 "configure"' > conftest.$ac_ext + if { (eval echo configure:2012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case `/usr/bin/file conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" @@ -2016,7 +2027,7 @@ case $host in ia64-*-hpux*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext - if { (eval echo configure:2020: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if { (eval echo configure:2031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then case "`/usr/bin/file conftest.o`" in *ELF-32*) HPUX_IA64_MODE="32" @@ -2034,7 +2045,7 @@ ia64-*-hpux*) SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -belf" echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 -echo "configure:2038: checking whether the C compiler needs -belf" >&5 +echo "configure:2049: 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 @@ -2047,14 +2058,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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2069: \"$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 @@ -2231,7 +2242,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:2235: checking for $ac_word" >&5 +echo "configure:2246: 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 @@ -2261,7 +2272,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:2265: checking for $ac_word" >&5 +echo "configure:2276: 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 @@ -2312,7 +2323,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:2316: checking for $ac_word" >&5 +echo "configure:2327: 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 @@ -2344,7 +2355,7 @@ fi fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2348: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2359: 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. @@ -2355,12 +2366,12 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext << EOF -#line 2359 "configure" +#line 2370 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2375: \"$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 @@ -2386,12 +2397,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:2390: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2401: 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:2395: checking whether we are using GNU C" >&5 +echo "configure:2406: 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 @@ -2400,7 +2411,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2404: \"$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:2415: \"$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 @@ -2419,7 +2430,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:2423: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2434: 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 @@ -2462,7 +2473,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:2466: checking for a BSD compatible install" >&5 +echo "configure:2477: 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 @@ -2517,7 +2528,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' ALL_LINGUAS="fr sv tr es" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:2521: checking how to run the C preprocessor" >&5 +echo "configure:2532: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -2532,13 +2543,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error 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:2553: \"$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 : @@ -2549,13 +2560,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2559: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2570: \"$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 : @@ -2566,13 +2577,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2576: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2587: \"$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 : @@ -2599,7 +2610,7 @@ echo "$ac_t""$CPP" 1>&6 # 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:2603: checking for $ac_word" >&5 +echo "configure:2614: 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 @@ -2627,12 +2638,12 @@ else fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2631: checking for ANSI C header files" >&5 +echo "configure:2642: 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 < #include @@ -2640,7 +2651,7 @@ else #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2655: \"$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* @@ -2657,7 +2668,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 @@ -2675,7 +2686,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 @@ -2696,7 +2707,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2707,7 +2718,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:2711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:2722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -2731,12 +2742,12 @@ EOF fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:2735: checking for working const" >&5 +echo "configure:2746: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2800: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -2806,21 +2817,21 @@ EOF fi echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:2810: checking for inline" >&5 +echo "configure:2821: 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 <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2835: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -2846,12 +2857,12 @@ EOF esac echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:2850: checking for off_t" >&5 +echo "configure:2861: 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 < #if STDC_HEADERS @@ -2879,12 +2890,12 @@ EOF fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2883: checking for size_t" >&5 +echo "configure:2894: 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 < #if STDC_HEADERS @@ -2914,19 +2925,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:2918: checking for working alloca.h" >&5 +echo "configure:2929: 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 < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:2930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2941: \"$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 @@ -2947,12 +2958,12 @@ EOF fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:2951: checking for alloca" >&5 +echo "configure:2962: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2995: \"$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 @@ -3012,12 +3023,12 @@ EOF echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:3016: checking whether alloca needs Cray hooks" >&5 +echo "configure:3027: 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 <&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:3046: checking for $ac_func" >&5 +echo "configure:3057: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3085: \"$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 @@ -3097,7 +3108,7 @@ done fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:3101: checking stack direction for C alloca" >&5 +echo "configure:3112: 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 @@ -3105,7 +3116,7 @@ else ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3139: \"$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 @@ -3145,21 +3156,21 @@ EOF fi -for ac_hdr in stdlib.h unistd.h sys/stat.h sys/types.h +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:3153: checking for $ac_hdr" >&5 +echo "configure:3164: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3163: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3174: \"$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* @@ -3188,12 +3199,12 @@ done for ac_func in getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3192: checking for $ac_func" >&5 +echo "configure:3203: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3231: \"$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 @@ -3241,7 +3252,7 @@ fi done echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:3245: checking for working mmap" >&5 +echo "configure:3256: 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 @@ -3249,7 +3260,7 @@ else ac_cv_func_mmap_fixed_mapped=no else cat > conftest.$ac_ext < #include -#if HAVE_SYS_TYPES_H -# include -#endif - -#if HAVE_STDLIB_H -# include -#endif - -#if HAVE_SYS_STAT_H -# include -#endif - -#if HAVE_UNISTD_H -# include -#endif - /* This mess was copied from the GNU getpagesize.h. */ #ifndef HAVE_GETPAGESIZE +# ifdef HAVE_UNISTD_H +# include +# endif /* Assume that all systems that can run configure have sys/param.h. */ # ifndef HAVE_SYS_PARAM_H @@ -3402,7 +3400,7 @@ main() } EOF -if { (eval echo configure:3406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:3404: \"$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 @@ -3430,17 +3428,17 @@ unistd.h values.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:3434: checking for $ac_hdr" >&5 +echo "configure:3432: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3444: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3442: \"$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* @@ -3470,12 +3468,12 @@ done __argz_count __argz_stringify __argz_next do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3474: checking for $ac_func" >&5 +echo "configure:3472: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3500: \"$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 @@ -3527,12 +3525,12 @@ done for ac_func in stpcpy do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3531: checking for $ac_func" >&5 +echo "configure:3529: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3557: \"$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 @@ -3589,19 +3587,19 @@ EOF if test $ac_cv_header_locale_h = yes; then echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:3593: checking for LC_MESSAGES" >&5 +echo "configure:3591: 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 < int main() { return LC_MESSAGES ; return 0; } EOF -if { (eval echo configure:3605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3603: \"$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 @@ -3622,7 +3620,7 @@ EOF fi fi echo $ac_n "checking whether NLS is requested""... $ac_c" 1>&6 -echo "configure:3626: checking whether NLS is requested" >&5 +echo "configure:3624: 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" @@ -3642,7 +3640,7 @@ fi EOF echo $ac_n "checking whether included gettext is requested""... $ac_c" 1>&6 -echo "configure:3646: checking whether included gettext is requested" >&5 +echo "configure:3644: 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" @@ -3661,17 +3659,17 @@ fi ac_safe=`echo "libintl.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for libintl.h""... $ac_c" 1>&6 -echo "configure:3665: checking for libintl.h" >&5 +echo "configure:3663: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3675: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3673: \"$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* @@ -3688,19 +3686,19 @@ fi if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libc""... $ac_c" 1>&6 -echo "configure:3692: checking for gettext in libc" >&5 +echo "configure:3690: checking for gettext in libc" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return (int) gettext ("") ; return 0; } EOF -if { (eval echo configure:3704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libc=yes else @@ -3716,7 +3714,7 @@ echo "$ac_t""$gt_cv_func_gettext_libc" 1>&6 if test "$gt_cv_func_gettext_libc" != "yes"; then echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 -echo "configure:3720: checking for bindtextdomain in -lintl" >&5 +echo "configure:3718: checking for bindtextdomain in -lintl" >&5 ac_lib_var=`echo intl'_'bindtextdomain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3724,7 +3722,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3737: \"$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 @@ -3751,19 +3749,19 @@ fi if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for gettext in libintl""... $ac_c" 1>&6 -echo "configure:3755: checking for gettext in libintl" >&5 +echo "configure:3753: checking for gettext in libintl" >&5 if eval "test \"`echo '$''{'gt_cv_func_gettext_libintl'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* gt_cv_func_gettext_libintl=yes else @@ -3791,7 +3789,7 @@ EOF # 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:3795: checking for $ac_word" >&5 +echo "configure:3793: 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 @@ -3825,12 +3823,12 @@ fi for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3829: checking for $ac_func" >&5 +echo "configure:3827: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3855: \"$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 @@ -3880,7 +3878,7 @@ done # 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:3884: checking for $ac_word" >&5 +echo "configure:3882: 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 @@ -3916,7 +3914,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:3920: checking for $ac_word" >&5 +echo "configure:3918: 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 @@ -3948,7 +3946,7 @@ else fi cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:3958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* CATOBJEXT=.gmo DATADIRNAME=share @@ -3988,7 +3986,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:3992: checking for $ac_word" >&5 +echo "configure:3990: 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 @@ -4022,7 +4020,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:4026: checking for $ac_word" >&5 +echo "configure:4024: 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 @@ -4058,7 +4056,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:4062: checking for $ac_word" >&5 +echo "configure:4060: 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 @@ -4148,7 +4146,7 @@ fi LINGUAS= else echo $ac_n "checking for catalogs to be installed""... $ac_c" 1>&6 -echo "configure:4152: checking for catalogs to be installed" >&5 +echo "configure:4150: checking for catalogs to be installed" >&5 NEW_LINGUAS= for lang in ${LINGUAS=$ALL_LINGUAS}; do case "$ALL_LINGUAS" in @@ -4176,17 +4174,17 @@ echo "configure:4152: checking for catalogs to be installed" >&5 if test "$CATOBJEXT" = ".cat"; then ac_safe=`echo "linux/version.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for linux/version.h""... $ac_c" 1>&6 -echo "configure:4180: checking for linux/version.h" >&5 +echo "configure:4178: checking for linux/version.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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4188: \"$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* @@ -4251,7 +4249,7 @@ fi echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 -echo "configure:4255: checking for executable suffix" >&5 +echo "configure:4253: checking for executable suffix" >&5 if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4261,10 +4259,10 @@ else rm -f conftest* echo 'int main () { return 0; }' > conftest.$ac_ext ac_cv_exeext= - if { (eval echo configure:4265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + if { (eval echo configure:4263: \"$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 @@ -4287,7 +4285,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:4291: checking for $ac_word" >&5 +echo "configure:4289: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4323,7 +4321,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:4327: checking for $ac_word" >&5 +echo "configure:4325: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4356,7 +4354,7 @@ test -n "$LEX" || LEX=""$missing_dir/missing flex"" # 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:4360: checking for $ac_word" >&5 +echo "configure:4358: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LEX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4390,7 +4388,7 @@ then *) ac_lib=l ;; esac echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 -echo "configure:4394: checking for yywrap in -l$ac_lib" >&5 +echo "configure:4392: checking for yywrap in -l$ac_lib" >&5 ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4398,7 +4396,7 @@ else ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4411: \"$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 @@ -4432,7 +4430,7 @@ fi fi echo $ac_n "checking lex output file root""... $ac_c" 1>&6 -echo "configure:4436: checking lex output file root" >&5 +echo "configure:4434: checking lex output file root" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_root'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4453,7 +4451,7 @@ echo "$ac_t""$ac_cv_prog_lex_root" 1>&6 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root echo $ac_n "checking whether yytext is a pointer""... $ac_c" 1>&6 -echo "configure:4457: checking whether yytext is a pointer" >&5 +echo "configure:4455: checking whether yytext is a pointer" >&5 if eval "test \"`echo '$''{'ac_cv_prog_lex_yytext_pointer'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4465,14 +4463,14 @@ echo 'extern char *yytext;' >>$LEX_OUTPUT_ROOT.c ac_save_LIBS="$LIBS" LIBS="$LIBS $LEXLIB" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_prog_lex_yytext_pointer=yes else @@ -4495,7 +4493,7 @@ fi echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 -echo "configure:4499: checking whether to enable maintainer-specific portions of Makefiles" >&5 +echo "configure:4497: 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" @@ -4529,17 +4527,17 @@ for ac_hdr in string.h strings.h stdlib.h unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:4533: checking for $ac_hdr" >&5 +echo "configure:4531: 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 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4543: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4541: \"$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* @@ -4568,12 +4566,12 @@ done for ac_func in sbrk do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:4572: checking for $ac_func" >&5 +echo "configure:4570: 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 <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4598: \"$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 @@ -4625,12 +4623,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:4629: checking for $ac_hdr that defines DIR" >&5 +echo "configure:4627: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -4638,7 +4636,7 @@ int main() { DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:4642: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4640: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -4663,7 +4661,7 @@ done # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:4667: checking for opendir in -ldir" >&5 +echo "configure:4665: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4671,7 +4669,7 @@ else ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4684: \"$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 @@ -4704,7 +4702,7 @@ fi else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:4708: checking for opendir in -lx" >&5 +echo "configure:4706: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4712,7 +4710,7 @@ else ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4725: \"$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 @@ -4756,12 +4754,12 @@ EOF esac echo $ac_n "checking whether strstr must be declared""... $ac_c" 1>&6 -echo "configure:4760: checking whether strstr must be declared" >&5 +echo "configure:4758: checking whether strstr must be declared" >&5 if eval "test \"`echo '$''{'bfd_cv_decl_needed_strstr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -4782,7 +4780,7 @@ int main() { char *(*pfn) = (char *(*)) strstr ; return 0; } EOF -if { (eval echo configure:4786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_strstr=no else @@ -4803,12 +4801,12 @@ EOF fi echo $ac_n "checking whether free must be declared""... $ac_c" 1>&6 -echo "configure:4807: checking whether free must be declared" >&5 +echo "configure:4805: checking whether free must be declared" >&5 if eval "test \"`echo '$''{'bfd_cv_decl_needed_free'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -4829,7 +4827,7 @@ int main() { char *(*pfn) = (char *(*)) free ; return 0; } EOF -if { (eval echo configure:4833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4831: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_free=no else @@ -4850,12 +4848,12 @@ EOF fi echo $ac_n "checking whether sbrk must be declared""... $ac_c" 1>&6 -echo "configure:4854: checking whether sbrk must be declared" >&5 +echo "configure:4852: checking whether sbrk must be declared" >&5 if eval "test \"`echo '$''{'bfd_cv_decl_needed_sbrk'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -4876,7 +4874,7 @@ int main() { char *(*pfn) = (char *(*)) sbrk ; return 0; } EOF -if { (eval echo configure:4880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4878: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_sbrk=no else @@ -4897,12 +4895,12 @@ EOF fi echo $ac_n "checking whether getenv must be declared""... $ac_c" 1>&6 -echo "configure:4901: checking whether getenv must be declared" >&5 +echo "configure:4899: checking whether getenv must be declared" >&5 if eval "test \"`echo '$''{'bfd_cv_decl_needed_getenv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -4923,7 +4921,7 @@ int main() { char *(*pfn) = (char *(*)) getenv ; return 0; } EOF -if { (eval echo configure:4927: \"$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* bfd_cv_decl_needed_getenv=no else @@ -4944,12 +4942,12 @@ EOF fi echo $ac_n "checking whether environ must be declared""... $ac_c" 1>&6 -echo "configure:4948: checking whether environ must be declared" >&5 +echo "configure:4946: checking whether environ must be declared" >&5 if eval "test \"`echo '$''{'bfd_cv_decl_needed_environ'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -4970,7 +4968,7 @@ int main() { char *(*pfn) = (char *(*)) environ ; return 0; } EOF -if { (eval echo configure:4974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:4972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* bfd_cv_decl_needed_environ=no else @@ -4998,19 +4996,19 @@ fi # constants, while still supporting pre-ANSI compilers which do not # support string concatenation. echo $ac_n "checking whether ANSI C string concatenation works""... $ac_c" 1>&6 -echo "configure:5002: checking whether ANSI C string concatenation works" >&5 +echo "configure:5000: checking whether ANSI C string concatenation works" >&5 if eval "test \"`echo '$''{'ld_cv_string_concatenation'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ld_cv_string_concatenation=yes else diff --git a/ld/configure.tgt b/ld/configure.tgt index e1d6ea0..6d179b8 100644 --- a/ld/configure.tgt +++ b/ld/configure.tgt @@ -272,6 +272,11 @@ sh-*-elf* | sh-*-rtemself*) sh-*-pe) targ_emul=shpe ; targ_extra_ofiles="deffilep.o pe-dll.o" ;; sh-*-*|sh-*-rtems*) targ_emul=sh; targ_extra_emuls=shl ;; +sh64-*-elf*) + targ_emul=shelf + targ_extra_emuls="shlelf shelf32 shlelf32 shelf64 shlelf64" + targ_extra_libpath=$targ_extra_emuls + ;; m68k-sony-*) targ_emul=news ;; m68k-hp-bsd*) targ_emul=hp300bsd ;; m68*-motorola-sysv*) targ_emul=delta68 ;; diff --git a/ld/emulparams/shelf32.sh b/ld/emulparams/shelf32.sh new file mode 100644 index 0000000..9b0c698 --- /dev/null +++ b/ld/emulparams/shelf32.sh @@ -0,0 +1,43 @@ +# Note: this parameter script is sourced by the other +# sh[l]elf(32|64).sh parameter scripts. +SCRIPT_NAME=elf +OUTPUT_FORMAT=${OUTPUT_FORMAT-"elf32-sh64"} +TEXT_START_ADDR=0x1000 +STACK_ADDR='ALIGN (0x40000) + 0x40000' +MAXPAGESIZE=128 +ARCH=sh +MACHINE= +ALIGNMENT=8 +TEMPLATE_NAME=elf32 +GENERATE_SHLIB_SCRIPT=yes +EMBEDDED=yes + +DATA_START_SYMBOLS='PROVIDE (___data = .);' + +# If data is located right after .text (not explicitly specified), +# then we need to align it to an 8-byte boundary. +OTHER_READONLY_SECTIONS=' +PROVIDE (___rodata = DEFINED (.rodata) ? .rodata : 0); +. = ALIGN (8); +' + +# Make _edata and .bss aligned by smuggling in an alignment directive. +OTHER_GOT_SECTIONS='. = ALIGN (8);' + +# These are for compatibility with the COFF toolchain. +ENTRY=start +CTOR_START='___ctors = .;' +CTOR_END='___ctors_end = .;' +DTOR_START='___dtors = .;' +DTOR_END='___dtors_end = .;' + +# Do not use the varname=${varname-'string'} construct here; there are +# problems with that on some shells (e.g. on Solaris) where there is a bug +# that trigs when $varname contains a "}". +OTHER_SECTIONS=' + .cranges 0 : { *(.cranges) } +' + +# We need to adjust sizes in the .cranges section after relaxation, so +# we need an after_allocation function, and it goes in this file. +EXTRA_EM_FILE=${EXTRA_EM_FILE-sh64elf} diff --git a/ld/emulparams/shelf64.sh b/ld/emulparams/shelf64.sh new file mode 100644 index 0000000..2c9a9c5 --- /dev/null +++ b/ld/emulparams/shelf64.sh @@ -0,0 +1,9 @@ +# Note: this is sourced in turn by shlelf64.sh +OUTPUT_FORMAT=${OUTPUT_FORMAT-"elf64-sh64"} +ELFSIZE=64 + +EXTRA_EM_FILE= +. ${srcdir}/emulparams/shelf32.sh + +# We do not need .cranges +OTHER_SECTIONS='' diff --git a/ld/emulparams/shlelf32.sh b/ld/emulparams/shlelf32.sh new file mode 100644 index 0000000..68c85dd --- /dev/null +++ b/ld/emulparams/shlelf32.sh @@ -0,0 +1,2 @@ +OUTPUT_FORMAT="elf32-sh64l" +. ${srcdir}/emulparams/shelf32.sh diff --git a/ld/emulparams/shlelf64.sh b/ld/emulparams/shlelf64.sh new file mode 100644 index 0000000..874b00c --- /dev/null +++ b/ld/emulparams/shlelf64.sh @@ -0,0 +1,2 @@ +OUTPUT_FORMAT="elf64-sh64l" +. ${srcdir}/emulparams/shelf64.sh diff --git a/ld/emultempl/sh64elf.em b/ld/emultempl/sh64elf.em new file mode 100644 index 0000000..ffa3906 --- /dev/null +++ b/ld/emultempl/sh64elf.em @@ -0,0 +1,568 @@ +# This shell script emits a C file. -*- C -*- +# Copyright (C) 2000, 2001 Free Software Foundation, Inc. +# +# This file is part of GLD, the Gnu Linker. +# +# 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 of the License, 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 02111-1307, USA. +# + +# This file is sourced from elf32.em, and defines extra sh64 +# specific routines. +# + +LDEMUL_AFTER_ALLOCATION=sh64_elf_${EMULATION_NAME}_after_allocation +LDEMUL_BEFORE_ALLOCATION=sh64_elf_${EMULATION_NAME}_before_allocation + +cat >>e${EMULATION_NAME}.c <the_bfd, + SH64_CRANGES_SECTION_NAME); + if (input_cranges != NULL) + einfo (" %I\n", f); + } + } + + command_line.relax = false; + } + + /* We wouldn't need to do anything when there's already a .cranges + section (and have a return here), except that we need to set the + section flags right for output sections that *don't* need a + .cranges section. */ + } + + if (command_line.relax) + { + LANG_FOR_EACH_INPUT_STATEMENT (f) + { + if (bfd_get_flavour (f->the_bfd) == bfd_target_elf_flavour) + { + asection *isec; + for (isec = f->the_bfd->sections; + isec != NULL; + isec = isec->next) + { + if (elf_section_data (isec)->this_hdr.sh_flags + & (SHF_SH5_ISA32 | SHF_SH5_ISA32_MIXED)) + { + einfo (_("%P: Sorry, turning off relaxing: SHmedia sections present.\n")); + einfo (" %I\n", f); + command_line.relax = false; + goto done_scanning_shmedia_sections; + } + } + } + } + } + done_scanning_shmedia_sections: + + /* For each non-empty input section in each output section, check if it + has the same SH64-specific flags. If some input section differs, we + need a .cranges section. */ + for (osec = output_bfd->sections; + osec != NULL; + osec = osec->next) + { + struct sh64_section_data *sh64_sec_data; + bfd_vma oflags_isa = 0; + bfd_vma iflags_isa = 0; + + if (bfd_get_flavour (output_bfd) != bfd_target_elf_flavour) + einfo (_("%FError: non-ELF output formats are not supported by this target's linker.\n")); + + sh64_sec_data = sh64_elf_section_data (osec); + + /* Omit excluded or garbage-collected sections. */ + if (bfd_get_section_flags (output_bfd, osec) & SEC_EXCLUDE) + continue; + + /* Make sure we have the target section data initialized. */ + if (sh64_sec_data == NULL) + { + sh64_sec_data = xcalloc (1, sizeof (struct sh64_section_data)); + sh64_elf_section_data (osec) = sh64_sec_data; + } + + /* First find an input section so we have flags to compare with; the + flags in the output section are not valid. */ + { + LANG_FOR_EACH_INPUT_STATEMENT (f) + { + asection *isec; + + for (isec = f->the_bfd->sections; + isec != NULL; + isec = isec->next) + { + if (isec->output_section == osec + && isec->_raw_size != 0 + && (bfd_get_section_flags (isec->owner, isec) + & SEC_EXCLUDE) == 0) + { + oflags_isa + = (elf_section_data (isec)->this_hdr.sh_flags + & (SHF_SH5_ISA32 | SHF_SH5_ISA32_MIXED)); + goto break_1; + } + } + } + } + + break_1: + + /* Check that all input sections have the same contents-type flags + as the first input section. */ + { + LANG_FOR_EACH_INPUT_STATEMENT (f) + { + asection *isec; + + for (isec = f->the_bfd->sections; + isec != NULL; + isec = isec->next) + { + if (isec->output_section == osec + && isec->_raw_size != 0 + && (bfd_get_section_flags (isec->owner, isec) + & SEC_EXCLUDE) == 0) + { + iflags_isa + = (elf_section_data (isec)->this_hdr.sh_flags + & (SHF_SH5_ISA32 | SHF_SH5_ISA32_MIXED)); + + /* If flags don't agree, we need a .cranges section. + Create it here if it did not exist through input + sections. */ + if (iflags_isa != oflags_isa) + { + if (cranges == NULL) + { + /* This section will be *appended* to + sections, so the outer iteration will reach + it in due time and set + sh64_elf_section_data; no need to set it + specifically here. */ + cranges + = bfd_make_section (output_bfd, + SH64_CRANGES_SECTION_NAME); + if (cranges == NULL + || (bfd_set_section_flags (output_bfd, + cranges, + SEC_LINKER_CREATED + | SEC_KEEP + | SEC_HAS_CONTENTS + | SEC_DEBUGGING) + == false)) + einfo + (_("%P%E%F: Can't make .cranges section\n")); + } + + /* We don't need to look at more input sections, + and we know this section will have mixed + contents. */ + goto break_2; + } + } + } + } + } + + /* If we got here, then all input sections in this output section + have the same contents flag. Put that where we expect to see + contents flags. We don't need to do this for sections that will + need additional, linker-generated .cranges entries. */ + sh64_sec_data->contents_flags = iflags_isa; + + break_2: + ; + } +} + +/* Size up and extend the .cranges section, merging generated entries. */ + +static void +sh64_elf_${EMULATION_NAME}_after_allocation () +{ + bfd_vma new_cranges = 0; + bfd_vma cranges_growth = 0; + asection *osec; + bfd_byte *crangesp; + + asection *cranges + = bfd_get_section_by_name (output_bfd, SH64_CRANGES_SECTION_NAME); + + /* If this ever starts doing something, we will pick it up. */ + after_allocation_default (); + + /* If there is no .cranges section, it is because it was seen earlier on + that none was needed. Otherwise it must have been created then, or + be present in input. */ + if (cranges == NULL) + return; + + /* First, we set the ISA flags for each output section according to the + first non-discarded section. For each input section in osec, we + check if it has the same flags. If it does not, we set flags to mark + a mixed section (and exit the loop early). */ + for (osec = output_bfd->sections; + osec != NULL; + osec = osec->next) + { + bfd_vma oflags_isa = 0; + boolean need_check_cranges = false; + + /* Omit excluded or garbage-collected sections. */ + if (bfd_get_section_flags (output_bfd, osec) & SEC_EXCLUDE) + continue; + + /* First find an input section so we have flags to compare with; the + flags in the output section are not valid. */ + { + LANG_FOR_EACH_INPUT_STATEMENT (f) + { + asection *isec; + + for (isec = f->the_bfd->sections; + isec != NULL; + isec = isec->next) + { + if (isec->output_section == osec + && isec->_raw_size != 0 + && (bfd_get_section_flags (isec->owner, isec) + & SEC_EXCLUDE) == 0) + { + oflags_isa + = (elf_section_data (isec)->this_hdr.sh_flags + & (SHF_SH5_ISA32 | SHF_SH5_ISA32_MIXED)); + goto break_1; + } + } + } + } + + break_1: + + /* Check that all input sections have the same contents-type flags + as the first input section. */ + { + LANG_FOR_EACH_INPUT_STATEMENT (f) + { + asection *isec; + + for (isec = f->the_bfd->sections; + isec != NULL; + isec = isec->next) + { + if (isec->output_section == osec + && isec->_raw_size != 0 + && (bfd_get_section_flags (isec->owner, isec) + & SEC_EXCLUDE) == 0) + { + bfd_vma iflags_isa + = (elf_section_data (isec)->this_hdr.sh_flags + & (SHF_SH5_ISA32 | SHF_SH5_ISA32_MIXED)); + + /* If flags don't agree, set the target-specific data + of the section to mark that this section needs to + be have .cranges section entries added. Don't + bother setting ELF section flags in output section; + they will be cleared later and will have to be + re-initialized before the linked file is written. */ + if (iflags_isa != oflags_isa) + { + oflags_isa = SHF_SH5_ISA32_MIXED; + + BFD_ASSERT (sh64_elf_section_data (osec) != NULL); + + sh64_elf_section_data (osec)->contents_flags + = SHF_SH5_ISA32_MIXED; + need_check_cranges = true; + goto break_2; + } + } + } + } + } + + break_2: + + /* If there were no new ranges for this output section, we don't + need to iterate over the input sections to check how many are + needed. */ + if (! need_check_cranges) + continue; + + /* If we found a section with differing contents type, we need more + ranges to mark the sections that are not mixed (and already have + .cranges descriptors). Calculate the maximum number of new + entries here. We may merge some of them, so that number is not + final; it can shrink. */ + { + LANG_FOR_EACH_INPUT_STATEMENT (f) + { + asection *isec; + + for (isec = f->the_bfd->sections; + isec != NULL; + isec = isec->next) + { + if (isec->output_section == osec + && isec->_raw_size != 0 + && (bfd_get_section_flags (isec->owner, isec) + & SEC_EXCLUDE) == 0 + && ((elf_section_data (isec)->this_hdr.sh_flags + & (SHF_SH5_ISA32 | SHF_SH5_ISA32_MIXED)) + != SHF_SH5_ISA32_MIXED)) + new_cranges++; + } + } + } + } + + BFD_ASSERT (cranges->contents == NULL); + BFD_ASSERT (sh64_elf_section_data (cranges) != NULL); + + /* Make sure we have .cranges in memory even if there were only + assembler-generated .cranges. */ + cranges_growth = new_cranges * SH64_CRANGE_SIZE; + cranges->contents + = (bfd_byte *) xcalloc (cranges->_raw_size + cranges_growth, 1); + bfd_set_section_flags (cranges->owner, cranges, + bfd_get_section_flags (cranges->owner, cranges) + | SEC_IN_MEMORY); + + /* If we don't need to grow the .cranges section beyond what was in the + input sections, we have nothing more to do here. We then only got + here because there was a .cranges section coming from input. Zero + out the number of generated .cranges. */ + if (new_cranges == 0) + { + sh64_elf_section_data (cranges)->cranges_growth = 0; + return; + } + + crangesp = cranges->contents + cranges->_raw_size; + + /* Now pass over the sections again, and make reloc orders for the new + .cranges entries. Constants are set as we go. */ + for (osec = output_bfd->sections; + osec != NULL; + osec = osec->next) + { + struct bfd_link_order *cr_addr_order = NULL; + enum sh64_elf_cr_type last_cr_type = CRT_NONE; + bfd_vma last_cr_size = 0; + bfd_vma continuation_vma = 0; + + /* Omit excluded or garbage-collected sections, and output sections + which were not marked as needing further processing. */ + if ((bfd_get_section_flags (output_bfd, osec) & SEC_EXCLUDE) != 0 + || (sh64_elf_section_data (osec)->contents_flags + != SHF_SH5_ISA32_MIXED)) + continue; + + { + LANG_FOR_EACH_INPUT_STATEMENT (f) + { + asection *isec; + + for (isec = f->the_bfd->sections; + isec != NULL; + isec = isec->next) + { + /* Allow only sections that have (at least initially) a + non-zero size, and are not excluded, and are not marked + as containing mixed data, thus already having .cranges + entries. */ + if (isec->output_section == osec + && isec->_raw_size != 0 + && (bfd_get_section_flags (isec->owner, isec) + & SEC_EXCLUDE) == 0 + && ((elf_section_data (isec)->this_hdr.sh_flags + & (SHF_SH5_ISA32 | SHF_SH5_ISA32_MIXED)) + != SHF_SH5_ISA32_MIXED)) + { + enum sh64_elf_cr_type cr_type; + bfd_vma cr_size; + bfd_vma isa_flags + = (elf_section_data (isec)->this_hdr.sh_flags + & (SHF_SH5_ISA32 | SHF_SH5_ISA32_MIXED)); + + if (isa_flags == SHF_SH5_ISA32) + cr_type = CRT_SH5_ISA32; + else if ((bfd_get_section_flags (isec->owner, isec) + & SEC_CODE) == 0) + cr_type = CRT_DATA; + else + cr_type = CRT_SH5_ISA16; + + cr_size + = (isec->_cooked_size + ? isec->_cooked_size : isec->_raw_size); + + /* Sections can be empty, like .text in a file that + only contains other sections. Ranges shouldn't be + emitted for them. This can presumably happen after + relaxing and is not be caught at the "raw size" + test above. */ + if (cr_size == 0) + continue; + + /* See if this is a continuation of the previous range + for the same output section. If so, just change + the size of the last range and continue. */ + if (cr_type == last_cr_type + && (continuation_vma + == osec->vma + isec->output_offset)) + { + last_cr_size += cr_size; + bfd_put_32 (output_bfd, last_cr_size, + crangesp - SH64_CRANGE_SIZE + + SH64_CRANGE_CR_SIZE_OFFSET); + + continuation_vma += cr_size; + continue; + } + + /* If we emit relocateable contents, we need a + relocation for the start address. */ + if (link_info.relocateable || link_info.emitrelocations) + { + /* FIXME: We could perhaps use lang_add_reloc and + friends here, but I'm not really sure that + would leave us free to do some optimizations + later. */ + cr_addr_order + = bfd_new_link_order (output_bfd, cranges); + + if (cr_addr_order == NULL) + { + einfo (_("%P%F: bfd_new_link_order failed\n")); + return; + } + + cr_addr_order->type = bfd_section_reloc_link_order; + cr_addr_order->offset + = (cranges->output_offset + + crangesp + SH64_CRANGE_CR_ADDR_OFFSET + - cranges->contents); + cr_addr_order->size = 4; + cr_addr_order->u.reloc.p + = ((struct bfd_link_order_reloc *) + xmalloc (sizeof (struct bfd_link_order_reloc))); + + cr_addr_order->u.reloc.p->reloc = BFD_RELOC_32; + cr_addr_order->u.reloc.p->u.section = osec; + + /* Since SH, unlike normal RELA-targets, uses a + "partial inplace" REL-like relocation for this, + we put the addend in the contents and specify 0 + for the reloc. */ + bfd_put_32 (output_bfd, isec->output_offset, + crangesp + SH64_CRANGE_CR_ADDR_OFFSET); + cr_addr_order->u.reloc.p->addend = 0; + + /* We must update the number of relocations here, + since the elf linker does not take link orders + into account when setting header sizes. The + actual relocation orders are however executed + correctly. */ + elf_section_data(cranges)->rel_count++; + } + else + bfd_put_32 (output_bfd, + osec->vma + isec->output_offset, + crangesp + SH64_CRANGE_CR_ADDR_OFFSET); + + /* If we could make a reloc for cr_size we would do + it, but we would have to have a symbol for the size + of the _input_ section and there's no way to + generate that. */ + bfd_put_32 (output_bfd, cr_size, + crangesp + SH64_CRANGE_CR_SIZE_OFFSET); + + bfd_put_16 (output_bfd, (bfd_vma) cr_type, + crangesp + SH64_CRANGE_CR_TYPE_OFFSET); + + last_cr_type = cr_type; + last_cr_size = cr_size; + continuation_vma + = osec->vma + isec->output_offset + cr_size; + crangesp += SH64_CRANGE_SIZE; + } + } + } + } + } + + /* The .cranges section will have this size, no larger or smaller. + Since relocs (if relocateable linking) will be emitted into the + "extended" size, we must set the raw size to the total. We have to + keep track of the number of new .cranges entries. + + Sorting before writing is done by sh64_elf_final_write_processing. */ + + cranges->_cooked_size = crangesp - cranges->contents; + sh64_elf_section_data (cranges)->cranges_growth + = cranges->_cooked_size - cranges->_raw_size; + cranges->_raw_size = cranges->_cooked_size; +} diff --git a/ld/po/ld.pot b/ld/po/ld.pot index e9daf04..4bb918d 100644 --- a/ld/po/ld.pot +++ b/ld/po/ld.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-01-31 17:09+0000\n" +"POT-Creation-Date: 2002-02-08 04:11-0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -271,7 +271,7 @@ msgstr "" msgid "Errors encountered processing file %s for interworking" msgstr "" -#: emultempl/pe.em:1297 ldlang.c:2050 ldlang.c:4441 ldlang.c:4474 +#: emultempl/pe.em:1297 ldlang.c:2049 ldlang.c:4440 ldlang.c:4473 #: ldmain.c:1069 msgid "%P%F: bfd_link_hash_lookup failed: %E\n" msgstr "" @@ -478,206 +478,206 @@ msgstr "" msgid "%P%F: cannot represent machine `%s'\n" msgstr "" -#: ldlang.c:771 +#: ldlang.c:770 msgid "" "\n" "Memory Configuration\n" "\n" msgstr "" -#: ldlang.c:773 +#: ldlang.c:772 msgid "Name" msgstr "" -#: ldlang.c:773 +#: ldlang.c:772 msgid "Origin" msgstr "" -#: ldlang.c:773 +#: ldlang.c:772 msgid "Length" msgstr "" -#: ldlang.c:773 +#: ldlang.c:772 msgid "Attributes" msgstr "" -#: ldlang.c:815 +#: ldlang.c:814 msgid "" "\n" "Linker script and memory map\n" "\n" msgstr "" -#: ldlang.c:832 +#: ldlang.c:831 msgid "%P%F: Illegal use of `%s' section\n" msgstr "" -#: ldlang.c:842 +#: ldlang.c:841 msgid "%P%F: output format %s cannot represent section called %s\n" msgstr "" -#: ldlang.c:1004 +#: ldlang.c:1003 msgid "%P: %B: warning: ignoring duplicate section `%s'\n" msgstr "" -#: ldlang.c:1007 +#: ldlang.c:1006 msgid "%P: %B: warning: ignoring duplicate `%s' section symbol `%s'\n" msgstr "" -#: ldlang.c:1021 +#: ldlang.c:1020 msgid "%P: %B: warning: duplicate section `%s' has different size\n" msgstr "" -#: ldlang.c:1069 +#: ldlang.c:1068 msgid "%P%F: Failed to create hash table\n" msgstr "" -#: ldlang.c:1484 +#: ldlang.c:1483 msgid "%B: file not recognized: %E\n" msgstr "" -#: ldlang.c:1485 +#: ldlang.c:1484 msgid "%B: matching formats:" msgstr "" -#: ldlang.c:1492 +#: ldlang.c:1491 msgid "%F%B: file not recognized: %E\n" msgstr "" -#: ldlang.c:1548 +#: ldlang.c:1547 msgid "%F%B: member %B in archive is not an object\n" msgstr "" -#: ldlang.c:1559 ldlang.c:1573 +#: ldlang.c:1558 ldlang.c:1572 msgid "%F%B: could not read symbols: %E\n" msgstr "" -#: ldlang.c:1834 +#: ldlang.c:1833 msgid "" "%P: warning: could not find any targets that match endianness requirement\n" msgstr "" -#: ldlang.c:1847 +#: ldlang.c:1846 msgid "%P%F: target %s not found\n" msgstr "" -#: ldlang.c:1849 +#: ldlang.c:1848 msgid "%P%F: cannot open output file %s: %E\n" msgstr "" -#: ldlang.c:1859 +#: ldlang.c:1858 msgid "%P%F:%s: can not make object file: %E\n" msgstr "" -#: ldlang.c:1863 +#: ldlang.c:1862 msgid "%P%F:%s: can not set architecture: %E\n" msgstr "" -#: ldlang.c:1867 +#: ldlang.c:1866 msgid "%P%F: can not create link hash table: %E\n" msgstr "" -#: ldlang.c:2169 +#: ldlang.c:2168 msgid " load address 0x%V" msgstr "" -#: ldlang.c:2299 +#: ldlang.c:2298 msgid "%W (size before relaxing)\n" msgstr "" -#: ldlang.c:2381 +#: ldlang.c:2380 #, c-format msgid "Address of section %s set to " msgstr "" -#: ldlang.c:2535 +#: ldlang.c:2534 #, c-format msgid "Fail with %d\n" msgstr "" -#: ldlang.c:2777 +#: ldlang.c:2776 msgid "%X%P: section %s [%V -> %V] overlaps section %s [%V -> %V]\n" msgstr "" -#: ldlang.c:2806 +#: ldlang.c:2805 msgid "%X%P: address 0x%v of %B section %s is not within region %s\n" msgstr "" -#: ldlang.c:2814 +#: ldlang.c:2813 msgid "%X%P: region %s is full (%B section %s)\n" msgstr "" -#: ldlang.c:2864 +#: ldlang.c:2863 msgid "%P%X: Internal error on COFF shared library section %s\n" msgstr "" -#: ldlang.c:2906 +#: ldlang.c:2905 msgid "%P: warning: no memory region specified for section `%s'\n" msgstr "" -#: ldlang.c:2921 +#: ldlang.c:2920 msgid "%P: warning: changing start of section %s by %u bytes\n" msgstr "" -#: ldlang.c:2935 +#: ldlang.c:2934 msgid "%F%S: non constant address expression for section %s\n" msgstr "" -#: ldlang.c:2999 +#: ldlang.c:2998 msgid "%X%P: use an absolute load address or a load memory region, not both\n" msgstr "" -#: ldlang.c:3114 +#: ldlang.c:3113 msgid "%P%F: can't relax section: %E\n" msgstr "" -#: ldlang.c:3273 +#: ldlang.c:3272 msgid "%F%P: invalid data statement\n" msgstr "" -#: ldlang.c:3310 +#: ldlang.c:3309 msgid "%F%P: invalid reloc statement\n" msgstr "" -#: ldlang.c:3448 +#: ldlang.c:3447 msgid "%P%F:%s: can't set start address\n" msgstr "" -#: ldlang.c:3461 ldlang.c:3478 +#: ldlang.c:3460 ldlang.c:3477 msgid "%P%F: can't set start address\n" msgstr "" -#: ldlang.c:3473 +#: ldlang.c:3472 msgid "%P: warning: cannot find entry symbol %s; defaulting to %V\n" msgstr "" -#: ldlang.c:3483 +#: ldlang.c:3482 msgid "%P: warning: cannot find entry symbol %s; not setting start address\n" msgstr "" -#: ldlang.c:3525 +#: ldlang.c:3524 msgid "" "%P: warning: %s architecture of input file `%B' is incompatible with %s " "output\n" msgstr "" -#: ldlang.c:3538 +#: ldlang.c:3537 msgid "" "%P%F: Relocatable linking with relocations from format %s (%B) to format %s " "(%B) is not supported\n" msgstr "" -#: ldlang.c:3558 +#: ldlang.c:3557 msgid "%E%X: failed to merge target specific data of file %B\n" msgstr "" -#: ldlang.c:3647 +#: ldlang.c:3646 msgid "" "\n" "Allocating common symbols\n" msgstr "" -#: ldlang.c:3648 +#: ldlang.c:3647 msgid "" "Common symbol size file\n" "\n" @@ -686,48 +686,48 @@ msgstr "" #. This message happens when using the #. svr3.ifile linker script, so I have #. disabled it. -#: ldlang.c:3730 +#: ldlang.c:3729 msgid "%P: no [COMMON] command, defaulting to .bss\n" msgstr "" -#: ldlang.c:3789 +#: ldlang.c:3788 msgid "%P%F: invalid syntax in flags\n" msgstr "" -#: ldlang.c:4390 +#: ldlang.c:4389 msgid "%P%Fmultiple STARTUP files\n" msgstr "" -#: ldlang.c:4658 +#: ldlang.c:4657 msgid "%F%P: bfd_record_phdr failed: %E\n" msgstr "" -#: ldlang.c:4677 +#: ldlang.c:4676 msgid "%X%P: section `%s' assigned to non-existent phdr `%s'\n" msgstr "" -#: ldlang.c:5003 +#: ldlang.c:5002 msgid "%X%P: unknown language `%s' in version information\n" msgstr "" -#: ldlang.c:5055 +#: ldlang.c:5054 msgid "" "%X%P: anonymous version tag cannot be combined with other version tags\n" msgstr "" -#: ldlang.c:5062 +#: ldlang.c:5061 msgid "%X%P: duplicate version tag `%s'\n" msgstr "" -#: ldlang.c:5075 ldlang.c:5088 +#: ldlang.c:5074 ldlang.c:5087 msgid "%X%P: duplicate expression `%s' in version information\n" msgstr "" -#: ldlang.c:5130 +#: ldlang.c:5129 msgid "%X%P: unable to find version dependency `%s'\n" msgstr "" -#: ldlang.c:5152 +#: ldlang.c:5151 msgid "%X%P: unable to read .exports section contents\n" msgstr "" -- 2.7.4