summaryrefslogtreecommitdiff
path: root/fixincludes/inclhack.def
diff options
context:
space:
mode:
authorro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>2012-03-14 16:33:37 +0000
committerro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>2012-03-14 16:33:37 +0000
commit5641963ca5f31161680dc1c8820c1baf94372965 (patch)
tree5175e6fd7593bf938b7a2ead15292f42da0c81e6 /fixincludes/inclhack.def
parent884b03c98243d7384e902c8314a1b61f6d852cdc (diff)
downloadgcc-5641963ca5f31161680dc1c8820c1baf94372965.tar.gz
Remove obsolete IRIX 6.5 support
libstdc++-v3: * configure.host (irix6.5*): Remove. * config/os/irix: Remove. * config/io/basic_file_stdio.cc (__basic_file<char>::showmanyc()) [_GLIBCXX_FIONREAD_TAKES_OFF_T]: Remove. * doc/xml/faq.xml: Remove IRIX reference. * doc/xml/manual/using.xml (Finding Dynamic or Shared Libraries): Remove IRIX example. * testsuite/20_util/shared_ptr/thread/default_weaktoshared.cc: Remove mips-sgi-irix6* handling. * testsuite/20_util/shared_ptr/thread/mutex_weaktoshared.cc: Likewise. * testsuite/21_strings/basic_string/pthread18185.cc: Likewise. * testsuite/21_strings/basic_string/pthread4.cc: Likewise. * testsuite/22_locale/locale/cons/12658_thread-1.cc: Likewise. * testsuite/22_locale/locale/cons/12658_thread-2.cc: Likewise. * testsuite/23_containers/list/pthread1.cc: Likewise. * testsuite/23_containers/list/pthread5.cc: Likewise. * testsuite/23_containers/map/pthread6.cc: Likewise. * testsuite/23_containers/vector/debug/multithreaded_swap.cc: Likewise. * testsuite/27_io/basic_ofstream/pthread2.cc: Likewise. * testsuite/27_io/basic_ostringstream/pthread3.cc: Likewise. * testsuite/30_threads/async/42819.cc: Likewise. * testsuite/30_threads/async/49668.cc: Likewise. * testsuite/30_threads/async/any.cc: Likewise. * testsuite/30_threads/async/async.cc: Likewise. * testsuite/30_threads/async/launch.cc: Likewise. * testsuite/30_threads/async/sync.cc: Likewise. * testsuite/30_threads/call_once/39909.cc: Likewise. * testsuite/30_threads/call_once/49668.cc: Likewise. * testsuite/30_threads/call_once/call_once1.cc: Likewise. * testsuite/30_threads/condition_variable/cons/1.cc: Likewise. * testsuite/30_threads/condition_variable/members/1.cc: Likewise. * testsuite/30_threads/condition_variable/members/2.cc: Likewise. * testsuite/30_threads/condition_variable/native_handle/typesizes.cc: Likewise. * testsuite/30_threads/condition_variable_any/50862.cc: Likewise. * testsuite/30_threads/condition_variable_any/cons/1.cc: Likewise. * testsuite/30_threads/condition_variable_any/members/1.cc: Likewise. * testsuite/30_threads/condition_variable_any/members/2.cc: Likewise. * testsuite/30_threads/future/cons/move.cc: Likewise. * testsuite/30_threads/future/members/45133.cc: Likewise. * testsuite/30_threads/future/members/get.cc: Likewise. * testsuite/30_threads/future/members/get2.cc: Likewise. * testsuite/30_threads/future/members/share.cc: Likewise. * testsuite/30_threads/future/members/valid.cc: Likewise. * testsuite/30_threads/future/members/wait.cc: Likewise. * testsuite/30_threads/future/members/wait_for.cc: Likewise. * testsuite/30_threads/future/members/wait_until.cc: Likewise. * testsuite/30_threads/lock/1.cc: Likewise. * testsuite/30_threads/lock/2.cc: Likewise. * testsuite/30_threads/lock/3.cc: Likewise. * testsuite/30_threads/lock/4.cc: Likewise. * testsuite/30_threads/lock_guard/cons/1.cc: Likewise. * testsuite/30_threads/mutex/cons/1.cc: Likewise. * testsuite/30_threads/mutex/dest/destructor_locked.cc: Likewise. * testsuite/30_threads/mutex/lock/1.cc: Likewise. * testsuite/30_threads/mutex/native_handle/1.cc: Likewise. * testsuite/30_threads/mutex/native_handle/typesizes.cc: Likewise. * testsuite/30_threads/mutex/try_lock/1.cc: Likewise. * testsuite/30_threads/mutex/try_lock/2.cc: Likewise. * testsuite/30_threads/mutex/unlock/1.cc: Likewise. * testsuite/30_threads/packaged_task/49668.cc: Likewise. * testsuite/30_threads/packaged_task/cons/1.cc: Likewise. * testsuite/30_threads/packaged_task/cons/2.cc: Likewise. * testsuite/30_threads/packaged_task/cons/3.cc: Likewise. * testsuite/30_threads/packaged_task/cons/alloc.cc: Likewise. * testsuite/30_threads/packaged_task/cons/move.cc: Likewise. * testsuite/30_threads/packaged_task/cons/move_assign.cc: Likewise. * testsuite/30_threads/packaged_task/members/get_future.cc: Likewise. * testsuite/30_threads/packaged_task/members/get_future2.cc: Likewise. * testsuite/30_threads/packaged_task/members/invoke.cc: Likewise. * testsuite/30_threads/packaged_task/members/invoke2.cc: Likewise. * testsuite/30_threads/packaged_task/members/invoke3.cc: Likewise. * testsuite/30_threads/packaged_task/members/invoke4.cc: Likewise. * testsuite/30_threads/packaged_task/members/invoke5.cc: Likewise. * testsuite/30_threads/packaged_task/members/reset.cc: Likewise. * testsuite/30_threads/packaged_task/members/reset2.cc: Likewise. * testsuite/30_threads/packaged_task/members/swap.cc: Likewise. * testsuite/30_threads/packaged_task/members/valid.cc: Likewise. * testsuite/30_threads/promise/cons/1.cc: Likewise. * testsuite/30_threads/promise/cons/alloc.cc: Likewise. * testsuite/30_threads/promise/cons/move.cc: Likewise. * testsuite/30_threads/promise/cons/move_assign.cc: Likewise. * testsuite/30_threads/promise/members/get_future.cc: Likewise. * testsuite/30_threads/promise/members/get_future2.cc: Likewise. * testsuite/30_threads/promise/members/set_exception.cc: Likewise. * testsuite/30_threads/promise/members/set_exception2.cc: Likewise. * testsuite/30_threads/promise/members/set_value.cc: Likewise. * testsuite/30_threads/promise/members/set_value2.cc: Likewise. * testsuite/30_threads/promise/members/set_value3.cc: Likewise. * testsuite/30_threads/promise/members/swap.cc: Likewise. * testsuite/30_threads/recursive_mutex/cons/1.cc: Likewise. * testsuite/30_threads/recursive_mutex/dest/destructor_locked.cc: Likewise. * testsuite/30_threads/recursive_mutex/lock/1.cc: Likewise. * testsuite/30_threads/recursive_mutex/native_handle/1.cc: Likewise. * testsuite/30_threads/recursive_mutex/native_handle/typesizes.cc: Likewise. * testsuite/30_threads/recursive_mutex/try_lock/1.cc: Likewise. * testsuite/30_threads/recursive_mutex/try_lock/2.cc: Likewise. * testsuite/30_threads/recursive_mutex/unlock/1.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/cons/1.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/dest/destructor_locked.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/lock/1.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/lock/2.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/native_handle/1.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/native_handle/typesizes.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/try_lock/1.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/try_lock/2.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/try_lock_for/1.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/try_lock_for/2.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/try_lock_for/3.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/try_lock_until/1.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/try_lock_until/2.cc: Likewise. * testsuite/30_threads/recursive_timed_mutex/unlock/1.cc: Likewise. * testsuite/30_threads/shared_future/cons/move.cc: Likewise. * testsuite/30_threads/shared_future/members/45133.cc: Likewise. * testsuite/30_threads/shared_future/members/get.cc: Likewise. * testsuite/30_threads/shared_future/members/get2.cc: Likewise. * testsuite/30_threads/shared_future/members/valid.cc: Likewise. * testsuite/30_threads/shared_future/members/wait.cc: Likewise. * testsuite/30_threads/shared_future/members/wait_for.cc: Likewise. * testsuite/30_threads/shared_future/members/wait_until.cc: Likewise. * testsuite/30_threads/this_thread/1.cc: Likewise. * testsuite/30_threads/this_thread/2.cc: Likewise. * testsuite/30_threads/this_thread/3.cc: Likewise. * testsuite/30_threads/this_thread/4.cc: Likewise. * testsuite/30_threads/thread/cons/1.cc: Likewise. * testsuite/30_threads/thread/cons/2.cc: Likewise. * testsuite/30_threads/thread/cons/3.cc: Likewise. * testsuite/30_threads/thread/cons/4.cc: Likewise. * testsuite/30_threads/thread/cons/49668.cc: Likewise. * testsuite/30_threads/thread/cons/5.cc: Likewise. * testsuite/30_threads/thread/cons/6.cc: Likewise. * testsuite/30_threads/thread/cons/7.cc: Likewise. * testsuite/30_threads/thread/cons/8.cc: Likewise. * testsuite/30_threads/thread/cons/9.cc: Likewise. * testsuite/30_threads/thread/cons/moveable.cc: Likewise. * testsuite/30_threads/thread/members/1.cc: Likewise. * testsuite/30_threads/thread/members/2.cc: Likewise. * testsuite/30_threads/thread/members/3.cc: Likewise. * testsuite/30_threads/thread/members/4.cc: Likewise. * testsuite/30_threads/thread/members/5.cc: Likewise. * testsuite/30_threads/thread/members/hardware_concurrency.cc: Likewise. * testsuite/30_threads/thread/native_handle/typesizes.cc: Likewise. * testsuite/30_threads/thread/swap/1.cc: Likewise. * testsuite/30_threads/timed_mutex/cons/1.cc: Likewise. * testsuite/30_threads/timed_mutex/dest/destructor_locked.cc: Likewise. * testsuite/30_threads/timed_mutex/lock/1.cc: Likewise. * testsuite/30_threads/timed_mutex/native_handle/1.cc: Likewise. * testsuite/30_threads/timed_mutex/native_handle/typesizes.cc: Likewise. * testsuite/30_threads/timed_mutex/try_lock/1.cc: Likewise. * testsuite/30_threads/timed_mutex/try_lock/2.cc: Likewise. * testsuite/30_threads/timed_mutex/try_lock_for/1.cc: Likewise. * testsuite/30_threads/timed_mutex/try_lock_for/2.cc: Likewise. * testsuite/30_threads/timed_mutex/try_lock_for/3.cc: Likewise. * testsuite/30_threads/timed_mutex/try_lock_until/1.cc: Likewise. * testsuite/30_threads/timed_mutex/try_lock_until/2.cc: Likewise. * testsuite/30_threads/timed_mutex/unlock/1.cc: Likewise. * testsuite/30_threads/try_lock/1.cc: Likewise. * testsuite/30_threads/try_lock/2.cc: Likewise. * testsuite/30_threads/try_lock/3.cc: Likewise. * testsuite/30_threads/try_lock/4.cc: Likewise. * testsuite/30_threads/unique_lock/cons/1.cc: Likewise. * testsuite/30_threads/unique_lock/cons/2.cc: Likewise. * testsuite/30_threads/unique_lock/cons/3.cc: Likewise. * testsuite/30_threads/unique_lock/cons/4.cc: Likewise. * testsuite/30_threads/unique_lock/cons/5.cc: Likewise. * testsuite/30_threads/unique_lock/cons/6.cc: Likewise. * testsuite/30_threads/unique_lock/locking/1.cc: Likewise. * testsuite/30_threads/unique_lock/locking/2.cc: Likewise. * testsuite/30_threads/unique_lock/locking/3.cc: Likewise. * testsuite/30_threads/unique_lock/locking/4.cc: Likewise. * testsuite/30_threads/unique_lock/modifiers/1.cc: Likewise. * testsuite/30_threads/unique_lock/modifiers/2.cc: Likewise. * testsuite/ext/rope/pthread7-rope.cc: Likewise. * testsuite/tr1/2_general_utilities/shared_ptr/thread/default_weaktoshared.cc: Likewise. * testsuite/tr1/2_general_utilities/shared_ptr/thread/mutex_weaktoshared.cc: Likewise. * testsuite/23_containers/vector/capacity/resize/1.cc: Remove dg-options for mips*-*-irix6*. * testsuite/27_io/ios_base/storage/1.cc: Likewise. * testsuite/27_io/ios_base/storage/2.cc: Likewise. * testsuite/27_io/ios_base/storage/3.cc: Likewise. * testsuite/lib/libstdc++.exp (v3-build_support): Remove IRIX 6 workaround. libjava: * configure.ac (libgcj_cv_exidx): Remove IRIX 6 ld workaround. (mips-sgi-irix6*): Remove. (mips-sgi-irix*): Remove. (AC_CHECK_HEADERS): Remove bstring.h. * configure: Regenerate. * include/config.h.in: Regenerate. * configure.host (mips-sgi-irix6*): Remove. * include/posix-signal.h [__sgi__]: Remove. * gnu/java/net/natPlainDatagramSocketImplPosix.cc [HAVE_BSTRING_H]: Remove. * gnu/java/net/natPlainDatagramSocketImplWin32.cc: Likewise. * gnu/java/net/natPlainSocketImplPosix.cc: Likewise. libitm: * configure.tgt (*-*-irix6*): Remove. libgomp: * configure.tgt (mips-sgi-irix6*): Remove. libgfortran: * intrinsics/c99_functions.c [__sgi__ && !HAVE_COMPLEX_H]: Remove. libgcc: * config.host (mips-sgi-irix6.5*): Remove. * config/mips/irix-crti.S: Remove. * config/mips/irix-crtn.S: Remove. * config/mips/irix6-unwind.h: Remove. * config/mips/t-irix6: Remove. * config/mips/t-slibgcc-irix: Remove. gnattools: * configure.ac (mips-sgi-irix*): Remove. * configure: Regenerate. gcc/testsuite: * g++.dg/other/anon5.C: Don't skip on mips-sgi-irix*. * g++.dg/tree-prof/partition1.C: Likewise. * g++.dg/tree-prof/partition2.C: Likewise. * g++.old-deja/g++.other/init19.C: Remove mips-sgi-irix* handling. * gcc.c-torture/compile/labels-3.c: Remove dg-options. * gcc.c-torture/execute/20010724-1.c: Remove. * gcc.c-torture/execute/20010724-1.x: Remove. * gcc.c-torture/execute/20040208-2.c: Remove. * gcc.c-torture/execute/20040208-2.x: Remove. * gcc.c-torture/execute/ieee/20000320-1.c [__mips__ && __sgi__]: Remove. (main) [__mips__ && __sgi__]: Remove. * gcc.c-torture/execute/ieee/copysign1.c: Remove IRIX reference. * gcc.c-torture/execute/ieee/copysign2.c: Likewise. * gcc.c-torture/execute/ieee/mul-subnormal-single-1.x: Remove mips-sgi-irix6* handling. * gcc.dg/cpp/assert4.c [__mips__]: Remove __sgi__, sgi. * gcc.dg/torture/20090618-1.c: Don't skip on mips-sgi-irix*. * gcc.dg/torture/builtin-frexp-1.c: Remove mips*-*-irix6* handling. * gcc.dg/torture/builtin-logb-1.c: Likewise. * gcc.dg/torture/pr47917.c: Remove mips-sgi-irix6.5 handling. * gcc.dg/tree-ssa/ssa-store-ccp-3.c: Don't skip on mips*-*-irix*. * gcc.misc-tests/linkage.exp: Remove mips-sgi-irix6* handling. * gcc.target/mips/args-1.c [!__sgi__]: Remove. * gcc.target/mips/interrupt_handler-2.c: Don't skip on mips-sgi-irix6*. * gcc.target/mips/interrupt_handler-3.c: Likewise. * gcc.target/mips/save-restore-1.c: Don't skip on mips-sgi-irix6*. * gcc.target/mips/save-restore-3.c: Likewise. * gcc.target/mips/save-restore-4.c: Likewise. * gcc.target/mips/save-restore-5.c: Likewise. * gfortran.dg/g77/cabs.f: Don't xfail on mips-sgi-irix6*. * lib/prune.exp (prune_gcc_output): Remove pruning of IRIX 6 ld messages. * lib/target-libpath.exp (set_ld_library_path_env_vars): Remove IRIX 6 handling. (restore_ld_library_path_env_vars): Likewise. * lib/target-supports.exp (check_profiling_available): Remove mips*-*-irix* handling. (check_ascii_locale_available): Remove mips-sgi-irix* handling. (add_options_for_c99_runtime): Remove mips-sgi-irix6.5* handling. * objc.dg/stabs-1.m: Don't xfail on mips-sgi-irix6.5. gcc/ada: * gcc-interface/Makefile.in (mips-sgi-irix6*): Remove. * a-intnam-irix.ads, mlib-tgt-specific-irix.adb, s-intman-irix.adb, s-mastop-irix.adb, s-osinte-irix.adb, s-osinte-irix.ads, s-proinf-irix-athread.adb, s-proinf-irix-athread.ads, s-taprop-irix.adb, s-tasinf-irix.ads, system-irix-n32.ads, system-irix-n64.ads, system-irix-o32.ads: Remove. * adaint.c [__mips && __sgi]: Remove. (__gnat_number_of_cpus) [__mips && __sgi]: Remove. [IS_CROSS && !(__mips && __sgi)]: Remove. * adaint.h [sgi && _LFAPI]: Remove. * cstreams.c (__gnat_full_name) [sgi]: Remove. * env.c (__gnat_unsetenv) [__mips && __sgi]: Remove. (__gnat_clearenv) [__mips && __sgi]: Remove. * errno.c (_SGI_MP_SOURCE): Remove. * gsocket.h [sgi]: Remove. * init.c: Remove IRIX reference. [sgi]: Remove. * link.c [sgi]: Remove. * s-oscons-tmplt.c [__mips && __sgi] (IOV_MAX): Don't define. (main) [__mips && __sgi] (MAX_tv_sec): Don't define. (CLOCK_SGI_FAST, CLOCK_SGI_CYCLE): Remove. * sysdep.c [sgi]: Remove. (getc_immediate_common) [sgi]: Remove. (__gnat_localtime_tzoff) [sgi]: Remove. * terminals.c [__mips && __sgi] (IRIX): Don't define. [IRIX] (USE_GETPTY): Don't define. (allocate_pty_desc) [USE_GETPTY]: Remove. * g-traceb.ads: Remove IRIX reference. * g-trasym.ads: Likewise. * memtrack.adb: Likewise. * s-interr-sigaction.adb: Likewise. * gnat_rm.texi (Implementation Advice): Remove SGI info. (Implementation Defined Characteristics): Likewise. * gnat_ugn.texi (Summary of Run-Time Configurations, mips-irix): Remove. (Irix-Specific Considerations): Remove. gcc/cp: * Make-lang.in (doc/g++.1): Remove IRIX 6.5 reference. gcc: * config.gcc (enable_obsolete): Remove mips-sgi-irix6.5. (mips-sgi-irix6.5*): Remove. * config.host (mips-sgi-irix*): Remove. * configure.ac (enable_fixed_point): Remove mips*-sgi-irix*. (set_have_as_tls): Remove *-*-irix6*. (gcc_cv_ld_static_dynamic): Remove mips-sgi-irix6*. * configure: Regenerate. * config/mips/iris6.h: Remove. * config/mips/iris6.opt: Remove. * config/mips/t-irix6: Remove. * config/mips/mips.h (TARGET_GPWORD): Remove IRIX 6 N64 handling. (TARGET_IRIX6): Remove. (TARGET_CPU_CPP_BUILTINS): Remove IRIX 6 handling. Don't define LANGUAGE_C, _LANGUAGE_C for Objective-C. * config/mips/mips.c (mips_build_builtin_va_list): Remove IRIX 6 handling. (mips_file_start): Likewise. * config/mips/mips-protos.h (irix_asm_output_align): Remove. * config/mips/driver-native.c [__sgi__]: Remove. (host_detect_local_cpu) [__sgi__]: Remove. * config/mips/gnu-user.h: Remove iris5.h reference. * config/mips/mips-modes.def: Remove IRIX 6 reference. * config/mips/gnu-user64.h (MIPS_TFMODE_FORMAT): Remove. * config/mips/mips.c (mips_option_override) [MIPS_TFMODE_FORMAT]: Remove. * gcc.c (main): Move asm_debug initialization ... (asm_debug): ... here. * ginclude/stddef.h (__STDDEF_H__): Don't define. * defaults.h (LINK_ELIMINATE_DUPLICATE_LDIRECTORIES): Remove. * system.h (LINK_ELIMINATE_DUPLICATE_LDIRECTORIES): Poison. * collect2.c [LINK_ELIMINATE_DUPLICATE_LDIRECTORIES]: Remove. (main) [LINK_ELIMINATE_DUPLICATE_LDIRECTORIES]: Remove. [LINK_ELIMINATE_DUPLICATE_LDIRECTORIES] (is_in_args): Remove. * doc/tm.texi.in (Driver, LINK_ELIMINATE_DUPLICATE_LDIRECTORIES): Remove. * doc/tm.texi: Regenerate. * doc/invoke.texi (Debugging Options, -gdwarf-<version>): Remove IRIX 6 reference. (MIPS Options, -march): Remove IRIX reference. * doc/install.texi (Binaries, SGI IRIX): Remove. (Specific, mips-sgi-irix6): Document IRIX 6.5 removal, remove rest of section. * doc/trouble.texi (Interoperation): Remove -lgl_s handling. fixincludes: * inclhack.def (broken_cabs): Remove IRIX and SunOS 4 support. (irix___restrict): Remove. (irix___generic1): Remove. (irix___generic2): Remove. (irix_asm_apostrophe): Remove. (irix_complex): Remove. (irix_pthread_init): Remove. (irix_socklen_t): Remove. (irix_stdint_c99_mode): Remove. (irix_stdint_c99_types): Remove. (irix_stdint_c99_macros): Remove. (irix_stdio_va_list): Remove IRIX 6.5 support. (irix_wcsftime): Remove. (stdio_va_list): Remove IRIX 6.5 support. (svr4_profil): Remove IRIX bypass. * fixincl.x: Regenerate. * tests/base/complex.h [IRIX_COMPLEX_CHECK]: Remove. * tests/base/internal/math_core.h: Remove. * tests/base/internal/sgimacros.h: Remove. * tests/base/internal/wchar_core.h: Remove. * tests/base/math.h [BROKEN_CABS_CHECK]: Remove IRIX and SunOS 4 support. * tests/base/pthread.h [IRIX_PTHREAD_INIT_CHECK]: Remove. * tests/base/stdint-irix65.h: Remove. * tests/base/stdint.h [IRIX_STDINT_C99_MODE_CHECK]: Remove. * tests/base/sys/asm.h: Remove. * tests/base/sys/socket.h [IRIX_SOCKLEN_T_CHECK]: Remove. contrib: * config-list.mk (LIST): Remove mips-sgi-irix6.5. toplevel: * MAINTAINERS (OS Port Maintainers): Remove irix. * configure.ac (enable_libgomp): Remove *-*-irix6*. (unsupported_languages): Remove mips-sgi-irix6.*. (noconfigdirs): Don't add ${libgcj} for mips*-*-irix6*. (with_stabs): Remove. * configure: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185390 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'fixincludes/inclhack.def')
-rw-r--r--fixincludes/inclhack.def288
1 files changed, 3 insertions, 285 deletions
diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
index 40b8d0fe5dd..8f36077829a 100644
--- a/fixincludes/inclhack.def
+++ b/fixincludes/inclhack.def
@@ -780,10 +780,6 @@ fix = {
/*
* Remove `extern double cabs' declarations from math.h.
* This conflicts with C99. Discovered on AIX.
- * IRIX 5 and IRIX 6 before 6.5.18 (where C99 support was introduced)
- * declares cabs() to take a struct __cabs_s argument.
- * SunOS4 has its cabs() declaration followed by a comment which
- * terminates on the following line.
* Darwin hides its broken cabs in architecture-specific subdirs.
*/
fix = {
@@ -799,11 +795,7 @@ fix = {
"#else\n"
"extern double cabs();\n"
"#endif\n"
- "extern double cabs ( _Complex z );\n"
- "extern double cabs(); /* This is a comment\n"
- " and it ends here. */\n"
- "extern double cabs(struct __cabs_s);\n"
- "extern long double cabsl( struct __cabsl_s );";
+ "extern double cabs ( _Complex z );";
};
@@ -2243,110 +2235,6 @@ fix = {
/*
- * IRIX 6.5.1[89] <internal/sgimacros.h> unconditionally defines
- * __restrict as restrict iff __c99. This is wrong for C++, which
- * needs many C99 features, but only supports __restrict.
- */
-fix = {
- hackname = irix___restrict;
- files = internal/sgimacros.h;
- select = "(#ifdef __c99\n)(#[ \t]*define __restrict restrict)";
-
- mach = "mips-sgi-irix6.5";
- c_fix = format;
- c_fix_arg = "%1"
- "# ifndef __cplusplus\n%2\n# endif";
-
- test_text = "#ifdef __c99\n# define __restrict restrict";
-};
-
-/*
- * IRIX 6.5.22 <internal/math_core.h> uses the SGI c99 __generic() intrinsic
- * to define the fpclasify, isfinite, isinf, isnan, isnormal and signbit
- * functions.
- *
- * This was probably introduced around IRIX 6.5.18
- */
-fix = {
- hackname = irix___generic1;
- files = internal/math_core.h;
- mach = "mips-sgi-irix6.5";
- select = "#define ([a-z]+)\\(x\\) *__generic.*";
-
- c_fix = format;
- c_fix_arg = "extern int %1(double);\n"
- "extern int %1f(float);\n"
- "extern int %1l(long double);\n"
- "#define %1(x) (sizeof(x) == sizeof(double) ? _%1(x) \\\n"
- " : sizeof(x) == sizeof(float) ? _%1f(x) \\\n"
- " : _%1l(x))\n";
-
- test_text =
- "#define isnan(x) __generic(x,,, _isnan, _isnanf, _isnanl,,,)(x)\n";
-};
-
-
-/* Likewise <internal/math_core.h> on IRIX 6.5.19 and later uses the SGI
- compiler's __generic intrinsic to define isgreater, isgreaterequal,
- isless, islessequal, islessgreater and isunordered functions. */
-fix = {
- hackname = irix___generic2;
- files = internal/math_core.h;
- mach = "mips-sgi-irix6.5";
- select = "#define ([a-z]+)\\(x,y\\) *__generic.*";
-
- c_fix = format;
- c_fix_arg = "#define %1(x,y) \\\n"
- " ((sizeof(x)<=4 && sizeof(y)<=4) ? _%1f(x,y) \\\n"
- " : (sizeof(x)<=8 && sizeof(y)<=8) ? _%1(x,y) \\\n"
- " : _%1l(x,y))\n";
-
- test_text =
- "#define isless(x,y) __generic(x,y,, _isless, _islessf, _islessl,,,)(x,y)";
-};
-
-
-/*
- * IRIX 5.2's <sys/asm.h> contains an asm comment with a contraction
- * that causes the assembly preprocessor to complain about an
- * unterminated character constant.
- */
-fix = {
- hackname = irix_asm_apostrophe;
- files = sys/asm.h;
-
- select = "^[ \t]*#.*[Ww]e're";
- c_fix = format;
- c_fix_arg = "%1 are";
- c_fix_arg = "^([ \t]*#.*[Ww]e)'re";
- test_text = "\t# and we're on vacation";
-};
-
-
-/*
- * IRIX 6.5 complex.h defines _Complex_I and _Imaginary_I in terms of __I__,
- * which is a MIPSpro compiler builtin. Remove _Imaginary_I and imaginary
- * definitions which are not supported by GCC.
- */
-fix = {
- hackname = irix_complex;
- mach = "mips-sgi-irix6.5";
- files = complex.h;
- select = "#define[ \t]_Complex_I[ \t]\\(\\(float[ \t]_Complex\\)[ \t]\\(__I__\\)\\)";
- sed = "s/#define[ \t]_Complex_I[ \t]((float[ \t]_Complex)[ \t](__I__))/"
- "#define _Complex_I (__extension__ 1.0iF)/";
- sed = "/#define[ \t]imaginary[ \t]_Imaginary/d";
- sed = "/#define[ \t]_Imaginary_I/d";
- sed = "s/#define[ \t]I[ \t]_Imaginary_I/#define I _Complex_I/";
- test_text = "#define _Complex_I ((float _Complex) (__I__))\n"
- "#define imaginary _Imaginary\n"
- "// #define _Imaginary_I ((float _Imaginary) 1)\n"
- "#define _Imaginary_I __I__\n"
- "#define I _Imaginary_I";
-};
-
-
-/*
* Non-traditional "const" declaration in Irix's limits.h.
*/
fix = {
@@ -2360,155 +2248,12 @@ fix = {
/*
- * IRIX 6.5 PTHREAD_*_INITIALIZER need an additional level of braces in
- * <pthread.h>.
- */
-fix = {
- hackname = irix_pthread_init;
- files = pthread.h;
- select = "^(#define[ \t]+PTHREAD_.*_INITIALIZER[ \t]+)(\\{ 0 \\})";
-
- mach = "mips-sgi-irix6.5";
- c_fix = format;
- c_fix_arg = "%1{ %2 }";
- test_text = "#define PTHREAD_MUTEX_INITIALIZER { 0 }\n"
- "#define PTHREAD_COND_INITIALIZER { 0 }\n"
- "#define PTHREAD_RWLOCK_INITIALIZER { 0 }";
-};
-
-
-/*
- * IRIX 6.5.1[78] <sys/socket.h> has a broken definition of socklen_t.
- * Various socket function prototypes use different types instead,
- * depending on the API in use (BSD, XPG4/5), but the socklen_t
- * definition doesn't reflect this (SGI Bug Id 864477, fixed in
- * IRIX 6.5.19).
- */
-fix = {
- hackname = irix_socklen_t;
- files = sys/socket.h;
- select = "(#define _SOCKLEN_T\n)(typedef u_int32_t socklen_t;)";
-
- mach = "mips-sgi-irix6.5";
- c_fix = format;
- c_fix_arg = "%1"
- "#if _NO_XOPEN4 && _NO_XOPEN5\n"
- "typedef int socklen_t;\n"
- "#else\n"
- "%2\n"
- "#endif /* _NO_XOPEN4 && _NO_XOPEN5 */";
-
- test_text = "#define _SOCKLEN_T\ntypedef u_int32_t socklen_t;";
-};
-
-/*
- * IRIX 6.5 <stdint.h> only works with ISO C99 and errors out
- * otherwise.
- */
-fix = {
- hackname = irix_stdint_c99_mode;
- files = stdint.h;
- select = "(#ifndef __c99\n)(#error This header file is to be used only for c99 mode compilations)";
-
- mach = "mips-sgi-irix6.5";
- c_fix = format;
- c_fix_arg = "#if 0\n"
- "%2";
- test_text =
- "#ifndef __c99\n#error This header file is to be used only for c99 mode compilations\n#else";
-};
-
-
-/*
- * IRIX 6.5 <stdint.h> has some *_MIN/MAX constants whose types don't
- * match the corresponding types, as required by ISO C99.
- */
-fix = {
- hackname = irix_stdint_c99_types;
- files = stdint-irix65.h, stdint.h;
- mach = "mips-sgi-irix6.5";
- sed = "s@^#define INT64_MIN.*(-0x7fffffffffffffff - 1)$@"
- "#define INT64_MIN (-0x7fffffffffffffffLL - 1)@";
- sed = "s@^#define INT64_MAX.*0x7fffffffffffffff$@"
- "#define INT64_MAX 0x7fffffffffffffffLL@";
- sed = "s@^#define UINT32_MAX.*0xffffffff$@"
- "#define UINT32_MAX 0xffffffffU@";
- sed = "s@^#define UINT64_MAX.*0xffffffffffffffff$@"
- "#define UINT64_MAX 0xffffffffffffffffULL@";
- sed = "s@^#define INTPTR_MIN.*INT32_MIN$@"
- "#define INTPTR_MIN (-0x7fffffffL - 1)@";
- sed = "s@^#define INTPTR_MAX.*INT32_MAX$@"
- "#define INTPTR_MAX 0x7fffffffL@";
- sed = "s@^#define UINTPTR_MAX.*UINT32_MAX$@"
- "#define UINTPTR_MAX 0xffffffffUL@";
- sed = "s@^#define INTPTR_MIN.*INT64_MIN@"
- "#define INTPTR_MIN (-0x7fffffffffffffffL - 1)@";
- sed = "s@^#define INTPTR_MAX.*INT64_MAX$@"
- "#define INTPTR_MAX 0x7fffffffffffffffL@";
- sed = "s@^#define UINTPTR_MAX.*UINT64_MAX$@"
- "#define UINTPTR_MAX 0xffffffffffffffffUL@";
- sed = "s@^#define PTRDIFF_MIN.*INT64_MIN$@"
- "#define PTRDIFF_MIN (-0x7fffffffffffffffL - 1)@";
- sed = "s@^#define PTRDIFF_MAX.*INT64_MAX$@"
- "#define PTRDIFF_MAX 0x7fffffffffffffffL@";
- sed = "s@^#define SIZE_MAX.*UINT64_MAX$@"
- "#define SIZE_MAX 0xffffffffffffffffUL@";
- test_text = "#define INT64_MIN (-0x7fffffffffffffff - 1)\n"
- "#define INT64_MAX 0x7fffffffffffffff\n"
- "#define UINT32_MAX 0xffffffff\n"
- "#define UINT64_MAX 0xffffffffffffffff\n"
- "#define INTPTR_MIN INT32_MIN\n"
- "#define INTPTR_MAX INT32_MAX\n"
- "#define UINTPTR_MAX UINT32_MAX\n"
- "#define INTPTR_MIN INT64_MIN\n"
- "#define INTPTR_MAX INT64_MAX\n"
- "#define UINTPTR_MAX UINT64_MAX\n"
- "#define PTRDIFF_MIN INT64_MIN\n"
- "#define PTRDIFF_MAX INT64_MAX\n"
- "#define SIZE_MAX UINT64_MAX";
-};
-
-
-/*
- * IRIX 6.5 <stdint.h> uses casts in some macros which cannot thus be used
- * in preprocessor tests, although ISO C99 requires this.
- */
-fix = {
- hackname = irix_stdint_c99_macros;
- files = stdint-irix65.h, stdint.h;
- mach = "mips-sgi-irix6.5";
- sed = "s@^#define INT8_C(x).*int.*_t.*$@#define INT8_C(x) (x)@";
- sed = "s@^#define INT16_C(x).*int.*_t.*$@#define INT16_C(x) (x)@";
- sed = "s@^#define INT32_C(x).*int.*_t.*$@#define INT32_C(x) (x)@";
- sed = "s@^#define INT64_C(x).*int.*_t.*$@#define INT64_C(x) (x ## LL)@";
- sed = "s@^#define UINT8_C(x).*int.*_t.*$@#define UINT8_C(x) (x)@";
- sed = "s@^#define UINT16_C(x).*int.*_t.*$@#define UINT16_C(x) (x)@";
- sed = "s@^#define UINT32_C(x).*int.*_t.*$@#define UINT32_C(x) (x ## U)@";
- sed = "s@^#define UINT64_C(x).*int.*_t.*$@#define UINT64_C(x) (x ## ULL)@";
- sed = "s@^#define INTMAX_C(x).*int.*_t.*$@#define INTMAX_C(x) (x ## LL)@";
- sed = "s@^#define UINTMAX_C(x).*int.*_t.*$@#define UINTMAX_C(x) (x ## ULL)@";
- test_text = "#define INT8_C(x) (int_least8_t)(x)\n"
- "#define INT16_C(x) (int_least16_t)(x)\n"
- "#define INT32_C(x) (int_least32_t)(x)\n"
- "#define INT64_C(x) (int_least64_t)(x)\n"
- "#define UINT8_C(x) (uint_least8_t)(x)\n"
- "#define UINT16_C(x) (uint_least16_t)(x)\n"
- "#define UINT32_C(x) (uint_least32_t)(x)\n"
- "#define UINT64_C(x) (uint_least64_t)(x)\n"
- "#define INTMAX_C(x) (intmax_t)(x)\n"
- "#define UINTMAX_C(x) (uintmax_t)(x)";
-};
-
-
-/*
- * IRIX 5.x's stdio.h and IRIX 6.5's internal/stdio_core.h declare
- * some functions that take a va_list as
+ * IRIX 5.x's stdio.h declares some functions that take a va_list as
* taking char *. However, GCC uses void * for va_list, so
* calling vfprintf with a va_list fails in C++. */
fix = {
hackname = irix_stdio_va_list;
files = stdio.h;
- files = internal/stdio_core.h;
select = '/\* va_list \*/ char \*';
c_fix = format;
@@ -2519,26 +2264,6 @@ fix = {
/*
- * IRIX 6.5.19 <internal/wchar_core.h> provides the XPG4 variant of
- * wcsftime by default. ISO C99 requires the XPG5 variant instead.
- */
-fix = {
- hackname = irix_wcsftime;
- files = internal/wchar_core.h;
- select = "#if _NO_XOPEN5\n(extern size_t[ \t]+wcsftime.*const char \*.*)";
-
- mach = "mips-sgi-irix6.5";
- c_fix = format;
- c_fix_arg = "#if _NO_XOPEN5 && !defined(__c99)\n%1";
-
- test_text = "#if _NO_XOPEN5\n"
- "extern size_t wcsftime(wchar_t *, "
- "__SGI_LIBC_NAMESPACE_QUALIFIER size_t, const char *, "
- "const struct tm *);";
-};
-
-
-/*
* These files in Sun OS 4.x and ARM/RISCiX and BSD4.3
* use / * * / to concatenate tokens.
*/
@@ -3767,15 +3492,11 @@ fix = {
* of __gnuc_va_list, __DJ_va_list, or _G_va_list is taken to
* indicate that the header knows what it's doing -- under SUSv2,
* stdio.h is required to define va_list, and we shouldn't break
- * that. On IRIX 6.5, internal/wchar_core.h used to get its
- * definition of va_list from stdio.h. Since this doesn't happen any
- * longer, use __gnuc_va_list there, too.
+ * that.
*/
fix = {
hackname = stdio_va_list;
files = stdio.h;
- files = internal/stdio_core.h;
- files = internal/wchar_core.h;
bypass = '__gnuc_va_list|_BSD_VA_LIST_|__DJ_va_list|_G_va_list';
/*
* On Solaris 10, the definition in
@@ -4151,9 +3872,6 @@ fix = {
select =
'profil\(unsigned short \*, unsigned int, unsigned int, unsigned int\)';
- /* The fix is wrong on IRIX 5/6 and creates a conflict with another
- prototype in <sys/profil.h>. */
- bypass = 'Silicon Graphics';
c_fix = format;
c_fix_arg = 'profil(unsigned short *, size_t, int, unsigned int)';