diff --git a/gcc/ChangeLog b/gcc/ChangeLog index de08bab31e921ee4ff5d6440d45191439ba671a7..ecabe7c33564f61e72d17f5b348ab4c22d4a9f67 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2011-02-05 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/47610 + * varasm.c (default_section_type_flags): If decl is NULL, + and name is .data.rel.ro or .data.rel.ro.local, set SECTION_RELRO + bit. + 2011-02-05 Jie Zhang <jie@codesourcery.com> PR debug/42631 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 89053c20e6dfbaea56dc4d6ee230b3c8a0771042..61110da51f2430a9f1d99933958394c780745c4e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-02-05 Jakub Jelinek <jakub@redhat.com> + + PR middle-end/47610 + * gcc.dg/pr47610.c: New test. + 2011-02-05 Jie Zhang <jie@codesourcery.com> PR debug/42631 diff --git a/gcc/testsuite/gcc.dg/pr47610.c b/gcc/testsuite/gcc.dg/pr47610.c new file mode 100644 index 0000000000000000000000000000000000000000..906af74f92075e66722d832653629676337e347c --- /dev/null +++ b/gcc/testsuite/gcc.dg/pr47610.c @@ -0,0 +1,8 @@ +/* PR middle-end/47610 */ +/* { dg-do compile } */ +/* { dg-options "-O2 -fpic" { target fpic } } */ +struct S { const char *s; }; +const struct S s[] = { "s" }; +extern void foo (void (*) (void)); +static void bar (void) {} +void baz () { foo (bar); } diff --git a/gcc/varasm.c b/gcc/varasm.c index 3a9fbae59011bf54eff93bed9a8fb6941f452354..76675cdeb0d60ad35d04af4f4447c80861ab7325 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -6060,7 +6060,12 @@ default_section_type_flags (tree decl, const char *name, int reloc) flags = SECTION_WRITE; } else - flags = SECTION_WRITE; + { + flags = SECTION_WRITE; + if (strcmp (name, ".data.rel.ro") == 0 + || strcmp (name, ".data.rel.ro.local") == 0) + flags |= SECTION_RELRO; + } if (decl && DECL_ONE_ONLY (decl)) flags |= SECTION_LINKONCE;