OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

varasm.c (output_addressed_constants): Clear reloc if both operands contain local relocations.

Browse Source 
* varasm.c (output_addressed_constants) [MINUS_EXPR]: Clear reloc if
	both operands contain local relocations.
	(categorize_decl_for_section): Don't use mergeable sections if
	initializer has any relocations.

	* gcc.dg/20021029-1.c: New test.
	* gcc.dg/20021029-2.c: New test.

From-SVN: r59097
This commit is contained in:
Jakub Jelinek 2002-11-14 08:56:54 +01:00 committed by Jakub Jelinek
parent 57751dd6cb
commit 7eca317a0f
5 changed files with 54 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2002-11-14 Jakub Jelinek <jakub@redhat.com>
* varasm.c (output_addressed_constants) [MINUS_EXPR]: Clear reloc if
both operands contain local relocations.
(categorize_decl_for_section): Don't use mergeable sections if
initializer has any relocations.
2002-11-14 Kazu Hirata <kazu@cs.umass.edu>
* gthr-vxworks.h: Fix formatting.

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2002-11-14 Jakub Jelinek <jakub@redhat.com>
* gcc.dg/20021029-1.c: New test.
* gcc.dg/20021029-2.c: New test.
2002-11-13 John David Anglin <dave@hiauly1.hia.nrc.ca>
* g++.dg/abi/vague1.C (dg-final): Return if target is hppa*-*-hpux*.

16
gcc/testsuite/gcc.dg/20021029-1.c Normal file
View File

@ -0,0 +1,16 @@
/* Test whether difference of local labels doesn't force
variables into writable sections. */
/* { dg-do compile } */
/* { dg-options "-O2 -fpic" } */
/* { dg-final { scan-assembler-not ".data.rel.ro.local" } } */
int foo (int a)
{
static const int ar[] = { &&l1 - &&l1, &&l2 - &&l1 };
void *p = &&l1 + ar[a];
goto *p;
l1:
return 1;
l2:
return 2;
}

14
gcc/testsuite/gcc.dg/20021029-2.c Normal file
View File

@ -0,0 +1,14 @@
/* Test whether variables with relocations aren't put into
mergeable sections even with -fmerge-all-constants. */
/* { dg-do compile } */
/* { dg-options "-O2 -fmerge-all-constants" } */
/* { dg-final { scan-assembler-not ".rodata.cst" } } */
int foo (int a)
{
static void * const ar[] = { &&l2 };
void *p = ar[a];
goto *p;
l2:
return 2;
}

15
gcc/varasm.c
View File

@ -3679,7 +3679,7 @@ static int
output_addressed_constants (exp)
tree exp;
{
int reloc = 0;
int reloc = 0, reloc2;
tree tem;
/* Give the front-end a chance to convert VALUE to something that
@ -3708,11 +3708,20 @@ output_addressed_constants (exp)
break;
case PLUS_EXPR:
case MINUS_EXPR:
reloc = output_addressed_constants (TREE_OPERAND (exp, 0));
reloc |= output_addressed_constants (TREE_OPERAND (exp, 1));
break;
case MINUS_EXPR:
reloc = output_addressed_constants (TREE_OPERAND (exp, 0));
reloc2 = output_addressed_constants (TREE_OPERAND (exp, 1));
/* The difference of two local labels is computable at link time. */
if (reloc == 1 && reloc2 == 1)
reloc = 0;
else
reloc |= reloc2;
break;
case NOP_EXPR:
case CONVERT_EXPR:
case NON_LVALUE_EXPR:
@ -5076,7 +5085,7 @@ categorize_decl_for_section (decl, reloc, shlib)
ret = SECCAT_DATA_REL_RO;
else if (shlib && reloc)
ret = SECCAT_DATA_REL_RO_LOCAL;
else if (flag_merge_constants < 2)
else if (reloc || flag_merge_constants < 2)
/* C and C++ don't allow different variables to share the same
location. -fmerge-all-constants allows even that (at the
expense of not conforming). */