Skip to contentSkip to conversation

Revert "powerpc new toolchains fix (crt.S)"

PATCH Applied Maxim Uvarov 2 participants 5 messages Sep 7, 2010 – Sep 13, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 Revert "powerpc new toolchains fix (crt.S)"

This reverts commit 45e8f29639d9f97b74389e5bd28c7a5cccbf3e2a. purgatory/arch/ppc/crt.S and purgatory/arch/ppc/misc.S are the same files.

---

 configure.ac                |    9 -
 purgatory/arch/ppc/Makefile |    1 
 purgatory/arch/ppc/crt.S    |  263 -------------------------------------------
 3 files changed, 0 insertions(+), 273 deletions(-)
 delete mode 100644 purgatory/arch/ppc/crt.S
configure.ac +0 -9
index 7f6acc6..2960c25 100644
@@ -159,15 +159,6 @@ if test "$with_xen" = yes ; then
 		AC_MSG_NOTICE([Xen support disabled])))
 fi
 
-dnl new toolchains
-if test "$ARCH" = ppc; then
-AC_ARG_WITH([oldtoolchain],
-		AC_HELP_STRING([--with-oldtoolchain],[compile without crt.S
-			required for new toolchains]),
-		AC_DEFINE(PPC_OLDTOOLCHAIN, 1,
-			[Define to compile with old toolchains]))
-fi
-
 dnl ---Sanity checks
 if test "$CC"      = "no"; then AC_MSG_ERROR([cc not found]); fi
 if test "$CPP"     = "no"; then AC_MSG_ERROR([cpp not found]); fi
purgatory/arch/ppc/Makefile +0 -1
index 4020778..72289a0 100644
@@ -6,7 +6,6 @@ ppc_PURGATORY_SRCS += purgatory/arch/ppc/v2wrap_32.S
 ppc_PURGATORY_SRCS += purgatory/arch/ppc/misc.S
 ppc_PURGATORY_SRCS += purgatory/arch/ppc/purgatory-ppc.c
 ppc_PURGATORY_SRCS += purgatory/arch/ppc/console-ppc.c
-ppc_PURGATORY_SRCS += purgatory/arch/ppc/crt.S
 
 dist += purgatory/arch/ppc/Makefile $(ppc_PURGATORY_SRCS)		\
 	purgatory/arch/ppc/purgatory-ppc.h purgatory/arch/ppc/ppc_asm.h
purgatory/arch/ppc/crt.S deleted +0 -263

263 lines not on this page · raw message

Best regards,
Maxim Uvarov.

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

#1 lore raw

PATCH 2/2 Revert "Revert "powerpc new toolchains fix (crt.S)""

Revert the revert patch specially made to remove 45e8f29639d9f97b74389e5bd28c7a5cccbf3e2a commit from git tree.

This reverts commit c42b92cd1f3c6c2e812bd1fcc4203672f3b6d461. Revert "powerpc new toolchains fix (crt.S)"

This reverts commit 45e8f29639d9f97b74389e5bd28c7a5cccbf3e2a. purgatory/arch/ppc/crt.S and purgatory/arch/ppc/misc.S are the same files.

---

 configure.ac                |    9 +
 purgatory/arch/ppc/Makefile |    1 
 purgatory/arch/ppc/crt.S    |  263 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 273 insertions(+), 0 deletions(-)
 create mode 100644 purgatory/arch/ppc/crt.S
configure.ac +9 -0
index 2960c25..7f6acc6 100644
@@ -159,6 +159,15 @@ if test "$with_xen" = yes ; then
 		AC_MSG_NOTICE([Xen support disabled])))
 fi
 
+dnl new toolchains
+if test "$ARCH" = ppc; then
+AC_ARG_WITH([oldtoolchain],
+		AC_HELP_STRING([--with-oldtoolchain],[compile without crt.S
+			required for new toolchains]),
+		AC_DEFINE(PPC_OLDTOOLCHAIN, 1,
+			[Define to compile with old toolchains]))
+fi
+
 dnl ---Sanity checks
 if test "$CC"      = "no"; then AC_MSG_ERROR([cc not found]); fi
 if test "$CPP"     = "no"; then AC_MSG_ERROR([cpp not found]); fi
purgatory/arch/ppc/Makefile +1 -0
index 72289a0..4020778 100644
@@ -6,6 +6,7 @@ ppc_PURGATORY_SRCS += purgatory/arch/ppc/v2wrap_32.S
 ppc_PURGATORY_SRCS += purgatory/arch/ppc/misc.S
 ppc_PURGATORY_SRCS += purgatory/arch/ppc/purgatory-ppc.c
 ppc_PURGATORY_SRCS += purgatory/arch/ppc/console-ppc.c
+ppc_PURGATORY_SRCS += purgatory/arch/ppc/crt.S
 
 dist += purgatory/arch/ppc/Makefile $(ppc_PURGATORY_SRCS)		\
 	purgatory/arch/ppc/purgatory-ppc.h purgatory/arch/ppc/ppc_asm.h
purgatory/arch/ppc/crt.S new file +263 -0

263 lines not on this page · raw message

Best regards,
Maxim Uvarov.

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec

#3 lore raw

2010/9/9 Simon Horman <[email protected]>:

Quoted 7 lines · Maxim Uvarov
Quoted 3 lines

This reverts commit 45e8f29639d9f97b74389e5bd28c7a5cccbf3e2a. purgatory/arch/ppc/crt.S and purgatory/arch/ppc/misc.S are the same files.

Thanks, applied both patches.

Thanks, we had some misunderstanding there and committed 3 patches instead of one.
But now crt.S is out of the tree and it is ok. Powerpc code is compilable without any specific
options.

Signature · 7 lines
Best regards,
Maxim Uvarov

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
#4 lore raw
Quoted 11 lines · Maxim Uvarov

2010/9/9 Simon Horman <[email protected]>:

Quoted 7 lines · Maxim Uvarov
Quoted 3 lines

This reverts commit 45e8f29639d9f97b74389e5bd28c7a5cccbf3e2a. purgatory/arch/ppc/crt.S and purgatory/arch/ppc/misc.S are the same files.

Thanks, applied both patches.

Thanks, we had some misunderstanding there and committed 3 patches instead of one.

Sorry about that.

Quoted 3 lines

But now crt.S is out of the tree and it is ok. Powerpc code is compilable without any specific
options.

:-)

_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec