svn commit: r227739 - in head: . contrib/binutils/ld/emulparams contrib/gcc/config/rs6000 contrib/llvm/tools/clang/lib/Driver gnu/usr.bin/binutils/ld sys/boot/ofw sys/boot/powerpc sys/boot/uboot

Andreas Tobler andreast at FreeBSD.org
Sat Nov 19 19:25:57 UTC 2011


Author: andreast
Date: Sat Nov 19 19:25:57 2011
New Revision: 227739
URL: http://svn.freebsd.org/changeset/base/227739

Log:
  Rename the linker emulation name for powerpc and powerc64. This is needed that
  we can also use the upstream binutils linker where we have to have a unique
  name for the FreeBSD emulation.

Added:
  head/contrib/binutils/ld/emulparams/elf64ppc_fbsd.sh   (contents, props changed)
Modified:
  head/Makefile.inc1
  head/contrib/gcc/config/rs6000/freebsd.h
  head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
  head/gnu/usr.bin/binutils/ld/Makefile.powerpc
  head/gnu/usr.bin/binutils/ld/Makefile.powerpc64
  head/sys/boot/ofw/Makefile.inc
  head/sys/boot/powerpc/Makefile.inc
  head/sys/boot/uboot/Makefile.inc

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sat Nov 19 19:06:08 2011	(r227738)
+++ head/Makefile.inc1	Sat Nov 19 19:25:57 2011	(r227739)
@@ -291,7 +291,7 @@ LIB32CPUFLAGS=	-mcpu=powerpc
 LIB32CPUFLAGS=	-mcpu=${TARGET_CPUTYPE}
 .endif
 LIB32WMAKEENV=	MACHINE=powerpc MACHINE_ARCH=powerpc \
-		LD="${LD} -m elf32ppc"
+		LD="${LD} -m elf32ppc_fbsd"
 .endif
 
 

Added: head/contrib/binutils/ld/emulparams/elf64ppc_fbsd.sh
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/contrib/binutils/ld/emulparams/elf64ppc_fbsd.sh	Sat Nov 19 19:25:57 2011	(r227739)
@@ -0,0 +1,3 @@
+. ${srcdir}/emulparams/elf64ppc.sh
+. ${srcdir}/emulparams/elf_fbsd.sh
+

Modified: head/contrib/gcc/config/rs6000/freebsd.h
==============================================================================
--- head/contrib/gcc/config/rs6000/freebsd.h	Sat Nov 19 19:06:08 2011	(r227738)
+++ head/contrib/gcc/config/rs6000/freebsd.h	Sat Nov 19 19:25:57 2011	(r227739)
@@ -193,7 +193,7 @@ extern int dot_symbols;
 #undef	LINK_OS_FREEBSD_SPEC
 #define	ASM_DEFAULT_SPEC	"-mppc%{!m32:64}"
 #define	ASM_SPEC		"%{m32:-a32}%{!m32:-a64} " SVR4_ASM_SPEC
-#define	LINK_OS_FREEBSD_SPEC	"%{m32:-melf32ppc}%{!m32:-melf64ppc} " LINK_OS_FREEBSD_SPEC_DEF
+#define	LINK_OS_FREEBSD_SPEC	"%{m32:-melf32ppc_fbsd}%{!m32:-melf64ppc_fbsd} " LINK_OS_FREEBSD_SPEC_DEF
 #endif
 
 /* _init and _fini functions are built from bits spread across many

Modified: head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
==============================================================================
--- head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Sat Nov 19 19:06:08 2011	(r227738)
+++ head/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Sat Nov 19 19:25:57 2011	(r227739)
@@ -3926,7 +3926,7 @@ void freebsd::Link::ConstructJob(Compila
 
   if (getToolChain().getArchName() == "powerpc") {
     CmdArgs.push_back("-m");
-    CmdArgs.push_back("elf32ppc");
+    CmdArgs.push_back("elf32ppc_fbsd");
   }
 
   if (Output.isFilename()) {

Modified: head/gnu/usr.bin/binutils/ld/Makefile.powerpc
==============================================================================
--- head/gnu/usr.bin/binutils/ld/Makefile.powerpc	Sat Nov 19 19:06:08 2011	(r227738)
+++ head/gnu/usr.bin/binutils/ld/Makefile.powerpc	Sat Nov 19 19:25:57 2011	(r227739)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NATIVE_EMULATION=	elf32ppc
+NATIVE_EMULATION=	elf32ppc_fbsd
 
 SRCS+=		e${NATIVE_EMULATION}.c
 CLEANFILES+=	e${NATIVE_EMULATION}.c

Modified: head/gnu/usr.bin/binutils/ld/Makefile.powerpc64
==============================================================================
--- head/gnu/usr.bin/binutils/ld/Makefile.powerpc64	Sat Nov 19 19:06:08 2011	(r227738)
+++ head/gnu/usr.bin/binutils/ld/Makefile.powerpc64	Sat Nov 19 19:25:57 2011	(r227739)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-NATIVE_EMULATION=	elf64ppc
+NATIVE_EMULATION=	elf64ppc_fbsd
 
 SRCS+=		e${NATIVE_EMULATION}.c
 CLEANFILES+=	e${NATIVE_EMULATION}.c
@@ -11,7 +11,7 @@ e${NATIVE_EMULATION}.c: emulparams/${NAT
 	    ${HOST} ${TARGET_TUPLE} ${TARGET_TUPLE} \
 	    ${NATIVE_EMULATION} ""  no ${NATIVE_EMULATION} ${TARGET_TUPLE}
 
-PPC32_EMULATION= elf32ppc
+PPC32_EMULATION= elf32ppc_fbsd
 _ppc32_path=	\"${TOOLS_PREFIX}/usr/lib32\"
 EMS+=		${PPC32_EMULATION}
 .for ext in ${ELF_SCR_EXT}

Modified: head/sys/boot/ofw/Makefile.inc
==============================================================================
--- head/sys/boot/ofw/Makefile.inc	Sat Nov 19 19:06:08 2011	(r227738)
+++ head/sys/boot/ofw/Makefile.inc	Sat Nov 19 19:25:57 2011	(r227739)
@@ -2,7 +2,7 @@
 
 .if ${MACHINE_ARCH} == "powerpc64"
 CFLAGS+=	-m32 -mcpu=powerpc
-LDFLAGS+=	-m elf32ppc
+LDFLAGS+=	-m elf32ppc_fbsd
 .endif
 
 .include "../Makefile.inc"

Modified: head/sys/boot/powerpc/Makefile.inc
==============================================================================
--- head/sys/boot/powerpc/Makefile.inc	Sat Nov 19 19:06:08 2011	(r227738)
+++ head/sys/boot/powerpc/Makefile.inc	Sat Nov 19 19:25:57 2011	(r227739)
@@ -2,7 +2,7 @@
 
 .if ${MACHINE_ARCH} == "powerpc64"
 CFLAGS+=	-m32 -mcpu=powerpc
-LDFLAGS+=	-m elf32ppc
+LDFLAGS+=	-m elf32ppc_fbsd
 .endif
 
 .include "../Makefile.inc"

Modified: head/sys/boot/uboot/Makefile.inc
==============================================================================
--- head/sys/boot/uboot/Makefile.inc	Sat Nov 19 19:06:08 2011	(r227738)
+++ head/sys/boot/uboot/Makefile.inc	Sat Nov 19 19:25:57 2011	(r227739)
@@ -2,7 +2,7 @@
 
 .if ${MACHINE_ARCH} == "powerpc64"
 CFLAGS+=	-m32 -mcpu=powerpc
-LDFLAGS+=	-m elf32ppc
+LDFLAGS+=	-m elf32ppc_fbsd
 .endif
 
 .include "../Makefile.inc"


More information about the svn-src-head mailing list