diff mbox

[build] Cleanup rs6000/t-ppccomm configurations (PR other/51022)

Message ID yddty5xwfof.fsf@manam.CeBiTec.Uni-Bielefeld.DE
State New
Headers show

Commit Message

Rainer Orth Nov. 21, 2011, 5:25 p.m. UTC 
Paolo Bonzini <bonzini@gnu.org> writes:

> Wrong patch attached.

Indeed ;-)

Comments

Joel Sherrill Nov. 21, 2011, 6:02 p.m. UTC | #1 
On 11/21/2011 11:25 AM, Rainer Orth wrote:
> Paolo Bonzini<bonzini@gnu.org>  writes:
>
>> Wrong patch attached.
> Indeed ;-)
>
Does this patch apply OK for others?

Ranier.. you can just send me the impacted files if you like.  I have
no local changes to libgcc.

$ cat /tmp/libgcc-t-savresfgpr.patch | patch -p1
patching file libgcc/config.host
Hunk #1 succeeded at 843 (offset -9 lines).
patching file libgcc/config/rs6000/t-ppccomm
patching file libgcc/config/rs6000/t-ppccomm-ldbl
patching file libgcc/config/rs6000/t-ppccomm
Hunk #1 FAILED at 1.
Hunk #2 FAILED at 21.
2 out of 2 hunks FAILED -- saving rejects to file 
libgcc/config/rs6000/t-ppccomm.rej
Rainer Orth Nov. 21, 2011, 6:08 p.m. UTC | #2 
Joel Sherrill <joel.sherrill@oarcorp.com> writes:

> Does this patch apply OK for others?
>
> Ranier.. you can just send me the impacted files if you like.  I have
> no local changes to libgcc.
>
> $ cat /tmp/libgcc-t-savresfgpr.patch | patch -p1
> patching file libgcc/config.host
> Hunk #1 succeeded at 843 (offset -9 lines).
> patching file libgcc/config/rs6000/t-ppccomm
> patching file libgcc/config/rs6000/t-ppccomm-ldbl
> patching file libgcc/config/rs6000/t-ppccomm
> Hunk #1 FAILED at 1.
> Hunk #2 FAILED at 21.
> 2 out of 2 hunks FAILED -- saving rejects to file
> libgcc/config/rs6000/t-ppccomm.rej

Released versions of patch cannot deal with git-style patches (a copy in
this case), it seems.  git patch (or a snapshot from alpha.gnu.org)
should be ok.

I'm including libgcc/config/rs6000/t-savresfgpr for your convenience.

	Rainer
# These can't end up in shared libgcc
LIB2ADD_ST += \
	   $(srcdir)/config/rs6000/crtsavfpr.S \
	   $(srcdir)/config/rs6000/crtresfpr.S \
	   $(srcdir)/config/rs6000/crtsavgpr.S \
	   $(srcdir)/config/rs6000/crtresgpr.S \
	   $(srcdir)/config/rs6000/crtresxfpr.S \
	   $(srcdir)/config/rs6000/crtresxgpr.S \
	   $(srcdir)/config/rs6000/e500crtres32gpr.S \
	   $(srcdir)/config/rs6000/e500crtres64gpr.S \
	   $(srcdir)/config/rs6000/e500crtres64gprctr.S \
	   $(srcdir)/config/rs6000/e500crtrest32gpr.S \
	   $(srcdir)/config/rs6000/e500crtrest64gpr.S \
	   $(srcdir)/config/rs6000/e500crtresx32gpr.S \
	   $(srcdir)/config/rs6000/e500crtresx64gpr.S \
	   $(srcdir)/config/rs6000/e500crtsav32gpr.S \
	   $(srcdir)/config/rs6000/e500crtsav64gpr.S \
	   $(srcdir)/config/rs6000/e500crtsav64gprctr.S \
	   $(srcdir)/config/rs6000/e500crtsavg32gpr.S \
	   $(srcdir)/config/rs6000/e500crtsavg64gpr.S \
	   $(srcdir)/config/rs6000/e500crtsavg64gprctr.S
Joel Sherrill Nov. 23, 2011, 6:36 p.m. UTC | #3 
Thanks.

