svn commit: r195876 - in projects/ppc64/sys: conf powerpc/aim
Nathan Whitehorn
nwhitehorn at FreeBSD.org
Sat Jul 25 19:43:47 UTC 2009
Author: nwhitehorn
Date: Sat Jul 25 19:43:46 2009
New Revision: 195876
URL: http://svn.freebsd.org/changeset/base/195876
Log:
Add separate powerpc64 conf files for now and remove an extraneous include
of opt_psim.h from aim's nexus. I'm a little torn on how much architecture
unification there should be here.
Added:
projects/ppc64/sys/conf/Makefile.powerpc64
- copied unchanged from r195651, projects/ppc64/sys/conf/Makefile.powerpc
projects/ppc64/sys/conf/files.powerpc64
- copied, changed from r195651, projects/ppc64/sys/conf/files.powerpc
projects/ppc64/sys/conf/ldscript.powerpc64
- copied unchanged from r195651, projects/ppc64/sys/conf/ldscript.powerpc
projects/ppc64/sys/conf/options.powerpc64
- copied, changed from r195651, projects/ppc64/sys/conf/options.powerpc
Modified:
projects/ppc64/sys/powerpc/aim/nexus.c
Copied: projects/ppc64/sys/conf/Makefile.powerpc64 (from r195651, projects/ppc64/sys/conf/Makefile.powerpc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/ppc64/sys/conf/Makefile.powerpc64 Sat Jul 25 19:43:46 2009 (r195876, copy of r195651, projects/ppc64/sys/conf/Makefile.powerpc)
@@ -0,0 +1,54 @@
+# Makefile.powerpc -- with config changes.
+# Copyright 1990 W. Jolitz
+# from: @(#)Makefile.i386 7.1 5/10/91
+# $FreeBSD$
+#
+# Makefile for FreeBSD
+#
+# This makefile is constructed from a machine description:
+# config machineid
+# Most changes should be made in the machine description
+# /sys/powerpc/conf/``machineid''
+# after which you should do
+# config machineid
+# Generic makefile changes should be made in
+# /sys/conf/Makefile.powerpc
+# after which config should be rerun for all machines.
+#
+
+# Which version of config(8) is required.
+%VERSREQ= 600004
+
+STD8X16FONT?= iso
+
+.if !defined(S)
+.if exists(./@/.)
+S= ./@
+.else
+S= ../../..
+.endif
+.endif
+.include "$S/conf/kern.pre.mk"
+
+CFLAGS+= -msoft-float
+
+DDB_ENABLED!= grep DDB opt_ddb.h || true
+.if !empty(DDB_ENABLED)
+CFLAGS+= -fno-omit-frame-pointer
+.endif
+
+%BEFORE_DEPEND
+
+%OBJS
+
+%FILES.c
+
+%FILES.s
+
+%FILES.m
+
+%CLEAN
+
+%RULES
+
+.include "$S/conf/kern.post.mk"
Copied and modified: projects/ppc64/sys/conf/files.powerpc64 (from r195651, projects/ppc64/sys/conf/files.powerpc)
==============================================================================
--- projects/ppc64/sys/conf/files.powerpc Mon Jul 13 01:37:48 2009 (r195651, copy source)
+++ projects/ppc64/sys/conf/files.powerpc64 Sat Jul 25 19:43:46 2009 (r195876)
@@ -37,9 +37,7 @@ dev/ofw/ofw_disk.c optional ofwd aim
dev/ofw/ofw_iicbus.c optional iicbus aim
dev/ofw/ofw_standard.c optional aim
dev/powermac_nvram/powermac_nvram.c optional powermac_nvram powermac
-dev/quicc/quicc_bfe_ocp.c optional quicc mpc85xx
dev/scc/scc_bfe_macio.c optional scc powermac
-dev/sec/sec.c optional sec mpc85xx
dev/sound/macio/aoa.c optional snd_davbus | snd_ai2s powermac
dev/sound/macio/davbus.c optional snd_davbus powermac
dev/sound/macio/i2s.c optional snd_ai2s powermac
@@ -49,9 +47,6 @@ dev/syscons/scgfbrndr.c optional sc
dev/syscons/scterm-teken.c optional sc
dev/syscons/scvtb.c optional sc
dev/syscons/teken/teken.c optional sc
-dev/tsec/if_tsec.c optional tsec
-dev/tsec/if_tsec_ocp.c optional tsec mpc85xx
-dev/uart/uart_bus_ocp.c optional uart mpc85xx
dev/uart/uart_cpu_powerpc.c optional uart
kern/syscalls.c optional ktr
libkern/ashldi3.c standard
@@ -67,7 +62,6 @@ libkern/lshrdi3.c standard
libkern/memmove.c standard
libkern/memset.c standard
libkern/moddi3.c standard
-libkern/qdivrem.c standard
libkern/ucmpdi2.c standard
libkern/udivdi3.c standard
libkern/umoddi3.c standard
@@ -87,39 +81,8 @@ powerpc/aim/swtch.S optional aim
powerpc/aim/trap.c optional aim
powerpc/aim/uma_machdep.c optional aim
powerpc/aim/vm_machdep.c optional aim
-powerpc/booke/clock.c optional e500
-powerpc/booke/copyinout.c optional e500
-powerpc/booke/interrupt.c optional e500
-powerpc/booke/locore.S optional e500 no-obj
-powerpc/booke/machdep.c optional e500
-powerpc/booke/mp_cpudep.c optional e500 smp
-powerpc/booke/platform_bare.c optional mpc85xx
-powerpc/booke/pmap.c optional e500
-powerpc/booke/swtch.S optional e500
-powerpc/booke/trap.c optional e500
-powerpc/booke/vm_machdep.c optional e500
powerpc/cpufreq/dfs.c optional cpufreq
powerpc/cpufreq/pcr.c optional cpufreq aim
-powerpc/fpu/fpu_add.c optional fpu_emu
-powerpc/fpu/fpu_compare.c optional fpu_emu
-powerpc/fpu/fpu_div.c optional fpu_emu
-powerpc/fpu/fpu_emu.c optional fpu_emu
-powerpc/fpu/fpu_explode.c optional fpu_emu
-powerpc/fpu/fpu_implode.c optional fpu_emu
-powerpc/fpu/fpu_mul.c optional fpu_emu
-powerpc/fpu/fpu_sqrt.c optional fpu_emu
-powerpc/fpu/fpu_subr.c optional fpu_emu
-powerpc/mpc85xx/atpic.c optional mpc85xx isa
-powerpc/mpc85xx/ds1553_bus_lbc.c optional ds1553
-powerpc/mpc85xx/ds1553_core.c optional ds1553
-powerpc/mpc85xx/i2c.c optional iicbus mpc85xx
-powerpc/mpc85xx/isa.c optional mpc85xx isa
-powerpc/mpc85xx/lbc.c optional mpc85xx
-powerpc/mpc85xx/mpc85xx.c optional mpc85xx
-powerpc/mpc85xx/nexus.c optional mpc85xx
-powerpc/mpc85xx/ocpbus.c optional mpc85xx
-powerpc/mpc85xx/opic.c optional mpc85xx
-powerpc/mpc85xx/pci_ocp.c optional pci mpc85xx
powerpc/ofw/ofw_cpu.c optional aim
powerpc/ofw/ofw_pcibus.c optional pci aim
powerpc/ofw/ofw_pcib_pci.c optional pci aim
Copied: projects/ppc64/sys/conf/ldscript.powerpc64 (from r195651, projects/ppc64/sys/conf/ldscript.powerpc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/ppc64/sys/conf/ldscript.powerpc64 Sat Jul 25 19:43:46 2009 (r195876, copy of r195651, projects/ppc64/sys/conf/ldscript.powerpc)
@@ -0,0 +1,144 @@
+/* $FreeBSD$ */
+
+OUTPUT_FORMAT("elf32-powerpc", "elf32-powerpc", "elf32-powerpc")
+OUTPUT_ARCH(powerpc)
+ENTRY(__start)
+SEARCH_DIR(/usr/lib);
+/* Do we need any of these for elf?
+ __DYNAMIC = 0; */
+PROVIDE (__stack = 0);
+SECTIONS
+{
+ /* Read-only sections, merged into text segment: */
+
+ . = kernbase + SIZEOF_HEADERS;
+
+ .text :
+ {
+ *(.text)
+ *(.stub)
+ /* .gnu.warning sections are handled specially by elf32.em. */
+ *(.gnu.warning)
+ *(.gnu.linkonce.t*)
+ } =0
+ _etext = .;
+ PROVIDE (etext = .);
+
+ .interp : { *(.interp) }
+ .hash : { *(.hash) }
+ .dynsym : { *(.dynsym) }
+ .dynstr : { *(.dynstr) }
+ .gnu.version : { *(.gnu.version) }
+ .gnu.version_d : { *(.gnu.version_d) }
+ .gnu.version_r : { *(.gnu.version_r) }
+ .rela.text :
+ { *(.rela.text) *(.rela.gnu.linkonce.t*) }
+ .rela.data :
+ { *(.rela.data) *(.rela.gnu.linkonce.d*) }
+ .rela.rodata :
+ { *(.rela.rodata) *(.rela.gnu.linkonce.r*) }
+ .rela.got : { *(.rela.got) }
+ .rela.got1 : { *(.rela.got1) }
+ .rela.got2 : { *(.rela.got2) }
+ .rela.ctors : { *(.rela.ctors) }
+ .rela.dtors : { *(.rela.dtors) }
+ .rela.init : { *(.rela.init) }
+ .rela.fini : { *(.rela.fini) }
+ .rela.bss : { *(.rela.bss) }
+ .rela.plt : { *(.rela.plt) }
+ .rela.sdata : { *(.rela.sdata) }
+ .rela.sbss : { *(.rela.sbss) }
+ .rela.sdata2 : { *(.rela.sdata2) }
+ .rela.sbss2 : { *(.rela.sbss2) }
+
+ .init : { *(.init) } =0
+ .fini : { *(.fini) } =0
+ .rodata : { *(.rodata) *(.gnu.linkonce.r*) }
+ .rodata1 : { *(.rodata1) }
+ .sdata2 : { *(.sdata2) }
+ .sbss2 : { *(.sbss2) }
+ /* Adjust the address for the data segment to the next page up. */
+ . = ((. + 0x1000) & ~(0x1000 - 1));
+ .data :
+ {
+ *(.data)
+ *(.gnu.linkonce.d*)
+ CONSTRUCTORS
+ }
+ .data1 : { *(.data1) }
+ .got1 : { *(.got1) }
+ .dynamic : { *(.dynamic) }
+ /* Put .ctors and .dtors next to the .got2 section, so that the pointers
+ get relocated with -mrelocatable. Also put in the .fixup pointers.
+ The current compiler no longer needs this, but keep it around for 2.7.2 */
+ PROVIDE (_GOT2_START_ = .);
+ .got2 : { *(.got2) }
+ PROVIDE (__CTOR_LIST__ = .);
+ .ctors : { *(.ctors) }
+ PROVIDE (__CTOR_END__ = .);
+ PROVIDE (__DTOR_LIST__ = .);
+ .dtors : { *(.dtors) }
+ PROVIDE (__DTOR_END__ = .);
+ PROVIDE (_FIXUP_START_ = .);
+ .fixup : { *(.fixup) }
+ PROVIDE (_FIXUP_END_ = .);
+ PROVIDE (_GOT2_END_ = .);
+ PROVIDE (_GOT_START_ = .);
+ .got : { *(.got) }
+ .got.plt : { *(.got.plt) }
+ PROVIDE (_GOT_END_ = .);
+ /* We want the small data sections together, so single-instruction offsets
+ can access them all, and initialized data all before uninitialized, so
+ we can shorten the on-disk segment size. */
+ .sdata : { *(.sdata) }
+ _edata = .;
+ PROVIDE (edata = .);
+ .sbss :
+ {
+ PROVIDE (__sbss_start = .);
+ *(.sbss)
+ *(.scommon)
+ *(.dynsbss)
+ PROVIDE (__sbss_end = .);
+ }
+ .plt : { *(.plt) }
+ .bss :
+ {
+ PROVIDE (__bss_start = .);
+ *(.dynbss)
+ *(.bss)
+ *(COMMON)
+ }
+ _end = . ;
+ PROVIDE (end = .);
+ /* Stabs debugging sections. */
+ .stab 0 : { *(.stab) }
+ .stabstr 0 : { *(.stabstr) }
+ /* DWARF debug sections.
+ Symbols in the DWARF debugging sections are relative to the beginning
+ of the section so we begin them at 0. */
+ /* DWARF 1 */
+ .debug 0 : { *(.debug) }
+ .line 0 : { *(.line) }
+ /* GNU DWARF 1 extensions */
+ .debug_srcinfo 0 : { *(.debug_srcinfo) }
+ .debug_sfnames 0 : { *(.debug_sfnames) }
+ /* DWARF 1.1 and DWARF 2 */
+ .debug_aranges 0 : { *(.debug_aranges) }
+ .debug_pubnames 0 : { *(.debug_pubnames) }
+ /* DWARF 2 */
+ .debug_info 0 : { *(.debug_info) }
+ .debug_abbrev 0 : { *(.debug_abbrev) }
+ .debug_line 0 : { *(.debug_line) }
+ .debug_frame 0 : { *(.debug_frame) }
+ .debug_str 0 : { *(.debug_str) }
+ .debug_loc 0 : { *(.debug_loc) }
+ .debug_macinfo 0 : { *(.debug_macinfo) }
+ /* SGI/MIPS DWARF 2 extensions */
+ .debug_weaknames 0 : { *(.debug_weaknames) }
+ .debug_funcnames 0 : { *(.debug_funcnames) }
+ .debug_typenames 0 : { *(.debug_typenames) }
+ .debug_varnames 0 : { *(.debug_varnames) }
+ /* These must appear regardless of . */
+}
+
Copied and modified: projects/ppc64/sys/conf/options.powerpc64 (from r195651, projects/ppc64/sys/conf/options.powerpc)
==============================================================================
--- projects/ppc64/sys/conf/options.powerpc Mon Jul 13 01:37:48 2009 (r195651, copy source)
+++ projects/ppc64/sys/conf/options.powerpc64 Sat Jul 25 19:43:46 2009 (r195876)
@@ -4,15 +4,11 @@
AIM opt_global.h
E500 opt_global.h
-FPU_EMU
-
GFB_DEBUG opt_gfb.h
GFB_NO_FONT_LOADING opt_gfb.h
GFB_NO_MODE_CHANGE opt_gfb.h
POWERMAC opt_platform.h
-MPC85XX opt_platform.h
-PSIM
SC_OFWFB opt_ofwfb.h
Modified: projects/ppc64/sys/powerpc/aim/nexus.c
==============================================================================
--- projects/ppc64/sys/powerpc/aim/nexus.c Sat Jul 25 18:45:09 2009 (r195875)
+++ projects/ppc64/sys/powerpc/aim/nexus.c Sat Jul 25 19:43:46 2009 (r195876)
@@ -54,8 +54,6 @@
*
* $FreeBSD$
*/
-#include "opt_psim.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/module.h>
More information about the svn-src-projects
mailing list