From: Eric Botcazou Date: Fri, 21 Dec 2012 12:32:31 +0000 (+0000) Subject: adaint.c: Move directive around. X-Git-Tag: releases/gcc-4.8.0~1274 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8afd02aa6b640b7098bf40bbda3e72a14d3f07b3;p=thirdparty%2Fgcc.git adaint.c: Move directive around. * adaint.c: Move directive around. * argv.c: Likewise. * cio.c: Likewise. * cstreams.c: Likewise. * env.c: Likewise. * exit.c: Likewise. * init.c: Likewise. * initialize.c: Likewise. * raise.c: Likewise. * seh_init.c: Likewise. * targext.c: Likewise. From-SVN: r194660 --- diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 0c902a825ffe..f18c14653ea7 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,17 @@ +2012-12-21 Eric Botcazou + + * adaint.c: Move directive around. + * argv.c: Likewise. + * cio.c: Likewise. + * cstreams.c: Likewise. + * env.c: Likewise. + * exit.c: Likewise. + * init.c: Likewise. + * initialize.c: Likewise. + * raise.c: Likewise. + * seh_init.c: Likewise. + * targext.c: Likewise. + 2012-12-15 Eric Botcazou Martin Ettl diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c index eab3ea5fbae8..4b8ce5341eff 100644 --- a/gcc/ada/adaint.c +++ b/gcc/ada/adaint.c @@ -34,10 +34,6 @@ package Osint. Many of the subprograms in OS_Lib import standard library calls directly. This file contains all other routines. */ -#ifdef __cplusplus -extern "C" { -#endif - #ifdef __vxworks /* No need to redefine exit here. */ @@ -107,6 +103,10 @@ extern "C" { #include "version.h" #endif +#ifdef __cplusplus +extern "C" { +#endif + #if defined (__MINGW32__) #if defined (RTX) diff --git a/gcc/ada/argv.c b/gcc/ada/argv.c index 29f163972eaf..ebca8bbc09c8 100644 --- a/gcc/ada/argv.c +++ b/gcc/ada/argv.c @@ -42,10 +42,6 @@ main program, and these routines are accessed from the Ada.Command_Line.Environment package. */ -#ifdef __cplusplus -extern "C" { -#endif - #ifdef IN_RTS #include "tconfig.h" #include "tsystem.h" @@ -57,6 +53,10 @@ extern "C" { #include "adaint.h" +#ifdef __cplusplus +extern "C" { +#endif + /* argc and argv of the main program are saved under gnat_argc and gnat_argv, envp of the main program is saved under gnat_envp. */ diff --git a/gcc/ada/cio.c b/gcc/ada/cio.c index 2564e4d3c473..70b2550535be 100644 --- a/gcc/ada/cio.c +++ b/gcc/ada/cio.c @@ -29,10 +29,6 @@ * * ****************************************************************************/ -#ifdef __cplusplus -extern "C" { -#endif - #ifdef IN_RTS #include "tconfig.h" #include "tsystem.h" @@ -44,6 +40,10 @@ extern "C" { #include "adaint.h" +#ifdef __cplusplus +extern "C" { +#endif + /* Don't use macros on GNU/Linux since they cause incompatible changes between glibc 2.0 and 2.1 */ #ifdef linux diff --git a/gcc/ada/cstreams.c b/gcc/ada/cstreams.c index 894b056eaba1..b82fcdfa7559 100644 --- a/gcc/ada/cstreams.c +++ b/gcc/ada/cstreams.c @@ -31,10 +31,6 @@ /* Routines required for implementing routines in Interfaces.C.Streams. */ -#ifdef __cplusplus -extern "C" { -#endif - #ifdef __vxworks #include "vxWorks.h" #endif @@ -50,6 +46,10 @@ extern "C" { #include "adaint.h" +#ifdef __cplusplus +extern "C" { +#endif + #ifdef VMS #include #endif diff --git a/gcc/ada/env.c b/gcc/ada/env.c index 78328dc371b5..800d20748ece 100644 --- a/gcc/ada/env.c +++ b/gcc/ada/env.c @@ -29,10 +29,6 @@ * * ****************************************************************************/ -#ifdef __cplusplus -extern "C" { -#endif - #ifdef IN_RTS #include "tconfig.h" #include "tsystem.h" @@ -76,6 +72,10 @@ extern "C" { #include "system.h" #endif /* IN_RTS */ +#ifdef __cplusplus +extern "C" { +#endif + #if defined (__APPLE__) #include #endif diff --git a/gcc/ada/exit.c b/gcc/ada/exit.c index 47983e87ef7e..cf3f11d13213 100644 --- a/gcc/ada/exit.c +++ b/gcc/ada/exit.c @@ -29,10 +29,6 @@ * * ****************************************************************************/ -#ifdef __cplusplus -extern "C" { -#endif - #ifdef __alpha_vxworks #include "vxWorks.h" #endif @@ -48,6 +44,10 @@ extern "C" { #include "adaint.h" +#ifdef __cplusplus +extern "C" { +#endif + /* Routine used by Ada.Command_Line.Set_Exit_Status. */ int gnat_exit_status = 0; diff --git a/gcc/ada/init.c b/gcc/ada/init.c index 8a28bf68ab54..916c3befef4b 100644 --- a/gcc/ada/init.c +++ b/gcc/ada/init.c @@ -38,10 +38,6 @@ installed by this file are used to catch the resulting signals that come from these probes failing (i.e. touching protected pages). */ -#ifdef __cplusplus -extern "C" { -#endif - /* This file should be kept synchronized with 2sinit.ads, 2sinit.adb, s-init-ae653-cert.adb and s-init-xi-sparc.adb. All these files implement the required functionality for different targets. */ @@ -71,6 +67,10 @@ extern "C" { #include "adaint.h" #include "raise.h" +#ifdef __cplusplus +extern "C" { +#endif + extern void __gnat_raise_program_error (const char *, int); /* Addresses of exception data blocks for predefined exceptions. Tasking_Error diff --git a/gcc/ada/initialize.c b/gcc/ada/initialize.c index 7e1141a9be7f..6b92d27cb134 100644 --- a/gcc/ada/initialize.c +++ b/gcc/ada/initialize.c @@ -34,10 +34,6 @@ in a separate file/object so that users can replace it easily. The default implementation should be null on most targets. */ -#ifdef __cplusplus -extern "C" { -#endif - /* The following include is here to meet the published VxWorks requirement that the __vxworks header appear before any other include. */ #ifdef __vxworks @@ -57,6 +53,10 @@ extern "C" { #include "raise.h" +#ifdef __cplusplus +extern "C" { +#endif + /******************************************/ /* __gnat_initialize (NT-mingw32 Version) */ /******************************************/ diff --git a/gcc/ada/raise.c b/gcc/ada/raise.c index 35b0e988ee11..d17b9dd4a7a8 100644 --- a/gcc/ada/raise.c +++ b/gcc/ada/raise.c @@ -32,10 +32,6 @@ /* Shared routines to support exception handling. __gnat_unhandled_terminate is shared between all exception handling mechanisms. */ -#ifdef __cplusplus -extern "C" { -#endif - #ifdef IN_RTS #include "tconfig.h" #include "tsystem.h" @@ -47,6 +43,10 @@ extern "C" { #include "adaint.h" #include "raise.h" +#ifdef __cplusplus +extern "C" { +#endif + /* Wrapper to builtin_longjmp. This is for the compiler eh only, as the sjlj runtime library interfaces directly to the intrinsic. We can't yet do this for the compiler itself, because this capability relies on changes diff --git a/gcc/ada/seh_init.c b/gcc/ada/seh_init.c index 772dab0aa842..9b3c081081da 100644 --- a/gcc/ada/seh_init.c +++ b/gcc/ada/seh_init.c @@ -32,10 +32,6 @@ /* This unit contains support for SEH (Structured Exception Handling). Right now the only implementation is for Win32. */ -#ifdef __cplusplus -extern "C" { -#endif - #ifdef IN_RTS #include "tconfig.h" #include "tsystem.h" @@ -50,6 +46,10 @@ extern "C" { #include "raise.h" +#ifdef __cplusplus +extern "C" { +#endif + /* Addresses of exception data blocks for predefined exceptions. */ extern struct Exception_Data constraint_error; extern struct Exception_Data numeric_error; diff --git a/gcc/ada/targext.c b/gcc/ada/targext.c index 6a9f970c2862..a7f3ee9b3fdd 100644 --- a/gcc/ada/targext.c +++ b/gcc/ada/targext.c @@ -35,10 +35,6 @@ Note that, in order to have access to the TARGET_* macros used below, the file must be compiled with IN_GCC defined, even for the library. */ -#ifdef __cplusplus -extern "C" { -#endif - #ifdef IN_RTS #include "tconfig.h" #include "tsystem.h" @@ -57,6 +53,10 @@ extern "C" { #define TARGET_EXECUTABLE_SUFFIX "" #endif +#ifdef __cplusplus +extern "C" { +#endif + const char *__gnat_target_object_extension = TARGET_OBJECT_SUFFIX; const char *__gnat_target_executable_extension = TARGET_EXECUTABLE_SUFFIX; const char *__gnat_target_debuggable_extension = TARGET_EXECUTABLE_SUFFIX;