diff options
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/Makefile.ia64 | 53 | ||||
-rw-r--r-- | sys/conf/files.ia64 | 137 | ||||
-rw-r--r-- | sys/conf/kern.mk | 11 | ||||
-rw-r--r-- | sys/conf/ldscript.ia64 | 152 | ||||
-rw-r--r-- | sys/conf/options.ia64 | 33 |
5 files changed, 1 insertions, 385 deletions
diff --git a/sys/conf/Makefile.ia64 b/sys/conf/Makefile.ia64 deleted file mode 100644 index de4d41c474cb..000000000000 --- a/sys/conf/Makefile.ia64 +++ /dev/null @@ -1,53 +0,0 @@ -# Makefile.ia64 -- with config changes. -# Copyright 1990 W. Jolitz -# from: src/sys/conf/Makefile.alpha,v 1.76 -# $FreeBSD$ -# -# Makefile for FreeBSD -# -# This makefile is constructed from a machine description: -# config machineid -# Most changes should be made in the machine description -# /sys/ia64/conf/``machineid'' -# after which you should do -# config machineid -# Generic makefile changes should be made in -# /sys/conf/Makefile.ia64 -# after which config should be rerun for all machines. -# - -# Which version of config(8) is required. -%VERSREQ= 600012 - -STD8X16FONT?= iso - -.if !defined(S) -.if exists(./@/.) -S= ./@ -.else -S= ../../.. -.endif -.endif -.include "$S/conf/kern.pre.mk" - -INCLUDES+= -I$S/contrib/ia64/libuwx/src - -CFLAGS+= -mconstant-gp - -ASM_CFLAGS= -x assembler-with-cpp -Wa,-x -DLOCORE ${CFLAGS} - -%BEFORE_DEPEND - -%OBJS - -%FILES.c - -%FILES.s - -%FILES.m - -%CLEAN - -%RULES - -.include "$S/conf/kern.post.mk" diff --git a/sys/conf/files.ia64 b/sys/conf/files.ia64 deleted file mode 100644 index 71b6232fc54b..000000000000 --- a/sys/conf/files.ia64 +++ /dev/null @@ -1,137 +0,0 @@ -# This file tells config what files go into building a kernel, -# files marked standard are always included. -# -# $FreeBSD$ -# -# The long compile-with and dependency lines are required because of -# limitations in config: backslash-newline doesn't work in strings, and -# dependency lines other than the first are silently ignored. -# -# -font8x16.o optional std8x16font \ - compile-with "uudecode < /usr/share/syscons/fonts/${STD8X16FONT}-8x16.fnt && file2c 'unsigned char font_16[16*256] = {' '};' < ${STD8X16FONT}-8x16 > font8x16.c && ${CC} -c ${CFLAGS} font8x16.c" \ - no-implicit-rule before-depend \ - clean "${STD8X16FONT}-8x16 font8x16.c" -# -atkbdmap.h optional atkbd_dflt_keymap \ - compile-with "/usr/sbin/kbdcontrol -L ${ATKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > atkbdmap.h" \ - no-obj no-implicit-rule before-depend \ - clean "atkbdmap.h" -# -font.h optional sc_dflt_font \ - compile-with "uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x16.fnt && file2c 'static u_char dflt_font_16[16*256] = {' '};' < ${SC_DFLT_FONT}-8x16 > font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x14.fnt && file2c 'static u_char dflt_font_14[14*256] = {' '};' < ${SC_DFLT_FONT}-8x14 >> font.h && uudecode < /usr/share/syscons/fonts/${SC_DFLT_FONT}-8x8.fnt && file2c 'static u_char dflt_font_8[8*256] = {' '};' < ${SC_DFLT_FONT}-8x8 >> font.h" \ - no-obj no-implicit-rule before-depend \ - clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8" -# -ukbdmap.h optional ukbd_dflt_keymap \ - compile-with "/usr/sbin/kbdcontrol -L ${UKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > ukbdmap.h" \ - no-obj no-implicit-rule before-depend \ - clean "ukbdmap.h" -# -cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S optional zfs compile-with "${ZFS_S}" -compat/ia32/ia32_sysvec.c optional compat_freebsd32 -contrib/ia64/libuwx/src/uwx_bstream.c standard -contrib/ia64/libuwx/src/uwx_context.c standard -contrib/ia64/libuwx/src/uwx_env.c standard -contrib/ia64/libuwx/src/uwx_scoreboard.c standard -contrib/ia64/libuwx/src/uwx_step.c standard -contrib/ia64/libuwx/src/uwx_str.c standard -contrib/ia64/libuwx/src/uwx_swap.c standard -contrib/ia64/libuwx/src/uwx_trace.c standard -contrib/ia64/libuwx/src/uwx_uinfo.c standard -contrib/ia64/libuwx/src/uwx_utable.c standard -crypto/blowfish/bf_enc.c optional crypto | ipsec -crypto/des/des_enc.c optional crypto | ipsec | netsmb -dev/atkbdc/atkbd.c optional atkbd atkbdc -dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc -dev/atkbdc/atkbdc.c optional atkbdc -dev/atkbdc/atkbdc_isa.c optional atkbdc isa -dev/atkbdc/atkbdc_subr.c optional atkbdc -dev/atkbdc/psm.c optional psm atkbdc -dev/fb/fb.c optional fb | vga -dev/fb/vga.c optional vga -dev/hwpmc/hwpmc_ia64.c optional hwpmc -dev/io/iodev.c optional io -dev/kbd/kbd.c optional atkbd | sc | ukbd | vt -dev/syscons/scterm-teken.c optional sc -dev/syscons/scvgarndr.c optional sc vga -dev/syscons/scvtb.c optional sc -dev/uart/uart_cpu_ia64.c optional uart -dev/acpica/acpi_if.m standard -ia64/acpica/OsdEnvironment.c optional acpi -ia64/acpica/acpi_machdep.c optional acpi -ia64/acpica/acpi_wakeup.c optional acpi -ia64/acpica/madt.c optional acpi -ia64/disasm/disasm_decode.c standard -ia64/disasm/disasm_extract.c standard -ia64/disasm/disasm_format.c standard -ia64/ia32/ia32_misc.c optional compat_freebsd32 -ia64/ia32/ia32_reg.c optional compat_freebsd32 -ia64/ia32/ia32_signal.c optional compat_freebsd32 -ia64/ia32/ia32_trap.c optional compat_freebsd32 -ia64/ia64/autoconf.c standard -ia64/ia64/bus_machdep.c standard -ia64/ia64/busdma_machdep.c standard -ia64/ia64/clock.c standard -ia64/ia64/context.S standard -ia64/ia64/db_machdep.c optional ddb -ia64/ia64/dump_machdep.c standard -ia64/ia64/efi.c standard -ia64/ia64/elf_machdep.c standard -ia64/ia64/emulate.c standard -ia64/ia64/exception.S standard -ia64/ia64/gdb_machdep.c optional gdb -ia64/ia64/highfp.c standard -ia64/ia64/in_cksum.c optional inet | inet6 -ia64/ia64/interrupt.c standard -ia64/ia64/iodev_machdep.c optional io -ia64/ia64/locore.S standard no-obj -ia64/ia64/machdep.c standard -ia64/ia64/mca.c standard -ia64/ia64/mem.c optional mem -ia64/ia64/mp_locore.S optional smp -ia64/ia64/mp_machdep.c optional smp -ia64/ia64/nexus.c standard -ia64/ia64/pal.S standard -ia64/ia64/physical.S standard -ia64/ia64/physmem.c standard -ia64/ia64/pmap.c standard -ia64/ia64/ptrace_machdep.c standard -ia64/ia64/sal.c standard -ia64/ia64/sapic.c standard -ia64/ia64/setjmp.S standard -ia64/ia64/stack_machdep.c optional ddb | stack -ia64/ia64/support.S standard -ia64/ia64/sys_machdep.c standard -ia64/ia64/syscall.S standard -ia64/ia64/trap.c standard -ia64/ia64/uio_machdep.c standard -ia64/ia64/uma_machdep.c standard -ia64/ia64/unaligned.c standard -ia64/ia64/unwind.c standard -ia64/ia64/vm_machdep.c standard -ia64/ia64/xtrace.c optional xtrace -ia64/isa/isa.c optional isa -ia64/isa/isa_dma.c optional isa -ia64/pci/pci_cfgreg.c optional pci -isa/syscons_isa.c optional sc -isa/vga_isa.c optional vga -kern/kern_clocksource.c standard -libkern/bcmp.c standard -libkern/ffsl.c standard -libkern/fls.c standard -libkern/flsl.c standard -libkern/flsll.c standard -libkern/ia64/__divdi3.S standard -libkern/ia64/__divsi3.S standard -libkern/ia64/__moddi3.S standard -libkern/ia64/__modsi3.S standard -libkern/ia64/__udivdi3.S standard -libkern/ia64/__udivsi3.S standard -libkern/ia64/__umoddi3.S standard -libkern/ia64/__umodsi3.S standard -libkern/ia64/bswap16.S standard -libkern/ia64/bswap32.S standard -libkern/memmove.c standard -libkern/memset.c standard -kern/subr_dummy_vdso_tc.c standard diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk index ee9a204c21ed..deba3e5e8459 100644 --- a/sys/conf/kern.mk +++ b/sys/conf/kern.mk @@ -72,15 +72,6 @@ INLINE_LIMIT?= 8000 .endif # -# For IA-64, we use r13 for the kernel globals pointer and we only use -# a very small subset of float registers for integer divides. -# -.if ${MACHINE_CPUARCH} == "ia64" -CFLAGS+= -ffixed-r13 -mfixed-range=f32-f127 -fpic #-mno-sdata -INLINE_LIMIT?= 15000 -.endif - -# # For sparc64 we want the medany code model so modules may be located # anywhere in the 64-bit address space. We also tell GCC to use floating # point emulation. This avoids using floating point registers for integer @@ -147,7 +138,7 @@ CFLAGS+= -ffreestanding # # GCC SSP support # -.if ${MK_SSP} != "no" && ${MACHINE_CPUARCH} != "ia64" && \ +.if ${MK_SSP} != "no" && \ ${MACHINE_CPUARCH} != "arm" && ${MACHINE_CPUARCH} != "mips" CFLAGS+= -fstack-protector .endif diff --git a/sys/conf/ldscript.ia64 b/sys/conf/ldscript.ia64 deleted file mode 100644 index 8e0b297cc2f4..000000000000 --- a/sys/conf/ldscript.ia64 +++ /dev/null @@ -1,152 +0,0 @@ -/* $FreeBSD$ */ -OUTPUT_FORMAT("elf64-ia64-freebsd", "elf64-ia64-freebsd", "elf64-ia64-freebsd") -OUTPUT_ARCH(ia64) -ENTRY(__start) -SEARCH_DIR(/usr/lib); -kernel_text = 0x9ffc000000000000; -SECTIONS -{ - /* Read-only sections, merged into text segment: */ - . = kernel_text + SIZEOF_HEADERS; - .interp : { *(.interp) } - - PROVIDE (btext = .); - .text : - { - *(.ivt) - *(.ivt.text) - *(.text .stub .text.* .gnu.linkonce.t.*) - /* .gnu.warning sections are handled specially by elf32.em. */ - *(.gnu.warning) - } = 0x00300000010070000002000001000400 - .init : { *(.init) } = 0x00300000010070000002000001000400 - .plt : { *(.plt) } - .fini : { *(.fini) } = 0x00300000010070000002000001000400 - _etext = .; - PROVIDE (etext = .); - - .hash : { *(.hash) } - .dynsym : { *(.dynsym) } - .dynstr : { *(.dynstr) } - .gnu.version : { *(.gnu.version) } - .gnu.version_d : { *(.gnu.version_d) } - .gnu.version_r : { *(.gnu.version_r) } - .rela.init : { *(.rela.init) } - .rela.text : { *(.rela.text .rela.text.* .rela.gnu.linkonce.t.*) } - .rela.fini : { *(.rela.fini) } - .rela.rodata : { *(.rela.rodata .rela.rodata.* .rela.gnu.linkonce.r.*) } - .rela.data : { *(.rela.data .rela.data.* .rela.gnu.linkonce.d.*) } - .rela.ctors : { *(.rela.ctors) } - .rela.dtors : { *(.rela.dtors) } - .rela.got : { *(.rela.got) } - .rela.sdata : { *(.rela.sdata .rela.sdata.* .rela.gnu.linkonce.s.*) } - .rela.sbss : { *(.rela.sbss .rela.sbss.* .rela.gnu.linkonce.sb.*) } - .rela.sdata2 : { *(.rela.sdata2 .rela.sdata2.* .rela.gnu.linkonce.s2.*) } - .rela.sbss2 : { *(.rela.sbss2 .rela.sbss2.* .rela.gnu.linkonce.sb2.*) } - .rela.bss : { *(.rela.bss .rela.bss.* .rela.gnu.linkonce.b.*) } - .rela.plt : { *(.rela.plt) } - .rela.IA_64.pltoff : { *(.rela.IA_64.pltoff) } - - .IA_64.unwind_info : { *(.IA_64.unwind_info* .gnu.linkonce.ia64unwi.*) } - .IA_64.unwind : { *(.IA_64.unwind* .gnu.linkonce.ia64unw.*) } - - .rodata : { *(.rodata .rodata.* .gnu.linkonce.r.*) } - .rodata1 : { *(.rodata1) } - .sdata2 : { *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) } - .sbss2 : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) } - .opd : { *(.opd) } - - /* Adjust the address for the data segment. We want to start in the next - page in the loader virtual memory. */ - . = ALIGN(65536); - - PROVIDE (bdata = .); - .data : - { - *(.ivt.data) - *(.data .data.* .gnu.linkonce.d.*) - SORT(CONSTRUCTORS) - } - .data1 : { *(.data1) } - .dynamic : { *(.dynamic) } - .ctors : - { - *(.ctors) - *(SORT(.ctors.*)) - } - .dtors : - { - *(.dtors) - *(SORT(.dtors.*)) - } - . = ALIGN(16); - __gp = . + 0x200000; - .got : { *(.got.plt) *(.got) } - .IA_64.pltoff : { *(.IA_64.pltoff) } - /* 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 .sdata.* .gnu.linkonce.s.*) - } - _edata = .; - PROVIDE (edata = .); - __bss_start = .; - .sbss : - { - PROVIDE (__sbss_start = .); - PROVIDE (___sbss_start = .); - *(.dynsbss) - *(.sbss .sbss.* .gnu.linkonce.sb.*) - *(.scommon) - PROVIDE (__sbss_end = .); - PROVIDE (___sbss_end = .); - } - .bss : - { - *(.dynbss) - *(.bss .bss.* .gnu.linkonce.b.*) - *(COMMON) - /* Align here to ensure that the .bss section occupies space up to - _end. Align after .bss to ensure correct alignment even if the - .bss section disappears because there are no input sections. */ - . = ALIGN(64 / 8); - } - . = ALIGN(64 / 8); - _end = .; - PROVIDE (end = .); - /* Stabs debugging sections. */ - .stab 0 : { *(.stab) } - .stabstr 0 : { *(.stabstr) } - .stab.excl 0 : { *(.stab.excl) } - .stab.exclstr 0 : { *(.stab.exclstr) } - .stab.index 0 : { *(.stab.index) } - .stab.indexstr 0 : { *(.stab.indexstr) } - .comment 0 : { *(.comment) } - /* 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 .gnu.linkonce.wi.*) } - .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) } -} diff --git a/sys/conf/options.ia64 b/sys/conf/options.ia64 deleted file mode 100644 index e5ef143e0b53..000000000000 --- a/sys/conf/options.ia64 +++ /dev/null @@ -1,33 +0,0 @@ -# $FreeBSD$ -# Options specific to the ia64 platform kernels - -ITANIUM opt_global.h -ITANIUM2 opt_global.h - -LOG2_ID_PAGE_SIZE opt_global.h -LOG2_PAGE_SIZE opt_global.h - -UWX_TRACE_ENABLE opt_global.h - -COMPAT_FREEBSD32 opt_compat.h - -PV_STATS opt_pmap.h - -XTRACE - -VGA_ALT_SEQACCESS opt_vga.h -VGA_DEBUG opt_vga.h -VGA_NO_FONT_LOADING opt_vga.h -VGA_NO_MODE_CHANGE opt_vga.h -VGA_SLOW_IOACCESS opt_vga.h -VGA_WIDTH90 opt_vga.h - -# AGP debugging. -AGP_DEBUG opt_agp.h - -PSM_HOOKRESUME opt_psm.h -PSM_RESETAFTERSUSPEND opt_psm.h -PSM_DEBUG opt_psm.h - -# Atkbd options -ATKBD_DFLT_KEYMAP opt_atkbd.h |