bfd/:

2009-09-07  Tristan Gingold  <gingold@adacore.com>

	* bfd.m4 (BFD_HAVE_TIME_TYPE_MEMBER,
	BFD_HAVE_SYS_STAT_TYPE_MEMBER): Moved to gas/acinclude.m4
	* configure.in: Move tests for tm_gmtoff, st_mtim.tv_sec and
	st_mtim.tv_nsec to gas/configure.in
	(bfd_elf64_ia64_vms_vec): Remove vmsutil.lo
	* configure: Regenerate.
	* config.in: Regenerate.
	* vmsutil.c: Moved to gas/config/te-vms.c
	* vmsutil.h: Removed.
	* Makefile.am (BFD32_BACKENDS_CFILES): Remove vmsutil.c
	(BFD32_BACKENDS): Remove vmsutil.lo
	* Makefile.in: Regenerate.

gas/:
2009-09-07  Tristan Gingold  <gingold@adacore.com>

	* Makefile.am (TARG_ENV_CFILES): New variable.  Set to te-vms.c
	(POTFILES): Add $(TARG_ENV_CFILES) in definition.
	(EXTRA_as_new_SOURCES): Ditto.
	* Makefile: Regenerate.
	* acinclude.m4 (BFD_HAVE_TIME_TYPE_MEMBER,
	BFD_HAVE_SYS_STAT_TYPE_MEMBER): New macro created from bfd/bfd.m4.
	* configure.in: Add Tests for tm_gmtoff, st_mtim.tv_sec and
	st_mtim.tv_nsec (from bfd/configure.in).  Check for time.h and
	sys/stat.h headers.
	Add te-vms.o in extra_objects if te_file is vms.
	* configure: Regenerate.
	* config.in: Regenerate.
	* config/te-vms.c: New file, from bfd/vmsutil.c
	(vms_dwarf2_file_time_name, vms_dwarf2_file_size_name)
	(vms_dwarf2_file_name): New functions.
	(vms_file_stats_name): Make it static, add a dirname parameter to
	locally create the full pathname.
	* config/te-vms.h: Add a copyright header.
	Declare the above functions.
	(DWARF2_FILE_TIME_NAME, DWARF2_FILE_SIZE_NAME, DWARF2_FILE_NAME): Use
	the above functions in the definition.
	* makefile.vms (OBJS): Add te-vms.obj.
	(te-vms.obj): Create a specific target.
	* configure.com: Create targ-env.h using a per target value.
	Compile te-vms.c for ia64.

9 files changed, 18 insertions, 503 deletions

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 5668d91..e79185c 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,18 @@
+2009-09-07  Tristan Gingold  <gingold@adacore.com>
+
+	* bfd.m4 (BFD_HAVE_TIME_TYPE_MEMBER,
+	BFD_HAVE_SYS_STAT_TYPE_MEMBER): Moved to gas/acinclude.m4
+	* configure.in: Move tests for tm_gmtoff, st_mtim.tv_sec and
+	st_mtim.tv_nsec to gas/configure.in
+	(bfd_elf64_ia64_vms_vec): Remove vmsutil.lo
+	* configure: Regenerate.
+	* config.in: Regenerate.
+	* vmsutil.c: Moved to gas/config/te-vms.c
+	* vmsutil.h: Removed.
+	* Makefile.am (BFD32_BACKENDS_CFILES): Remove vmsutil.c
+	(BFD32_BACKENDS): Remove vmsutil.lo
+	* Makefile.in: Regenerate.
+
 2009-09-05  Eli Zaretskii  <eliz@gnu.org>
 
 	* coffcode.h: Include libiberty.h.
@@ -822,7 +837,7 @@
 	BFD_HAVE_SYS_STAT_TYPE_MEMBER): New config functions.
 	* configure.in: Use them.
 	* configure: Regenerate.
-	* config.in: Regnerate.
+	* config.in: Regenerate.
 	* vmsutil.c: Include sysdep.h, remove ansidecl.h.
 	#define _BSD_SOURCE. Add comments.
 	(vms_file_stats_name): Calculate creation date based on available
diff --git a/bfd/Makefile.am b/bfd/Makefile.am
index f6142dc..13ace29 100644
--- a/bfd/Makefile.am
+++ b/bfd/Makefile.am
@@ -390,7 +390,6 @@ BFD32_BACKENDS = \
 	vms-misc.lo \
 	vms-tir.lo \
 	vms.lo \
