From 77495bbfbf6b24069a0a541005fa5c9dda2efd4f Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Tue, 1 Sep 2009 14:27:38 +0000
Subject: [PATCH] merge from gcc

---
 libiberty/ChangeLog    | 6 ------
 libiberty/makefile.vms | 4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 3950158793d..8698a2d3acc 100644
--- 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 e273cf03ca1..2f45f69a2ae 100644
--- 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])
-- 
GitLab