mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-28 00:21:52 +03:00
Update.
2002-02-01 Jakub Jelinek <jakub@redhat.com> * sysdeps/generic/ldsodefs.h (_dl_load_lock): Remove duplicate definition. * sysdeps/ia64/hp-timing.h: Move _dl_hp_timing_overhead in _rtld_global struct. * sysdeps/sparc/sparc32/sparcv9/hp-timing.h: Likewise. * sysdeps/sparc/sparc64/hp-timing.c: Likewise. * sysdeps/sparc/sparc64/hp-timing.h: Likewise. * sysdeps/sparc/sparc64/Makefile: Make hp-timing static only. * sysdeps/unix/sysv/aix/init-first.c (_dl_fpu_control, _dl_fpu_control_set): Remove unused externs. * sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.c: New file. * sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.c: New file. * sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.h: Move procinfo related variables in _rtld_global struct. * sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.h: Likewise. * sysdeps/unix/sysv/linux/init-first.c (_dl_fpu_control_set): Remove unused extern.
This commit is contained in:
Ulrich Drepper
62
sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.c
Normal file
62
sysdeps/unix/sysv/linux/sparc/sparc32/dl-procinfo.c
Normal file
@ -0,0 +1,62 @@
|
||||
/* Data for Linux/sparc32 version of processor capability information.
|
||||
Copyright (C) 2002 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
|
||||
|
||||
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. */
|
||||
|
||||
/* This information must be kept in sync with the _DL_HWCAP_COUNT
|
||||
definition in procinfo.h.
|
||||
|
||||
If anything should be added here check whether the size of each string
|
||||
is still ok with the given array size.
|
||||
|
||||
All the #ifdefs in the definitions ar equite irritating but
|
||||
necessary if we want to avoid duplicating the information. There
|
||||
are three different modes:
|
||||
|
||||
- PROCINFO_DECL is defined. This means we are only interested in
|
||||
declarations.
|
||||
|
||||
- PROCINFO_DECL is not defined:
|
||||
|
||||
+ if SHARED is defined the file is included in an array
|
||||
initializer. The .element = { ... } syntax is needed.
|
||||
|
||||
+ if SHARED is not defined a normal array initialization is
|
||||
needed.
|
||||
*/
|
||||
|
||||
#ifdef PROCINFO_DECL
|
||||
EXTERN
|
||||
#endif
|
||||
#if !defined PROCINFO_DECL && defined SHARED
|
||||
._dl_sparc32_cap_flags
|
||||
#else
|
||||
const char _dl_sparc32_cap_flags[6][7]
|
||||
#endif
|
||||
#ifndef PROCINFO_DECL
|
||||
= {
|
||||
"flush", "stbar", "swap", "muldiv", "v9", "ultra3"
|
||||
}
|
||||
#endif
|
||||
#if !defined SHARED || defined PROCINFO_DECL
|
||||
;
|
||||
#else
|
||||
,
|
||||
#endif
|
||||
|
||||
#undef PROCINFO_DECL
|
||||
@ -1,5 +1,5 @@
|
||||
/* Linux/sparc32 version of processor capability information handling macros.
|
||||
Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
|
||||
Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Jakub Jelinek <jj@ultra.linux.cz>, 1999.
|
||||
|
||||
@ -23,12 +23,6 @@
|
||||
|
||||
#include <ldsodefs.h>
|
||||
|
||||
/* If anything should be added here check whether the size of each string
|
||||
is still ok with the given array size. */
|
||||
static const char sparc32_cap_flags[][7] =
|
||||
{
|
||||
"flush", "stbar", "swap", "muldiv", "v9", "ultra3"
|
||||
};
|
||||
#define _DL_HWCAP_COUNT 6
|
||||
|
||||
static inline int
|
||||
@ -41,7 +35,7 @@ _dl_procinfo (int word)
|
||||
|
||||
for (i = 0; i < _DL_HWCAP_COUNT; ++i)
|
||||
if (word & (1 << i))
|
||||
_dl_printf (" %s", sparc32_cap_flags[i]);
|
||||
_dl_printf (" %s", GL(dl_sparc32_cap_flags)[i]);
|
||||
|
||||
_dl_printf ("\n");
|
||||
|
||||
@ -52,7 +46,7 @@ static inline const char *
|
||||
__attribute__ ((unused))
|
||||
_dl_hwcap_string (int idx)
|
||||
{
|
||||
return sparc32_cap_flags[idx];
|
||||
return GL(dl_sparc32_cap_flags)[idx];
|
||||
};
|
||||
|
||||
static inline int
|
||||
@ -62,7 +56,7 @@ _dl_string_hwcap (const char *str)
|
||||
int i;
|
||||
for (i = 0; i < _DL_HWCAP_COUNT; i++)
|
||||
{
|
||||
if (strcmp (str, sparc32_cap_flags [i]) == 0)
|
||||
if (strcmp (str, GL(dl_sparc32_cap_flags) [i]) == 0)
|
||||
return i;
|
||||
}
|
||||
return -1;
|
||||
|
||||
62
sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.c
Normal file
62
sysdeps/unix/sysv/linux/sparc/sparc64/dl-procinfo.c
Normal file
@ -0,0 +1,62 @@
|
||||
/* Data for Linux/sparc64 version of processor capability information.
|
||||
Copyright (C) 2002 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Jakub Jelinek <jakub@redhat.com>, 2002.
|
||||
|
||||
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. */
|
||||
|
||||
/* This information must be kept in sync with the _DL_HWCAP_COUNT
|
||||
definition in procinfo.h.
|
||||
|
||||
If anything should be added here check whether the size of each string
|
||||
is still ok with the given array size.
|
||||
|
||||
All the #ifdefs in the definitions ar equite irritating but
|
||||
necessary if we want to avoid duplicating the information. There
|
||||
are three different modes:
|
||||
|
||||
- PROCINFO_DECL is defined. This means we are only interested in
|
||||
declarations.
|
||||
|
||||
- PROCINFO_DECL is not defined:
|
||||
|
||||
+ if SHARED is defined the file is included in an array
|
||||
initializer. The .element = { ... } syntax is needed.
|
||||
|
||||
+ if SHARED is not defined a normal array initialization is
|
||||
needed.
|
||||
*/
|
||||
|
||||
#ifdef PROCINFO_DECL
|
||||
EXTERN
|
||||
#endif
|
||||
#if !defined PROCINFO_DECL && defined SHARED
|
||||
._dl_sparc64_cap_flags
|
||||
#else
|
||||
const char _dl_sparc64_cap_flags[6][7]
|
||||
#endif
|
||||
#ifndef PROCINFO_DECL
|
||||
= {
|
||||
"flush", "stbar", "swap", "muldiv", "v9", "ultra3"
|
||||
}
|
||||
#endif
|
||||
#if !defined SHARED || defined PROCINFO_DECL
|
||||
;
|
||||
#else
|
||||
,
|
||||
#endif
|
||||
|
||||
#undef PROCINFO_DECL
|
||||
@ -1,5 +1,5 @@
|
||||
/* Linux/sparc64 version of processor capability information handling macros.
|
||||
Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
|
||||
Copyright (C) 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Jakub Jelinek <jj@ultra.linux.cz>, 1999.
|
||||
|
||||
@ -23,12 +23,6 @@
|
||||
|
||||
#include <ldsodefs.h>
|
||||
|
||||
/* If anything should be added here check whether the size of each string
|
||||
is still ok with the given array size. */
|
||||
static const char sparc64_cap_flags[][7] =
|
||||
{
|
||||
"flush", "stbar", "swap", "muldiv", "v9", "ultra3"
|
||||
};
|
||||
#define _DL_HWCAP_COUNT 6
|
||||
|
||||
static inline int
|
||||
@ -41,7 +35,7 @@ _dl_procinfo (int word)
|
||||
|
||||
for (i = 0; i < _DL_HWCAP_COUNT; ++i)
|
||||
if (word & (1 << i))
|
||||
_dl_printf (" %s", sparc64_cap_flags[i]);
|
||||
_dl_printf (" %s", GL(dl_sparc64_cap_flags)[i]);
|
||||
|
||||
_dl_printf ("\n");
|
||||
|
||||
@ -52,7 +46,7 @@ static inline const char *
|
||||
__attribute__ ((unused))
|
||||
_dl_hwcap_string (int idx)
|
||||
{
|
||||
return sparc64_cap_flags[idx];
|
||||
return GL(dl_sparc64_cap_flags)[idx];
|
||||
};
|
||||
|
||||
|
||||
@ -63,7 +57,7 @@ _dl_string_hwcap (const char *str)
|
||||
int i;
|
||||
for (i = 0; i < _DL_HWCAP_COUNT; i++)
|
||||
{
|
||||
if (strcmp (str, sparc64_cap_flags [i]) == 0)
|
||||
if (strcmp (str, GL(dl_sparc64_cap_flags) [i]) == 0)
|
||||
return i;
|
||||
}
|
||||
return -1;
|
||||
|
||||
Reference in New Issue
Block a user