merge from gcc

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 3950158793db96f4e8651241e3fe1fa2c0cc6338..8698a2d3acc74347366dd847aa54b70a56c27742 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,9 +1,3 @@
-2009-09-01  Tristan Gingold  <gingold@adacore.com>
-
-       * makefile.vms (OBJS): Add stpcpy.
-       * configure.com: New file to create build.com DCL script for
-       Itanium VMS or Alpha VMS.
-
 2009-08-24  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        * configure.ac (AC_PREREQ): Bump to 2.64.

diff --git a/libiberty/makefile.vms b/libiberty/makefile.vms
index e273cf03ca12fa055d979595bbc4fcadf02d39e8..2f45f69a2aeb718a5a53f618aa34b11288bd083f 100644 (file)
--- a/libiberty/makefile.vms
+++ b/libiberty/makefile.vms
@@ -1,5 +1,5 @@
 #
-# Makefile for libiberty under openVMS
+# Makefile for libiberty under openVMS/Alpha
 #
 # For use with gnu-make for vms
 #
@@ -13,7 +13,7 @@ OBJS=getopt.obj,obstack.obj,xexit.obj,xmalloc.obj,hex.obj,\
     concat.obj,getruntime.obj,getpagesize.obj,getpwd.obj,xstrerror.obj,\
     xmemdup.obj,xstrdup.obj,xatexit.obj,choose-temp.obj,fnmatch.obj,\
     objalloc.obj,safe-ctype.obj,hashtab.obj,lbasename.obj,argv.obj,\
-    lrealpath.obj,make-temp-file.obj,stpcpy.obj,unlink-if-ordinary.obj
+    lrealpath.obj,make-temp-file.obj,unlink-if-ordinary.obj
 
 ifeq ($(CC),gcc)
 CFLAGS=/include=([],[-.include])