-	vmsutil.lo \
 	xcofflink.lo \
 	xsym.lo \
 	xtensa-isa.lo \
@@ -573,7 +572,6 @@ BFD32_BACKENDS_CFILES = \
 	vms-misc.c \
 	vms-tir.c \
 	vms.c \
-	vmsutil.c \
 	xcofflink.c \
 	xsym.c \
 	xtensa-isa.c \
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 04e2316..721069f 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -686,7 +686,6 @@ BFD32_BACKENDS = \
 	vms-misc.lo \
 	vms-tir.lo \
 	vms.lo \
-	vmsutil.lo \
 	xcofflink.lo \
 	xsym.lo \
 	xtensa-isa.lo \
@@ -869,7 +868,6 @@ BFD32_BACKENDS_CFILES = \
 	vms-misc.c \
 	vms-tir.c \
 	vms.c \
-	vmsutil.c \
 	xcofflink.c \
 	xsym.c \
 	xtensa-isa.c \
@@ -1477,7 +1475,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vms-misc.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vms-tir.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vms.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/vmsutil.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xcofflink.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xsym.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xtensa-isa.Plo@am__quote@
diff --git a/bfd/bfd.m4 b/bfd/bfd.m4
index 96f03d4..55cc2be 100644
--- a/bfd/bfd.m4
+++ b/bfd/bfd.m4
@@ -39,40 +39,3 @@ AC_DEFUN([BFD_HAVE_SYS_PROCFS_TYPE_MEMBER],
  AC_MSG_RESULT($bfd_cv_have_sys_procfs_type_member_$1_$2)
 ])
 
