From e2ce1e4a4173cc5ddba48e83d74faef7c0738ed8 Mon Sep 17 00:00:00 2001
From: DJ Delorie <dj@redhat.com>
Date: Fri, 21 Nov 2008 15:04:35 +0000
Subject: [PATCH] merge from gcc

---
 libiberty/ChangeLog    |  7 -------
 libiberty/config.h-vms | 21 +++++++++++++--------
 libiberty/makefile.vms | 13 +++++--------
 3 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index ff319c7cfd3..fd9d3000217 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,10 +1,3 @@
-2008-11-21  Tristan Gingold  <gingold@adacore.com>
-
-	* makefile.vms (OBJS): Update objects list.
-	(CFLAGS): Update.
-	(libiberty.olb): Remove alloca-conf.h dependency.
-	* config.h-vms: Use new macro sets, use builtin alloca.
-	
 2008-10-22  Daniel Jacobowitz  <dan@codesourcery.com>
 
 	* Makefile.in (CPPFLAGS): Define.
diff --git a/libiberty/config.h-vms b/libiberty/config.h-vms
index 1c0824cb130..ccac6a2bcc7 100644
--- a/libiberty/config.h-vms
+++ b/libiberty/config.h-vms
@@ -1,8 +1,13 @@
-#define HAVE_SYS_STAT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRING_H 1
-#define HAVE_LIMITS_H 1
-#define HAVE_UNISTD_H 1
-#define HAVE_TIMES 1
-#include <builtins.h>
-#define C_alloca __ALLOCA
\ No newline at end of file
+#ifndef NEED_strerror
+#define NEED_strerror
+#endif
+#ifndef NEED_basename
+#define NEED_basename
+#endif
+#ifndef NEED_psignal
+#define NEED_psignal
+#endif
+#ifndef NEED_on_exit
+#define NEED_on_exit
+#endif
+
diff --git a/libiberty/makefile.vms b/libiberty/makefile.vms
index 15d80f8aa56..6a7dd45718e 100644
--- a/libiberty/makefile.vms
+++ b/libiberty/makefile.vms
@@ -8,21 +8,18 @@
 #
 
 OBJS=bcopy.obj,bcmp.obj,getopt.obj,obstack.obj,xexit.obj,xmalloc.obj,hex.obj,\
-    getopt1.obj,cplus-dem.obj,cp-demangle.obj,cp-demint.obj,\
-    asprintf.obj vasprintf.obj,mkstemps.obj,\
-    concat.obj,getruntime.obj,getpagesize.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,unlink-if-ordinary.obj
+   getopt1.obj,cplus-dem.obj,strncasecmp.obj,strcasecmp.obj,strdup.obj,\
+   concat.obj,getruntime.obj,getpagesize.obj,alloca.obj,xstrerror.obj,\
+   xmemdup.obj,xstrdup.obj,xatexit.obj,choose-temp.obj,fnmatch.obj,objalloc.obj
 
 ifeq ($(CC),gcc)
 CFLAGS=/include=([],[-.include])
 else
 # assume dec c
-CFLAGS=/noopt/debug/include=([],[-.include])/warnings=disable=(missingreturn)/name=(as_is,shortened)/define=(HAVE_CONFIG_H=1)/prefix=(all,except=("getopt","optarg","optopt","optind","opterr"))
+CFLAGS=/noopt/debug/include=([],[-.include])/define=("const=")/warnings=disable=(missingreturn,implicitfunc)
 endif
 
-libiberty.olb: config.h $(OBJS)
+libiberty.olb: config.h alloca-conf.h $(OBJS)
 	purge
 	lib/create libiberty *.obj
 
-- 
2.30.2