Works for me.  I posted test results for powerpc-rtems4.11
at http://gcc.gnu.org/ml/gcc-testresults/2011-11/msg02314.html

 From the rtems perspective, you can commit it.

--joel

On 11/21/2011 12:08 PM, Rainer Orth wrote:
> Joel Sherrill<joel.sherrill@oarcorp.com>  writes:
>
>> Does this patch apply OK for others?
>>
>> Ranier.. you can just send me the impacted files if you like.  I have
>> no local changes to libgcc.
>>
>> $ cat /tmp/libgcc-t-savresfgpr.patch | patch -p1
>> patching file libgcc/config.host
>> Hunk #1 succeeded at 843 (offset -9 lines).
>> patching file libgcc/config/rs6000/t-ppccomm
>> patching file libgcc/config/rs6000/t-ppccomm-ldbl
>> patching file libgcc/config/rs6000/t-ppccomm
>> Hunk #1 FAILED at 1.
>> Hunk #2 FAILED at 21.
>> 2 out of 2 hunks FAILED -- saving rejects to file
>> libgcc/config/rs6000/t-ppccomm.rej
> Released versions of patch cannot deal with git-style patches (a copy in
> this case), it seems.  git patch (or a snapshot from alpha.gnu.org)
> should be ok.
>
> I'm including libgcc/config/rs6000/t-savresfgpr for your convenience.
>
> 	Rainer
>
>
Rainer Orth Nov. 24, 2011, 12:12 p.m. UTC | #4 
Joel,

> Works for me.  I posted test results for powerpc-rtems4.11
> at http://gcc.gnu.org/ml/gcc-testresults/2011-11/msg02314.html
>
> From the rtems perspective, you can commit it.

thanks for the confirmation.  It would be great if one of the powerpc
maintainers could review it.

Thanks.
        Rainer
diff mbox

Patch

# HG changeset patch
# Parent e270cbe9e8641882fbcae2c23e927cdfd2be182f
Cleanup rs6000/t-ppccomm configurations (PR other/51022)

diff --git a/libgcc/config.host b/libgcc/config.host
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -852,65 +852,65 @@  powerpc64-*-darwin*)
 	extra_parts="$extra_parts crt2.o"
 	;;
 powerpc-*-freebsd*)
-	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-crtstuff rs6000/t-freebsd t-softfp-sfdf t-softfp-excl t-softfp t-slibgcc-libgcc"
+	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-savresfgpr rs6000/t-crtstuff rs6000/t-freebsd t-softfp-sfdf t-softfp-excl t-softfp t-slibgcc-libgcc"
 	extra_parts="$extra_parts crtbeginT.o ecrti.o ecrtn.o ncrti.o ncrtn.o"
 	;;
 powerpc-*-netbsd*)
 	tmake_file="$tmake_file rs6000/t-netbsd rs6000/t-crtstuff"
 	;;
 powerpc-*-eabispe*)
-	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-crtstuff t-crtstuff-pic"
+	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-savresfgpr rs6000/t-crtstuff t-crtstuff-pic"
 	extra_parts="$extra_parts crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o ecrti.o ecrtn.o ncrti.o ncrtn.o"
 	;;
 powerpc-*-eabisimaltivec*)
-	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ppccomm-ldbl rs6000/t-crtstuff t-crtstuff-pic t-fdpbit"
+	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-crtstuff t-crtstuff-pic t-fdpbit"
 	extra_parts="$extra_parts crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o ecrti.o ecrtn.o ncrti.o ncrtn.o"
 	;;
 powerpc-*-eabisim*)
-	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ppccomm-ldbl rs6000/t-crtstuff t-crtstuff-pic t-fdpbit"
+	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-crtstuff t-crtstuff-pic t-fdpbit"
 	extra_parts="$extra_parts crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o ecrti.o ecrtn.o ncrti.o ncrtn.o"
 	;;
 powerpc-*-elf*)
-	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ppccomm-ldbl rs6000/t-crtstuff t-crtstuff-pic t-fdpbit"
+	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-crtstuff t-crtstuff-pic t-fdpbit"
 	extra_parts="$extra_parts crtbeginS.o crtendS.o crtbeginT.o ecrti.o ecrtn.o ncrti.o ncrtn.o"
 	;;
 powerpc-*-eabialtivec*)