-dnl Check for existence of member $2 in type $1 in time.h
-
-AC_DEFUN([BFD_HAVE_TIME_TYPE_MEMBER],
-[AC_MSG_CHECKING([for $1.$2 in time.h])
- AC_CACHE_VAL(bfd_cv_have_time_type_member_$2,
-   [AC_TRY_COMPILE([
-#define _BSD_SOURCE 1
-#include <time.h>],
-      [$1 avar; void* aref = (void*) &avar.$2],
-      bfd_cv_have_time_type_member_$2=yes,
-      bfd_cv_have_time_type_member_$2=no
-   )])
- if test $bfd_cv_have_time_type_member_$2 = yes; then
-   AC_DEFINE([HAVE_]translit($2, [a-z], [A-Z]), 1,
-	     [Define if <time.h> has $1.$2.])
- fi
- AC_MSG_RESULT($bfd_cv_have_time_type_member_$2)
-])
-
-dnl Check for existence of member $2.$3 in type $1 in sys/stat.h
-
-AC_DEFUN([BFD_HAVE_SYS_STAT_TYPE_MEMBER],
-[AC_MSG_CHECKING([for $1.$2.$3 in sys/stat.h])
- AC_CACHE_VAL(bfd_cv_have_sys_stat_type_member_$2_$3,
-   [AC_TRY_COMPILE([
-#define _BSD_SOURCE 1
-#include <sys/stat.h>],
-      [$1 avar; void* aref = (void*) &avar.$2.$3],
-      bfd_cv_have_sys_stat_type_member_$2_$3=yes,
-      bfd_cv_have_sys_stat_type_member_$2_$3=no
-   )])
- if test $bfd_cv_have_sys_stat_type_member_$2_$3 = yes; then
-   AC_DEFINE([HAVE_]translit($2, [a-z], [A-Z])[_]translit($3, [a-z], [A-Z]), 1,
-	     [Define if <sys/stat.h> has $1.$2.$3])
- fi
- AC_MSG_RESULT($bfd_cv_have_sys_stat_type_member_$2_$3)
-])
diff --git a/bfd/config.in b/bfd/config.in
index f70f2b3..3cb2bfc 100644
--- a/bfd/config.in
+++ b/bfd/config.in
@@ -192,12 +192,6 @@
 /* Define if struct core_dumpx has member c_impl */
 #undef HAVE_ST_C_IMPL
 
-/* Define if <sys/stat.h> has struct stat.st_mtim.tv_nsec */
-#undef HAVE_ST_MTIM_TV_NSEC
-
-/* Define if <sys/stat.h> has struct stat.st_mtim.tv_sec */
-#undef HAVE_ST_MTIM_TV_SEC
-
 /* Define to 1 if you have the `sysconf' function. */
 #undef HAVE_SYSCONF
 
@@ -227,9 +221,6 @@
 /* Define to 1 if you have the <time.h> header file. */
 #undef HAVE_TIME_H
 
-/* Define if <time.h> has struct tm.tm_gmtoff. */
-#undef HAVE_TM_GMTOFF
-
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
diff --git a/bfd/configure b/bfd/configure
index 0c06a60..865ef69 100755
--- a/bfd/configure
+++ b/bfd/configure
@@ -13583,119 +13583,6 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-# Support for VMS timestamps via cross compile
-
-if test "$ac_cv_header_time_h" = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct tm.tm_gmtoff in time.h" >&5
-$as_echo_n "checking for struct tm.tm_gmtoff in time.h... " >&6; }
- if test "${bfd_cv_have_time_type_member_tm_gmtoff+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#define _BSD_SOURCE 1
-#include <time.h>
-int
-main ()
-{
-struct tm avar; void* aref = (void*) &avar.tm_gmtoff
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  bfd_cv_have_time_type_member_tm_gmtoff=yes
-else
-  bfd_cv_have_time_type_member_tm_gmtoff=no
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
- if test $bfd_cv_have_time_type_member_tm_gmtoff = yes; then
-
-$as_echo "#define HAVE_TM_GMTOFF 1" >>confdefs.h
-
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_time_type_member_tm_gmtoff" >&5
-$as_echo "$bfd_cv_have_time_type_member_tm_gmtoff" >&6; }
-
-fi
-
-if test "$ac_cv_header_sys_stat_h" = yes; then
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct stat.st_mtim.tv_sec in sys/stat.h" >&5
-$as_echo_n "checking for struct stat.st_mtim.tv_sec in sys/stat.h... " >&6; }
- if test "${bfd_cv_have_sys_stat_type_member_st_mtim_tv_sec+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#define _BSD_SOURCE 1
-#include <sys/stat.h>
-int
-main ()
-{
-struct stat avar; void* aref = (void*) &avar.st_mtim.tv_sec
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  bfd_cv_have_sys_stat_type_member_st_mtim_tv_sec=yes
-else
-  bfd_cv_have_sys_stat_type_member_st_mtim_tv_sec=no
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
- if test $bfd_cv_have_sys_stat_type_member_st_mtim_tv_sec = yes; then
-
-$as_echo "#define HAVE_ST_MTIM_TV_SEC 1" >>confdefs.h
-
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_stat_type_member_st_mtim_tv_sec" >&5
-$as_echo "$bfd_cv_have_sys_stat_type_member_st_mtim_tv_sec" >&6; }
-
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct stat.st_mtim.tv_nsec in sys/stat.h" >&5
-$as_echo_n "checking for struct stat.st_mtim.tv_nsec in sys/stat.h... " >&6; }
- if test "${bfd_cv_have_sys_stat_type_member_st_mtim_tv_nsec+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#define _BSD_SOURCE 1
-#include <sys/stat.h>
-int
-main ()
-{
-struct stat avar; void* aref = (void*) &avar.st_mtim.tv_nsec
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  bfd_cv_have_sys_stat_type_member_st_mtim_tv_nsec=yes
-else
-  bfd_cv_have_sys_stat_type_member_st_mtim_tv_nsec=no
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
- if test $bfd_cv_have_sys_stat_type_member_st_mtim_tv_nsec = yes; then
-
-$as_echo "#define HAVE_ST_MTIM_TV_NSEC 1" >>confdefs.h
-
- fi
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $bfd_cv_have_sys_stat_type_member_st_mtim_tv_nsec" >&5
-$as_echo "$bfd_cv_have_sys_stat_type_member_st_mtim_tv_nsec" >&6; }
-
-fi
-
 # Link in zlib if we can.  This allows us to read compressed debug sections.
 # This is used only by compress.c.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing zlibVersion" >&5
@@ -15023,7 +14910,7 @@ do
     bfd_elf64_ia64_big_vec)	tb="$tb elf64-ia64.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_ia64_hpux_big_vec) tb="$tb elf64-ia64.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_ia64_little_vec)	tb="$tb elf64-ia64.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_ia64_vms_vec)	tb="$tb elf64-ia64.lo elf64.lo $elf vmsutil.lo"; target_size=64 ;;
