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/c6x/pt-machine.h | 63 ---------------------- 1 file changed, 63 deletions(-) delete mode 100644 libpthread/linuxthreads.old/sysdeps/c6x/pt-machine.h (limited to 'libpthread/linuxthreads.old/sysdeps/c6x/pt-machine.h') diff --git a/libpthread/linuxthreads.old/sysdeps/c6x/pt-machine.h b/libpthread/linuxthreads.old/sysdeps/c6x/pt-machine.h deleted file mode 100644 index 5e8bfca56..000000000 --- a/libpthread/linuxthreads.old/sysdeps/c6x/pt-machine.h +++ /dev/null @@ -1,63 +0,0 @@ -/* Machine-dependent pthreads configuration and inline functions. - C6x version. - Copyright (C) 2004 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Aurelien Jacquiot . - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation; either version 2.1 of the - License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; see the file COPYING.LIB. If - not, see . */ - -#ifndef _PT_MACHINE_H -#define _PT_MACHINE_H 1 - -#ifndef PT_EI -# define PT_EI extern inline -#endif - -extern int __compare_and_swap (long int *p, long int oldval, long int newval); - -/* Spinlock implementation; required. */ -static inline long int -testandset (int *spinlock) -{ - register unsigned int ret = 1; - int dummy; - __asm__ __volatile__ ("mvc .s2 CSR, %0\n\tand .s2 -2, %0, %0\n\tmvc .s2 %0, CSR\n" - : "=b" (dummy)); - - if (*spinlock == 0) { - *spinlock = 1; - ret = 0; - } - __asm__ __volatile__ ("mvc .s2 CSR, %0\n\tor .s2 1, %0, %0\n\tmvc .s2 %0, CSR\n" - : "=b" (dummy)); - return ret; -} - -#define WRITE_MEMORY_BARRIER() -#define READ_MEMORY_BARRIER() - -/* 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 get_stack_pointer() -static inline char * get_stack_pointer(void) -{ - char *sp; - __asm__ __volatile__ ("mv .d2 B15, %0" : "=b" (sp)); - return sp; -} - -#define THREAD_STACK_OFFSET 8 - -#endif /* pt-machine.h */ -- cgit v1.2.3