yann@1
|
1 |
See http://sources.redhat.com/bugzilla/show_bug.cgi?id=758
|
yann@1
|
2 |
|
yann@1
|
3 |
Submitted By: Jim Gifford (patches at jg555 dot com)
|
yann@1
|
4 |
Date: 2005-02-23
|
yann@1
|
5 |
Initial Package Version: 2.3.4
|
yann@1
|
6 |
Origin: Richard Sandiford
|
yann@1
|
7 |
Upstream Status: Unknown
|
yann@1
|
8 |
Description: Fixes Syscall.h generation
|
yann@1
|
9 |
|
yann@1
|
10 |
diff -Naur glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/Makefile glibc-2.3.4/sysdeps/unix/sysv/linux/mips/Makefile
|
yann@1
|
11 |
--- glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/Makefile 2004-11-24 04:38:15 +0000
|
yann@1
|
12 |
+++ glibc-2.3.4/sysdeps/unix/sysv/linux/mips/Makefile 2005-02-23 18:21:54 +0000
|
yann@1
|
13 |
@@ -9,11 +9,73 @@
|
yann@1
|
14 |
|
yann@1
|
15 |
no_syscall_list_h = 1
|
yann@1
|
16 |
|
yann@1
|
17 |
-# Generate the list of SYS_* macros for the system calls (__NR_* macros).
|
yann@1
|
18 |
-# We generate not only SYS_<syscall>, pointing at SYS_<abi>_<syscall> if
|
yann@1
|
19 |
-# it exists, but also define SYS_<abi>_<syscall> for all ABIs.
|
yann@1
|
20 |
+# A callable macro that expands to a shell command. Preprocess file $(1)
|
yann@1
|
21 |
+# using ABI option $(2) and see which macros it defines. Print FOO for each
|
yann@1
|
22 |
+# macro of the form __NR$(3)_FOO, filtering out ABI-specific __NR macros
|
yann@1
|
23 |
+# that have a prefix other than $(3).
|
yann@1
|
24 |
+mips_list_syscalls = $(filter-out -m%,$(CC)) -E -x c $(+includes) \
|
yann@1
|
25 |
+ $(sysincludes) -D_LIBC -dM -mabi=$(2) $(1) | \
|
yann@1
|
26 |
+ sed -n 's@^\#define __NR$(3)_\([^ ]*\) .*@\1@p' | \
|
yann@1
|
27 |
+ sed -e '/^[ON]32_/d' -e '/^N64_/d' -e '/^64_/d' | \
|
yann@1
|
28 |
+ LC_ALL=C sort
|
yann@1
|
29 |
+
|
yann@1
|
30 |
+# Generate a list of SYS_* macros from the linux __NR macros.
|
yann@1
|
31 |
+#
|
yann@1
|
32 |
+# Before version 2.6, linux had separate 32-bit and 64-bit MIPS ports,
|
yann@1
|
33 |
+# each with its own set of headers. The ports were merged for 2.6 and
|
yann@1
|
34 |
+# this merged port defines the syscalls in a slightly different way.
|
yann@1
|
35 |
+# There are therefore three sets of headers that we need to consider:
|
yann@1
|
36 |
+#
|
yann@1
|
37 |
+# (1) Headers from the separate 32-bit MIPS port. They just define
|
yann@1
|
38 |
+# a single list of __NR macros.
|
yann@1
|
39 |
+#
|
yann@1
|
40 |
+# (2) Headers from the separate 64-bit MIPS port. They unconditionally
|
yann@1
|
41 |
+# define syscalls for all three ABIs, with o32 syscalls prefixed
|
yann@1
|
42 |
+# by __NR_O32, n32 syscalls prefixed by __NR_N32 and n64 syscalls
|
yann@1
|
43 |
+# prefixed by plain __NR.
|
yann@1
|
44 |
+#
|
yann@1
|
45 |
+# (3) Headers from the combined port. They use the _MIPS_SIM macro to
|
yann@1
|
46 |
+# define the right set of syscalls for the current ABI. The syscalls
|
yann@1
|
47 |
+# themselves have no special ABI prefix, but the headers also define:
|
yann@1
|
48 |
+#
|
yann@1
|
49 |
+# __NR_O32_Linux{,_syscalls}
|
yann@1
|
50 |
+# __NR_N32_Linux{,_syscalls}
|
yann@1
|
51 |
+# __NR_64_Linux{,_syscalls}
|
yann@1
|
52 |
+#
|
yann@1
|
53 |
+# In case (1) we just want a simple list of SYS_* macros. In cases (2)
|
yann@1
|
54 |
+# and (3) we want a file that will work for all three ABIs, regardless
|
yann@1
|
55 |
+# of which ABI we are currently using. We also want the file to work
|
yann@1
|
56 |
+# if the user later moves from (2) to (3). Thus the file we create
|
yann@1
|
57 |
+# for (2) and (3) has the form:
|
yann@1
|
58 |
+#
|
yann@1
|
59 |
+# #if _MIPS_SIM == _MIPS_SIM_NABI32
|
yann@1
|
60 |
+# # ifdef __NR_N32_open
|
yann@1
|
61 |
+# # define SYS_n32syscall1 __NR_N32_n32syscall1
|
yann@1
|
62 |
+# # ...
|
yann@1
|
63 |
+# # else
|
yann@1
|
64 |
+# # define SYS_n32syscall1 __NR_n32syscall1
|
yann@1
|
65 |
+# # ...
|
yann@1
|
66 |
+# # endif
|
yann@1
|
67 |
+# #elif _MIPS_SIM == _MIPS_SIM_ABI64
|
yann@1
|
68 |
+# # define SYS_n64syscall1 __NR_n64syscall1
|
yann@1
|
69 |
+# # ...
|
yann@1
|
70 |
+# #else
|
yann@1
|
71 |
+# # ifdef __NR_O32_open
|
yann@1
|
72 |
+# # define SYS_o32syscall1 __NR_O32_o32syscall1
|
yann@1
|
73 |
+# # ...
|
yann@1
|
74 |
+# # else
|
yann@1
|
75 |
+# # define SYS_o32syscall1 __NR_o32syscall1
|
yann@1
|
76 |
+# # ...
|
yann@1
|
77 |
+# # endif
|
yann@1
|
78 |
+# #endif
|
yann@1
|
79 |
+#
|
yann@1
|
80 |
+# Here, __NR_N32_open and __NR_O32_open are used to detect case (2)
|
yann@1
|
81 |
+# over case (3). The n64 SYS_* macros can always use the normal
|
yann@1
|
82 |
+# ABI-less names.
|
yann@1
|
83 |
$(objpfx)syscall-%.h $(objpfx)syscall-%.d: ../sysdeps/unix/sysv/linux/mips/sys/syscall.h
|
yann@1
|
84 |
$(make-target-directory)
|
yann@1
|
85 |
+ $(CC) -E -x c $(+includes) $(sysincludes) -D_LIBC $< -MD -MP \
|
yann@1
|
86 |
+ -MF $(@:.h=.d)-t -MT '$(@:.d=.h) $(@:.h=.d)' > /dev/null
|
yann@1
|
87 |
{ \
|
yann@1
|
88 |
echo '/* Generated at libc build time from kernel syscall list. */';\
|
yann@1
|
89 |
echo ''; \
|
yann@1
|
90 |
@@ -22,28 +84,38 @@
|
yann@1
|
91 |
echo '#endif'; \
|
yann@1
|
92 |
echo ''; \
|
yann@1
|
93 |
echo '#include <sgidefs.h>'; \
|
yann@1
|
94 |
- rm -f $(@:.d=.h).newt; \
|
yann@1
|
95 |
- $(CC) -E -MD -MP -MF $(@:.h=.d)-t -MT '$(@:.d=.h) $(@:.h=.d)' \
|
yann@1
|
96 |
- -x c $(+includes) $(sysincludes) $< -D_LIBC -dM | \
|
yann@1
|
97 |
- sed -n 's@^#define __NR_\([^ ]*\) .*$$@#define SYS_\1 __NR_\1@p' \
|
yann@1
|
98 |
- > $(@:.d=.h).newt; \
|
yann@1
|
99 |
- if grep SYS_O32_ $(@:.d=.h).newt > /dev/null; then \
|
yann@1
|
100 |
+ rm -f $(@:.d=.h).new32 $(@:.d=.h).newn32 $(@:.d=.h).new64; \
|
yann@1
|
101 |
+ $(call mips_list_syscalls,$<,n32,_N32) > $(@:.d=.h).newn32; \
|
yann@1
|
102 |
+ if test -s $(@:.d=.h).newn32; then \
|
yann@1
|
103 |
+ if grep open $(@:.d=.h).newn32 > /dev/null; then \
|
yann@1
|
104 |
+ $(call mips_list_syscalls,$<,32,_O32) > $(@:.d=.h).new32; \
|
yann@1
|
105 |
+ $(call mips_list_syscalls,$<,64,) > $(@:.d=.h).new64; \
|
yann@1
|
106 |
+ else \
|
yann@1
|
107 |
+ $(call mips_list_syscalls,$<,32,) > $(@:.d=.h).new32; \
|
yann@1
|
108 |
+ $(call mips_list_syscalls,$<,n32,) > $(@:.d=.h).newn32; \
|
yann@1
|
109 |
+ $(call mips_list_syscalls,$<,64,) > $(@:.d=.h).new64; \
|
yann@1
|
110 |
+ fi; \
|
yann@1
|
111 |
echo '#if _MIPS_SIM == _ABIN32'; \
|
yann@1
|
112 |
- sed -n 's/^\(#define SYS_\)N32_/\1/p' < $(@:.d=.h).newt | \
|
yann@1
|
113 |
- LC_ALL=C sort; \
|
yann@1
|
114 |
+ echo '# ifdef __NR_N32_open'; \
|
yann@1
|
115 |
+ sed 's@\(.*\)@# define SYS_\1 __NR_N32_\1@' < $(@:.d=.h).newn32; \
|
yann@1
|
116 |
+ echo '# else'; \
|
yann@1
|
117 |
+ sed 's@\(.*\)@# define SYS_\1 __NR_\1@' < $(@:.d=.h).newn32; \
|
yann@1
|
118 |
+ echo '# endif'; \
|
yann@1
|
119 |
echo '#elif _MIPS_SIM == _ABI64'; \
|
yann@1
|
120 |
- sed -n 's/^\(#define SYS_\)N64_/\1/p' < $(@:.d=.h).newt | \
|
yann@1
|
121 |
- LC_ALL=C sort; \
|
yann@1
|
122 |
+ sed 's@\(.*\)@# define SYS_\1 __NR_\1@' < $(@:.d=.h).new64; \
|
yann@1
|
123 |
echo '#else'; \
|
yann@1
|
124 |
- sed -n 's/^\(#define SYS_\)O32_/\1/p' < $(@:.d=.h).newt | \
|
yann@1
|
125 |
- LC_ALL=C sort; \
|
yann@1
|
126 |
+ echo '# ifdef __NR_O32_open'; \
|
yann@1
|
127 |
+ sed 's@\(.*\)@# define SYS_\1 __NR_O32_\1@' < $(@:.d=.h).new32; \
|
yann@1
|
128 |
+ echo '# else'; \
|
yann@1
|
129 |
+ sed 's@\(.*\)@# define SYS_\1 __NR_\1@' < $(@:.d=.h).new32; \
|
yann@1
|
130 |
+ echo '# endif'; \
|
yann@1
|
131 |
echo '#endif'; \
|
yann@1
|
132 |
- sed -n '/^#define SYS_\([ON]32\|N64\)_/p' < $(@:.d=.h).newt | \
|
yann@1
|
133 |
- LC_ALL=C sort +1.8; \
|
yann@1
|
134 |
else \
|
yann@1
|
135 |
- cat $(@:.d=.h).newt; \
|
yann@1
|
136 |
+ $(CC) -E -x c $(+includes) $(sysincludes) -D_LIBC -dM $< | \
|
yann@1
|
137 |
+ sed -n 's@^\#define __NR_\([^ ]*\) .*@\#define SYS_\1 __NR_\1@p' | \
|
yann@1
|
138 |
+ LC_ALL=C sort; \
|
yann@1
|
139 |
fi; \
|
yann@1
|
140 |
- rm $(@:.d=.h).newt; \
|
yann@1
|
141 |
+ rm -f $(@:.d=.h).new32 $(@:.d=.h).newn32 $(@:.d=.h).new64; \
|
yann@1
|
142 |
} > $(@:.d=.h).new
|
yann@1
|
143 |
mv -f $(@:.d=.h).new $(@:.d=.h)
|
yann@1
|
144 |
ifneq (,$(objpfx))
|
yann@1
|
145 |
diff -Naur glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/configure glibc-2.3.4/sysdeps/unix/sysv/linux/mips/configure
|
yann@1
|
146 |
--- glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/configure 2004-11-24 04:42:45 +0000
|
yann@1
|
147 |
+++ glibc-2.3.4/sysdeps/unix/sysv/linux/mips/configure 2005-02-23 18:10:11 +0000
|
yann@1
|
148 |
@@ -18,7 +18,7 @@
|
yann@1
|
149 |
{ echo "$as_me:$LINENO: WARNING: *** asm/unistd.h not found, it will not be pre-processed" >&5
|
yann@1
|
150 |
echo "$as_me: WARNING: *** asm/unistd.h not found, it will not be pre-processed" >&2;}
|
yann@1
|
151 |
echo '#include <asm/unistd.h>' > asm-unistd.h
|
yann@1
|
152 |
- else
|
yann@1
|
153 |
+ elif grep __NR_N32_open "$asm_unistd_h" > /dev/null; then
|
yann@1
|
154 |
# The point of this preprocessing is to turn __NR_<syscall> into
|
yann@1
|
155 |
# __NR_N64_<syscall>, as well as to define __NR_<syscall> to
|
yann@1
|
156 |
# __NR_<abi>_<syscall>, if __NR_<abi>_<syscall> is defined
|
yann@1
|
157 |
@@ -68,6 +68,8 @@
|
yann@1
|
158 |
{
|
yann@1
|
159 |
print;
|
yann@1
|
160 |
}'
|
yann@1
|
161 |
+ else
|
yann@1
|
162 |
+ echo '#include <asm/unistd.h>' > asm-unistd.h
|
yann@1
|
163 |
fi ;;
|
yann@1
|
164 |
mips*)
|
yann@1
|
165 |
rm -f asm-unistd.h
|
yann@1
|
166 |
diff -Naur glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/configure.in glibc-2.3.4/sysdeps/unix/sysv/linux/mips/configure.in
|
yann@1
|
167 |
--- glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/configure.in 2004-11-24 04:38:31 +0000
|
yann@1
|
168 |
+++ glibc-2.3.4/sysdeps/unix/sysv/linux/mips/configure.in 2005-02-23 18:10:11 +0000
|
yann@1
|
169 |
@@ -18,7 +18,7 @@
|
yann@1
|
170 |
if test ! -f "$asm_unistd_h"; then
|
yann@1
|
171 |
AC_MSG_WARN([*** asm/unistd.h not found, it will not be pre-processed])
|
yann@1
|
172 |
echo '#include <asm/unistd.h>' > asm-unistd.h
|
yann@1
|
173 |
- else
|
yann@1
|
174 |
+ elif grep __NR_N32_open "$asm_unistd_h" > /dev/null; then
|
yann@1
|
175 |
# The point of this preprocessing is to turn __NR_<syscall> into
|
yann@1
|
176 |
# __NR_N64_<syscall>, as well as to define __NR_<syscall> to
|
yann@1
|
177 |
# __NR_<abi>_<syscall>, if __NR_<abi>_<syscall> is defined
|
yann@1
|
178 |
@@ -68,6 +68,8 @@
|
yann@1
|
179 |
{
|
yann@1
|
180 |
print;
|
yann@1
|
181 |
}'
|
yann@1
|
182 |
+ else
|
yann@1
|
183 |
+ echo '#include <asm/unistd.h>' > asm-unistd.h
|
yann@1
|
184 |
fi ;;
|
yann@1
|
185 |
mips*)
|
yann@1
|
186 |
rm -f asm-unistd.h
|
yann@1
|
187 |
diff -Naur glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/mips32/kern64/sysdep.h glibc-2.3.4/sysdeps/unix/sysv/linux/mips/mips32/kern64/sysdep.h
|
yann@1
|
188 |
--- glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/mips32/kern64/sysdep.h 2003-03-29 08:15:29 +0000
|
yann@1
|
189 |
+++ glibc-2.3.4/sysdeps/unix/sysv/linux/mips/mips32/kern64/sysdep.h 2005-02-23 18:10:11 +0000
|
yann@1
|
190 |
@@ -1,36 +0,0 @@
|
yann@1
|
191 |
-/* Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc.
|
yann@1
|
192 |
- This file is part of the GNU C Library.
|
yann@1
|
193 |
-
|
yann@1
|
194 |
- The GNU C Library is free software; you can redistribute it and/or
|
yann@1
|
195 |
- modify it under the terms of the GNU Lesser General Public
|
yann@1
|
196 |
- License as published by the Free Software Foundation; either
|
yann@1
|
197 |
- version 2.1 of the License, or (at your option) any later version.
|
yann@1
|
198 |
-
|
yann@1
|
199 |
- The GNU C Library is distributed in the hope that it will be useful,
|
yann@1
|
200 |
- but WITHOUT ANY WARRANTY; without even the implied warranty of
|
yann@1
|
201 |
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
yann@1
|
202 |
- Lesser General Public License for more details.
|
yann@1
|
203 |
-
|
yann@1
|
204 |
- You should have received a copy of the GNU Lesser General Public
|
yann@1
|
205 |
- License along with the GNU C Library; if not, write to the Free
|
yann@1
|
206 |
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
yann@1
|
207 |
- 02111-1307 USA. */
|
yann@1
|
208 |
-
|
yann@1
|
209 |
-#ifndef _LINUX_MIPS_MIPS32_KERN64_SYSDEP_H
|
yann@1
|
210 |
-#define _LINUX_MIPS_MIPS32_KERN64_SYSDEP_H 1
|
yann@1
|
211 |
-
|
yann@1
|
212 |
-/* There is some commonality. */
|
yann@1
|
213 |
-#include <sysdeps/unix/sysv/linux/mips/mips32/sysdep.h>
|
yann@1
|
214 |
-
|
yann@1
|
215 |
-/* For Linux we can use the system call table in the header file
|
yann@1
|
216 |
- /usr/include/asm/unistd.h
|
yann@1
|
217 |
- of the kernel. But these symbols do not follow the SYS_* syntax
|
yann@1
|
218 |
- so we have to redefine the `SYS_ify' macro here. */
|
yann@1
|
219 |
-#undef SYS_ify
|
yann@1
|
220 |
-#ifdef __STDC__
|
yann@1
|
221 |
-# define SYS_ify(syscall_name) __NR_O32_##syscall_name
|
yann@1
|
222 |
-#else
|
yann@1
|
223 |
-# define SYS_ify(syscall_name) __NR_O32_/**/syscall_name
|
yann@1
|
224 |
-#endif
|
yann@1
|
225 |
-
|
yann@1
|
226 |
-#endif /* linux/mips/mips32/kern64/sysdep.h */
|
yann@1
|
227 |
diff -Naur glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h glibc-2.3.4/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h
|
yann@1
|
228 |
--- glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h 2004-10-18 05:16:07 +0000
|
yann@1
|
229 |
+++ glibc-2.3.4/sysdeps/unix/sysv/linux/mips/mips64/n32/sysdep.h 2005-02-23 18:10:11 +0000
|
yann@1
|
230 |
@@ -28,9 +28,9 @@
|
yann@1
|
231 |
so we have to redefine the `SYS_ify' macro here. */
|
yann@1
|
232 |
#undef SYS_ify
|
yann@1
|
233 |
#ifdef __STDC__
|
yann@1
|
234 |
-# define SYS_ify(syscall_name) __NR_N32_##syscall_name
|
yann@1
|
235 |
+# define SYS_ify(syscall_name) __NR_##syscall_name
|
yann@1
|
236 |
#else
|
yann@1
|
237 |
-# define SYS_ify(syscall_name) __NR_N32_/**/syscall_name
|
yann@1
|
238 |
+# define SYS_ify(syscall_name) __NR_/**/syscall_name
|
yann@1
|
239 |
#endif
|
yann@1
|
240 |
|
yann@1
|
241 |
#ifdef __ASSEMBLER__
|
yann@1
|
242 |
diff -Naur glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h glibc-2.3.4/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h
|
yann@1
|
243 |
--- glibc-2.3.4.orig/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h 2004-10-18 05:16:08 +0000
|
yann@1
|
244 |
+++ glibc-2.3.4/sysdeps/unix/sysv/linux/mips/mips64/n64/sysdep.h 2005-02-23 18:10:11 +0000
|
yann@1
|
245 |
@@ -28,9 +28,9 @@
|
yann@1
|
246 |
so we have to redefine the `SYS_ify' macro here. */
|
yann@1
|
247 |
#undef SYS_ify
|
yann@1
|
248 |
#ifdef __STDC__
|
yann@1
|
249 |
-# define SYS_ify(syscall_name) __NR_N64_##syscall_name
|
yann@1
|
250 |
+# define SYS_ify(syscall_name) __NR_##syscall_name
|
yann@1
|
251 |
#else
|
yann@1
|
252 |
-# define SYS_ify(syscall_name) __NR_N64_/**/syscall_name
|
yann@1
|
253 |
+# define SYS_ify(syscall_name) __NR_/**/syscall_name
|
yann@1
|
254 |
#endif
|
yann@1
|
255 |
|
yann@1
|
256 |
#ifdef __ASSEMBLER__
|