mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 16:40:54 +00:00
388b4f1a02
The .symver directive on common symbol just creates a new common symbol, not an alias and the newer assembler with the bug fix for https://sourceware.org/bugzilla/show_bug.cgi?id=21661 will issue an error. Before the fix, we got $ readelf -sW libc.so | grep "loc[12s]" 5109: 00000000003a0608 8 OBJECT LOCAL DEFAULT 36 loc1 5188: 00000000003a0610 8 OBJECT LOCAL DEFAULT 36 loc2 5455: 00000000003a0618 8 OBJECT LOCAL DEFAULT 36 locs 6575: 00000000003a05f0 8 OBJECT GLOBAL DEFAULT 36 locs@GLIBC_2.2.5 7156: 00000000003a05f8 8 OBJECT GLOBAL DEFAULT 36 loc1@GLIBC_2.2.5 7312: 00000000003a0600 8 OBJECT GLOBAL DEFAULT 36 loc2@GLIBC_2.2.5 in libc.so. The versioned loc1, loc2 and locs have the wrong addresses. After the fix, we got $ readelf -sW libc.so | grep "loc[12s]" 6570: 000000000039e3b8 8 OBJECT GLOBAL DEFAULT 34 locs@GLIBC_2.2.5 7151: 000000000039e3c8 8 OBJECT GLOBAL DEFAULT 34 loc1@GLIBC_2.2.5 7307: 000000000039e3c0 8 OBJECT GLOBAL DEFAULT 34 loc2@GLIBC_2.2.5 [BZ #21666] * misc/regexp.c (loc1): Add __attribute__ ((nocommon)); (loc2): Likewise. (locs): Likewise.
94 lines
3.3 KiB
C
94 lines
3.3 KiB
C
/* Compatibility symbols for the obsolete <regexp.h> interface.
|
|
Copyright (C) 1996-2017 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
|
|
|
|
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, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
/* regexp.h now contains only an #error directive, so it cannot be
|
|
used in this file.
|
|
|
|
The function that would produce an 'expbuf' to use as the second
|
|
argument to 'step' and 'advance' was defined only in regexp.h,
|
|
as its definition depended on macros defined by the user. */
|
|
|
|
#include <regex.h>
|
|
#include <shlib-compat.h>
|
|
|
|
#if SHLIB_COMPAT (libc, GLIBC_2_0, GLIBC_2_23)
|
|
|
|
/* Define the variables used for the interface. Avoid .symver on common
|
|
symbol, which just creates a new common symbol, not an alias. */
|
|
char *loc1 __attribute__ ((nocommon));
|
|
char *loc2 __attribute__ ((nocommon));
|
|
compat_symbol (libc, loc1, loc1, GLIBC_2_0);
|
|
compat_symbol (libc, loc2, loc2, GLIBC_2_0);
|
|
|
|
/* Although we do not support the use we define this variable as well. */
|
|
char *locs __attribute__ ((nocommon));
|
|
compat_symbol (libc, locs, locs, GLIBC_2_0);
|
|
|
|
|
|
/* Find the next match in STRING. The compiled regular expression is
|
|
found in the buffer starting at EXPBUF. `loc1' will return the
|
|
first character matched and `loc2' points to the next unmatched
|
|
character. */
|
|
int
|
|
weak_function attribute_compat_text_section
|
|
step (const char *string, const char *expbuf)
|
|
{
|
|
regmatch_t match; /* We only need info about the full match. */
|
|
|
|
expbuf += __alignof (regex_t *);
|
|
expbuf -= (expbuf - ((const char *) 0)) % __alignof__ (regex_t *);
|
|
|
|
if (__regexec ((const regex_t *) expbuf, string, 1, &match, REG_NOTEOL)
|
|
== REG_NOMATCH)
|
|
return 0;
|
|
|
|
loc1 = (char *) string + match.rm_so;
|
|
loc2 = (char *) string + match.rm_eo;
|
|
return 1;
|
|
}
|
|
compat_symbol (libc, step, step, GLIBC_2_0);
|
|
|
|
|
|
/* Match the beginning of STRING with the compiled regular expression
|
|
in EXPBUF. If the match is successful `loc2' will contain the
|
|
position of the first unmatched character. */
|
|
int
|
|
weak_function attribute_compat_text_section
|
|
advance (const char *string, const char *expbuf)
|
|
{
|
|
regmatch_t match; /* We only need info about the full match. */
|
|
|
|
expbuf += __alignof__ (regex_t *);
|
|
expbuf -= (expbuf - ((const char *) 0)) % __alignof__ (regex_t *);
|
|
|
|
if (__regexec ((const regex_t *) expbuf, string, 1, &match, REG_NOTEOL)
|
|
== REG_NOMATCH
|
|
/* We have to check whether the check is at the beginning of the
|
|
buffer. */
|
|
|| match.rm_so != 0)
|
|
return 0;
|
|
|
|
loc2 = (char *) string + match.rm_eo;
|
|
return 1;
|
|
}
|
|
compat_symbol (libc, advance, advance, GLIBC_2_0);
|
|
|
|
|
|
#endif /* SHLIB_COMPAT (2.0, 2.23) */
|