mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-21 01:12:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

* sysdeps/unix/common/Makefile: File removed.

Browse Source 
* sysdeps/unix/common/glue-ctype.c: File removed.
	* sysdeps/unix/common/configure.in: File removed.
	* sysdeps/unix/common/configure: File removed.

	* sysdeps/unix/configure.in: File removed.
	* sysdeps/unix/configure: File removed.
	* sysdeps/unix/make_errlist.c: File removed.
	* sysdeps/unix/Makefile ($(objpfx)errlist.c, $(objpfx)make_errlist):
	Rules removed.
This commit is contained in:
Roland McGrath 2006-02-26 23:57:29 +00:00
parent f04d645ebe
commit d900bcba1e
9 changed files with 11 additions and 558 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,5 +1,16 @@
2006-02-26 Roland McGrath <roland@redhat.com>
* sysdeps/unix/common/Makefile: File removed.
* sysdeps/unix/common/glue-ctype.c: File removed.
* sysdeps/unix/common/configure.in: File removed.
* sysdeps/unix/common/configure: File removed.
* sysdeps/unix/configure.in: File removed.
* sysdeps/unix/configure: File removed.
* sysdeps/unix/make_errlist.c: File removed.
* sysdeps/unix/Makefile ($(objpfx)errlist.c, $(objpfx)make_errlist):
Rules removed.
* timezone/africa: Update from tzdata2006b (comment changes only).
* timezone/antarctica: Likewise.
* timezone/asia: Likewise.

18
sysdeps/unix/Makefile
View File

@ -212,24 +212,6 @@ common-generated := $(common-generated) \
bits/ioctls.h ioctls make-ioctls make-ioctls.c
endif
ifeq ($(subdir),stdio-common)
ifeq (,$(filter-out $(sysdep_dir)/generic/ $(objpfx),\
$(dir $(firstword $(wildcard $(+sysdep_dirs:%=%/errlist.c))))))
before-compile: $(objpfx)errlist.c
$(objpfx)errlist.c: $(objpfx)make_errlist
@rm -f $@
$(dir $<)$(notdir $<) > $@-tmp
mv $@-tmp $@
$(objpfx)make_errlist: $(sysdep_dir)/unix/make_errlist.c
$(native-compile)
generated := $(generated) make_errlist errlist.c
endif
endif # stdio-common
ifeq (,$(filter-out $(sysdep_dir)/generic/ $(common-objpfx),\
$(dir $(firstword $(wildcard $(+sysdep_dirs:%=%/sys/syscall.h))))))

35
sysdeps/unix/common/Makefile
View File

@ -1,35 +0,0 @@
# Copyright (C) 1991, 1992, 1993, 1994, 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 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.
ifndef inhibit-glue
ifeq ($(subdir),ctype)
sysdep_routines := $(sysdep_routines) ctype-glue
generated := $(generated) glue-ctype ctype-glue.c
$(objpfx)ctype-glue.c: $(objpfx)glue-ctype
@rm -f $@
$(dir $<)$(notdir $<) > $@-t
mv $@-t $@
$(objpfx)glue-ctype: $(sysdep_dir)/unix/common/glue-ctype.c
$(native-compile)
endif
endif

195
sysdeps/unix/common/configure vendored
View File

