From 1f36328e7f31694b422c29881c17e957265d8344 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 1 May 2013 01:20:37 +0000 Subject: Throughout, (mainly in fhandler*) fix remaining gcc 4.7 mismatch warnings between regparm definitions and declarations. * smallprint.cc (__small_vswprintf): Conditionalize declaration and setting of l_opt for only x86_64. * spawn.cc (child_info_spawn::worker): Remove unused 'pid' variable. * thread.cc (verifyable_object_isvalid): Temporarily define as non-inline with gcc 4.7+, regardless of target. --- winsup/cygwin/thread.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'winsup/cygwin/thread.cc') diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc index 2e54b7a50..0d5ded675 100644 --- a/winsup/cygwin/thread.cc +++ b/winsup/cygwin/thread.cc @@ -38,8 +38,8 @@ extern "C" void __fp_lock_all (); extern "C" void __fp_unlock_all (); extern "C" int valid_sched_parameters(const struct sched_param *); extern "C" int sched_set_thread_priority(HANDLE thread, int priority); -#ifdef __x86_64__ -/* FIXME: Temporarily workaround gcc 4.8 bug. */ +#if __GNUC__ == 4 && __GNUC_MINOR__ >= 7 +/* FIXME: Temporarily workaround gcc 4.7+ bug. */ static verifyable_object_state #else static inline verifyable_object_state @@ -122,8 +122,8 @@ __cygwin_lock_unlock (_LOCK_T *lock) paranoid_printf ("threadcount %d. unlocked", MT_INTERFACE->threadcount); } -#ifdef __x86_64__ -/* FIXME: Temporarily workaround gcc 4.8 bug. */ +#if __GNUC__ == 4 && __GNUC_MINOR__ >= 7 +/* FIXME: Temporarily workaround gcc 4.7+ bug. */ static verifyable_object_state #else static inline verifyable_object_state -- cgit v1.2.3