mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-23 01:33:36 +08:00
elf: Add more DT_RELR tests
Verify that: 1. A DT_RELR shared library without DT_NEEDED works. 2. A DT_RELR shared library without DT_VERNEED works. 3. A DT_RELR shared library without libc.so on DT_NEEDED works.
This commit is contained in:
H.J. Lu
parent
60196d2ef2
commit
4ada564f35
76
elf/Makefile
76
elf/Makefile
@ -545,7 +545,20 @@ endif
|
||||
ifeq ($(have-dt-relr),yes)
|
||||
tests += \
|
||||
tst-relr \
|
||||
tst-relr2 \
|
||||
tst-relr3 \
|
||||
tst-relr4 \
|
||||
# tests
|
||||
modules-names-dt-relr = \
|
||||
tst-relr-mod2 \
|
||||
tst-relr-mod3a \
|
||||
tst-relr-mod3b \
|
||||
tst-relr-mod4a \
|
||||
tst-relr-mod4b \
|
||||
# modules-names-dt-relr
|
||||
modules-names += $(modules-names-dt-relr)
|
||||
# These shared libraries have special build rules.
|
||||
modules-names-nobuild += $(modules-names-dt-relr)
|
||||
ifeq ($(have-fpie),yes)
|
||||
tests += \
|
||||
tst-relr-pie \
|
||||
@ -560,6 +573,11 @@ endif
|
||||
CFLAGS-tst-relr-pie.c += $(pie-ccflag)
|
||||
LDFLAGS-tst-relr += -Wl,-z,pack-relative-relocs
|
||||
LDFLAGS-tst-relr-pie += -Wl,-z,pack-relative-relocs
|
||||
CFLAGS-tst-relr-mod2.c += $(no-stack-protector)
|
||||
CFLAGS-tst-relr-mod3a.c += $(no-stack-protector)
|
||||
CFLAGS-tst-relr-mod3b.c += $(no-stack-protector)
|
||||
CFLAGS-tst-relr-mod4a.c += $(no-stack-protector)
|
||||
CFLAGS-tst-relr-mod4b.c += $(no-stack-protector)
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -637,7 +655,7 @@ test-extras += \
|
||||
tst-tlsmod17a \
|
||||
tst-tlsmod18a \
|
||||
# test-extras
|
||||
modules-names = \
|
||||
modules-names += \
|
||||
circlemod1 \
|
||||
circlemod1a \
|
||||
circlemod2 \
|
||||
@ -1008,8 +1026,13 @@ extra-test-objs += $(addsuffix .os,$(strip $(modules-names)))
|
||||
|
||||
# filtmod1.so, tst-big-note-lib.so, tst-ro-dynamic-mod.so have special
|
||||
# rules.
|
||||
modules-names-nobuild := filtmod1 tst-big-note-lib tst-ro-dynamic-mod \
|
||||
tst-audit24bmod1 tst-audit24bmod2
|
||||
modules-names-nobuild += \
|
||||
filtmod1 \
|
||||
tst-audit24bmod1 \
|
||||
tst-audit24bmod2 \
|
||||
tst-big-note-lib \
|
||||
tst-ro-dynamic-mod \
|
||||
# modules-names-nobuild
|
||||
|
||||
tests += $(tests-static)
|
||||
|
||||
@ -2814,3 +2837,50 @@ $(objpfx)check-tst-relr-pie.out: $(objpfx)tst-relr-pie
|
||||
| sed -ne '/required from libc.so/,$$ p' \
|
||||
| grep GLIBC_ABI_DT_RELR > $@; \
|
||||
$(evaluate-test)
|
||||
|
||||
# The test checks if a DT_RELR shared library without DT_NEEDED works as
|
||||
# intended, so it uses an explicit link rule.
|
||||
$(objpfx)tst-relr2: $(objpfx)tst-relr-mod2.so
|
||||
$(objpfx)tst-relr-mod2.so: $(objpfx)tst-relr-mod2.os
|
||||
$(LINK.o) -nostdlib -nostartfiles -Wl,-z,pack-relative-relocs \
|
||||
$(LDFLAGS-soname-fname) \
|
||||
-shared -o $@.new $(filter-out $(map-file),$^)
|
||||
$(call after-link,$@.new)
|
||||
mv -f $@.new $@
|
||||
|
||||
# The test checks if a DT_RELR shared library without DT_VERNEED works as
|
||||
# intended, so it uses an explicit link rule.
|
||||
$(objpfx)tst-relr3: $(objpfx)tst-relr-mod3a.so
|
||||
$(objpfx)tst-relr-mod3b.so: $(objpfx)tst-relr-mod3b.os
|
||||
$(LINK.o) -nostdlib -nostartfiles -Wl,-z,pack-relative-relocs \
|
||||
$(LDFLAGS-soname-fname) \
|
||||
-shared -o $@.new $(filter-out $(map-file),$^)
|
||||
$(call after-link,$@.new)
|
||||
mv -f $@.new $@
|
||||
|
||||
$(objpfx)tst-relr-mod3a.so: $(objpfx)tst-relr-mod3a.os \
|
||||
$(objpfx)tst-relr-mod3b.so
|
||||
$(LINK.o) -nostdlib -nostartfiles -Wl,-z,pack-relative-relocs \
|
||||
$(LDFLAGS-soname-fname) \
|
||||
-shared -o $@.new $(filter-out $(map-file),$^)
|
||||
$(call after-link,$@.new)
|
||||
mv -f $@.new $@
|
||||
|
||||
# The test checks if a DT_RELR shared library without libc.so on DT_NEEDED
|
||||
# works as intended, so it uses an explicit link rule.
|
||||
$(objpfx)tst-relr4: $(objpfx)tst-relr-mod4a.so
|
||||
$(objpfx)tst-relr-mod4b.so: $(objpfx)tst-relr-mod4b.os
|
||||
$(LINK.o) -nostdlib -nostartfiles -Wl,-z,pack-relative-relocs \
|
||||
$(LDFLAGS-soname-fname) \
|
||||
-Wl,--version-script=tst-relr-mod4b.map \
|
||||
-shared -o $@.new $(filter-out $(map-file),$^)
|
||||
$(call after-link,$@.new)
|
||||
mv -f $@.new $@
|
||||
|
||||
$(objpfx)tst-relr-mod4a.so: $(objpfx)tst-relr-mod4a.os \
|
||||
$(objpfx)tst-relr-mod4b.so
|
||||
$(LINK.o) -nostdlib -nostartfiles -Wl,-z,pack-relative-relocs \
|
||||
$(LDFLAGS-soname-fname) \
|
||||
-shared -o $@.new $(filter-out $(map-file),$^)
|
||||
$(call after-link,$@.new)
|
||||
mv -f $@.new $@
|
||||
|
||||
46
elf/tst-relr-mod2.c
Normal file
46
elf/tst-relr-mod2.c
Normal file
@ -0,0 +1,46 @@
|
||||
/* Test for DT_RELR in a shared library without DT_NEEDED.
|
||||
Copyright (C) 2022 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, see
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <array_length.h>
|
||||
|
||||
static int o, x;
|
||||
|
||||
#define ELEMS O O O O O O O O X X X X X X X O O X O O X X X E X E E O X O E
|
||||
#define E 0,
|
||||
|
||||
#define O &o,
|
||||
#define X &x,
|
||||
void *arr[] = { ELEMS };
|
||||
#undef O
|
||||
#undef X
|
||||
|
||||
#define O 1,
|
||||
#define X 2,
|
||||
static char val[] = { ELEMS };
|
||||
|
||||
int
|
||||
foo (void)
|
||||
{
|
||||
int err = 0;
|
||||
for (int i = 0; i < array_length (arr); i++)
|
||||
if (!((arr[i] == 0 && val[i] == 0)
|
||||
|| (arr[i] == &o && val[i] == 1)
|
||||
|| (arr[i] == &x && val[i] == 2)))
|
||||
err++;
|
||||
return err;
|
||||
}
|
||||
49
elf/tst-relr-mod3a.c
Normal file
49
elf/tst-relr-mod3a.c
Normal file
@ -0,0 +1,49 @@
|
||||
/* Test for DT_RELR in a shared library without DT_VERNEED.
|
||||
Copyright (C) 2022 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, see
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <array_length.h>
|
||||
|
||||
static int o, x;
|
||||
|
||||
#define ELEMS O O O O O O O O X X X X X X X O O X O O X X X E X E E O X O E
|
||||
#define E 0,
|
||||
|
||||
#define O &o,
|
||||
#define X &x,
|
||||
void *arr[] = { ELEMS };
|
||||
#undef O
|
||||
#undef X
|
||||
|
||||
#define O 1,
|
||||
#define X 2,
|
||||
static char val[] = { ELEMS };
|
||||
|
||||
extern void bar (void);
|
||||
|
||||
int
|
||||
foo (void)
|
||||
{
|
||||
int err = 0;
|
||||
for (int i = 0; i < array_length (arr); i++)
|
||||
if (!((arr[i] == 0 && val[i] == 0)
|
||||
|| (arr[i] == &o && val[i] == 1)
|
||||
|| (arr[i] == &x && val[i] == 2)))
|
||||
err++;
|
||||
bar ();
|
||||
return err;
|
||||
}
|
||||
22
elf/tst-relr-mod3b.c
Normal file
22
elf/tst-relr-mod3b.c
Normal file
@ -0,0 +1,22 @@
|
||||
/* Test for DT_RELR in a shared library without DT_VERNEED.
|
||||
Copyright (C) 2022 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, see
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
void
|
||||
bar (void)
|
||||
{
|
||||
}
|
||||
19
elf/tst-relr-mod4a.c
Normal file
19
elf/tst-relr-mod4a.c
Normal file
@ -0,0 +1,19 @@
|
||||
/* Test for DT_RELR in a shared library without libc.so on DT_NEEDED.
|
||||
Copyright (C) 2022 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, see
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
#include "tst-relr-mod3a.c"
|
||||
19
elf/tst-relr-mod4b.c
Normal file
19
elf/tst-relr-mod4b.c
Normal file
@ -0,0 +1,19 @@
|
||||
/* Test for DT_RELR in a shared library without libc.so on DT_NEEDED.
|
||||
Copyright (C) 2022 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, see
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
#include "tst-relr-mod3b.c"
|
||||
3
elf/tst-relr-mod4b.map
Normal file
3
elf/tst-relr-mod4b.map
Normal file
@ -0,0 +1,3 @@
|
||||
DT_RELR {
|
||||
global: bar;
|
||||
};
|
||||
27
elf/tst-relr2.c
Normal file
27
elf/tst-relr2.c
Normal file
@ -0,0 +1,27 @@
|
||||
/* Test for DT_RELR in a shared library without DT_NEEDED.
|
||||
Copyright (C) 2022 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, see
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
extern int foo (void);
|
||||
|
||||
static int
|
||||
do_test (void)
|
||||
{
|
||||
return foo ();
|
||||
}
|
||||
|
||||
#include <support/test-driver.c>
|
||||
27
elf/tst-relr3.c
Normal file
27
elf/tst-relr3.c
Normal file
@ -0,0 +1,27 @@
|
||||
/* Test for DT_RELR in a shared library without libc.so on DT_NEEDED.
|
||||
Copyright (C) 2022 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, see
|
||||
<https://www.gnu.org/licenses/>. */
|
||||
|
||||
extern int foo (void);
|
||||
|
||||
static int
|
||||
do_test (void)
|
||||
{
|
||||
return foo ();
|
||||
}
|
||||
|
||||
#include <support/test-driver.c>
|
||||
1
elf/tst-relr4.c
Normal file
1
elf/tst-relr4.c
Normal file
@ -0,0 +1 @@
|
||||
#include "tst-relr3.c"
|
||||
Loading…
Reference in New Issue
Block a user