: Add include hacks for VMS headers

Message ID	67DFA492-9995-4C03-8B0B-5F87B4AE8F64@adacore.com
State	New
Headers	show Return-Path: <gcc-patches-return-314680-incoming=patchwork.ozlabs.org@gcc.gnu.org> Comment: DKIM? See http://www.dkim.org Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:Received:From:Content-Type:Content-Transfer-Encoding:Subject:Date:Message-Id:Cc:To:Mime-Version:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=rprSk1dluafhbKJlc32t6SrB6eMCFzpxpkCPqcoC/6OY7ch/WirGMqb9iZ0SVj itNr67I53Re9OoiL4Mph4ejVXZHWbepneQma8qw30CEgrRZx359wXmMbLPueqB0E MukkoGXnKqD7S6da3z8xmItY2UUTYyHhIR6pL0mkmP6nQ=; From: Tristan Gingold <gingold@adacore.com> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Subject: [Patch]: Add include hacks for VMS headers Date: Mon, 12 Mar 2012 11:05:02 +0100 Message-Id: <67DFA492-9995-4C03-8B0B-5F87B4AE8F64@adacore.com> Cc: Bruce Korb <bkorb@gnu.org> To: GCC Patches <gcc-patches@gcc.gnu.org> Mime-Version: 1.0 (Apple Message framework v1257) Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org

diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def index 40e7805..1a5cd8d 100644 --- a/fixincludes/inclhack.def +++ b/fixincludes/inclhack.def @@ -4611,6 +4611,129 @@ fix = { }; /* + * On VMS, change <resource.h> to <sys/resource.h> to avoid a + * conflict while building gcc. Likewise for <builtins.h> + */ +fix = { + hackname = vms_use_quoted_include; + select = "(#[ \t]*include[ \t]+)<(resource|builtins)\\.h>"; + mach = "*-*-*vms*"; + files = rtldef/wait.h, starlet_c/pthread.h; + c_fix = format; + + c_fix_arg = '%1<sys/%2.h>'; + + test_text = "# include <resource.h>"; +}; + +/* + * On VMS, add missing braces around sigset_t constants. + */ +fix = { + hackname = vms_add_missing_braces; + select = "(_SIG_[A-Z]+_SET[ \t]+= \\{)(0x[0F]+, 0x[0F]+)"; + mach = "*-*-*vms*"; + files = "rtldef/signal.h"; + c_fix = format; + + c_fix_arg = '%1 {%2} '; + + test_text = "static const __sigset_t _SIG_EMPTY_SET = " + "{0x00000000, 0x00000000},\n" + " _SIG_FULL_SET = {0xFFFFFFFF, 0xFFFFFFFF};\n"; +}; + +/* + * On VMS, fix incompatible redeclaration of hostalias. + */ +fix = { + hackname = vms_do_not_redeclare_hostalias; + select = "(void[ \t]+fp_nquery \\(const u_char \\*, int, FILE \\*\\);)\n" + "(__char_ptr32[ \t]+hostalias \\(const char \\*\\);)"; + mach = "*-*-*vms*"; + files = "rtldef/resolv.h"; + c_fix = format; + + c_fix_arg = "%1\n" + "/* %2 */"; + + test_text = "void fp_nquery (const u_char *, int, FILE *);\n" + "__char_ptr32 hostalias (const char *);\n"; +}; + +/* + * On VMS, some DEC-C builtins are directly used. + */ +fix = { + hackname = vms_decc_builtin; + select = "(__MEMSET|__MEMMOVE|__MEMCPY|__STRLEN|__STRCPY)"; + mach = "*-*-*vms*"; + files = rtldef/string.h, rtldef/time.h, rtldef/strings.h, + rtldef/socket.h; + sed = "s@__MEMSET@memset@"; + sed = "s@__MEMMOVE@memmove@"; + sed = "s@__MEMCPY@memcpy@"; + sed = "s@__STRLEN@strlen@"; + sed = "s@__STRCPY@strcpy@"; + + test_text = "define FD_ZERO(__p) __MEMSET((__p), 0, sizeof(*(__p)))\n"; +}; + +/* + * On VMS, do not declare getopt and al if pointers are 64 bit. + */ +fix = { + hackname = vms_no_64bit_getopt; + select = "^[ \t]*(extern[ \t]*)?(int[ \t]*(getopt|optind|opterr|optopt)|(char \\*optarg))([ \t]*\\(.*\\))?;\n"; + /* select = "^[ \t](extern[ \t))?(int[ \t](getopt|optind|opterr|optopt))|(char *optarg).*;\n"; */ + mach = "*-*-*vms*"; + files = rtldef/stdio.h, rtldef/unistd.h; + c_fix = format; + + c_fix_arg = "#if __INITIAL_POINTER_SIZE != 64 /* getopt is short ptr only. */\n" + "%0" + "#endif\n"; + + test_text = "int getopt (int, char * const [], const char *);"; +}; + +/* + * On VMS, forward declare structure before referencing them in prototypes. + */ +fix = { + hackname = vms_forward_declare_struct; + select = "(/\\* forward decls for C\\+\\+ \\*/\n)" + "#ifdef __cplusplus\n"; + mach = "*-*-*vms*"; + files = rtldef/if.h; + c_fix = format; + + c_fix_arg = "%1" + "#if defined (__cplusplus) || defined (__GNUC__)\n"; + + test_text = "/* forward decls for C++ */\n" + "#ifdef __cplusplus\n" + "struct foo;\n" + "#endif\n"; +}; + +/* + * On VMS, force the use of fast setjmp, as the normal setjmp uses conditions + * which is not yet fully supported by gcc. + */ +fix = { + hackname = vms_use_fast_setjmp; + select = "(#[ \t]*if[ \t]*defined\\(__FAST_SETJMP\\)[ \t]*\\|\\|)"; + mach = "*-*-*vms*"; + files = rtldef/setjmp.h; + c_fix = format; + + c_fix_arg = "%0 defined (__GNUC__) ||"; + + test_text = "# if defined(__FAST_SETJMP) || defined(__UNIX_SETJMP)"; +}; + +/* * AIX and Interix headers define NULL to be cast to a void pointer, * which is illegal in ANSI C++. */ diff --git a/fixincludes/tests/base/rtldef/if.h b/fixincludes/tests/base/rtldef/if.h new file mode 100644 index 0000000..836ff27 --- /dev/null +++ b/fixincludes/tests/base/rtldef/if.h @@ -0,0 +1,18 @@ +/* DO NOT EDIT THIS FILE. + + It has been auto-edited by fixincludes from: + + "fixinc/tests/inc/rtldef/if.h" + + This had to be done to correct non-standard usages in the + original, manufacturer supplied header file. */ + + + +#if defined( VMS_FORWARD_DECLARE_STRUCT_CHECK ) +/* forward decls for C++ */ +#if defined (__cplusplus) || defined (__GNUC__) +struct foo; +#endif + +#endif /* VMS_FORWARD_DECLARE_STRUCT_CHECK */ diff --git a/fixincludes/tests/base/rtldef/resolv.h b/fixincludes/tests/base/rtldef/resolv.h new file mode 100644 index 0000000..0b5b248 --- /dev/null +++ b/fixincludes/tests/base/rtldef/resolv.h @@ -0,0 +1,16 @@ +/* DO NOT EDIT THIS FILE. + + It has been auto-edited by fixincludes from: + + "fixinc/tests/inc/rtldef/resolv.h" + + This had to be done to correct non-standard usages in the + original, manufacturer supplied header file. */ + + + +#if defined( VMS_DO_NOT_REDECLARE_HOSTALIAS_CHECK ) +void fp_nquery (const u_char *, int, FILE *); +/* __char_ptr32 hostalias (const char *); */ + +#endif /* VMS_DO_NOT_REDECLARE_HOSTALIAS_CHECK */ diff --git a/fixincludes/tests/base/rtldef/setjmp.h b/fixincludes/tests/base/rtldef/setjmp.h new file mode 100644 index 0000000..5414efc --- /dev/null +++ b/fixincludes/tests/base/rtldef/setjmp.h @@ -0,0 +1,14 @@ +/* DO NOT EDIT THIS FILE. + + It has been auto-edited by fixincludes from: + + "fixinc/tests/inc/rtldef/setjmp.h" + + This had to be done to correct non-standard usages in the + original, manufacturer supplied header file. */ + + + +#if defined( VMS_USE_FAST_SETJMP_CHECK ) +# if defined(__FAST_SETJMP) || defined (__GNUC__) || defined(__UNIX_SETJMP) +#endif /* VMS_USE_FAST_SETJMP_CHECK */ diff --git a/fixincludes/tests/base/rtldef/signal.h b/fixincludes/tests/base/rtldef/signal.h new file mode 100644 index 0000000..3b5a2b8 --- /dev/null +++ b/fixincludes/tests/base/rtldef/signal.h @@ -0,0 +1,16 @@ +/* DO NOT EDIT THIS FILE. + + It has been auto-edited by fixincludes from: + + "fixinc/tests/inc/rtldef/signal.h" + + This had to be done to correct non-standard usages in the + original, manufacturer supplied header file. */ + + + +#if defined( VMS_ADD_MISSING_BRACES_CHECK ) +static const __sigset_t _SIG_EMPTY_SET = { {0x00000000, 0x00000000} }, + _SIG_FULL_SET = { {0xFFFFFFFF, 0xFFFFFFFF} }; + +#endif /* VMS_ADD_MISSING_BRACES_CHECK */ diff --git a/fixincludes/tests/base/rtldef/stdio.h b/fixincludes/tests/base/rtldef/stdio.h new file mode 100644 index 0000000..4835d0f --- /dev/null +++ b/fixincludes/tests/base/rtldef/stdio.h @@ -0,0 +1,16 @@ +/* DO NOT EDIT THIS FILE. + + It has been auto-edited by fixincludes from: + + "fixinc/tests/inc/rtldef/stdio.h" + + This had to be done to correct non-standard usages in the + original, manufacturer supplied header file. */ + + + +#if defined( VMS_NO_64BIT_GETOPT_CHECK ) +#if __INITIAL_POINTER_SIZE != 64 /* getopt is short ptr only. */ +int getopt (int, char * const [], const char *); +#endif +#endif /* VMS_NO_64BIT_GETOPT_CHECK */ diff --git a/fixincludes/tests/base/rtldef/string.h b/fixincludes/tests/base/rtldef/string.h index 1ac9b2a..6249b0c 100644 --- a/fixincludes/tests/base/rtldef/string.h +++ b/fixincludes/tests/base/rtldef/string.h @@ -13,3 +13,9 @@ #if !defined(__VAX) && !defined(__GNUC__) #endif /* VMS_DISABLE_DECC_STRING_BUILTINS_CHECK */ + + +#if defined( VMS_DECC_BUILTIN_CHECK ) +define FD_ZERO(__p) memset((__p), 0, sizeof(*(__p))) + +#endif /* VMS_DECC_BUILTIN_CHECK */ diff --git a/fixincludes/tests/base/rtldef/wait.h b/fixincludes/tests/base/rtldef/wait.h new file mode 100644 index 0000000..0587834 --- /dev/null +++ b/fixincludes/tests/base/rtldef/wait.h @@ -0,0 +1,14 @@ +/* DO NOT EDIT THIS FILE. + + It has been auto-edited by fixincludes from: + + "fixinc/tests/inc/rtldef/wait.h" + + This had to be done to correct non-standard usages in the + original, manufacturer supplied header file. */ + + + +#if defined( VMS_USE_QUOTED_INCLUDE_CHECK ) +# include <sys/resource.h> +#endif /* VMS_USE_QUOTED_INCLUDE_CHECK */

: Add include hacks for VMS headers

Commit Message

Comments

Patch