+    bfd_elf64_ia64_vms_vec)	tb="$tb elf64-ia64.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_little_generic_vec) tb="$tb elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_littlemips_vec) 	tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
     bfd_elf64_mmix_vec) 	tb="$tb elf64-mmix.lo elf64.lo $elf" target_size=64 ;;
diff --git a/bfd/configure.in b/bfd/configure.in
index a3cc89a..bf4dc6c 100644
--- a/bfd/configure.in
+++ b/bfd/configure.in
@@ -223,17 +223,6 @@ AC_CHECK_DECLS(strstr)
 AC_CHECK_DECLS(snprintf)
 AC_CHECK_DECLS(vsnprintf)
 
-# Support for VMS timestamps via cross compile
-
-if test "$ac_cv_header_time_h" = yes; then
-  BFD_HAVE_TIME_TYPE_MEMBER(struct tm, tm_gmtoff)
-fi
-
-if test "$ac_cv_header_sys_stat_h" = yes; then
-    BFD_HAVE_SYS_STAT_TYPE_MEMBER(struct stat, st_mtim, tv_sec)
-    BFD_HAVE_SYS_STAT_TYPE_MEMBER(struct stat, st_mtim, tv_nsec)
-fi
-
 # Link in zlib if we can.  This allows us to read compressed debug sections.
 # This is used only by compress.c.
 AC_SEARCH_LIBS(zlibVersion, z, [AC_CHECK_HEADERS(zlib.h)])
@@ -809,7 +798,7 @@ do
     bfd_elf64_ia64_big_vec)	tb="$tb elf64-ia64.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_ia64_hpux_big_vec) tb="$tb elf64-ia64.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_ia64_little_vec)	tb="$tb elf64-ia64.lo elf64.lo $elf"; target_size=64 ;;
-    bfd_elf64_ia64_vms_vec)	tb="$tb elf64-ia64.lo elf64.lo $elf vmsutil.lo"; target_size=64 ;;
+    bfd_elf64_ia64_vms_vec)	tb="$tb elf64-ia64.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_little_generic_vec) tb="$tb elf64-gen.lo elf64.lo $elf"; target_size=64 ;;
     bfd_elf64_littlemips_vec) 	tb="$tb elf64-mips.lo elf64.lo elfxx-mips.lo elf-vxworks.lo elf32.lo $elf ecofflink.lo"; target_size=64 ;;
     bfd_elf64_mmix_vec) 	tb="$tb elf64-mmix.lo elf64.lo $elf" target_size=64 ;;
