Update.

1998-04-23  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>

	* misc/sys/cdefs.h (__REDIRECT): Handle systems with non-empty
	__USER_LABEL_PREFIX__.
	(__ASMNAME, __ASMNAME2): New macros.

diff --git a/ChangeLog b/ChangeLog
index 35043c0..e2a7ce5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1998-04-23  Andreas Schwab  <schwab@issan.informatik.uni-dortmund.de>
+
+       * misc/sys/cdefs.h (__REDIRECT): Handle systems with non-empty
+       __USER_LABEL_PREFIX__.
+       (__ASMNAME, __ASMNAME2): New macros.
+
 1998-04-24  Ulrich Drepper  <drepper@cygnus.com>
 
        * elf/dl-load.c: Include sys/param.h for MAX.

diff --git a/linuxthreads/Makefile b/linuxthreads/Makefile
index cdfe06c..d75cb73 100644 (file)
--- a/linuxthreads/Makefile
+++ b/linuxthreads/Makefile
@@ -21,7 +21,7 @@
 #
 subdir := linuxthreads
 
-libpthread-version=0.7
+linuxthreads-version=0.7
 
 headers := pthread.h semaphore.h bits/semaphore.h
 distribute := internals.h queue.h restart.h spinlock.h

diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index c0c442e..1ced090 100644 (file)
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1992, 93, 94, 95, 96, 97 Free Software Foundation, Inc.
+/* Copyright (C) 1992, 93, 94, 95, 96, 97, 98 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
@@ -107,14 +107,16 @@
 
 #if defined __GNUC__ && __GNUC__ >= 2
 
-# define __REDIRECT(name, proto, asname) name proto __asm__ (#asname)
+# define __REDIRECT(name, proto, alias) name proto __asm__ (__ASMNAME (#alias))
+# define __ASMNAME(cname)  __ASMNAME2 (__USER_LABEL_PREFIX__, cname)
+# define __ASMNAME2(prefix, cname) __STRING (prefix) cname
 
 /*
 #elif __SOME_OTHER_COMPILER__
 
 # define __attribute__(xyz)
-# define __ALIAS(name, proto, asname) name proto; \
-                  _Pragma("let " #name " = " #asname)
+# define __REDIRECT(name, proto, alias) name proto; \
+       _Pragma("let " #name " = " #alias)
 */
 #endif