-	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ppccomm-ldbl rs6000/t-crtstuff t-crtstuff-pic t-fdpbit"
+	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-crtstuff t-crtstuff-pic t-fdpbit"
 	extra_parts="$extra_parts crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o ecrti.o ecrtn.o ncrti.o ncrtn.o"
 	;;
 powerpc-xilinx-eabi*)
-	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ppccomm-ldbl rs6000/t-crtstuff t-crtstuff-pic t-fdpbit"
+	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-crtstuff t-crtstuff-pic t-fdpbit"
 	extra_parts="$extra_parts crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o ecrti.o ecrtn.o ncrti.o ncrtn.o"
 	;;
 powerpc-*-eabi*)
-	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-crtstuff t-crtstuff-pic t-fdpbit"
+	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-savresfgpr rs6000/t-crtstuff t-crtstuff-pic t-fdpbit"
 	extra_parts="$extra_parts crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o ecrti.o ecrtn.o ncrti.o ncrtn.o"
 	;;
 powerpc-*-rtems*)
-	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ppccomm-ldbl rs6000/t-crtstuff t-crtstuff-pic t-fdpbit"
+	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-crtstuff t-crtstuff-pic t-fdpbit"
 	extra_parts="$extra_parts crtbeginS.o crtendS.o crtbeginT.o ecrti.o ecrtn.o ncrti.o ncrtn.o"
 	;;
 powerpc-*-linux* | powerpc64-*-linux*)
-	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-crtstuff rs6000/t-linux t-softfp-sfdf t-softfp-excl t-dfprules rs6000/t-ppc64-fp t-softfp t-slibgcc-libgcc"
+	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-savresfgpr rs6000/t-crtstuff rs6000/t-linux t-softfp-sfdf t-softfp-excl t-dfprules rs6000/t-ppc64-fp t-softfp t-slibgcc-libgcc"
 	extra_parts="$extra_parts ecrti.o ecrtn.o ncrti.o ncrtn.o"
 	md_unwind_header=rs6000/linux-unwind.h
 	;;
 powerpc-wrs-vxworks|powerpc-wrs-vxworksae)
-	tmake_file="$tmake_file rs6000/t-ppccomm-ldbl t-fdpbit"
+	tmake_file="$tmake_file rs6000/t-ppccomm t-fdpbit"
 	;;
 powerpc-*-lynxos*)
 	tmake_file="$tmake_file rs6000/t-lynx t-fdpbit"
 	;;
 powerpcle-*-elf*)
-	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ppccomm-ldbl rs6000/t-crtstuff t-crtstuff-pic t-fdpbit"
+	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-crtstuff t-crtstuff-pic t-fdpbit"
 	extra_parts="$extra_parts crtbeginS.o crtendS.o crtbeginT.o ecrti.o ecrtn.o ncrti.o ncrtn.o"
 	;;
 powerpcle-*-eabisim*)
-	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ppccomm-ldbl rs6000/t-crtstuff t-crtstuff-pic t-fdpbit"
+	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-crtstuff t-crtstuff-pic t-fdpbit"
 	extra_parts="$extra_parts crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o ecrti.o ecrtn.o ncrti.o ncrtn.o"
 	;;
 powerpcle-*-eabi*)
-	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-ppccomm-ldbl rs6000/t-crtstuff t-crtstuff-pic t-fdpbit"
+	tmake_file="${tmake_file} rs6000/t-ppccomm rs6000/t-crtstuff t-crtstuff-pic t-fdpbit"
 	extra_parts="$extra_parts crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o ecrti.o ecrtn.o ncrti.o ncrtn.o"
 	;;
 rs6000-ibm-aix4.[3456789]* | powerpc-ibm-aix4.[3456789]*)
diff --git a/libgcc/config/rs6000/t-ppccomm b/libgcc/config/rs6000/t-ppccomm
--- a/libgcc/config/rs6000/t-ppccomm
+++ b/libgcc/config/rs6000/t-ppccomm
@@ -1,27 +1,8 @@ 
 LIB2ADD += $(srcdir)/config/rs6000/ibm-ldouble.c \
 	   $(srcdir)/config/rs6000/tramp.S
 
