tsystem.h (CONST_CAST2, CONST_CAST): Define.

	gcc:
	* tsystem.h (CONST_CAST2, CONST_CAST): Define.

	gcc/ada:
	* init.c [__alpha__ && __osf__] (__gnat_error_handler): Use
	CONST_CAST.

From-SVN: r177427

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0087f0553851f6d51ab706573292a392de66b2c7..cb2adc82514be3203494dad5769a0a68e608cb78 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2011-08-05  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * tsystem.h (CONST_CAST2, CONST_CAST): Define.
+
 2011-08-05  Ira Rosen  <ira.rosen@linaro.org>
 
        * tree-vect-loop.c (vect_create_epilog_for_reduction): Use the

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index 6162166601ab536cc14f913ce1d413b77a0fa810..6a0b21d0c225716aeed3c6d21f09755dd5f9f2d2 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-05  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+       * init.c [__alpha__ && __osf__] (__gnat_error_handler): Use
+       CONST_CAST.
+
 2011-08-04  Ed Schonberg  <schonberg@adacore.com>
 
        * sem_util.ads, sem_unit.adb (Type_Without_Stream_Operation): determine

diff --git a/gcc/ada/init.c b/gcc/ada/init.c
index df0bb932ca7a588a25b5f83851d7310dca0e276d..a8a94269c33a0eae7169bf850389c7b8a100be51 100644 (file)
--- a/gcc/ada/init.c
+++ b/gcc/ada/init.c
@@ -379,7 +379,7 @@ __gnat_error_handler (int sig, siginfo_t *si, void *ucontext)
     }
 
   recurse = 0;
-  Raise_From_Signal_Handler (exception, (char *) msg);
+  Raise_From_Signal_Handler (exception, CONST_CAST (char *, msg));
 }
 
 void

diff --git a/gcc/tsystem.h b/gcc/tsystem.h
index fc7713c9d13990ae88a0c9d051569b66c09620ad..3a5f3c61649ce2e82b75a676406767ebe5d5233c 100644 (file)
--- a/gcc/tsystem.h
+++ b/gcc/tsystem.h
@@ -1,6 +1,7 @@
 /* Get common system includes and various definitions and declarations
    based on target macros.
-   Copyright (C) 2000, 2001, 2004, 2005, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2004, 2005, 2009, 2011
+   Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -128,6 +129,9 @@ extern int errno;
    unreachable default case of a switch.  Do not use gcc_assert(0).  */
 #define gcc_unreachable() (abort ())
 
+#define CONST_CAST2(TOTYPE,FROMTYPE,X) ((__extension__(union {FROMTYPE _q; TOTYPE _nq;})(X))._nq)
+#define CONST_CAST(TYPE,X) CONST_CAST2(TYPE, const TYPE, (X))
+
 /* Filename handling macros.  */
 #include "filenames.h"