diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 41711f429d8..b67bf86c0d6 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,9 @@
+2009-09-21  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	* env.c [__alpha__ && __osf__] (_BSD): Define.
+	* init.c [__alpha__ && __osf__] (__gnat_error_handler): Cast msg
+	to const char *.
+
 2009-09-18  Pascal Obry  <obry@adacore.com>
 
 	* mingw32.h: Activate Unicode support for x86-64 Windows platform.
diff --git a/gcc/ada/env.c b/gcc/ada/env.c
index bcb8bdb9a80..ac6e835df9f 100644
--- a/gcc/ada/env.c
+++ b/gcc/ada/env.c
@@ -29,6 +29,11 @@
  *                                                                          *
  ****************************************************************************/
 
+/* Tru64 UNIX <stdlib.h> declares unsetenv() only if _BSD.  */
+#if defined (__alpha__) && defined (__osf__)
+#define _BSD
+#endif
+
 #ifdef IN_RTS
 #include "tconfig.h"
 #include "tsystem.h"
diff --git a/gcc/ada/init.c b/gcc/ada/init.c
index dff21ef7410..5fe46cd0ff2 100644
--- a/gcc/ada/init.c
+++ b/gcc/ada/init.c
@@ -376,7 +376,7 @@ __gnat_error_handler
     }
 
   recurse = 0;
-  Raise_From_Signal_Handler (exception, (char *) msg);
+  Raise_From_Signal_Handler (exception, (const char *) msg);
 }
 
 void