@@ -380,12 +380,12 @@ tas(volatile slock_t *lock)
380380:"=r" (_res ),"+m" (* lock )
381381:"r" (lock )
382382:"memory" );
383- #if defined(__sparcv7 )
383+ #if defined(__sparcv7 )|| defined( __sparc_v7__ )
384384/*
385385 * No stbar or membar available, luckily no actually produced hardware
386386 * requires a barrier.
387387 */
388- #elif defined(__sparcv8 )
388+ #elif defined(__sparcv8 )|| defined( __sparc_v8__ )
389389/* stbar is available (and required for both PSO, RMO), membar isn't */
390390__asm__ __volatile__ ("stbar \n" :::"memory" );
391391#else
@@ -398,13 +398,13 @@ tas(volatile slock_t *lock)
398398return (int )_res ;
399399}
400400
401- #if defined(__sparcv7 )
401+ #if defined(__sparcv7 )|| defined( __sparc_v7__ )
402402/*
403403 * No stbar or membar available, luckily no actually produced hardware
404404 * requires a barrier. We fall through to the default gcc definition of
405405 * S_UNLOCK in this case.
406406 */
407- #elif defined(__sparcv8 )
407+ #elif defined(__sparcv8 )|| defined( __sparc_v8__ )
408408/* stbar is available (and required for both PSO, RMO), membar isn't */
409409#define S_UNLOCK (lock )\
410410do \