niansa-misc/glibc
1
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-06 20:58:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

elf: Enable tst-dlopen-nodelete-reloc if TEST_CXX supports STB_GNU_UNIQUE

Browse source 
tst-dlopen-nodelete-reloc requires STB_GNU_UNIQUE support so that NODELETE
is propagated by do_lookup_unique.  Enable it only if TEST_CXX supports
STB_GNU_UNIQUE,

Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
Reviewed-by: Sam James <sam@gentoo.org>
This commit is contained in:
H.J. Lu 2024-12-20 04:32:49 +08:00
parent bce70034b1
commit 8d25b9f2c8
3 changed files with 108 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
configure vendored
View file

@ -8033,6 +8033,65 @@ CXX="$saved_CXX"
config_vars="$config_vars
test-config-cxxflags-finput-charset-ascii = $libc_cv_test_cxxflags_finput_charset_ascii"
conftest_code="
extern int not_exist (void);
inline int make_unique (void)
{
/* Static variables in inline functions and classes
generate STB_GNU_UNIQUE symbols. */
static int unique;
return ++unique;
}
int foo (void)
{
return make_unique () + not_exist ();
}
"
cat > conftest.cc <<EOF
$conftest_code
EOF
saved_CXX="$CXX"
CXX="$TEST_CXX"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for STB_GNU_UNIQUE in testing" >&5
printf %s "checking for STB_GNU_UNIQUE in testing... " >&6; }
if test ${libc_cv_test_stb_gnu_unique+y}
then :
printf %s "(cached) " >&6
else case e in #(
e) if { ac_try='${CXX-c++} $CXXFLAGS $CPPFLAGS -c conftest.cc -o conftest 1>&5'
{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_try\""; } >&5
(eval $ac_try) 2>&5
ac_status=$?
printf "%s\n" "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
test $ac_status = 0; }; }
then
if LC_ALL=C $READELF -sW conftest \
| grep -q "UNIQUE.* _ZZ11make_uniquevE6unique"; then
libc_cv_test_stb_gnu_unique=yes
else
libc_cv_test_stb_gnu_unique=no
fi
else
libc_cv_test_stb_gnu_unique=no
fi ;;
esac
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $libc_cv_test_stb_gnu_unique" >&5
printf "%s\n" "$libc_cv_test_stb_gnu_unique" >&6; }
CXX="$saved_CXX"
rm -f conftest*
config_vars="$config_vars
have-test-stb-gnu-unique = $libc_cv_test_stb_gnu_unique"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for libgd" >&5
printf %s "checking for libgd... " >&6; }
if test "$with_gd" != "no"; then

34
configure.ac
View file

@ -1599,6 +1599,40 @@ LIBC_TRY_TEST_CXX_OPTION([-finput-charset=ascii],
LIBC_CONFIG_VAR(test-config-cxxflags-finput-charset-ascii,
$libc_cv_test_cxxflags_finput_charset_ascii)
conftest_code="
extern int not_exist (void);
inline int make_unique (void)
{
/* Static variables in inline functions and classes
generate STB_GNU_UNIQUE symbols. */
static int unique;
return ++unique;
}
int foo (void)
{
return make_unique () + not_exist ();
}
"
dnl Check if TEST_CXX supports STB_GNU_UNIQUE.
LIBC_TRY_TEST_CXX_COMMAND([for STB_GNU_UNIQUE],
[$conftest_code],
[-c],
libc_cv_test_stb_gnu_unique,
[
if LC_ALL=C $READELF -sW conftest \
| grep -q "UNIQUE.* _ZZ11make_uniquevE6unique"; then
libc_cv_test_stb_gnu_unique=yes
else
libc_cv_test_stb_gnu_unique=no
fi
],
[libc_cv_test_stb_gnu_unique=no],
)
LIBC_CONFIG_VAR([have-test-stb-gnu-unique], [$libc_cv_test_stb_gnu_unique])
dnl Check whether we have the gd library available.
AC_MSG_CHECKING(for libgd)
if test "$with_gd" != "no"; then

22
elf/Makefile
View file

@ -505,11 +505,15 @@ tests += \
valgrind-test \
# tests
tests-cxx = \
tst-dlopen-nodelete-reloc \
tst-nodelete \
tst-unique3 \
tst-unique4 \
# tests-cxx
ifeq ($(have-test-stb-gnu-unique), yes)
tests-cxx += \
tst-dlopen-nodelete-reloc \
# tests-cxx
endif
tests += $(if $(CXX),$(tests-cxx))
@ -1042,6 +1046,15 @@ modules-names += \
# modules-names
modules-names-cxx = \
tst-nodelete-rtldmod \
tst-nodelete-uniquemod \
tst-nodelete-zmod \
tst-unique3lib \
tst-unique3lib2 \
tst-unique4lib \
# modules-names-cxx
ifeq ($(have-test-stb-gnu-unique), yes)
modules-names-cxx += \
tst-dlopen-nodelete-reloc-mod1 \
tst-dlopen-nodelete-reloc-mod2 \
tst-dlopen-nodelete-reloc-mod3 \
@ -1059,13 +1072,8 @@ modules-names-cxx = \
tst-dlopen-nodelete-reloc-mod15 \
tst-dlopen-nodelete-reloc-mod16 \
tst-dlopen-nodelete-reloc-mod17 \
tst-nodelete-rtldmod \
tst-nodelete-uniquemod \
tst-nodelete-zmod \
tst-unique3lib \
tst-unique3lib2 \
tst-unique4lib \
# modules-names-cxx
endif
modules-names += \
$(if $(CXX),$(modules-names-cxx)) \