From 56ae5eb977ae79f8555e92cb64e2f94a15f29826 Mon Sep 17 00:00:00 2001
From: Tristan Gingold <gingold@adacore.com>
Date: Mon, 25 May 2009 13:27:56 +0000
Subject: [PATCH] 2009-05-25  Tristan Gingold  <gingold@adacore.com>

	* makefile.vms: New file to compile gas on VMS.

	* configure.com: New file to do configuration on VMS with DCL.
---
 libiberty/ChangeLog    | 10 ++++++++++
 libiberty/config.h-vms | 22 ++++++++++------------
 libiberty/makefile.vms | 18 ++++++++++++------
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 5b36aa2489..850979abb9 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,13 @@
+2009-05-25  Tristan Gingold  <gingold@adacore.com>
+
+	* config.h-vms: Rewritten.  Define configure macros.
+	Use DEC-C builtin alloca.
+
+	* makefile.vms (OBJS): Update list.
+	(OPT): New variable.
+	(CFLAGS): Update compilation flags.
+	(libiberty.olb): Do not depend on alloca-conf.h anymore.
+
 2009-05-19  Ian Lance Taylor  <iant@google.com>
 	    Ben Elliston  <bje@au.ibm.com>
 
diff --git a/libiberty/config.h-vms b/libiberty/config.h-vms
index ccac6a2bcc..d84453101e 100644
--- a/libiberty/config.h-vms
+++ b/libiberty/config.h-vms
@@ -1,13 +1,11 @@
-#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
+/* This is -*- C -*-  */
+#define HAVE_STDLIB_H 1
+#define HAVE_UNISTD_H 1
+#define HAVE_STRING_H 1
+#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_TIME_H 1
 
+/* Cheat: use vms builtin alloca.  */
+#ifdef __DECC
+#define C_alloca(x) __ALLOCA(x)
+#endif
diff --git a/libiberty/makefile.vms b/libiberty/makefile.vms
index 6a7dd45718..2f45f69a2a 100644
--- a/libiberty/makefile.vms
+++ b/libiberty/makefile.vms
@@ -7,19 +7,25 @@
 #
 #
 
-OBJS=bcopy.obj,bcmp.obj,getopt.obj,obstack.obj,xexit.obj,xmalloc.obj,hex.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
+OBJS=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,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,unlink-if-ordinary.obj
 
 ifeq ($(CC),gcc)
 CFLAGS=/include=([],[-.include])
 else
 # assume dec c
-CFLAGS=/noopt/debug/include=([],[-.include])/define=("const=")/warnings=disable=(missingreturn,implicitfunc)
+OPT=/noopt/debug/warnings=disable=(missingreturn)
+CFLAGS=$(OPT)/include=([],[-.include])/name=(as_is,shortened)\
+ /define=(HAVE_CONFIG_H=1)\
+ /prefix=(all,except=("getopt","optarg","optopt","optind","opterr"))
 endif
 
-libiberty.olb: config.h alloca-conf.h $(OBJS)
+libiberty.olb: config.h $(OBJS)
 	purge
 	lib/create libiberty *.obj