-# These can't end up in shared libgcc
+# This can't end up in shared libgcc
 LIB2ADD_ST += \
-	   $(srcdir)/config/rs6000/crtsavfpr.S \
-	   $(srcdir)/config/rs6000/crtresfpr.S \
-	   $(srcdir)/config/rs6000/crtsavgpr.S \
-	   $(srcdir)/config/rs6000/crtresgpr.S \
-	   $(srcdir)/config/rs6000/crtresxfpr.S \
-	   $(srcdir)/config/rs6000/crtresxgpr.S \
-	   $(srcdir)/config/rs6000/e500crtres32gpr.S \
-	   $(srcdir)/config/rs6000/e500crtres64gpr.S \
-	   $(srcdir)/config/rs6000/e500crtres64gprctr.S \
-	   $(srcdir)/config/rs6000/e500crtrest32gpr.S \
-	   $(srcdir)/config/rs6000/e500crtrest64gpr.S \
-	   $(srcdir)/config/rs6000/e500crtresx32gpr.S \
-	   $(srcdir)/config/rs6000/e500crtresx64gpr.S \
-	   $(srcdir)/config/rs6000/e500crtsav32gpr.S \
-	   $(srcdir)/config/rs6000/e500crtsav64gpr.S \
-	   $(srcdir)/config/rs6000/e500crtsav64gprctr.S \
-	   $(srcdir)/config/rs6000/e500crtsavg32gpr.S \
-	   $(srcdir)/config/rs6000/e500crtsavg64gpr.S \
-	   $(srcdir)/config/rs6000/e500crtsavg64gprctr.S \
 	   $(srcdir)/config/rs6000/eabi.S
 
 # We build {e,n}crti.o and {e,n}crtn.o, which serve to add begin and
diff --git a/libgcc/config/rs6000/t-ppccomm-ldbl b/libgcc/config/rs6000/t-ppccomm-ldbl
deleted file mode 100644
--- a/libgcc/config/rs6000/t-ppccomm-ldbl
+++ /dev/null
@@ -1,1 +0,0 @@ 
-LIB2ADD += $(srcdir)/config/rs6000/ibm-ldouble.c
diff --git a/libgcc/config/rs6000/t-ppccomm b/libgcc/config/rs6000/t-savresfgpr
copy from libgcc/config/rs6000/t-ppccomm
copy to libgcc/config/rs6000/t-savresfgpr
--- a/libgcc/config/rs6000/t-ppccomm
+++ b/libgcc/config/rs6000/t-savresfgpr
@@ -1,6 +1,3 @@ 
-LIB2ADD += $(srcdir)/config/rs6000/ibm-ldouble.c \
-	   $(srcdir)/config/rs6000/tramp.S
-
 # These can't end up in shared libgcc
 LIB2ADD_ST += \
 	   $(srcdir)/config/rs6000/crtsavfpr.S \
@@ -21,21 +18,4 @@  LIB2ADD_ST += \
 	   $(srcdir)/config/rs6000/e500crtsav64gprctr.S \
 	   $(srcdir)/config/rs6000/e500crtsavg32gpr.S \
 	   $(srcdir)/config/rs6000/e500crtsavg64gpr.S \
-	   $(srcdir)/config/rs6000/e500crtsavg64gprctr.S \
-	   $(srcdir)/config/rs6000/eabi.S
-
-# We build {e,n}crti.o and {e,n}crtn.o, which serve to add begin and
-# end labels to all of the special sections used when we link using gcc.
-
-# Assemble startup files.
-ecrti$(objext): $(srcdir)/config/rs6000/eabi-ci.S
-	$(crt_compile) -c $<
-
-ecrtn$(objext): $(srcdir)/config/rs6000/eabi-cn.S
-	$(crt_compile) -c $<
-
-ncrti$(objext): $(srcdir)/config/rs6000/sol-ci.S
-	$(crt_compile) -c $<
-
-ncrtn$(objext): $(srcdir)/config/rs6000/sol-cn.S
-	$(crt_compile) -c $<
+	   $(srcdir)/config/rs6000/e500crtsavg64gprctr.S