summaryrefslogtreecommitdiffstats
path: root/contrib/gcc/final.c
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2001-03-19 19:50:16 +0000
committerobrien <obrien@FreeBSD.org>2001-03-19 19:50:16 +0000
commit6830f79554990d17639076838f65feb21b5b2514 (patch)
treef933328e302223be3227deb576d89570fc6ede94 /contrib/gcc/final.c
parenta093aec8872e13739204127bcbb66b21050cc018 (diff)
downloadFreeBSD-src-6830f79554990d17639076838f65feb21b5b2514.zip
FreeBSD-src-6830f79554990d17639076838f65feb21b5b2514.tar.gz
Merge gcc-2.95.3 changes onto mainline. Update FreeBSD changes to converge
with changes made in the FSF tree.
Diffstat (limited to 'contrib/gcc/final.c')
-rw-r--r--contrib/gcc/final.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/gcc/final.c b/contrib/gcc/final.c
index 9769409..a89d5b8 100644
--- a/contrib/gcc/final.c
+++ b/contrib/gcc/final.c
@@ -1706,9 +1706,9 @@ static void
profile_function (file)
FILE *file;
{
-#ifndef NO_PROFILE_DATA
+#ifndef NO_PROFILE_COUNTERS
int align = MIN (BIGGEST_ALIGNMENT, LONG_TYPE_SIZE);
-#endif /* not NO_PROFILE_DATA */
+#endif
#if defined(ASM_OUTPUT_REG_PUSH)
#if defined(STRUCT_VALUE_INCOMING_REGNUM) || defined(STRUCT_VALUE_REGNUM)
int sval = current_function_returns_struct;
@@ -1718,12 +1718,12 @@ profile_function (file)
#endif
#endif /* ASM_OUTPUT_REG_PUSH */
-#ifndef NO_PROFILE_DATA
+#ifndef NO_PROFILE_COUNTERS
data_section ();
ASM_OUTPUT_ALIGN (file, floor_log2 (align / BITS_PER_UNIT));
ASM_OUTPUT_INTERNAL_LABEL (file, "LP", profile_label_no);
assemble_integer (const0_rtx, LONG_TYPE_SIZE / BITS_PER_UNIT, 1);
-#endif /* not NO_PROFILE_DATA */
+#endif
function_section (current_function_decl);
@@ -3115,7 +3115,7 @@ alter_subreg (x)
PUT_CODE (x, MEM);
MEM_COPY_ATTRIBUTES (x, y);
MEM_ALIAS_SET (x) = MEM_ALIAS_SET (y);
- XEXP (x, 0) = plus_constant (XEXP (y, 0), offset);
+ XEXP (x, 0) = plus_constant_for_output (XEXP (y, 0), offset);
}
return x;
OpenPOWER on IntegriCloud