Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 10 Oct 2014 06:24:10 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r272888 - in head: contrib/binutils/bfd contrib/binutils/gas/config contrib/binutils/ld/emulparams sys/boot/powerpc/ofw sys/boot/powerpc/ps3 sys/boot/powerpc/uboot sys/conf
Message-ID:  <201410100624.s9A6OAVo076537@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Fri Oct 10 06:24:09 2014
New Revision: 272888
URL: https://svnweb.freebsd.org/changeset/base/272888

Log:
  Rename elf*-powerpc into elf*-powerpc-freebsd in binutils
  
  The powerpc support was the only supported architecture not prepending the elf format name
  with "-freebsd" in base this change makes it consistent with other architectures.
  On newer version of binutils the powerpc format is also prepended with "-freebsd".
  
  Also modify the kernel ldscripts in that regards.
  
  As a result it is now possible cross build the kernel on powerpc using newer binutils
  
  Differential Revision:	https://reviews.freebsd.org/D926
  Differential Revision:	https://reviews.freebsd.org/D928

Modified:
  head/contrib/binutils/bfd/elf32-ppc.c
  head/contrib/binutils/bfd/elf64-ppc.c
  head/contrib/binutils/gas/config/tc-ppc.c
  head/contrib/binutils/ld/emulparams/elf32ppc_fbsd.sh
  head/contrib/binutils/ld/emulparams/elf64ppc_fbsd.sh
  head/sys/boot/powerpc/ofw/ldscript.powerpc
  head/sys/boot/powerpc/ps3/ldscript.powerpc
  head/sys/boot/powerpc/uboot/ldscript.powerpc
  head/sys/conf/ldscript.powerpc
  head/sys/conf/ldscript.powerpc64

