From mboxrd@z Thu Jan 1 00:00:00 1970 From: Richard Henderson To: egcs@cygnus.com Subject: alpha libio patch -- really Date: Fri, 07 Nov 1997 04:42:00 -0000 Message-id: <19971107044246.32491@dot.cygnus.com> X-SW-Source: 1997-11/msg00253.html Ho hum... Sat Oct 11 18:25:12 1997 Richard Henderson * configure.in (target frags): Add alpha*-linux-gnulibc1. (pic frags): Its alpha*- not alpha-. (stdio-lock): Kill everything. Add alpha*-linux-gnulibc1. * libio.h: Check __GLIBC_MINOR__ to find stdio-lock.h. If not _IO_MTSAFE_IO & GLIBC, make sure the lock pointer is still there. * libioP.h: Check __GLIBC_MINOR__ to find libc-lock.h. * config/linuxaxp1-libc-lock.h: New file. * config/linuxaxp1-stdio-lock.h: New file. * config/linuxaxp1.mt: New file. * gen-params (va_list): Check for and use __gnuc_va_list. (NULL): Work around some linux kernel headers and redefine NULL. ? libio/config/linuxaxp1.mt ? libio/config/linuxaxp1-libc-lock.h ? libio/config/linuxaxp1-stdio-lock.h Index: libio/configure.in =================================================================== RCS file: /cvs/cvsfiles/egcs/libio/configure.in,v retrieving revision 1.5 diff -u -p -d -r1.5 configure.in --- configure.in 1997/10/16 15:30:22 1.5 +++ configure.in 1997/11/07 06:46:59 @@ -16,6 +16,8 @@ frags= case "${target}" in *-hpux*) frags=hpux.mt ;; + alpha*-*-linux-gnulibc1) + frags="linux.mt linuxaxp1.mt mtsafe.mt" ;; *-linux-gnulibc1) frags=linuxlibc1.mt ;; *-linux-gnu) frags="linux.mt mtsafe.mt" ;; @@ -36,34 +38,21 @@ if [ "${shared}" = "yes" ]; then case "${target}" in hppa*-*) frags="${frags} ../../config/mh-papic" ;; i[3456]86-*) frags="${frags} ../../config/mh-x86pic" ;; - alpha-*-linux*) + alpha*-*-linux*) frags="${frags} ../../config/mh-elfalphapic" ;; *) frags="${frags} ../../config/mh-${target_cpu}pic" ;; esac fi -# Make a link for the correct stdio-lock.h file. +# Take care of header file lossage. case "${target}" in - *-linux-gnu) - # We have a correct file in glibc but the libioP.h file is written - # with glibc 2.1 in mind which has the internals headers in special - # directory while glibc 2.0 has them in /usr/include. Create a wrapper - # if necessary. - (echo "#include " | ${CC-cc} -E -) >/dev/null 2>&1 || - { - rm -fr bits - mkdir bits - echo "#include " > bits/libc-lock.h - echo 'asm (".weak _pthread_cleanup_pop_restore");' >> bits/libc-lock.h - echo 'asm (".weak _pthread_cleanup_push_defer");' >> bits/libc-lock.h - - echo "#include " > bits/stdio-lock.h - } - ;; - *) - rm -fr bits - mkdir bits - ln -s ${srcdir}/include/empty.h bits/stdio-lock.h + alpha*-*-linux-gnulibc1) + # For some reason stdio-lock.h is not installed on Red Hat systems. + # Further, libc-lock.h needs to define the pthreads stuff weak, and + # fails to do this for other than _LIBC. Install our own versions + # of these files. + cp ${srcdir}/config/linuxaxp1-libc-lock.h libc-lock.h + cp ${srcdir}/config/linuxaxp1-stdio-lock.h stdio-lock.h ;; esac Index: libio/gen-params =================================================================== RCS file: /cvs/cvsfiles/egcs/libio/gen-params,v retrieving revision 1.4 diff -u -p -d -r1.4 gen-params --- gen-params 1997/10/30 06:00:21 1.4 +++ gen-params 1997/11/07 06:47:00 @@ -487,9 +487,18 @@ if ${CXX} -c dummy.C >/dev/null 2>&1 ; t # Ok: We have something that works. echo "typedef ${va_list-char* /* default */} ${macro_prefix}va_list;" else - # No, it breaks. Indicate that must be included. - echo "#define ${macro_prefix}NEED_STDARG_H -#define ${macro_prefix}va_list va_list" + echo "#define ${macro_prefix}NEED_STDARG_H" + # Check and see if we have __gnuc_va_list, as we might set up define + # loops if we use va_list. + cat >dummy.C < +long foo(__gnuc_va_list ap) { return va_arg(ap, long); } +!EOF! + if ${CXX} -c dummy.C >/dev/null 2>&1 ; then + echo "#define ${macro_prefix}va_list __gnuc_va_list" + else + echo "#define ${macro_prefix}va_list va_list" + fi fi cat >dummy.c <= 2 -# include +# if __GLIBC_MINOR__ > 0 +# include +# else +# include +# endif # define _IO_LOCK_T _IO_lock_t * # else /*# include */ # endif #else -/* XXX This will go away as soon as comthread is finished. */ -# if defined __GLIBC__ && __GLIBC__ >= 2 +# if defined(__GLIBC__) && __GLIBC__ >= 2 + typedef void _IO_lock_t; # define _IO_LOCK_T void * # else # ifdef __linux__ -struct _IO_lock_t { - void *ptr; - short int field1; - short int field2; -}; + struct _IO_lock_t { void *ptr; short int field1; short int field2; }; # define _IO_LOCK_T struct _IO_lock_t +# else + typedef void _IO_lock_t; # endif # endif #endif Index: libio/libioP.h =================================================================== RCS file: /cvs/cvsfiles/egcs/libio/libioP.h,v retrieving revision 1.4 diff -u -p -d -r1.4 libioP.h --- libioP.h 1997/09/17 00:54:02 1.4 +++ libioP.h 1997/11/07 06:47:00 @@ -28,7 +28,11 @@ # define __set_errno(Val) errno = (Val) #endif #if defined __GLIBC__ && __GLIBC__ >= 2 -# include +# if __GLIBC_MINOR__ > 0 +# include +# else +# include +# endif #else /*# include */ #endif *** /dev/null Wed Aug 13 13:41:06 1997 --- libio/config/linuxaxp1-libc-lock.h Thu Nov 6 17:52:30 1997 *************** *** 0 **** --- 1,112 ---- + /* libc-internal interface for mutex locks. LinuxThreads version. + Copyright (C) 1996 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + + #ifndef _LIBC_LOCK_H + #define _LIBC_LOCK_H 1 + + #include + #define __libc_lock_t pthread_mutex_t + + /* Define a lock variable NAME with storage class CLASS. The lock must be + initialized with __libc_lock_init before it can be used (or define it + with __libc_lock_define_initialized, below). Use `extern' for CLASS to + declare a lock defined in another module. In public structure + definitions you must use a pointer to the lock structure (i.e., NAME + begins with a `*'), because its storage size will not be known outside + of libc. */ + #define __libc_lock_define(CLASS,NAME) \ + CLASS __libc_lock_t NAME; + + /* Define an initialized lock variable NAME with storage class CLASS. */ + #define __libc_lock_define_initialized(CLASS,NAME) \ + CLASS __libc_lock_t NAME = PTHREAD_MUTEX_INITIALIZER; + + /* Initialize the named lock variable, leaving it in a consistent, unlocked + state. */ + #define __libc_lock_init(NAME) \ + (__pthread_mutex_init != NULL ? __pthread_mutex_init (&(NAME), NULL) : 0); + + /* Same as last but this time we initialize a recursive mutex. */ + #define __libc_lock_init_recursive(NAME) \ + do { \ + if (__pthread_mutex_init != NULL) \ + { \ + pthread_mutexattr_t __attr; \ + __pthread_mutexattr_init (&__attr); \ + __pthread_mutexattr_setkind_np (&__attr, PTHREAD_MUTEX_RECURSIVE_NP); \ + __pthread_mutex_init (&(NAME), &__attr); \ + __pthread_mutexattr_destroy (&__attr); \ + } \ + } while (0); + + /* Finalize the named lock variable, which must be locked. It cannot be + used again until __libc_lock_init is called again on it. This must be + called on a lock variable before the containing storage is reused. */ + #define __libc_lock_fini(NAME) \ + (__pthread_mutex_destroy != NULL ? __pthread_mutex_destroy (&(NAME)) : 0); + + /* Lock the named lock variable. */ + #define __libc_lock_lock(NAME) \ + (__pthread_mutex_lock != NULL ? __pthread_mutex_lock (&(NAME)) : 0); + + /* Try to lock the named lock variable. */ + #define __libc_lock_trylock(NAME) \ + (__pthread_mutex_trylock != NULL ? __pthread_mutex_trylock (&(NAME)) : 0); + + /* Unlock the named lock variable. */ + #define __libc_lock_unlock(NAME) \ + (__pthread_mutex_unlock != NULL ? __pthread_mutex_unlock (&(NAME)) : 0); + + /* Start critical region with cleanup. */ + #define __libc_cleanup_region_start(FCT, ARG) \ + { struct _pthread_cleanup_buffer _buffer; \ + if (_pthread_cleanup_push_defer != NULL) { \ + _pthread_cleanup_push_defer (&_buffer, (FCT), (ARG)); \ + } + + /* End critical region with cleanup. */ + #define __libc_cleanup_region_end(DOIT) \ + if (_pthread_cleanup_push_defer != NULL) { \ + _pthread_cleanup_pop_restore (&_buffer, (DOIT)); \ + } \ + } + + /* Make the pthread functions weak so that we can elide them from + single-threaded processes. */ + #pragma weak __pthread_mutex_init + #pragma weak __pthread_mutex_destroy + #pragma weak __pthread_mutex_lock + #pragma weak __pthread_mutex_trylock + #pragma weak __pthread_mutex_unlock + #pragma weak __pthread_mutexattr_init + #pragma weak __pthread_mutexattr_destroy + #pragma weak __pthread_mutexattr_setkind_np + #pragma weak __pthread_key_create + #pragma weak __pthread_setspecific + #pragma weak __pthread_getspecific + #pragma weak __pthread_initialize + #pragma weak _pthread_cleanup_push_defer + #pragma weak _pthread_cleanup_pop_restore + + /* We need portable names for some functions. E.g., when they are + used as argument to __libc_cleanup_region_start. */ + #define __libc_mutex_unlock __pthread_mutex_unlock + + #endif /* libc-lock.h */ + *** /dev/null Wed Aug 13 13:41:06 1997 --- libio/config/linuxaxp1-stdio-lock.h Thu Nov 6 17:52:53 1997 *************** *** 0 **** --- 1,36 ---- + /* Thread package specific definitions of stream lock type. + Copyright (C) 1996, 1997 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + + #include + + typedef pthread_mutex_t _IO_lock_t; + + /* We need recursive (counting) mutexes. */ + #define _IO_lock_initializer PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP + + + #define _IO_cleanup_region_start(_fct, _fp) \ + __libc_cleanup_region_start (_fct, _fp) + #define _IO_cleanup_region_end(_doit) \ + __libc_cleanup_region_end (_doit) + #define _IO_lock_init(_name) \ + __libc_lock_init_recursive (_name) + #define _IO_lock_fini(_name) \ + __libc_lock_fini_recursive (_name) + *** /dev/null Wed Aug 13 13:41:06 1997 --- libio/config/linuxaxp1.mt Thu Nov 6 17:53:50 1997 *************** *** 0 **** --- 1,10 ---- + # We _do_ need a new _G_config.h + _G_CONFIG_H=_G_config.h + + # And the two bits files. + all: + install: install-axp-mt-headers + + install-axp-mt-headers: + $(INSTALL_DATA) libc-lock.h $(gxx_includedir)/libc-lock.h + $(INSTALL_DATA) stdio-lock.h $(gxx_includedir)/stdio-lock.h