@@ -384,12 +384,12 @@ tas(volatile slock_t *lock)
384384:"=r" (_res ),"+m" (* lock )
385385:"r" (lock )
386386:"memory" );
387- #if defined(__sparcv7 )
387+ #if defined(__sparcv7 )|| defined( __sparc_v7__ )
388388/*
389389 * No stbar or membar available, luckily no actually produced hardware
390390 * requires a barrier.
391391 */
392- #elif defined(__sparcv8 )
392+ #elif defined(__sparcv8 )|| defined( __sparc_v8__ )
393393/* stbar is available (and required for both PSO, RMO), membar isn't */
394394__asm__ __volatile__ ("stbar \n" :::"memory" );
395395#else
@@ -402,13 +402,13 @@ tas(volatile slock_t *lock)
402402return (int )_res ;
403403}
404404
405- #if defined(__sparcv7 )
405+ #if defined(__sparcv7 )|| defined( __sparc_v7__ )
406406/*
407407 * No stbar or membar available, luckily no actually produced hardware
408408 * requires a barrier. We fall through to the default gcc definition of
409409 * S_UNLOCK in this case.
410410 */
411- #elif defined(__sparcv8 )
411+ #elif defined(__sparcv8 )|| defined( __sparc_v8__ )
412412/* stbar is available (and required for both PSO, RMO), membar isn't */
413413#define S_UNLOCK (lock )\
414414do \