From 6b6ede3d15f04fe825cfa9f697507457e3640344 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 14 Feb 2015 23:00:19 -0600 Subject: resolve merge --- .../linuxthreads.old/sysdeps/v850/pt-machine.h | 52 ---------------------- 1 file changed, 52 deletions(-) delete mode 100644 libpthread/linuxthreads.old/sysdeps/v850/pt-machine.h (limited to 'libpthread/linuxthreads.old/sysdeps/v850/pt-machine.h') diff --git a/libpthread/linuxthreads.old/sysdeps/v850/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/v850/pt-machine.h deleted file mode 100644 index 34de63b9f..000000000 --- a/libpthread/linuxthreads.old/sysdeps/v850/pt-machine.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * sysdeps/v850/pt-machine.h -- v850-specific pthread definitions - * - * Copyright (C) 2002 NEC Electronics Corporation - * Copyright (C) 2002 Miles Bader - * - * This file is subject to the terms and conditions of the GNU Lesser - * General Public License. See the file COPYING.LIB in the main - * directory of this archive for more details. - * - * Written by Miles Bader - */ - -#ifndef _PT_MACHINE_H -#define _PT_MACHINE_H 1 - -#include - -#ifndef PT_EI -# define PT_EI __extern_always_inline -#endif - -/* Get some notion of the current stack. Need not be exactly the top - of the stack, just something somewhere in the current frame. */ -#define CURRENT_STACK_FRAME __stack_pointer -register char *__stack_pointer __asm__ ("sp"); - -#define HAS_COMPARE_AND_SWAP - -/* Atomically: If *PTR == OLD, set *PTR to NEW and return true, - otherwise do nothing and return false. */ -PT_EI int -__compare_and_swap (long *ptr, long old, long new) -{ - unsigned long psw; - - /* disable interrupts */ - __asm__ __volatile__ ("stsr psw, %0; di" : "=&r" (psw)); - - if (likely (*ptr == old)) - { - *ptr = new; - __asm__ __volatile__ ("ldsr %0, psw" :: "r" (psw)); /* re-enable */ - return 1; - } - else - { - __asm__ __volatile__ ("ldsr %0, psw" :: "r" (psw)); /* re-enable */ - return 0; - } -} -#endif /* pt-machine.h */ -- cgit v1.2.3