diff --git a/bfd/vmsutil.c b/bfd/vmsutil.c
deleted file mode 100644
index 3dbfb8c..0000000
--- a/bfd/vmsutil.c
+++ /dev/null
@@ -1,305 +0,0 @@
-/* vmsutil.c -- Utilities for VMS.
-   Copyright 2009 Free Software Foundation, Inc.
-
-   Written by Douglas B Rupp <rupp@gnat.com>
-
-   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 3 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#include "sysdep.h"
-#include "vmsutil.h"
-
-/* The purspose of the two alternate versions below is to have one that
-   works for native VMS and one that works on an NFS mounted filesystem
-   (Unix Server/VMS client).  The main issue being to generate the special
-   VMS file timestamps for the debug info.  */
-
-#ifdef VMS
-#define __NEW_STARLET 1
-#include <vms/starlet.h>
-#include <vms/rms.h>
-#include <vms/atrdef.h>
-#include <vms/fibdef.h>
-#include <vms/stsdef.h>
-#include <vms/iodef.h>
-#include <vms/fatdef.h>
-#include <errno.h>
-#include <vms/descrip.h>
-#include <string.h>
-#include <unixlib.h>
-
-#define MAXPATH 256
-
-/* Descrip.h doesn't have everything...  */
-typedef struct fibdef * __fibdef_ptr32 __attribute__ (( mode (SI) ));
-
-struct dsc$descriptor_fib
-{
-  unsigned int   fib$l_len;
-  __fibdef_ptr32 fib$l_addr;
-};
-
-/* I/O Status Block.  */
-struct IOSB
-{
-  unsigned short status, count;
-  unsigned int devdep;
-};
-
-static char *tryfile;
-
-/* Variable length string.  */
-struct vstring
-{
-  short length;
-  char string[NAM$C_MAXRSS+1];
-};
-
-static char filename_buff [MAXPATH];
-static char vms_filespec [MAXPATH];
-
-/* Callback function for filespec style conversion.  */
-
-static int
-translate_unix (char *name, int type ATTRIBUTE_UNUSED)
-{
-  strncpy (filename_buff, name, MAXPATH);
-  filename_buff [MAXPATH - 1] = (char) 0;
-  return 0;
-}
-
-/* Wrapper for DECC function that converts a Unix filespec
-   to VMS style filespec.  */
-
-static char *
-to_vms_file_spec (char *filespec)
-{
-  strncpy (vms_filespec, "", MAXPATH);
-  decc$to_vms (filespec, translate_unix, 1, 1);
-  strncpy (vms_filespec, filename_buff, MAXPATH);
-
-  vms_filespec [MAXPATH - 1] = (char) 0;
-
-  return vms_filespec;
-}
-
-#else /* not VMS */
-
-#define _BSD_SOURCE 1
-#include <sys/stat.h>
-#include <time.h>
-
-#define VMS_EPOCH_OFFSET        35067168000000000LL
-#define VMS_GRANULARITY_FACTOR  10000000
-
-#endif /* VMS */
-
-/* Return VMS file date, size, format, version given a name.  */
-
-int
-vms_file_stats_name (const char *filename,
-		     long long *cdt,
-		     long *siz,
-		     char *rfo,
-		     int *ver)
-{
-#ifdef VMS
-  struct FAB fab;
-  struct NAM nam;
-
-  unsigned long long create;
-  FAT recattr;
-  char ascnamebuff [256];
-
-  ATRDEF atrlst[]
-    = {
-      { ATR$S_CREDATE,  ATR$C_CREDATE,  &create },
-      { ATR$S_RECATTR,  ATR$C_RECATTR,  &recattr },
-      { ATR$S_ASCNAME,  ATR$C_ASCNAME,  &ascnamebuff },
-      { 0, 0, 0}
-    };
-
-  FIBDEF fib;
-  struct dsc$descriptor_fib fibdsc = {sizeof (fib), (void *) &fib};
-
-  struct IOSB iosb;
-
-  long status;
-  unsigned short chan;
-
-  struct vstring file;
-  struct dsc$descriptor_s filedsc
-    = {NAM$C_MAXRSS, DSC$K_DTYPE_T, DSC$K_CLASS_S, (void *) file.string};
-  struct vstring device;
-  struct dsc$descriptor_s devicedsc
-    = {NAM$C_MAXRSS, DSC$K_DTYPE_T, DSC$K_CLASS_S, (void *) device.string};
-  struct vstring result;
-  struct dsc$descriptor_s resultdsc
-    = {NAM$C_MAXRSS, DSC$K_DTYPE_VT, DSC$K_CLASS_VS, (void *) result.string};
-
-  if (strcmp (filename, "<internal>") == 0
-      || strcmp (filename, "<built-in>") == 0)
-    {
-      if (cdt)
-	*cdt = 0;
-
-      if (siz)
-	*siz = 0;
-
-      if (rfo)
-	*rfo = 0;
-
-      if (ver)
-        *ver = 0;
-
-      return 0;
-    }
-
-  tryfile = to_vms_file_spec ((char *) filename);
-
-  /* Allocate and initialize a FAB and NAM structures.  */
-  fab = cc$rms_fab;
-  nam = cc$rms_nam;
-
-  nam.nam$l_esa = file.string;
-  nam.nam$b_ess = NAM$C_MAXRSS;
-  nam.nam$l_rsa = result.string;
-  nam.nam$b_rss = NAM$C_MAXRSS;
-  fab.fab$l_fna = tryfile;
-  fab.fab$b_fns = strlen (tryfile);
-  fab.fab$l_nam = &nam;
-
-  /* Validate filespec syntax and device existence.  */
-  status = SYS$PARSE (&fab, 0, 0);
-  if ((status & 1) != 1)
-    return 1;
-
-  file.string[nam.nam$b_esl] = 0;
-
-  /* Find matching filespec.  */
-  status = SYS$SEARCH (&fab, 0, 0);
-  if ((status & 1) != 1)
-    return 1;
-
-  file.string[nam.nam$b_esl] = 0;
-  result.string[result.length=nam.nam$b_rsl] = 0;
-
-  /* Get the device name and assign an IO channel.  */
-  strncpy (device.string, nam.nam$l_dev, nam.nam$b_dev);
-  devicedsc.dsc$w_length  = nam.nam$b_dev;
-  chan = 0;
-  status = SYS$ASSIGN (&devicedsc, &chan, 0, 0, 0);
-  if ((status & 1) != 1)
-    return 1;
-
-  /* Initialize the FIB and fill in the directory id field.  */
-  memset (&fib, 0, sizeof (fib));
-  fib.fib$w_did[0]  = nam.nam$w_did[0];
-  fib.fib$w_did[1]  = nam.nam$w_did[1];
-  fib.fib$w_did[2]  = nam.nam$w_did[2];
-  fib.fib$l_acctl = 0;
-  fib.fib$l_wcc = 0;
-  strcpy (file.string, (strrchr (result.string, ']') + 1));
-  filedsc.dsc$w_length = strlen (file.string);
-  result.string[result.length = 0] = 0;
-
-  /* Open and close the file to fill in the attributes.  */
-  status
-    = SYS$QIOW (0, chan, IO$_ACCESS|IO$M_ACCESS, &iosb, 0, 0,
-		&fibdsc, &filedsc, &result.length, &resultdsc, &atrlst, 0);
-  if ((status & 1) != 1)
-    return 1;
-  if ((iosb.status & 1) != 1)
-    return 1;
-
-  result.string[result.length] = 0;
-  status = SYS$QIOW (0, chan, IO$_DEACCESS, &iosb, 0, 0, &fibdsc, 0, 0, 0,
-		     &atrlst, 0);
-  if ((status & 1) != 1)
-    return 1;
-  if ((iosb.status & 1) != 1)
-    return 1;
-
-  /* Deassign the channel and exit.  */
-  status = SYS$DASSGN (chan);
-  if ((status & 1) != 1)
-    return 1;
-
-  if (cdt) *cdt = create;
-  if (siz) *siz = (512 * 65536 * recattr.fat$w_efblkh) +
-                  (512 * (recattr.fat$w_efblkl - 1)) +
-                  recattr.fat$w_ffbyte;
-  if (rfo) *rfo = recattr.fat$v_rtype;
-  if (ver) *ver = strtol (strrchr (ascnamebuff, ';') + 1, 0, 10);
-#else /* not VMS */
-
-  struct stat buff;
-  struct tm *ts;
-  long long gmtoff, secs, nsecs;
-
-  if ((stat (filename, &buff)) != 0)
-     return 1;
-
-  if (cdt)
-    {
-      ts = localtime (& buff.st_mtime);
-
-#ifdef HAVE_TM_GMTOFF
-	gmtoff = ts->tm_gmtoff;
-#else
-	{
-	  extern long timezone;
-
-	  if (ts->tm_isdst == 1)
-	    gmtoff = - (timezone - 3600);
-	  else
-	    gmtoff = - timezone;
-	}
-#endif
-
-#ifdef HAVE_ST_MTIM_TV_SEC
-      secs = buff.st_mtim.tv_sec;
-#else
-      secs = buff.st_mtime;
-#endif
-
-#ifdef HAVE_ST_MTIM_TV_NSEC
-      nsecs = buff.st_mtim.tv_nsec;
-#else
-      nsecs = 0;
-#endif
-
-      /* VMS timestamps are stored in local time to 100 nsec accuracy, but by
-	 experiment I found timestamps truncated to (at least) microseconds
-	 on an NFS mounted filesystem, hence the adjustment below. DBR. */
-      *cdt = ((secs + gmtoff) * VMS_GRANULARITY_FACTOR)
-	+ (nsecs / 1000 * 10) + VMS_EPOCH_OFFSET;
-    }
-
-  if (siz)
-    *siz = buff.st_size;
-
-  if (rfo)
-    *rfo = 2; /* Stream LF format.  */
-
-  /* Returning a file version of 0 is never correct for debug info, version 1
-     will be correct if file editing is done only on the Unix side.  If editing
-     is done on the VMS side, then its TBD.  */
-  if (ver)
-    *ver = 1;
-#endif /* VMS */
-
-  return 0;
-}
-
diff --git a/bfd/vmsutil.h b/bfd/vmsutil.h
deleted file mode 100644
index 6eda572..0000000
--- a/bfd/vmsutil.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* vmsutil.h -- Header file for utilities for VMS.
-   Copyright 2009 Free Software Foundation, Inc.
-
-   Written by Douglas B Rupp <rupp@gnat.com>
-
-   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 3 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., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-extern int vms_file_stats_name (const char *, long long *, long *, char *, int *);