Modified: head/contrib/binutils/bfd/elf32-ppc.c
==============================================================================
--- head/contrib/binutils/bfd/elf32-ppc.c	Fri Oct 10 06:09:47 2014	(r272887)
+++ head/contrib/binutils/bfd/elf32-ppc.c	Fri Oct 10 06:24:09 2014	(r272888)
@@ -7572,7 +7572,7 @@ ppc_elf_finish_dynamic_sections (bfd *ou
 #define TARGET_LITTLE_SYM	bfd_elf32_powerpcle_vec
 #define TARGET_LITTLE_NAME	"elf32-powerpcle"
 #define TARGET_BIG_SYM		bfd_elf32_powerpc_vec
-#define TARGET_BIG_NAME		"elf32-powerpc"
+#define TARGET_BIG_NAME		"elf32-powerpc-freebsd"
 #define ELF_ARCH		bfd_arch_powerpc
 #define ELF_MACHINE_CODE	EM_PPC
 #ifdef __QNXTARGET__

Modified: head/contrib/binutils/bfd/elf64-ppc.c
==============================================================================
--- head/contrib/binutils/bfd/elf64-ppc.c	Fri Oct 10 06:09:47 2014	(r272887)
+++ head/contrib/binutils/bfd/elf64-ppc.c	Fri Oct 10 06:24:09 2014	(r272888)
@@ -58,7 +58,7 @@ static bfd_vma opd_entry_value
 #define TARGET_LITTLE_SYM	bfd_elf64_powerpcle_vec
 #define TARGET_LITTLE_NAME	"elf64-powerpcle"
 #define TARGET_BIG_SYM		bfd_elf64_powerpc_vec
-#define TARGET_BIG_NAME		"elf64-powerpc"
+#define TARGET_BIG_NAME		"elf64-powerpc-freebsd"
 #define ELF_ARCH		bfd_arch_powerpc
 #define ELF_MACHINE_CODE	EM_PPC64
 #define ELF_MAXPAGESIZE		0x10000

Modified: head/contrib/binutils/gas/config/tc-ppc.c
==============================================================================
--- head/contrib/binutils/gas/config/tc-ppc.c	Fri Oct 10 06:09:47 2014	(r272887)
+++ head/contrib/binutils/gas/config/tc-ppc.c	Fri Oct 10 06:24:09 2014	(r272888)
@@ -1210,7 +1210,7 @@ ppc_target_format (void)
   return "elf32-powerpc-vxworks";
 # else
   return (target_big_endian
-	  ? (ppc_obj64 ? "elf64-powerpc" : "elf32-powerpc")
+	  ? (ppc_obj64 ? "elf64-powerpc-freebsd" : "elf32-powerpc-freebsd")
 	  : (ppc_obj64 ? "elf64-powerpcle" : "elf32-powerpcle"));
 # endif
 #endif

Modified: head/contrib/binutils/ld/emulparams/elf32ppc_fbsd.sh
==============================================================================
--- head/contrib/binutils/ld/emulparams/elf32ppc_fbsd.sh	Fri Oct 10 06:09:47 2014	(r272887)
+++ head/contrib/binutils/ld/emulparams/elf32ppc_fbsd.sh	Fri Oct 10 06:24:09 2014	(r272888)
@@ -1,2 +1,4 @@
 . ${srcdir}/emulparams/elf32ppc.sh
 . ${srcdir}/emulparams/elf_fbsd.sh
+
+OUTPUT_FORMAT="elf32-powerpc-freebsd"

Modified: head/contrib/binutils/ld/emulparams/elf64ppc_fbsd.sh
==============================================================================
--- head/contrib/binutils/ld/emulparams/elf64ppc_fbsd.sh	Fri Oct 10 06:09:47 2014	(r272887)
+++ head/contrib/binutils/ld/emulparams/elf64ppc_fbsd.sh	Fri Oct 10 06:24:09 2014	(r272888)
@@ -1,3 +1,4 @@
 . ${srcdir}/emulparams/elf64ppc.sh
 . ${srcdir}/emulparams/elf_fbsd.sh
 
+OUTPUT_FORMAT="elf64-powerpc-freebsd"

Modified: head/sys/boot/powerpc/ofw/ldscript.powerpc
==============================================================================
--- head/sys/boot/powerpc/ofw/ldscript.powerpc	Fri Oct 10 06:09:47 2014	(r272887)
+++ head/sys/boot/powerpc/ofw/ldscript.powerpc	Fri Oct 10 06:24:09 2014	(r272888)
@@ -1,6 +1,7 @@
 /* $FreeBSD$ */
 
-OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc")
+OUTPUT_FORMAT("elf32-powerpc-freebsd", "elf32-powerpc-freebsd",
+	      "elf32-powerpc-freebsd")
 OUTPUT_ARCH(powerpc:common)
 ENTRY(_start)
 SEARCH_DIR(/usr/lib);

Modified: head/sys/boot/powerpc/ps3/ldscript.powerpc
==============================================================================
--- head/sys/boot/powerpc/ps3/ldscript.powerpc	Fri Oct 10 06:09:47 2014	(r272887)
+++ head/sys/boot/powerpc/ps3/ldscript.powerpc	Fri Oct 10 06:24:09 2014	(r272888)
@@ -1,6 +1,7 @@
 /* $FreeBSD$ */
 
-OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc")
+OUTPUT_FORMAT("elf32-powerpc-freebsd", "elf32-powerpc-freebsd",
+	      "elf32-powerpc-freebsd")
 OUTPUT_ARCH(powerpc:common)
 ENTRY(_start)
 SEARCH_DIR(/usr/lib);

Modified: head/sys/boot/powerpc/uboot/ldscript.powerpc
==============================================================================
--- head/sys/boot/powerpc/uboot/ldscript.powerpc	Fri Oct 10 06:09:47 2014	(r272887)
+++ head/sys/boot/powerpc/uboot/ldscript.powerpc	Fri Oct 10 06:24:09 2014	(r272888)
@@ -1,6 +1,7 @@
 /* $FreeBSD$ */
 
-OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc")
+OUTPUT_FORMAT("elf32-powerpc-freebsd", "elf32-powerpc-freebsd",
+	      "elf32-powerpc-freebsd")
 OUTPUT_ARCH(powerpc:common)
 ENTRY(_start)
 SEARCH_DIR(/usr/lib);

Modified: head/sys/conf/ldscript.powerpc
==============================================================================
--- head/sys/conf/ldscript.powerpc	Fri Oct 10 06:09:47 2014	(r272887)
+++ head/sys/conf/ldscript.powerpc	Fri Oct 10 06:24:09 2014	(r272888)
@@ -1,6 +1,7 @@
 /* $FreeBSD$ */
 
-OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc")
+OUTPUT_FORMAT("elf32-powerpc-freebsd", "elf32-powerpc-freebsd",
+	      "elf32-powerpc-freebsd")
 OUTPUT_ARCH(powerpc)
 ENTRY(__start)
 SEARCH_DIR(/usr/lib);

Modified: head/sys/conf/ldscript.powerpc64
==============================================================================
--- head/sys/conf/ldscript.powerpc64	Fri Oct 10 06:09:47 2014	(r272887)
+++ head/sys/conf/ldscript.powerpc64	Fri Oct 10 06:24:09 2014	(r272888)
@@ -1,6 +1,7 @@
 /* $FreeBSD$ */
 
-OUTPUT_FORMAT("elf64-powerpc", "elf64-powerpc", "elf64-powerpc")
+OUTPUT_FORMAT("elf64-powerpc-freebsd", "elf64-powerpc-freebsd",
+	      "elf64-powerpc-freebsd")
 OUTPUT_ARCH(powerpc:common64)
 ENTRY(__start)
 SEARCH_DIR(/usr/lib);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410100624.s9A6OAVo076537>