* [PATCH] Alpha build fixes
@ 2002-08-28 9:27 Jakub Jelinek
2002-08-28 17:41 ` Ulrich Drepper
0 siblings, 1 reply; 2+ messages in thread
From: Jakub Jelinek @ 2002-08-28 9:27 UTC (permalink / raw)
To: Ulrich Drepper, Roland McGrath; +Cc: Glibc hackers
Hi!
Ok, a bunch of things in libc broke Alpha in the last 5 days:
a) size of sys_errlist problems
- I have modified errlist-compat.awk script so that it picks up
#errlist-compat comments from the first Versions file in the search
path
b) the recent Alpha pipe.S move broke alpha-linux build, since
linux/syscalls.list provides pipe
c) after I fixed Alpha visibility hidden in gcc 3.2 backport, I got errors
when linking ld.so about relocation overflows - turns out _rtld_local
was declared in section .sdata, so gcc can access
it using GPREL16 relocs, but _rtld_global was not in .sdata and thus
the overflows
d) symbol versioning for aio_cancel for backward compatibility with the
bogus ECANCELED value on the problematic arches (alpha, sparc, hppa)
plus related <bits/errno.h> fixes.
2002-08-28 Jakub Jelinek <jakub@redhat.com>
* sysdeps/generic/ldsodefs.h (__rtld_global_attribute__): Define.
(_rtld_global): Use it.
* sysdeps/gnu/Dist: Remove errlist-compat.c.
* sysdeps/gnu/Makefile (errlist-compat.c): Build this file in the
object directory. Pass all Versions files to the awk script.
* sysdeps/gnu/errlist-compat.c: Removed.
* sysdeps/gnu/errlist.awk: Use #errlist-compat comments from the
first Versions file in the search path which has them.
Allow multiple errlist symbol versions to have the same count of
errors.
* sysdeps/gnu/errlist-compat.awk: Include <errlist-compat.c> instead
of "errlist-compat.c".
* sysdeps/gnu/errlist.c: Regenerated.
* sysdeps/unix/sysv/linux/mips/Versions (libc): Add #errlist-compat
comments at GLIBC_2.0, GLIBC_2.1 and GLIBC_2.3.
* sysdeps/unix/sysv/linux/alpha/Versions: Likewise.
(librt): Add aio_cancel and aio_cancel64 as GLIBC_2.3.
* sysdeps/unix/sysv/linux/hppa/Versions: Likewise.
* sysdeps/unix/sysv/linux/sparc/Versions: Likewise.
* sysdeps/unix/sysv/linux/alpha/bits/errno.h: New file.
* sysdeps/unix/sysv/linux/hppa/bits/errno.h (ECANCELED): Define to
ECANCELLED if not defined by kernel headers.
* sysdeps/unix/sysv/linux/bits/errno.h: Don't redefine ECANCELED if
already defined by kernel headers.
* sysdeps/unix/sysv/linux/sparc/bits/errno.h: New file.
* sysdeps/pthread/aio_cancel.c: Don't include aio.h and its
aio_cancel64 renaming hack nor provide weak_alias if aio_cancel
is a macro.
* Versions.def (GLIBC_2.3): Add.
* sysdeps/unix/sysv/linux/alpha/pipe.S: New file.
linuxthreads/
* sysdeps/unix/sysv/linux/hppa/aio_cancel.c: New file.
* sysdeps/unix/sysv/linux/sparc/aio_cancel.c: New file.
* sysdeps/unix/sysv/linux/alpha/aio_cancel.c: New file.
--- libc/sysdeps/generic/ldsodefs.h.jj 2002-08-27 23:19:50.000000000 +0200
+++ libc/sysdeps/generic/ldsodefs.h 2002-08-28 17:12:32.000000000 +0200
@@ -374,12 +374,14 @@ struct rtld_global
EXTERN struct link_map _dl_rtld_map;
#ifdef SHARED
};
-extern struct rtld_global _rtld_global;
+# define __rtld_global_attribute__
# ifdef IS_IN_rtld
# ifdef HAVE_VISIBILITY_ATTRIBUTE
# ifdef HAVE_SDATA_SECTION
# define __rtld_local_attribute__ \
__attribute__ ((visibility ("hidden"), section (".sdata")))
+# undef __rtld_global_attribute__
+# define __rtld_global_attribute__ __attribute__ ((section (".sdata")))
# else
# define __rtld_local_attribute__ __attribute__ ((visibility ("hidden")))
# endif
@@ -388,6 +390,7 @@ extern struct rtld_global _rtld_global;
# endif
extern struct rtld_global _rtld_local __rtld_local_attribute__;
# endif
+extern struct rtld_global _rtld_global __rtld_global_attribute__;
#endif
#undef EXTERN
--- libc/sysdeps/gnu/Dist.jj 2002-08-28 12:58:13.000000000 +0200
+++ libc/sysdeps/gnu/Dist 2002-08-28 15:00:51.000000000 +0200
@@ -1,5 +1,4 @@
errlist.awk
-errlist-compat.c
errlist-compat.awk
utmpx.h
bits/utmpx.h
--- libc/sysdeps/gnu/Makefile.jj 2002-08-27 23:19:50.000000000 +0200
+++ libc/sysdeps/gnu/Makefile 2002-08-28 15:37:22.000000000 +0200
@@ -29,24 +29,24 @@ ifeq ($(with-cvs),yes)
test ! -d CVS || cvs commit -m'Regenerated from $^' $@
endif
+ifeq ($(subdir),stdio-common)
+
vpath errlist.c $(full_config_sysdirs)
-$(..)sysdeps/gnu/errlist-compat.c: errlist.c \
+$(objpfx)errlist-compat.c: errlist.c \
$(..)sysdeps/gnu/errlist-compat.awk \
- $(..)sysdeps/gnu/Versions
+ $(common-objpfx)Versions.v.i
$(AWK) -v maxerr=`\
$(CC) -S $(CPPFLAGS) $(CFLAGS) -DNOT_IN_libc -DEMIT_ERR_MAX $< -o - \
| sed -n 's/^.*@@@[^0-9]*\([0-9]*\)[^0-9]*@@@.*$$/\1/p'` \
- -f $(filter-out $<,$^) > $@T
+ -f $(..)sysdeps/gnu/errlist-compat.awk \
+ $(wildcard $(patsubst %,$(..)%/Versions,\
+ $(config-sysdirs) $(add-ons))) > $@T
# Make it unwritable so noone will edit it by mistake.
-chmod a-w $@T
mv -f $@T $@
-ifeq ($(with-cvs),yes)
- test ! -d CVS || cvs commit -m'Regenerated from $^' $@
-endif
-ifeq ($(subdir),stdio-common)
# This will force the generation above to happy if need be.
-$(objpfx)errlist.d: $(..)sysdeps/gnu/errlist-compat.c
+$(objpfx)errlist.d: $(objpfx)errlist-compat.c
endif
ifeq ($(subdir),login)
--- libc/sysdeps/gnu/errlist-compat.c.jj 2002-08-28 07:22:41.000000000 +0200
+++ libc/sysdeps/gnu/errlist-compat.c 2002-08-28 14:47:37.000000000 +0200
@@ -1,44 +0,0 @@
-/* This file was generated by errlist-compat.awk; DO NOT EDIT! */
-
-#include <shlib-compat.h>
-
-#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_1)
-# include <bits/wordsize.h>
-extern const char *const __sys_errlist_GLIBC_2_0[];
-const int __sys_nerr_GLIBC_2_0 = 123;
-strong_alias (_sys_errlist_internal, __sys_errlist_GLIBC_2_0)
-declare_symbol (__sys_errlist_GLIBC_2_0, object, __WORDSIZE/8*123)
-compat_symbol (libc, __sys_errlist_GLIBC_2_0, sys_errlist, GLIBC_2_0);
-compat_symbol (libc, __sys_nerr_GLIBC_2_0, sys_nerr, GLIBC_2_0);
-extern const char *const ___sys_errlist_GLIBC_2_0[];
-extern const int __sys_nerr_GLIBC_2_0;
-strong_alias (__sys_errlist_GLIBC_2_0, ___sys_errlist_GLIBC_2_0)
-strong_alias (__sys_nerr_GLIBC_2_0, ___sys_nerr_GLIBC_2_0)
-compat_symbol (libc, ___sys_errlist_GLIBC_2_0, _sys_errlist, GLIBC_2_0);
-compat_symbol (libc, ___sys_nerr_GLIBC_2_0, _sys_nerr, GLIBC_2_0);
-#endif
-
-#if SHLIB_COMPAT (libc, GLIBC_2_1, GLIBC_2_3)
-# include <bits/wordsize.h>
-extern const char *const __sys_errlist_GLIBC_2_1[];
-const int __sys_nerr_GLIBC_2_1 = 125;
-strong_alias (_sys_errlist_internal, __sys_errlist_GLIBC_2_1)
-declare_symbol (__sys_errlist_GLIBC_2_1, object, __WORDSIZE/8*125)
-compat_symbol (libc, __sys_errlist_GLIBC_2_1, sys_errlist, GLIBC_2_1);
-compat_symbol (libc, __sys_nerr_GLIBC_2_1, sys_nerr, GLIBC_2_1);
-extern const char *const ___sys_errlist_GLIBC_2_1[];
-extern const int __sys_nerr_GLIBC_2_1;
-strong_alias (__sys_errlist_GLIBC_2_1, ___sys_errlist_GLIBC_2_1)
-strong_alias (__sys_nerr_GLIBC_2_1, ___sys_nerr_GLIBC_2_1)
-compat_symbol (libc, ___sys_errlist_GLIBC_2_1, _sys_errlist, GLIBC_2_1);
-compat_symbol (libc, ___sys_nerr_GLIBC_2_1, _sys_nerr, GLIBC_2_1);
-#endif
-
-extern const char *const __sys_errlist_internal[];
-extern const int __sys_nerr_internal;
-strong_alias (_sys_errlist_internal, __sys_errlist_internal)
-strong_alias (_sys_nerr_internal, __sys_nerr_internal)
-versioned_symbol (libc, _sys_errlist_internal, sys_errlist, GLIBC_2_3);
-versioned_symbol (libc, __sys_errlist_internal, _sys_errlist, GLIBC_2_3);
-versioned_symbol (libc, _sys_nerr_internal, sys_nerr, GLIBC_2_3);
-versioned_symbol (libc, __sys_nerr_internal, _sys_nerr, GLIBC_2_3);
--- libc/sysdeps/gnu/errlist.awk.jj 2002-08-27 23:19:50.000000000 +0200
+++ libc/sysdeps/gnu/errlist.awk 2002-08-28 15:01:14.000000000 +0200
@@ -101,7 +101,7 @@ END {
print " = sizeof _sys_errlist_internal / sizeof _sys_errlist_internal [0];";
print "";
print "#if !defined NOT_IN_libc && !ERRLIST_NO_COMPAT";
- print "# include \"errlist-compat.c\"";
+ print "# include <errlist-compat.c>";
print "#endif";
print "";
print "#ifdef EMIT_ERR_MAX";
--- libc/sysdeps/gnu/errlist.c.jj 2002-08-27 23:19:50.000000000 +0200
+++ libc/sysdeps/gnu/errlist.c 2002-08-28 15:01:29.000000000 +0200
@@ -1406,7 +1406,7 @@ const int _sys_nerr_internal
= sizeof _sys_errlist_internal / sizeof _sys_errlist_internal [0];
#if !defined NOT_IN_libc && !ERRLIST_NO_COMPAT
-# include "errlist-compat.c"
+# include <errlist-compat.c>
#endif
#ifdef EMIT_ERR_MAX
--- libc/sysdeps/gnu/errlist-compat.awk.jj 2002-08-28 12:58:13.000000000 +0200
+++ libc/sysdeps/gnu/errlist-compat.awk 2002-08-28 16:40:33.000000000 +0200
@@ -29,19 +29,25 @@
# necessary compatibility symbols for older, smaller versions of sys_errlist.
#
-BEGIN { highest = 0 }
-
# These two rules catch the Versions file contents.
NF == 2 && $2 == "{" { last_version = $1; next }
$1 == "#errlist-compat" {
- n = $2 + 0;
- if (n < 100) {
+ # Don't process any further Versions files
+ ARGC = ARGIND + 1;
+ cnt = $2 + 0;
+ if (cnt < 100) {
print "*** this line seems bogus:", $0 > "/dev/stderr";
exit 1;
}
- version[n] = last_version;
- if (n > highest)
- highest = n;
+ version[pos + 0] = cnt SUBSEP last_version;
+ pos++;
+ if (cnt < highest) {
+ printf "*** %s #errlist-compat counts are not sorted\n", ARGV[ARGIND];
+ exit 1;
+ }
+ if (cnt > highest)
+ highest = cnt;
+ highest_version = last_version;
next;
}
@@ -50,20 +56,20 @@ END {
if (highest != count) {
printf "*** errlist.c count %d vs Versions sys_errlist@%s count %d\n", \
- count, version[highest], highest > "/dev/stderr";
+ count, highest_version, highest > "/dev/stderr";
exit 1;
}
lastv = "";
- for (n = 0; n <= count; ++n)
- if (n in version) {
- v = version[n];
- gsub(/[^A-Z0-9_]/, "_", v);
- if (lastv != "")
- compat[lastv] = v;
- lastv = v;
- vcount[v] = n;
- }
+ for (n = 0; n < pos; ++n) {
+ split(version[n], t, SUBSEP)
+ v = t[2];
+ gsub(/[^A-Z0-9_]/, "_", v);
+ if (lastv != "")
+ compat[lastv] = v;
+ lastv = v;
+ vcount[v] = t[1];
+ }
print "/* This file was generated by errlist-compat.awk; DO NOT EDIT! */\n";
print "#include <shlib-compat.h>\n";
--- libc/sysdeps/unix/sysv/linux/alpha/Versions.jj 2002-08-27 23:19:53.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/alpha/Versions 2002-08-28 14:43:06.000000000 +0200
@@ -1,5 +1,14 @@
libc {
+ # The comment lines with "#errlist-compat" are magic; see
+ # sysdeps/gnu/errlist-compat.awk.
+ # When you get an error from errlist-compat.awk, you need to add a new
+ # version here. Don't do this blindly, since this means changing the ABI
+ # for all GNU/Linux configurations.
+
GLIBC_2.0 {
+ #errlist-compat 131
+ _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+
# Unfortunately in wider use.
_inb; _inw; _inl; _outb; _outw; _outl; _bus_base; _bus_base_sparse;
_hae_shift;
@@ -24,6 +33,9 @@ libc {
pciconfig_read; pciconfig_write; sethae;
}
GLIBC_2.1 {
+ #errlist-compat 131
+ _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+
# Linux/Alpha 64-bit timeval functions.
__select; select;
adjtime; adjtimex; __adjtimex;
@@ -57,4 +69,14 @@ libc {
# w*
wordexp;
}
+ GLIBC_2.3 {
+ #errlist-compat 132
+ _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+ }
+}
+librt {
+ GLIBC_2.3 {
+ # AIO functions.
+ aio_cancel; aio_cancel64;
+ }
}
--- libc/sysdeps/unix/sysv/linux/alpha/bits/errno.h.jj 2002-08-28 13:48:51.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/alpha/bits/errno.h 2002-08-28 13:55:10.000000000 +0200
@@ -0,0 +1,52 @@
+/* Error constants. Linux/Alpha specific version.
+ Copyright (C) 1996, 1997, 1998, 1999, 2002 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 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; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#ifdef _ERRNO_H
+
+# undef EDOM
+# undef EILSEQ
+# undef ERANGE
+# include <linux/errno.h>
+
+/* Linux has no ENOTSUP error code. */
+# define ENOTSUP EOPNOTSUPP
+
+# ifndef ECANCELED
+# define ECANCELED 131
+# endif
+
+# ifndef __ASSEMBLER__
+/* Function to get address of global `errno' variable. */
+extern int *__errno_location (void) __THROW __attribute__ ((__const__));
+
+# if !defined _LIBC || defined _LIBC_REENTRANT
+/* When using threads, errno is a per-thread value. */
+# define errno (*__errno_location ())
+# endif
+# endif /* !__ASSEMBLER__ */
+#endif /* _ERRNO_H */
+
+#if !defined _ERRNO_H && defined __need_Emath
+/* This is ugly but the kernel header is not clean enough. We must
+ define only the values EDOM, EILSEQ and ERANGE in case __need_Emath is
+ defined. */
+# define EDOM 33 /* Math argument out of domain of function. */
+# define EILSEQ 116 /* Illegal byte sequence. */
+# define ERANGE 34 /* Math result not representable. */
+#endif /* !_ERRNO_H && __need_Emath */
--- libc/sysdeps/unix/sysv/linux/alpha/pipe.S.jj 2002-08-28 17:25:58.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/alpha/pipe.S 2002-08-28 17:25:54.000000000 +0200
@@ -0,0 +1 @@
+#include <sysdeps/unix/alpha/pipe.S>
--- libc/sysdeps/unix/sysv/linux/hppa/bits/errno.h.jj 2002-07-23 10:06:19.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/hppa/bits/errno.h 2002-08-28 14:27:11.000000000 +0200
@@ -1,5 +1,5 @@
/* Error constants. Linux/HPPA specific version.
- Copyright (C) 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1996,1997,1998,1999,2000,2002 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
@@ -26,7 +26,9 @@
/* Linux also has no ECANCELED error code. Since it is not used here
we define it to an invalid value. */
-# define ECANCELED 125
+# ifndef ECANCELED
+# define ECANCELED ECANCELLED
+# endif
# ifndef __ASSEMBLER__
/* Function to get address of global `errno' variable. */
@@ -44,6 +46,6 @@ extern int *__errno_location (void) __TH
define only the values EDOM, EILSEQ and ERANGE in case __need_Emath is
defined. */
# define EDOM 33 /* Math argument out of domain of function. */
-# define EILSEQ 84 /* Illegal byte sequence. */
+# define EILSEQ 47 /* Illegal byte sequence. */
# define ERANGE 34 /* Math result not representable. */
#endif /* !_ERRNO_H && __need_Emath */
--- libc/sysdeps/unix/sysv/linux/hppa/Versions.jj 2000-10-15 05:26:01.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/hppa/Versions 2002-08-28 14:46:23.000000000 +0200
@@ -1,6 +1,25 @@
libc {
+ # The comment lines with "#errlist-compat" are magic; see errlist-compat.awk.
+ # When you get an error from errlist-compat.awk, you need to add a new
+ # version here. Don't do this blindly, since this means changing the ABI
+ # for all GNU/Linux configurations.
+
+ GLIBC_2.1 {
+ #errlist-compat 253
+ _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+ }
GLIBC_2.2 {
# New rlimit interface
getrlimit; setrlimit; getrlimit64; setrlimit64;
}
-}
\ No newline at end of file
+ GLIBC_2.3 {
+ #errlist-compat 254
+ _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+ }
+}
+librt {
+ GLIBC_2.3 {
+ # AIO functions.
+ aio_cancel; aio_cancel64;
+ }
+}
--- libc/sysdeps/unix/sysv/linux/bits/errno.h.jj 2002-07-23 10:06:19.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/bits/errno.h 2002-08-28 13:55:48.000000000 +0200
@@ -27,9 +27,11 @@
/* Linux has no ENOTSUP error code. */
# define ENOTSUP EOPNOTSUPP
-/* Linux also has no ECANCELED error code. Since it is not used here
+/* Linux also had no ECANCELED error code. Since it is not used here
we define it to an invalid value. */
-# define ECANCELED 125
+# ifndef ECANCELED
+# define ECANCELED 125
+# endif
# ifndef __ASSEMBLER__
/* Function to get address of global `errno' variable. */
--- libc/sysdeps/unix/sysv/linux/mips/Versions.jj 2002-08-27 23:19:54.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/mips/Versions 2002-08-28 15:48:53.000000000 +0200
@@ -1,5 +1,13 @@
libc {
+ # The comment lines with "#errlist-compat" are magic; see errlist-compat.awk.
+ # When you get an error from errlist-compat.awk, you need to add a new
+ # version here. Don't do this blindly, since this means changing the ABI
+ # for all GNU/Linux configurations.
+
GLIBC_2.0 {
+ #errlist-compat 1134
+ _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+
# Exception handling support functions from libgcc
__register_frame; __register_frame_table; __deregister_frame;
__frame_state_for; __register_frame_info_table;
@@ -13,8 +21,16 @@ libc {
# s*
sysmips;
}
+ GLIBC_2.1 {
+ #errlist-compat 1134
+ _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+ }
GLIBC_2.2 {
# _*
_test_and_set;
}
+ GLIBC_2.3 {
+ #errlist-compat 1134
+ _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+ }
}
--- libc/sysdeps/unix/sysv/linux/sparc/bits/errno.h.jj 2002-08-28 13:48:51.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/sparc/bits/errno.h 2002-08-28 13:57:24.000000000 +0200
@@ -0,0 +1,52 @@
+/* Error constants. Linux/Sparc specific version.
+ Copyright (C) 1996, 1997, 1998, 1999, 2002 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 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; if not, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+#ifdef _ERRNO_H
+
+# undef EDOM
+# undef EILSEQ
+# undef ERANGE
+# include <linux/errno.h>
+
+/* Linux has no ENOTSUP error code. */
+# define ENOTSUP EOPNOTSUPP
+
+# ifndef ECANCELED
+# define ECANCELED 127
+# endif
+
+# ifndef __ASSEMBLER__
+/* Function to get address of global `errno' variable. */
+extern int *__errno_location (void) __THROW __attribute__ ((__const__));
+
+# if !defined _LIBC || defined _LIBC_REENTRANT
+/* When using threads, errno is a per-thread value. */
+# define errno (*__errno_location ())
+# endif
+# endif /* !__ASSEMBLER__ */
+#endif /* _ERRNO_H */
+
+#if !defined _ERRNO_H && defined __need_Emath
+/* This is ugly but the kernel header is not clean enough. We must
+ define only the values EDOM, EILSEQ and ERANGE in case __need_Emath is
+ defined. */
+# define EDOM 33 /* Math argument out of domain of function. */
+# define EILSEQ 122 /* Illegal byte sequence. */
+# define ERANGE 34 /* Math result not representable. */
+#endif /* !_ERRNO_H && __need_Emath */
--- libc/sysdeps/unix/sysv/linux/sparc/Versions.jj 2002-08-28 13:59:28.000000000 +0200
+++ libc/sysdeps/unix/sysv/linux/sparc/Versions 2002-08-28 14:46:58.000000000 +0200
@@ -0,0 +1,25 @@
+libc {
+ # The comment lines with "#errlist-compat" are magic; see errlist-compat.awk.
+ # When you get an error from errlist-compat.awk, you need to add a new
+ # version here. Don't do this blindly, since this means changing the ABI
+ # for all GNU/Linux configurations.
+
+ GLIBC_2.0 {
+ #errlist-compat 127
+ _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+ }
+ GLIBC_2.1 {
+ #errlist-compat 127
+ _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+ }
+ GLIBC_2.3 {
+ #errlist-compat 128
+ _sys_errlist; sys_errlist; _sys_nerr; sys_nerr;
+ }
+}
+librt {
+ GLIBC_2.3 {
+ # AIO functions.
+ aio_cancel; aio_cancel64;
+ }
+}
--- libc/sysdeps/pthread/aio_cancel.c.jj 2002-07-01 12:32:46.000000000 +0200
+++ libc/sysdeps/pthread/aio_cancel.c 2002-08-28 14:06:22.000000000 +0200
@@ -24,10 +24,12 @@
we want to avoid code duplication by using aliases. But gcc sees
the different parameter lists and prints a warning. We define here
a function so that aio_cancel64 has no prototype. */
+#ifndef aio_cancel
#define aio_cancel64 XXX
#include <aio.h>
/* And undo the hack. */
#undef aio_cancel64
+#endif
#include <assert.h>
#include <errno.h>
@@ -146,4 +148,6 @@ aio_cancel (fildes, aiocbp)
return result;
}
+#ifndef aio_cancel
weak_alias (aio_cancel, aio_cancel64)
+#endif
--- libc/Versions.def.jj 2002-07-23 10:05:28.000000000 +0200
+++ libc/Versions.def 2002-08-28 14:23:24.000000000 +0200
@@ -78,6 +78,7 @@ libresolv {
librt {
GLIBC_2.1
GLIBC_2.2
+ GLIBC_2.3
}
libutil {
GLIBC_2.0
--- libc/linuxthreads/sysdeps/unix/sysv/linux/hppa/aio_cancel.c.jj 2002-08-28 14:11:16.000000000 +0200
+++ libc/linuxthreads/sysdeps/unix/sysv/linux/hppa/aio_cancel.c 2002-08-28 17:46:11.000000000 +0200
@@ -0,0 +1,33 @@
+#include <shlib-compat.h>
+
+#define aio_cancel64 XXX
+#include <aio.h>
+#undef aio_cancel64
+#include <errno.h>
+
+extern __typeof (aio_cancel) __new_aio_cancel;
+extern __typeof (aio_cancel) __old_aio_cancel;
+
+#define aio_cancel __new_aio_cancel
+
+#include <sysdeps/pthread/aio_cancel.c>
+
+#undef aio_cancel
+strong_alias (__new_aio_cancel, __new_aio_cancel64);
+versioned_symbol (librt, __new_aio_cancel, aio_cancel, GLIBC_2_3);
+versioned_symbol (librt, __new_aio_cancel64, aio_cancel64, GLIBC_2_3);
+
+#if SHLIB_COMPAT (librt, GLIBC_2_1, GLIBC_2_3)
+
+#undef ECANCELED
+#define aio_cancel __old_aio_cancel
+#define ECANCELED 125
+
+#include <sysdeps/pthread/aio_cancel.c>
+
+#undef aio_cancel
+strong_alias (__old_aio_cancel, __old_aio_cancel64);
+compat_symbol (librt, __old_aio_cancel, aio_cancel, GLIBC_2_1);
+compat_symbol (librt, __old_aio_cancel64, aio_cancel64, GLIBC_2_1);
+
+#endif
--- libc/linuxthreads/sysdeps/unix/sysv/linux/sparc/aio_cancel.c.jj 2002-08-28 14:11:16.000000000 +0200
+++ libc/linuxthreads/sysdeps/unix/sysv/linux/sparc/aio_cancel.c 2002-08-28 17:46:11.000000000 +0200
@@ -0,0 +1,33 @@
+#include <shlib-compat.h>
+
+#define aio_cancel64 XXX
+#include <aio.h>
+#undef aio_cancel64
+#include <errno.h>
+
+extern __typeof (aio_cancel) __new_aio_cancel;
+extern __typeof (aio_cancel) __old_aio_cancel;
+
+#define aio_cancel __new_aio_cancel
+
+#include <sysdeps/pthread/aio_cancel.c>
+
+#undef aio_cancel
+strong_alias (__new_aio_cancel, __new_aio_cancel64);
+versioned_symbol (librt, __new_aio_cancel, aio_cancel, GLIBC_2_3);
+versioned_symbol (librt, __new_aio_cancel64, aio_cancel64, GLIBC_2_3);
+
+#if SHLIB_COMPAT (librt, GLIBC_2_1, GLIBC_2_3)
+
+#undef ECANCELED
+#define aio_cancel __old_aio_cancel
+#define ECANCELED 125
+
+#include <sysdeps/pthread/aio_cancel.c>
+
+#undef aio_cancel
+strong_alias (__old_aio_cancel, __old_aio_cancel64);
+compat_symbol (librt, __old_aio_cancel, aio_cancel, GLIBC_2_1);
+compat_symbol (librt, __old_aio_cancel64, aio_cancel64, GLIBC_2_1);
+
+#endif
--- libc/linuxthreads/sysdeps/unix/sysv/linux/alpha/aio_cancel.c.jj 2002-08-28 14:11:16.000000000 +0200
+++ libc/linuxthreads/sysdeps/unix/sysv/linux/alpha/aio_cancel.c 2002-08-28 17:46:11.000000000 +0200
@@ -0,0 +1,33 @@
+#include <shlib-compat.h>
+
+#define aio_cancel64 XXX
+#include <aio.h>
+#undef aio_cancel64
+#include <errno.h>
+
+extern __typeof (aio_cancel) __new_aio_cancel;
+extern __typeof (aio_cancel) __old_aio_cancel;
+
+#define aio_cancel __new_aio_cancel
+
+#include <sysdeps/pthread/aio_cancel.c>
+
+#undef aio_cancel
+strong_alias (__new_aio_cancel, __new_aio_cancel64);
+versioned_symbol (librt, __new_aio_cancel, aio_cancel, GLIBC_2_3);
+versioned_symbol (librt, __new_aio_cancel64, aio_cancel64, GLIBC_2_3);
+
+#if SHLIB_COMPAT (librt, GLIBC_2_1, GLIBC_2_3)
+
+#undef ECANCELED
+#define aio_cancel __old_aio_cancel
+#define ECANCELED 125
+
+#include <sysdeps/pthread/aio_cancel.c>
+
+#undef aio_cancel
+strong_alias (__old_aio_cancel, __old_aio_cancel64);
+compat_symbol (librt, __old_aio_cancel, aio_cancel, GLIBC_2_1);
+compat_symbol (librt, __old_aio_cancel64, aio_cancel64, GLIBC_2_1);
+
+#endif
Jakub
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] Alpha build fixes
2002-08-28 9:27 [PATCH] Alpha build fixes Jakub Jelinek
@ 2002-08-28 17:41 ` Ulrich Drepper
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Drepper @ 2002-08-28 17:41 UTC (permalink / raw)
To: Jakub Jelinek; +Cc: Roland McGrath, Glibc hackers
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
> 2002-08-28 Jakub Jelinek <jakub@redhat.com>
>
> * sysdeps/generic/ldsodefs.h (__rtld_global_attribute__): Define.
> (_rtld_global): Use it.
> [...]
Thanks. After making one more change to libc-symbols.h I was able to
compile on IA-64 so this match seems OK.
- --
- ---------------. ,-. 1325 Chesapeake Terrace
Ulrich Drepper \ ,-------------------' \ Sunnyvale, CA 94089 USA
Red Hat `--' drepper at redhat.com `------------------------
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
iD8DBQE9bW2+2ijCOnn/RHQRAqw3AJwPKsSufr89nMdhvfsIjiDDxQOBZgCfbbHe
/Vg5xN9kPcLo7YdOFm9HbNI=
=cBJe
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2002-08-29 0:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2002-08-28 9:27 [PATCH] Alpha build fixes Jakub Jelinek
2002-08-28 17:41 ` Ulrich Drepper
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).