From 281c807353646569dc8c309a9f7f9c30710d18a1 Mon Sep 17 00:00:00 2001 From: korbb Date: Sun, 27 Oct 2002 17:02:29 +0000 Subject: [PATCH] Resorted the entries git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@58584 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/fixinc/inclhack.def | 65 +++++++++++++++++++++++-------------------------- 1 file changed, 31 insertions(+), 34 deletions(-) diff --git a/gcc/fixinc/inclhack.def b/gcc/fixinc/inclhack.def index b102a79..677b3cc 100644 --- a/gcc/fixinc/inclhack.def +++ b/gcc/fixinc/inclhack.def @@ -7,9 +7,8 @@ autogen definitions fixincl; This is the sort command: - blocksort output=XXX \ + blocksort output=inclhack.sorted \ pattern='^/\*$' \ - start='== REPLACEMENT FIXES ==' \ trailer='^/\*EOF\*[/]' \ input=inclhack.def \ key='hackname[ ]*=[ ]*(.*);' @@ -21,8 +20,6 @@ autogen definitions fixincl; FIXINC_DEBUG = yes; #endif -/* == REPLACEMENT FIXES == */ - /* * Completely replace <_int_varargs.h> with a file that includes gcc's * stdarg.h or varargs.h files as appropriate on DG/UX @@ -1145,6 +1142,21 @@ fix = { /* + * Make sure hpux defines abs in header. + */ +fix = { + hackname = hpux11_abs; + mach = ia64-hp-hpux11*; + files = stdlib.h; + select = "ifndef _MATH_INCLUDED"; + c_fix = format; + c_fix_arg = "if !defined(_MATH_INCLUDED) || defined(__GNUG__)"; +// sed = "s/ifndef _MATH_INCLUDED/if !defined(_MATH_INCLUDED) || defined(__GNUG__)/"; + test_text = "#ifndef _MATH_INCLUDED"; +}; + + +/* * Keep HP-UX 11 from stomping on C++ math namespace * with defines for fabsf. */ @@ -1165,21 +1177,6 @@ fix = { /* - * Make sure hpux defines abs in header. - */ -fix = { - hackname = hpux11_abs; - mach = ia64-hp-hpux11*; - files = stdlib.h; - select = "ifndef _MATH_INCLUDED"; - c_fix = format; - c_fix_arg = "if !defined(_MATH_INCLUDED) || defined(__GNUG__)"; -// sed = "s/ifndef _MATH_INCLUDED/if !defined(_MATH_INCLUDED) || defined(__GNUG__)/"; - test_text = "#ifndef _MATH_INCLUDED"; -}; - - -/* * Prevent HP-UX 11 from defining __size_t and preventing size_t from * being defined by having it define _hpux_size_t instead. */ @@ -1484,6 +1481,21 @@ fix = { /* + * Fix libc1 _G_va_list definition, used in declarations of several + * more-or-less standard functions, for example vasprintf. + */ +fix = { + hackname = libc1_G_va_list; + files = _G_config.h; + mach = '*-*-linux*libc1'; + select = 'typedef void \* _G_va_list;'; + c_fix = format; + c_fix_arg = "typedef __builtin_va_list _G_va_list;"; + test_text = 'typedef __builtin_va_list _G_va_list;'; +}; + + +/* * GNU libc1 string.h does not prototype memcpy and memcmp for gcc * versions > 1. This fix will open up the declaration for all * versions of GCC and for g++. @@ -1519,21 +1531,6 @@ fix = { /* - * Fix libc1 _G_va_list definition, used in declarations of several - * more-or-less standard functions, for example vasprintf. - */ -fix = { - hackname = libc1_G_va_list; - files = _G_config.h; - mach = '*-*-linux*libc1'; - select = 'typedef void \* _G_va_list;'; - c_fix = format; - c_fix_arg = "typedef __builtin_va_list _G_va_list;"; - test_text = 'typedef __builtin_va_list _G_va_list;'; -}; - - -/* * In limits.h, put #ifndefs around things that are supposed to be defined * in float.h to avoid redefinition errors if float.h is included first. * On HP/UX this patch does not work, because on HP/UX limits.h uses -- 2.7.4