This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
S/390: Fix merge problem
- From: "Ulrich Weigand" <Ulrich dot Weigand at de dot ibm dot com>
- To: gcc-patches at gcc dot gnu dot org
- Date: Tue, 17 Dec 2002 13:43:21 +0100
- Subject: S/390: Fix merge problem
- Sensitivity:
Hello,
this patch fixes a merge problem that caused bootstrap failure
on s390/s390x after the B-I-B merge.
Now s390/s390x bootstrap again, but there are still a couple of
new regressions in the libjava suite; I'm investigating those ...
ChangeLog:
* config/s390/s390.c (s390_output_constant_pool): Replace
ASM_OUTPUT_INTERNAL_LABEL by (*targetm.asm_out.internal_label).
Index: gcc/config/s390/s390.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/s390/s390.c,v
retrieving revision 1.71
diff -c -p -r1.71 s390.c
*** gcc/config/s390/s390.c 16 Dec 2002 18:21:52 -0000 1.71
--- gcc/config/s390/s390.c 16 Dec 2002 20:00:24 -0000
*************** s390_output_constant_pool (start_label,
*** 4067,4079 ****
{
readonly_data_section ();
ASM_OUTPUT_ALIGN (asm_out_file, 3);
! ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
! CODE_LABEL_NUMBER (start_label));
}
else
{
! ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L",
! CODE_LABEL_NUMBER (start_label));
ASM_OUTPUT_ALIGN (asm_out_file, 2);
}
--- 4067,4079 ----
{
readonly_data_section ();
ASM_OUTPUT_ALIGN (asm_out_file, 3);
! (*targetm.asm_out.internal_label) (asm_out_file, "L",
! CODE_LABEL_NUMBER (start_label));
}
else
{
! (*targetm.asm_out.internal_label) (asm_out_file, "L",
! CODE_LABEL_NUMBER (start_label));
ASM_OUTPUT_ALIGN (asm_out_file, 2);
}
*************** s390_output_constant_pool (start_label,
*** 4085,4091 ****
else
{
ASM_OUTPUT_ALIGN (asm_out_file, 1);
! ASM_OUTPUT_INTERNAL_LABEL (asm_out_file, "L", CODE_LABEL_NUMBER (end_label));
}
}
--- 4085,4092 ----
else
{
ASM_OUTPUT_ALIGN (asm_out_file, 1);
! (*targetm.asm_out.internal_label) (asm_out_file, "L",
! CODE_LABEL_NUMBER (end_label));
}
}
Mit freundlichen Gruessen / Best Regards
Ulrich Weigand
--
Dr. Ulrich Weigand
Linux for S/390 Design & Development
IBM Deutschland Entwicklung GmbH, Schoenaicher Str. 220, 71032 Boeblingen
Phone: +49-7031/16-3727 --- Email: Ulrich.Weigand@de.ibm.com