procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Hide __cpu_indicator_init/__cpu_model from linker

Browse source 
We shouldn't call external function, __cpu_indicator_init, while an object
is being relocated since its .got.plt section hasn't been updated.  It
works for non-PIE since no update on .got.plt section is required.  This
patch creates libgcc.so as a linker script, hides __cpu_indicator_init
and __cpu_model in libgcc.so.1 from linker, forces linker to resolve
__cpu_indicator_init and __cpu_model to their hidden definitions in
libgcc.a while providing backward binary compatibility.

gcc/testsuite/

	PR target/65612
	* g++.dg/ext/mv18.C: New test.
	* g++.dg/ext/mv19.C: Likewise.
	* g++.dg/ext/mv20.C: Likewise.
	* g++.dg/ext/mv21.C: Likewise.
	* g++.dg/ext/mv22.C: Likewise.
	* g++.dg/ext/mv23.C: Likewise.

libgcc/

	PR target/65612
	* config.host (tmake_file): Add t-slibgcc-libgcc for Linux/x86.
	* config/i386/cpuinfo.c (__cpu_model): Initialize.
	(__cpu_indicator_init@GCC_4.8.0): New.
	(__cpu_model@GCC_4.8.0): Likewise.
	* config/i386/t-linux (HOST_LIBGCC2_CFLAGS): Add
	-DUSE_ELF_SYMVER.

From-SVN: r222178
This commit is contained in:
H.J. Lu 2015-04-17 12:58:07 +00:00 • committed by H.J. Lu
parent 05b1fb220b
commit abd0cdc9c0
11 changed files with 70 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,13 @@
2015-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR target/65612
* g++.dg/ext/mv18.C: New test.
* g++.dg/ext/mv19.C: Likewise.
* g++.dg/ext/mv20.C: Likewise.
* g++.dg/ext/mv21.C: Likewise.
* g++.dg/ext/mv22.C: Likewise.
* g++.dg/ext/mv23.C: Likewise.
2015-04-17 Patrick Palka <ppalka@gcc.gnu.org>
PR c++/64527

7
gcc/testsuite/g++.dg/ext/mv18.C Normal file
View file

@ -0,0 +1,7 @@
/* Test case to check if Multiversioning works. */
/* { dg-do run { target i?86-*-* x86_64-*-* } } */
/* { dg-require-ifunc "" } */
/* { dg-require-effective-target pie } */
/* { dg-options "-O2 -fPIE -pie" } */
#include "mv1.C"

7
gcc/testsuite/g++.dg/ext/mv19.C Normal file
View file

@ -0,0 +1,7 @@
/* Test case to check if Multiversioning works. */
/* { dg-do run { target i?86-*-* x86_64-*-* } } */
/* { dg-require-ifunc "" } */
/* { dg-require-effective-target pie } */
/* { dg-options "-O2 -fPIE -pie -march=x86-64" } */
#include "mv14.C"

7
gcc/testsuite/g++.dg/ext/mv20.C Normal file
View file

@ -0,0 +1,7 @@
/* Test case to check if Multiversioning works. */
/* { dg-do run { target i?86-*-* x86_64-*-* } } */
/* { dg-require-ifunc "" } */
/* { dg-require-effective-target pie } */
/* { dg-options "-O2 -fPIE -pie -march=x86-64" } */
#include "mv15.C"

7
gcc/testsuite/g++.dg/ext/mv21.C Normal file
View file

@ -0,0 +1,7 @@
/* Test case to check if Multiversioning works. */
/* { dg-do run { target i?86-*-* x86_64-*-* } } */
/* { dg-require-ifunc "" } */
/* { dg-require-effective-target static } */
/* { dg-options "-O2 -static" } */
#include "mv1.C"

7
gcc/testsuite/g++.dg/ext/mv22.C Normal file
View file

@ -0,0 +1,7 @@
/* Test case to check if Multiversioning works. */
/* { dg-do run { target i?86-*-* x86_64-*-* } } */
/* { dg-require-ifunc "" } */
/* { dg-require-effective-target static } */
/* { dg-options "-O2 -static -march=x86-64" } */
#include "mv14.C"

7
gcc/testsuite/g++.dg/ext/mv23.C Normal file
View file

@ -0,0 +1,7 @@
/* Test case to check if Multiversioning works. */
/* { dg-do run { target i?86-*-* x86_64-*-* } } */
/* { dg-require-ifunc "" } */
/* { dg-require-effective-target static } */
/* { dg-options "-O2 -static -march=x86-64" } */
#include "mv15.C"

10
libgcc/ChangeLog
View file

@ -1,3 +1,13 @@
2015-04-17 H.J. Lu <hongjiu.lu@intel.com>
PR target/65612
* config.host (tmake_file): Add t-slibgcc-libgcc for Linux/x86.
* config/i386/cpuinfo.c (__cpu_model): Initialize.
(__cpu_indicator_init@GCC_4.8.0): New.
(__cpu_model@GCC_4.8.0): Likewise.
* config/i386/t-linux (HOST_LIBGCC2_CFLAGS): Add
-DUSE_ELF_SYMVER.
2015-04-16 Nick Clifton <nickc@redhat.com>
* config/rl78/divmodhi.S: Add G14 and G13 versions of the __divhi3

2
libgcc/config.host
View file

@ -1306,7 +1306,7 @@ i[34567]86-*-linux* | x86_64-*-linux* | \
i[34567]86-*-kfreebsd*-gnu | x86_64-*-kfreebsd*-gnu | \
i[34567]86-*-knetbsd*-gnu | \
i[34567]86-*-gnu*)
tmake_file="${tmake_file} t-tls i386/t-linux"
tmake_file="${tmake_file} t-tls i386/t-linux t-slibgcc-libgcc"
if test "$libgcc_cv_cfi" = "yes"; then
tmake_file="${tmake_file} t-stack i386/t-stack-i386"
fi

7
libgcc/config/i386/cpuinfo.c
View file

@ -109,7 +109,7 @@ struct __processor_model
unsigned int __cpu_type;
unsigned int __cpu_subtype;
unsigned int __cpu_features[1];
} __cpu_model;
} __cpu_model = { };
/* Get the specific type of AMD CPU. */
@ -424,3 +424,8 @@ __cpu_indicator_init (void)
return 0;
}
#if defined SHARED && defined USE_ELF_SYMVER
__asm__ (".symver __cpu_indicator_init, __cpu_indicator_init@GCC_4.8.0");
__asm__ (".symver __cpu_model, __cpu_model@GCC_4.8.0");
#endif

2
libgcc/config/i386/t-linux
View file

@ -3,4 +3,4 @@
# t-slibgcc-elf-ver and t-linux
SHLIB_MAPFILES = libgcc-std.ver $(srcdir)/config/i386/libgcc-glibc.ver
HOST_LIBGCC2_CFLAGS += -mlong-double-80
HOST_LIBGCC2_CFLAGS += -mlong-double-80 -DUSE_ELF_SYMVER