AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-22 04:50:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

* configure.in: Compile source test file with -fPIC for -shared.

Browse Source 
2005-09-05  Kaz Kojima  <kkojima@rr.iij4u.or.jp>

	* sysdeps/unix/sysv/linux/sh/lowlevellock.S (__lll_mutex_lock_wait):
	Fix typo in register name.
This commit is contained in:
Ulrich Drepper 2005-09-06 01:18:13 +00:00
parent 45541bdf5c
commit dbc92dc6cb
6 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2005-09-05 Alexandre Oliva <aoliva@redhat.com>
* configure.in: Compile source test file with -fPIC for -shared.
2005-09-05 Kaz Kojima <kkojima@rr.iij4u.or.jp>
* sysdeps/unix/sysv/linux/sh/lowlevellock.S (__lll_mutex_lock_wait):
Fix typo in register name.
2005-09-04 Ulrich Drepper <drepper@redhat.com> 2005-09-04 Ulrich Drepper <drepper@redhat.com>
* iconv/skeleton.c: Eliminate DEFINE_DIRECTION_OBJECTS macro use, * iconv/skeleton.c: Eliminate DEFINE_DIRECTION_OBJECTS macro use,

18
configure vendored
View File

@ -5361,7 +5361,7 @@ if test "${libc_cv_have_sdata_section+set}" = set; then
else else
echo "int i;" > conftest.c echo "int i;" > conftest.c
libc_cv_have_sdata_section=no libc_cv_have_sdata_section=no
if ${CC-cc} $LDFLAGS -shared -Wl,--verbose conftest.c -o conftest.so 2>&1 \ if ${CC-cc} $LDFLAGS -fPIC -shared -Wl,--verbose conftest.c -o conftest.so 2>&1 \
| grep '\.sdata' >/dev/null; then | grep '\.sdata' >/dev/null; then
libc_cv_have_sdata_section=yes libc_cv_have_sdata_section=yes
fi fi
@ -5453,7 +5453,7 @@ else
int _start (void) { return 42; } int _start (void) { return 42; }
EOF EOF
if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-shared -o conftest.so conftest.c -fPIC -shared -o conftest.so conftest.c
-nostartfiles -nostdlib -nostartfiles -nostdlib
-Wl,--enable-new-dtags,-z,nodelete 1>&5' -Wl,--enable-new-dtags,-z,nodelete 1>&5'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
@ -5481,7 +5481,7 @@ else
int _start (void) { return 42; } int _start (void) { return 42; }
EOF EOF
if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-shared -o conftest.so conftest.c -fPIC -shared -o conftest.so conftest.c
-nostartfiles -nostdlib -nostartfiles -nostdlib
-Wl,--enable-new-dtags,-z,nodlopen 1>&5' -Wl,--enable-new-dtags,-z,nodlopen 1>&5'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
@ -5509,7 +5509,7 @@ else
int _start (void) { return 42; } int _start (void) { return 42; }
EOF EOF
if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-shared -o conftest.so conftest.c -fPIC -shared -o conftest.so conftest.c
-nostartfiles -nostdlib -nostartfiles -nostdlib
-Wl,--enable-new-dtags,-z,initfirst 1>&5' -Wl,--enable-new-dtags,-z,initfirst 1>&5'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
@ -5571,7 +5571,7 @@ else
int _start (void) { return 42; } int _start (void) { return 42; }
EOF EOF
if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-shared -o conftest.so conftest.c -fPIC -shared -o conftest.so conftest.c
-Wl,-Bgroup -nostdlib 1>&5' -Wl,-Bgroup -nostdlib 1>&5'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5 (eval $ac_try) 2>&5
@ -5598,7 +5598,7 @@ else
int main (void) { return 0; } int main (void) { return 0; }
EOF EOF
libc_cv_libgcc_s_suffix=`${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \ libc_cv_libgcc_s_suffix=`${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \
-shared -shared-libgcc -o conftest.so \ -fPIC -shared -shared-libgcc -o conftest.so \
conftest.c -v 2>&1 >/dev/null \ conftest.c -v 2>&1 >/dev/null \
| sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'` | sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'`
rm -f conftest* rm -f conftest*
@ -5616,7 +5616,7 @@ else
int main (void) { return 0; } int main (void) { return 0; }
EOF EOF
if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-shared -o conftest.so conftest.c -fPIC -shared -o conftest.so conftest.c
-lgcc_s$libc_cv_libgcc_s_suffix -Wl,--as-needed -lgcc_s$libc_cv_libgcc_s_suffix -Wl,--as-needed
-nostdlib 1>&5' -nostdlib 1>&5'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
@ -5684,7 +5684,7 @@ extern int mumble;
int foo (void) { return bar (mumble); } int foo (void) { return bar (mumble); }
EOF EOF
if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-shared -o conftest.so conftest.c -fPIC -shared -o conftest.so conftest.c
-nostdlib -nostartfiles -nostdlib -nostartfiles
-Wl,-z,combreloc 1>&5' -Wl,-z,combreloc 1>&5'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
@ -5722,7 +5722,7 @@ else
int _start (void) { return 42; } int _start (void) { return 42; }
EOF EOF
if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS if { ac_try='${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-shared -o conftest.so conftest.c -fPIC -shared -o conftest.so conftest.c
-Wl,-z,execstack -nostdlib -Wl,-z,execstack -nostdlib
1>&5' 1>&5'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5

18
configure.in
View File

@ -1238,7 +1238,7 @@ EOF
libc_cv_have_sdata_section, libc_cv_have_sdata_section,
[echo "int i;" > conftest.c [echo "int i;" > conftest.c
libc_cv_have_sdata_section=no libc_cv_have_sdata_section=no
if ${CC-cc} $LDFLAGS -shared -Wl,--verbose conftest.c -o conftest.so 2>&1 \ if ${CC-cc} $LDFLAGS -fPIC -shared -Wl,--verbose conftest.c -o conftest.so 2>&1 \
| grep '\.sdata' >/dev/null; then | grep '\.sdata' >/dev/null; then
libc_cv_have_sdata_section=yes libc_cv_have_sdata_section=yes
fi fi
@ -1297,7 +1297,7 @@ EOF
int _start (void) { return 42; } int _start (void) { return 42; }
EOF EOF
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-shared -o conftest.so conftest.c -fPIC -shared -o conftest.so conftest.c
-nostartfiles -nostdlib -nostartfiles -nostdlib
-Wl,--enable-new-dtags,-z,nodelete 1>&AS_MESSAGE_LOG_FD]) -Wl,--enable-new-dtags,-z,nodelete 1>&AS_MESSAGE_LOG_FD])
then then
@ -1314,7 +1314,7 @@ EOF
int _start (void) { return 42; } int _start (void) { return 42; }
EOF EOF
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-shared -o conftest.so conftest.c -fPIC -shared -o conftest.so conftest.c
-nostartfiles -nostdlib -nostartfiles -nostdlib
-Wl,--enable-new-dtags,-z,nodlopen 1>&AS_MESSAGE_LOG_FD]) -Wl,--enable-new-dtags,-z,nodlopen 1>&AS_MESSAGE_LOG_FD])
then then
@ -1331,7 +1331,7 @@ EOF
int _start (void) { return 42; } int _start (void) { return 42; }
EOF EOF
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-shared -o conftest.so conftest.c -fPIC -shared -o conftest.so conftest.c
-nostartfiles -nostdlib -nostartfiles -nostdlib
-Wl,--enable-new-dtags,-z,initfirst 1>&AS_MESSAGE_LOG_FD]) -Wl,--enable-new-dtags,-z,initfirst 1>&AS_MESSAGE_LOG_FD])
then then
@ -1363,7 +1363,7 @@ EOF
int _start (void) { return 42; } int _start (void) { return 42; }
EOF EOF
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-shared -o conftest.so conftest.c -fPIC -shared -o conftest.so conftest.c
-Wl,-Bgroup -nostdlib 1>&AS_MESSAGE_LOG_FD]) -Wl,-Bgroup -nostdlib 1>&AS_MESSAGE_LOG_FD])
then then
libc_cv_Bgroup=yes libc_cv_Bgroup=yes
@ -1380,7 +1380,7 @@ int main (void) { return 0; }
EOF EOF
changequote(,)dnl changequote(,)dnl
libc_cv_libgcc_s_suffix=`${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \ libc_cv_libgcc_s_suffix=`${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS \
-shared -shared-libgcc -o conftest.so \ -fPIC -shared -shared-libgcc -o conftest.so \
conftest.c -v 2>&1 >/dev/null \ conftest.c -v 2>&1 >/dev/null \
| sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'` | sed -n 's/^.* -lgcc_s\([^ ]*\) .*$/\1/p'`
changequote([,])dnl changequote([,])dnl
@ -1393,7 +1393,7 @@ changequote([,])dnl
int main (void) { return 0; } int main (void) { return 0; }
EOF EOF
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-shared -o conftest.so conftest.c -fPIC -shared -o conftest.so conftest.c
-lgcc_s$libc_cv_libgcc_s_suffix -Wl,--as-needed -lgcc_s$libc_cv_libgcc_s_suffix -Wl,--as-needed
-nostdlib 1>&AS_MESSAGE_LOG_FD]) -nostdlib 1>&AS_MESSAGE_LOG_FD])
then then
@ -1434,7 +1434,7 @@ extern int mumble;
int foo (void) { return bar (mumble); } int foo (void) { return bar (mumble); }
EOF EOF
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-shared -o conftest.so conftest.c -fPIC -shared -o conftest.so conftest.c
-nostdlib -nostartfiles -nostdlib -nostartfiles
-Wl,-z,combreloc 1>&AS_MESSAGE_LOG_FD]) -Wl,-z,combreloc 1>&AS_MESSAGE_LOG_FD])
then then
@ -1463,7 +1463,7 @@ dnl look for a section named .rel.dyn.
int _start (void) { return 42; } int _start (void) { return 42; }
EOF EOF
if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS if AC_TRY_COMMAND([${CC-cc} $CFLAGS $CPPFLAGS $LDFLAGS
-shared -o conftest.so conftest.c -fPIC -shared -o conftest.so conftest.c
-Wl,-z,execstack -nostdlib -Wl,-z,execstack -nostdlib
1>&AS_MESSAGE_LOG_FD]) 1>&AS_MESSAGE_LOG_FD])
then then

10
iconv/skeleton.c
View File

@ -157,7 +157,7 @@
# endif # endif
#else #else
# ifndef FROM_DIRECTION # ifndef FROM_DIRECTION
# error "FROM_DIRECTION must be provided if direction objects are not used" # error "FROM_DIRECTION must be provided if non-default init is used"
# endif # endif
#endif #endif
@ -673,8 +673,8 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
#ifdef RESET_INPUT_BUFFER #ifdef RESET_INPUT_BUFFER
RESET_INPUT_BUFFER; RESET_INPUT_BUFFER;
#else #else
/* We have a problem with the in on of the functions /* We have a problem in one of the functions below.
below. Undo the conversion upto the error point. */ Undo the conversion upto the error point. */
size_t nstatus; size_t nstatus;
/* Reload the pointers. */ /* Reload the pointers. */
@ -772,12 +772,11 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
STORE_REST STORE_REST
# else # else
size_t cnt;
/* Make sure the remaining bytes fit into the state objects /* Make sure the remaining bytes fit into the state objects
buffer. */ buffer. */
assert (inend - *inptrp < 4); assert (inend - *inptrp < 4);
size_t cnt;
for (cnt = 0; *inptrp < inend; ++cnt) for (cnt = 0; *inptrp < inend; ++cnt)
data->__statep->__value.__wchb[cnt] = *(*inptrp)++; data->__statep->__value.__wchb[cnt] = *(*inptrp)++;
data->__statep->__count &= ~7; data->__statep->__count &= ~7;
@ -807,7 +806,6 @@ FUNCTION_NAME (struct __gconv_step *step, struct __gconv_step_data *data,
#undef TO_LOOP_MAX_NEEDED_FROM #undef TO_LOOP_MAX_NEEDED_FROM
#undef TO_LOOP_MIN_NEEDED_TO #undef TO_LOOP_MIN_NEEDED_TO
#undef TO_LOOP_MAX_NEEDED_TO #undef TO_LOOP_MAX_NEEDED_TO
#undef DEFINE_DIRECTION_OBJECTS
#undef FROM_DIRECTION #undef FROM_DIRECTION
#undef EMIT_SHIFT_TO_INIT #undef EMIT_SHIFT_TO_INIT
#undef FROM_LOOP #undef FROM_LOOP

6
nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2003, 2004 Free Software Foundation, Inc. /* Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -51,8 +51,8 @@ __lll_mutex_lock_wait:
SYSCALL_INST_PAD SYSCALL_INST_PAD
2: 2:
mov #2, r4 mov #2, r6
XCHG (r4, @r8, r2) XCHG (r6, @r8, r2)
tst r2, r2 tst r2, r2
bf 1b bf 1b

2
stdio-common/tst-put-error.c
View File

@ -17,7 +17,7 @@ do_test (void)
error (EXIT_FAILURE, errno, "fdopen"); error (EXIT_FAILURE, errno, "fdopen");
setlinebuf (fp); setlinebuf (fp);
close (fd); close (fd);
unlink ("aaa"); unlink (tmpl);
int n = fprintf (fp, "hello world\n"); int n = fprintf (fp, "hello world\n");
printf ("fprintf = %d\n", n); printf ("fprintf = %d\n", n);
if (n >= 0) if (n >= 0)