@ -1,195 +0,0 @@
# This file is generated from configure.in by Autoconf. DO NOT EDIT!
if test -z "$inhibit_glue"; then
# Find out what this system calls `sys_siglist'.
echo "$as_me:$LINENO: checking for sys_siglist" >&5
echo $ECHO_N "checking for sys_siglist... $ECHO_C" >&6
if test "${ac_cv_check_symbol_sys_siglist+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
main ()
{
extern char *sys_siglist[]; puts(*sys_siglist);
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_check_symbol_sys_siglist=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_check_symbol_sys_siglist=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
if test "$ac_cv_check_symbol_sys_siglist" = yes; then
ac_tr_symbol=`echo sys_siglist | tr '[a-z]' '[A-Z]'`
cat >>confdefs.h <<_ACEOF
#define HAVE_${ac_tr_symbol} 1
_ACEOF
fi
echo "$as_me:$LINENO: result: $ac_cv_check_symbol_sys_siglist" >&5
echo "${ECHO_T}$ac_cv_check_symbol_sys_siglist" >&6
echo "$as_me:$LINENO: checking for _sys_siglist" >&5
echo $ECHO_N "checking for _sys_siglist... $ECHO_C" >&6
if test "${ac_cv_check_symbol__sys_siglist+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
int
main ()
{
extern char *_sys_siglist[]; puts(*_sys_siglist);
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
ac_cv_check_symbol__sys_siglist=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_check_symbol__sys_siglist=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
if test "$ac_cv_check_symbol__sys_siglist" = yes; then
ac_tr_symbol=`echo _sys_siglist | tr '[a-z]' '[A-Z]'`
cat >>confdefs.h <<_ACEOF
#define HAVE_${ac_tr_symbol} 1
_ACEOF
fi
echo "$as_me:$LINENO: result: $ac_cv_check_symbol__sys_siglist" >&5
echo "${ECHO_T}$ac_cv_check_symbol__sys_siglist" >&6
# Find out the name of the table the system's <ctype.h> uses for character
# classification. This is used by sysdeps/unix/common/glue-ctype.c.
echo "$as_me:$LINENO: checking ctype array name for glue" >&5
echo $ECHO_N "checking ctype array name for glue... $ECHO_C" >&6
if test "${libc_cv_ctype_glue+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
for ctype in _ctype_ __ctype_ __ctype _ctype__ _ctype _locp; do
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <ctype.h>
int
main ()
{
$ctype[13];
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
libc_cv_ctype_glue="$ctype"; break
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
done
fi
echo "$as_me:$LINENO: result: $libc_cv_ctype_glue" >&5
echo "${ECHO_T}$libc_cv_ctype_glue" >&6
cat >>confdefs.h <<_ACEOF
#define HAVE_`echo $libc_cv_ctype_glue | tr 'a-z' 'A-Z'` 1
_ACEOF
fi

21
sysdeps/unix/common/configure.in
View File

@ -1,21 +0,0 @@
GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
if test -z "$inhibit_glue"; then
# Find out what this system calls `sys_siglist'.
AC_CHECK_SYMBOL(sys_siglist)
AC_CHECK_SYMBOL(_sys_siglist)
# Find out the name of the table the system's <ctype.h> uses for character
# classification. This is used by sysdeps/unix/common/glue-ctype.c.
AC_MSG_CHECKING(ctype array name for glue)
AC_CACHE_VAL(libc_cv_ctype_glue, [dnl
for ctype in _ctype_ __ctype_ __ctype _ctype__ _ctype _locp; do
AC_TRY_LINK([#include <ctype.h>],
[$ctype[13];],
[libc_cv_ctype_glue="$ctype"; break])
done])
AC_MSG_RESULT($libc_cv_ctype_glue)
AC_DEFINE_UNQUOTED(HAVE_`echo $libc_cv_ctype_glue | tr '[a-z]' '[A-Z]'`)
fi

91
sysdeps/unix/common/glue-ctype.c
View File

@ -1,91 +0,0 @@
/* Copyright (C) 1992, 1993, 1994, 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 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. */
/* Different systems have different names for the array.
This order is important for some systems. */
#if !defined(TABLE) && defined(HAVE__LOCP)
/* OSF/1 has the name _ctype defined as a macro, which points down into
the _locp structure. Jesus. We'll hope this works. We need to
check for LOCP first, since there is no symbol actually named _ctype
in their library. */
#include <sys/types.h> /* for wchar_t used by localdef.h */
#include <sys/localedef.h>
extern loc_t *_locp;
#define TABLE (_locp->lc_chrtbl)->lc_ctype
#undef _ctype
#define TABLE_NAME _ctype
#endif
#ifdef HAVE__CTYPE__
#define TABLE _ctype__
#endif
#if !defined(TABLE) && defined(HAVE__CTYPE)
#define TABLE _ctype
#endif
#if !defined(TABLE) && defined(HAVE__CTYPE_)
#define TABLE _ctype_
#endif
#if !defined(TABLE) && defined(HAVE___CTYPE_)
#define TABLE __ctype_
#endif
#if !defined(TABLE) && defined(HAVE___CTYPE)
#define TABLE __ctype
#endif
#if defined (__STDC__) && __STDC__
#define STRINGIFY(arg) #arg
#else
#define STRINGIFY(arg) "arg"
#endif
#define EVALLED_STRINGIFY(x) STRINGIFY (x)
int
main ()
{
#ifdef TABLE
int i;
#ifndef HAVE__LOCP
/* This won't work for the define to look into _locp. */
extern unsigned char TABLE[];
#endif
#ifdef TABLE_NAME
printf ("const unsigned char %s[] =\n {\n", EVALLED_STRINGIFY (TABLE_NAME));
#else
printf ("const unsigned char %s[] =\n {\n", EVALLED_STRINGIFY (TABLE));
#endif
for (i = -1; i < 256; ++i)
printf (" %d,\n", (int) ((TABLE+1)[i]));
puts (" };");
#else
puts ("/* I don't know what the ctype table is called on this system.");
puts (" If there is a table, and you want the ctype glue to work,");
puts (" edit configure.in and glue-ctype.c in sysdeps/unix/common/");
puts (" to check for the right name. */");
#endif
exit (0);
}

109
sysdeps/unix/configure vendored
View File

@ -1,109 +0,0 @@
# This file is generated from configure.in by Autoconf. DO NOT EDIT!
# Local configure fragment for sysdeps/unix.
if test -z "$inhibit_glue"; then
# For make_errlist.c, used in make_errlist.
for ac_func in strerror
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
echo "$as_me:$LINENO: checking for $ac_func" >&5
echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
if eval "test \"\${$as_ac_var+set}\" = set"; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
For example, HP-UX 11i <limits.h> declares gettimeofday. */
#define $ac_func innocuous_$ac_func
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below.
Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
<limits.h> exists even on freestanding compilers. */
#ifdef __STDC__
# include <limits.h>
#else
# include <assert.h>
#endif
#undef $ac_func
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
extern "C"
{
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
char $ac_func ();
/* The GNU C library defines this for functions which it implements
to always fail with ENOSYS. Some functions are actually named
something starting with __ and the normal name is an alias. */
#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
choke me
#else
char (*f) () = $ac_func;
#endif
#ifdef __cplusplus
}
#endif
int
main ()
{
return f != $ac_func;
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
(eval $ac_link) 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } &&
{ ac_try='test -z "$ac_c_werror_flag"
|| test ! -s conftest.err'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; } &&
{ ac_try='test -s conftest$ac_exeext'
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
(eval $ac_try) 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
fi
echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
if test `eval echo '${'$as_ac_var'}'` = yes; then
cat >>confdefs.h <<_ACEOF
#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
_ACEOF
fi
done
fi

7
sysdeps/unix/configure.in
View File

@ -1,7 +0,0 @@
GLIBC_PROVIDES dnl See aclocal.m4 in the top level source directory.
# Local configure fragment for sysdeps/unix.
if test -z "$inhibit_glue"; then
# For make_errlist.c, used in make_errlist.
AC_CHECK_FUNCS(strerror)
fi

82
sysdeps/unix/make_errlist.c
View File

@ -1,82 +0,0 @@
/* Copyright (C) 1991,1992,1995,1997,1999,2001 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. */
#include <stdio.h>
#include <time.h>
/* Make a definition for sys_errlist. */
extern int sys_nerr;
#ifndef HAVE_STRERROR
extern const char *const sys_errlist[];
#endif
int
main (void)
{
register int i;
struct tm timenow;
time_t now;
int year;
now = time (NULL);
timenow = *localtime (&now);
year = timenow.tm_year + 1900;
printf ("/* Copyright (C) %d Free Software Foundation, Inc.\n\
This file is part of the GNU C Library.\n\
\n\
The GNU C Library is free software; you can redistribute it and/or\n\
modify it under the terms of the GNU Lesser General Public\n\
License as published by the Free Software Foundation; either\n\
version 2.1 of the License, or (at your option) any later version.\n\
\n\
The GNU C Library is distributed in the hope that it will be useful,\n\
but WITHOUT ANY WARRANTY; without even the implied warranty of\n\
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU\n\
Lesser General Public License for more details.\n\
\n\
You should have received a copy of the GNU Lesser General Public\n\
License along with the GNU C Library; if not, write to the Free\n\
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA\n\
02111-1307 USA. */\n", year);
puts ("#include <stddef.h>\n");
puts ("#include <libintl.h>\n");
puts ("\n/* This is a list of all known `errno' codes. */\n");
printf ("\nconst int _sys_nerr = %d;\n\n", sys_nerr);
puts ("const char *const _sys_errlist[] =\n {");
for (i = 0; i < sys_nerr; ++i)
printf (" N_(\"%s\"),\n",
#ifdef HAVE_STRERROR
strerror (i)
#else /* ! HAVE_STRERROR */
sys_errlist[i]
#endif /* HAVE_STRERROR */
);
puts (" NULL\n };\n");
puts ("weak_alias (_sys_errlist, sys_errlist)");
puts ("weak_alias (_sys_nerr, sys_nerr)");
exit (0);
}