2005-10-23 Vincent Pelletier <subdino2004@yahoo.fr>
* kern/sparc64/dl.c: Rewritten for SPARCV9 ELF. * kern/sparc64/cache.S: New file. * kern/sparc64/cache.c: Removed. * conf/sparc64-ieee1275.rmk (COMMON_ASFLAGS): Add -Av9. (COMMON_CFLAGS): Add -mno-app-regs. Remove -mcpu=v9 and -mtune=ultrasparc. (COMMON_LDFLAGS): Add -melf64_sparc. (grubof_HEADERS): Add sparc64/libgcc.h and machine/kernel.h. (grubof_SOURCES): Use cache.S instead of cache.c. (grubof_LDFLAGS): Add -mno-app-regs. Replace "-Xlinker --oformat -Xlinker elf64-sparc" by "-Bstatic,-melf64_sparc". (pkgdata_MODULES): Uncomment. Leave linux.mod and _linux.mod commented though. (normal_mod_SOURCES): Add normal/completion.c and normal/misc.c. (_linux_mod_SOURCES, _linux_mod_CFLAGS, linux_mod_SOURCES) (linux_mod_CFLAGS): Commented out. (_linux_mod_LDFLAGS, linux_mod_LDFLAGS): New macro, commented out because module isn't built. (fshelp_mod_LDFLAGS, fat_mod_LDFLAGS, ext2_mod_LDFLAGS) (ufs_mod_LDFLAGS, minix_mod_LDFLAGS, hfs_mod_LDFLAGS) (jfs_mod_LDFLAGS, iso9660_mod_LDFLAGS, normal_mod_LDFLAGS) (hello_mod_LDFLAGS, boot_mod_LDFLAGS, terminal_mod_LDFLAGS) (ls_mod_LDFLAGS, cmp_mod_LDFLAGS, cat_mod_LDFLAGS) (font_mod_LDFLAGS, amiga_mod_LDFLAGS, apple_mod_LDFLAGS) (pc_mod_LDFLAGS, sun_mod_LDFLAGS, loopback_mod_LDFLAGS) (suspend_mod_LDFLAGS, reboot_mod_LDFLAGS, halt_mod_LDFLAGS) (help_mod_LDFLAGS, default_mod_LDFLAGS, timeout_mod_LDFLAGS) (configfile_mod_LDFLAGS, search_mod_LDFLAGS, xfs_mod_SOURCES) (xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES) (affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES) (sfs_mod_CFLAGS, sfs_mod_LDFLAGS, gzio_mod_SOURCES) (gzio_mod_CFLAGS, gzio_mod_LDFLAGS): New macro.
This commit is contained in:
parent
34eeec8a53
commit
03e8661a56
6 changed files with 1905 additions and 82 deletions
35
ChangeLog
35
ChangeLog
|
@ -1,3 +1,38 @@
|
||||||
|
2005-10-23 Vincent Pelletier <subdino2004@yahoo.fr>
|
||||||
|
|
||||||
|
* kern/sparc64/dl.c: Rewritten for SPARCV9 ELF.
|
||||||
|
* kern/sparc64/cache.S: New file.
|
||||||
|
* kern/sparc64/cache.c: Removed.
|
||||||
|
* conf/sparc64-ieee1275.rmk (COMMON_ASFLAGS): Add -Av9.
|
||||||
|
(COMMON_CFLAGS): Add -mno-app-regs. Remove -mcpu=v9 and
|
||||||
|
-mtune=ultrasparc.
|
||||||
|
(COMMON_LDFLAGS): Add -melf64_sparc.
|
||||||
|
(grubof_HEADERS): Add sparc64/libgcc.h and machine/kernel.h.
|
||||||
|
(grubof_SOURCES): Use cache.S instead of cache.c.
|
||||||
|
(grubof_LDFLAGS): Add -mno-app-regs. Replace "-Xlinker
|
||||||
|
--oformat -Xlinker elf64-sparc" by "-Bstatic,-melf64_sparc".
|
||||||
|
(pkgdata_MODULES): Uncomment. Leave linux.mod and _linux.mod
|
||||||
|
commented though.
|
||||||
|
(normal_mod_SOURCES): Add normal/completion.c and normal/misc.c.
|
||||||
|
(_linux_mod_SOURCES, _linux_mod_CFLAGS, linux_mod_SOURCES)
|
||||||
|
(linux_mod_CFLAGS): Commented out.
|
||||||
|
(_linux_mod_LDFLAGS, linux_mod_LDFLAGS): New macro, commented
|
||||||
|
out because module isn't built.
|
||||||
|
(fshelp_mod_LDFLAGS, fat_mod_LDFLAGS, ext2_mod_LDFLAGS)
|
||||||
|
(ufs_mod_LDFLAGS, minix_mod_LDFLAGS, hfs_mod_LDFLAGS)
|
||||||
|
(jfs_mod_LDFLAGS, iso9660_mod_LDFLAGS, normal_mod_LDFLAGS)
|
||||||
|
(hello_mod_LDFLAGS, boot_mod_LDFLAGS, terminal_mod_LDFLAGS)
|
||||||
|
(ls_mod_LDFLAGS, cmp_mod_LDFLAGS, cat_mod_LDFLAGS)
|
||||||
|
(font_mod_LDFLAGS, amiga_mod_LDFLAGS, apple_mod_LDFLAGS)
|
||||||
|
(pc_mod_LDFLAGS, sun_mod_LDFLAGS, loopback_mod_LDFLAGS)
|
||||||
|
(suspend_mod_LDFLAGS, reboot_mod_LDFLAGS, halt_mod_LDFLAGS)
|
||||||
|
(help_mod_LDFLAGS, default_mod_LDFLAGS, timeout_mod_LDFLAGS)
|
||||||
|
(configfile_mod_LDFLAGS, search_mod_LDFLAGS, xfs_mod_SOURCES)
|
||||||
|
(xfs_mod_CFLAGS, xfs_mod_LDFLAGS, affs_mod_SOURCES)
|
||||||
|
(affs_mod_CFLAGS, affs_mod_LDFLAGS, sfs_mod_SOURCES)
|
||||||
|
(sfs_mod_CFLAGS, sfs_mod_LDFLAGS, gzio_mod_SOURCES)
|
||||||
|
(gzio_mod_CFLAGS, gzio_mod_LDFLAGS): New macro.
|
||||||
|
|
||||||
2005-10-20 Yoshinori K. Okuji <okuji@enbug.org>
|
2005-10-20 Yoshinori K. Okuji <okuji@enbug.org>
|
||||||
|
|
||||||
* util/i386/pc/grub-probefs.c (main): Call grub_xfs_init and
|
* util/i386/pc/grub-probefs.c (main): Call grub_xfs_init and
|
||||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,8 +1,9 @@
|
||||||
|
|
||||||
# -*- makefile -*-
|
# -*- makefile -*-
|
||||||
|
|
||||||
COMMON_ASFLAGS = -nostdinc
|
COMMON_ASFLAGS = -nostdinc -Av9
|
||||||
COMMON_CFLAGS = -ggdb -ffreestanding -m64 -mcpu=v9 -mtune=ultrasparc
|
COMMON_CFLAGS = -ggdb -ffreestanding -m64 -mno-app-regs
|
||||||
|
COMMON_LDFLAGS = -melf64_sparc
|
||||||
|
|
||||||
# Images.
|
# Images.
|
||||||
|
|
||||||
|
@ -11,8 +12,9 @@ DEFSYMFILES += kernel_syms.lst
|
||||||
|
|
||||||
grubof_HEADERS = arg.h boot.h device.h disk.h dl.h elf.h env.h err.h \
|
grubof_HEADERS = arg.h boot.h device.h disk.h dl.h elf.h env.h err.h \
|
||||||
file.h fs.h kernel.h misc.h mm.h net.h rescue.h symbol.h \
|
file.h fs.h kernel.h misc.h mm.h net.h rescue.h symbol.h \
|
||||||
term.h types.h loader.h \
|
term.h types.h sparc64/libgcc.h loader.h \
|
||||||
partition.h pc_partition.h ieee1275/ieee1275.h machine/time.h
|
partition.h pc_partition.h ieee1275/ieee1275.h machine/time.h \
|
||||||
|
machine/kernel.h
|
||||||
|
|
||||||
grubof_symlist.c: $(addprefix include/grub/,$(grubof_HEADERS)) gensymlist.sh
|
grubof_symlist.c: $(addprefix include/grub/,$(grubof_HEADERS)) gensymlist.sh
|
||||||
sh $(srcdir)/gensymlist.sh $(filter %.h,$^) > $@
|
sh $(srcdir)/gensymlist.sh $(filter %.h,$^) > $@
|
||||||
|
@ -59,146 +61,199 @@ grubof_SOURCES = kern/sparc64/ieee1275/init.c kern/ieee1275/ieee1275.c \
|
||||||
kern/rescue.c kern/term.c term/ieee1275/ofconsole.c \
|
kern/rescue.c kern/term.c term/ieee1275/ofconsole.c \
|
||||||
kern/sparc64/ieee1275/openfw.c disk/ieee1275/ofdisk.c \
|
kern/sparc64/ieee1275/openfw.c disk/ieee1275/ofdisk.c \
|
||||||
kern/partition.c kern/env.c kern/sparc64/dl.c grubof_symlist.c \
|
kern/partition.c kern/env.c kern/sparc64/dl.c grubof_symlist.c \
|
||||||
kern/sparc64/cache.c
|
kern/sparc64/cache.S
|
||||||
grubof_HEADERS = grub/sparc64/ieee1275/ieee1275.h
|
grubof_HEADERS = grub/sparc64/ieee1275/ieee1275.h
|
||||||
grubof_CFLAGS = $(COMMON_CFLAGS)
|
grubof_CFLAGS = $(COMMON_CFLAGS)
|
||||||
grubof_ASFLAGS = $(COMMON_ASFLAGS)
|
grubof_ASFLAGS = $(COMMON_ASFLAGS)
|
||||||
grubof_LDFLAGS = -m64 -nostdlib -Wl,-N,-Ttext,0x200000,-Bstatic -Xlinker --oformat -Xlinker elf64-sparc
|
grubof_LDFLAGS = -mno-app-regs -nostdlib -Wl,-N,-Ttext,0x200000,-Bstatic,-melf64_sparc
|
||||||
|
|
||||||
# For genmoddep.
|
# For genmoddep.
|
||||||
genmoddep_SOURCES = util/genmoddep.c
|
genmoddep_SOURCES = util/genmoddep.c
|
||||||
|
|
||||||
# Modules.
|
# Modules.
|
||||||
#pkgdata_MODULES = _linux.mod linux.mod fat.mod ufs.mod ext2.mod minix.mod \
|
#_linux.mod linux.mod
|
||||||
# hfs.mod jfs.mod normal.mod hello.mod font.mod ls.mod \
|
pkgdata_MODULES = fat.mod ufs.mod ext2.mod minix.mod \
|
||||||
# boot.mod cmp.mod cat.mod terminal.mod fshelp.mod amiga.mod apple.mod \
|
hfs.mod jfs.mod normal.mod hello.mod font.mod ls.mod \
|
||||||
# pc.mod suspend.mod loopback.mod help.mod reboot.mod halt.mod sun.mod \
|
boot.mod cmp.mod cat.mod terminal.mod fshelp.mod amiga.mod apple.mod \
|
||||||
# default.mod timeout.mod configfile.mod search.mod
|
pc.mod suspend.mod loopback.mod help.mod reboot.mod halt.mod sun.mod \
|
||||||
|
default.mod timeout.mod configfile.mod search.mod gzio.mod xfs.mod \
|
||||||
|
affs.mod sfs.mod
|
||||||
|
|
||||||
# For fshelp.mod.
|
# For fshelp.mod.
|
||||||
fshelp_mod_SOURCES = fs/fshelp.c
|
fshelp_mod_SOURCES = fs/fshelp.c
|
||||||
fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
|
fshelp_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
fshelp_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For fat.mod.
|
# For fat.mod.
|
||||||
fat_mod_SOURCES = fs/fat.c
|
fat_mod_SOURCES = fs/fat.c
|
||||||
fat_mod_CFLAGS = $(COMMON_CFLAGS)
|
fat_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
fat_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For ext2.mod.
|
# For ext2.mod.
|
||||||
ext2_mod_SOURCES = fs/ext2.c
|
ext2_mod_SOURCES = fs/ext2.c
|
||||||
ext2_mod_CFLAGS = $(COMMON_CFLAGS)
|
ext2_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
ext2_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For ufs.mod.
|
# For ufs.mod.
|
||||||
ufs_mod_SOURCES = fs/ufs.c
|
ufs_mod_SOURCES = fs/ufs.c
|
||||||
ufs_mod_CFLAGS = $(COMMON_CFLAGS)
|
ufs_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
ufs_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For minix.mod.
|
# For minix.mod.
|
||||||
minix_mod_SOURCES = fs/minix.c
|
minix_mod_SOURCES = fs/minix.c
|
||||||
minix_mod_CFLAGS = $(COMMON_CFLAGS)
|
minix_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
minix_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For hfs.mod.
|
# For hfs.mod.
|
||||||
hfs_mod_SOURCES = fs/hfs.c
|
hfs_mod_SOURCES = fs/hfs.c
|
||||||
hfs_mod_CFLAGS = $(COMMON_CFLAGS)
|
hfs_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
hfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For jfs.mod.
|
# For jfs.mod.
|
||||||
jfs_mod_SOURCES = fs/jfs.c
|
jfs_mod_SOURCES = fs/jfs.c
|
||||||
jfs_mod_CFLAGS = $(COMMON_CFLAGS)
|
jfs_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
jfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For iso9660.mod.
|
# For iso9660.mod.
|
||||||
iso9660_mod_SOURCES = fs/iso9660.c
|
iso9660_mod_SOURCES = fs/iso9660.c
|
||||||
iso9660_mod_CFLAGS = $(COMMON_CFLAGS)
|
iso9660_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
iso9660_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
|
# For xfs.mod.
|
||||||
|
xfs_mod_SOURCES = fs/xfs.c
|
||||||
|
xfs_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
xfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
|
# For affs.mod.
|
||||||
|
affs_mod_SOURCES = fs/affs.c
|
||||||
|
affs_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
affs_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
|
# For sfs.mod.
|
||||||
|
sfs_mod_SOURCES = fs/sfs.c
|
||||||
|
sfs_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
sfs_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For _linux.mod.
|
# For _linux.mod.
|
||||||
_linux_mod_SOURCES = loader/sparc64/ieee1275/linux.c
|
#_linux_mod_SOURCES = loader/sparc64/ieee1275/linux.c
|
||||||
_linux_mod_CFLAGS = $(COMMON_CFLAGS)
|
#_linux_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
#_linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For linux.mod.
|
# For linux.mod.
|
||||||
linux_mod_SOURCES = loader/sparc64/ieee1275/linux_normal.c
|
#linux_mod_SOURCES = loader/sparc64/ieee1275/linux_normal.c
|
||||||
linux_mod_CFLAGS = $(COMMON_CFLAGS)
|
#linux_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
#linux_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For normal.mod.
|
# For normal.mod.
|
||||||
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
|
normal_mod_SOURCES = normal/arg.c normal/cmdline.c normal/command.c \
|
||||||
normal/context.c normal/main.c normal/menu.c \
|
normal/completion.c normal/context.c normal/main.c \
|
||||||
normal/menu_entry.c \
|
normal/menu.c normal/menu_entry.c normal/misc.c \
|
||||||
normal/sparc64/setjmp.c
|
normal/sparc64/setjmp.c
|
||||||
normal_mod_CFLAGS = $(COMMON_CFLAGS)
|
normal_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
normal_mod_ASFLAGS = $(COMMON_ASFLAGS)
|
normal_mod_ASFLAGS = $(COMMON_ASFLAGS)
|
||||||
|
normal_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For hello.mod.
|
# For hello.mod.
|
||||||
hello_mod_SOURCES = hello/hello.c
|
hello_mod_SOURCES = hello/hello.c
|
||||||
hello_mod_CFLAGS = $(COMMON_CFLAGS)
|
hello_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
hello_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For boot.mod.
|
# For boot.mod.
|
||||||
boot_mod_SOURCES = commands/boot.c
|
boot_mod_SOURCES = commands/boot.c
|
||||||
boot_mod_CFLAGS = $(COMMON_CFLAGS)
|
boot_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
boot_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For terminal.mod.
|
# For terminal.mod.
|
||||||
terminal_mod_SOURCES = commands/terminal.c
|
terminal_mod_SOURCES = commands/terminal.c
|
||||||
terminal_mod_CFLAGS = $(COMMON_CFLAGS)
|
terminal_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
terminal_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For ls.mod.
|
# For ls.mod.
|
||||||
ls_mod_SOURCES = commands/ls.c
|
ls_mod_SOURCES = commands/ls.c
|
||||||
ls_mod_CFLAGS = $(COMMON_CFLAGS)
|
ls_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
ls_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For cmp.mod.
|
# For cmp.mod.
|
||||||
cmp_mod_SOURCES = commands/cmp.c
|
cmp_mod_SOURCES = commands/cmp.c
|
||||||
cmp_mod_CFLAGS = $(COMMON_CFLAGS)
|
cmp_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
cmp_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For cat.mod.
|
# For cat.mod.
|
||||||
cat_mod_SOURCES = commands/cat.c
|
cat_mod_SOURCES = commands/cat.c
|
||||||
cat_mod_CFLAGS = $(COMMON_CFLAGS)
|
cat_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
cat_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For font.mod.
|
# For font.mod.
|
||||||
font_mod_SOURCES = font/manager.c
|
font_mod_SOURCES = font/manager.c
|
||||||
font_mod_CFLAGS = $(COMMON_CFLAGS)
|
font_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
font_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For amiga.mod
|
# For amiga.mod
|
||||||
amiga_mod_SOURCES = partmap/amiga.c
|
amiga_mod_SOURCES = partmap/amiga.c
|
||||||
amiga_mod_CFLAGS = $(COMMON_CFLAGS)
|
amiga_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
amiga_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For apple.mod
|
# For apple.mod
|
||||||
apple_mod_SOURCES = partmap/apple.c
|
apple_mod_SOURCES = partmap/apple.c
|
||||||
apple_mod_CFLAGS = $(COMMON_CFLAGS)
|
apple_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
apple_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For pc.mod
|
# For pc.mod
|
||||||
pc_mod_SOURCES = partmap/pc.c
|
pc_mod_SOURCES = partmap/pc.c
|
||||||
pc_mod_CFLAGS = $(COMMON_CFLAGS)
|
pc_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
pc_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For sun.mod
|
# For sun.mod
|
||||||
sun_mod_SOURCES = partmap/sun.c
|
sun_mod_SOURCES = partmap/sun.c
|
||||||
sun_mod_CFLAGS = $(COMMON_CFLAGS)
|
sun_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
sun_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For loopback.mod
|
# For loopback.mod
|
||||||
loopback_mod_SOURCES = disk/loopback.c
|
loopback_mod_SOURCES = disk/loopback.c
|
||||||
loopback_mod_CFLAGS = $(COMMON_CFLAGS)
|
loopback_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
loopback_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For suspend.mod
|
# For suspend.mod
|
||||||
suspend_mod_SOURCES = commands/ieee1275/suspend.c
|
suspend_mod_SOURCES = commands/ieee1275/suspend.c
|
||||||
suspend_mod_CFLAGS = $(COMMON_CFLAGS)
|
suspend_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
suspend_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For reboot.mod
|
# For reboot.mod
|
||||||
reboot_mod_SOURCES = commands/ieee1275/reboot.c
|
reboot_mod_SOURCES = commands/ieee1275/reboot.c
|
||||||
reboot_mod_CFLAGS = $(COMMON_CFLAGS)
|
reboot_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
reboot_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For halt.mod
|
# For halt.mod
|
||||||
halt_mod_SOURCES = commands/ieee1275/halt.c
|
halt_mod_SOURCES = commands/ieee1275/halt.c
|
||||||
halt_mod_CFLAGS = $(COMMON_CFLAGS)
|
halt_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
halt_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For help.mod.
|
# For help.mod.
|
||||||
help_mod_SOURCES = commands/help.c
|
help_mod_SOURCES = commands/help.c
|
||||||
help_mod_CFLAGS = $(COMMON_CFLAGS)
|
help_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
help_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For default.mod
|
# For default.mod
|
||||||
default_mod_SOURCES = commands/default.c
|
default_mod_SOURCES = commands/default.c
|
||||||
default_mod_CFLAGS = $(COMMON_CFLAGS)
|
default_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
default_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For timeout.mod
|
# For timeout.mod
|
||||||
timeout_mod_SOURCES = commands/timeout.c
|
timeout_mod_SOURCES = commands/timeout.c
|
||||||
timeout_mod_CFLAGS = $(COMMON_CFLAGS)
|
timeout_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
timeout_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For configfile.mod
|
# For configfile.mod
|
||||||
configfile_mod_SOURCES = commands/configfile.c
|
configfile_mod_SOURCES = commands/configfile.c
|
||||||
configfile_mod_CFLAGS = $(COMMON_CFLAGS)
|
configfile_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
configfile_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
# For search.mod.
|
# For search.mod.
|
||||||
search_mod_SOURCES = commands/search.c
|
search_mod_SOURCES = commands/search.c
|
||||||
search_mod_CFLAGS = $(COMMON_CFLAGS)
|
search_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
search_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
||||||
|
# For gzio.mod.
|
||||||
|
gzio_mod_SOURCES = io/gzio.c
|
||||||
|
gzio_mod_CFLAGS = $(COMMON_CFLAGS)
|
||||||
|
gzio_mod_LDFLAGS = $(COMMON_LDFLAGS)
|
||||||
|
|
44
kern/sparc64/cache.S
Normal file
44
kern/sparc64/cache.S
Normal file
|
@ -0,0 +1,44 @@
|
||||||
|
/* cache.S - Flush the processor cache for a specific region. */
|
||||||
|
/*
|
||||||
|
* GRUB -- GRand Unified Bootloader
|
||||||
|
* Copyright (C) 2005 Free Software Foundation, Inc.
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU General Public License as published by
|
||||||
|
* the Free Software Foundation; either version 2 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <grub/symbol.h>
|
||||||
|
|
||||||
|
.file "cache.S"
|
||||||
|
|
||||||
|
.text
|
||||||
|
|
||||||
|
/*
|
||||||
|
* void grub_arch_sync_caches (void *address, grub_size_t len)
|
||||||
|
*/
|
||||||
|
FUNCTION(grub_arch_sync_caches)
|
||||||
|
save %o6, -0xC, %o6 ! Get a new register window,
|
||||||
|
! reserve space on stack for
|
||||||
|
! %i0, %i1, %i2
|
||||||
|
brz,pn %i0, return ! Return if address == 0.
|
||||||
|
nop
|
||||||
|
brz,pn %i1, return ! Return if len == 0.
|
||||||
|
clr %i2 ! index = 0.
|
||||||
|
loop: flush %i0 + %i2 ! Flush address + index.
|
||||||
|
cmp %i1, %i2 ! Compare len & index .
|
||||||
|
bpos,a,pt %xcc, loop ! If len > index, loop.
|
||||||
|
add %i2, 8, %i2 ! Go to next doubleword.
|
||||||
|
return: ret ! Restore caller's register
|
||||||
|
restore ! window and return.
|
||||||
|
|
|
@ -1,9 +0,0 @@
|
||||||
#include <grub/types.h>
|
|
||||||
|
|
||||||
void grub_arch_sync_caches(void *address __attribute__((unused)),
|
|
||||||
grub_size_t len __attribute__((unused)));
|
|
||||||
void grub_arch_sync_caches(void *address __attribute__((unused)),
|
|
||||||
grub_size_t len __attribute__((unused)))
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
|
@ -30,9 +30,9 @@ grub_arch_dl_check_header (void *ehdr)
|
||||||
Elf64_Ehdr *e = ehdr;
|
Elf64_Ehdr *e = ehdr;
|
||||||
|
|
||||||
/* Check the magic numbers. */
|
/* Check the magic numbers. */
|
||||||
if (e->e_ident[EI_CLASS] != ELFCLASS32
|
if (e->e_ident[EI_CLASS] != ELFCLASS64
|
||||||
|| e->e_ident[EI_DATA] != ELFDATA2MSB
|
|| e->e_ident[EI_DATA] != ELFDATA2MSB
|
||||||
|| e->e_machine != EM_PPC)
|
|| e->e_machine != EM_SPARCV9)
|
||||||
return grub_error (GRUB_ERR_BAD_OS, "invalid arch specific ELF magic");
|
return grub_error (GRUB_ERR_BAD_OS, "invalid arch specific ELF magic");
|
||||||
|
|
||||||
return GRUB_ERR_NONE;
|
return GRUB_ERR_NONE;
|
||||||
|
@ -83,53 +83,53 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr)
|
||||||
rel < max;
|
rel < max;
|
||||||
rel++)
|
rel++)
|
||||||
{
|
{
|
||||||
Elf64_Xword *addr;
|
Elf64_Word *addr;
|
||||||
Elf64_Sym *sym;
|
Elf64_Sym *sym;
|
||||||
grub_uint64_t value;
|
Elf64_Addr value;
|
||||||
|
|
||||||
if (seg->size < rel->r_offset)
|
if (seg->size < rel->r_offset)
|
||||||
return grub_error (GRUB_ERR_BAD_MODULE,
|
return grub_error (GRUB_ERR_BAD_MODULE,
|
||||||
"reloc offset is out of the segment");
|
"reloc offset is out of the segment");
|
||||||
|
|
||||||
addr = (Elf64_Xword *) ((char *) seg->addr + rel->r_offset);
|
addr = (Elf64_Word *) ((char *) seg->addr + rel->r_offset);
|
||||||
sym = (Elf64_Sym *) ((char *) symtab
|
sym = (Elf64_Sym *) ((char *) symtab
|
||||||
+ entsize * ELF32_R_SYM (rel->r_info));
|
+ entsize * ELF64_R_SYM (rel->r_info));
|
||||||
|
|
||||||
/* On the PPC the value does not have an explicit
|
|
||||||
addend, add it. */
|
|
||||||
value = sym->st_value + rel->r_addend;
|
value = sym->st_value + rel->r_addend;
|
||||||
switch (ELF32_R_TYPE (rel->r_info))
|
switch (ELF64_R_TYPE (rel->r_info))
|
||||||
{
|
{
|
||||||
case R_PPC_ADDR16_LO:
|
case R_SPARC_32: /* 3 V-word32 */
|
||||||
*(Elf64_Half *) addr = value;
|
if (value & 0xFFFFFFFF00000000)
|
||||||
break;
|
return grub_error (GRUB_ERR_BAD_MODULE,
|
||||||
|
"Address out of 32 bits range");
|
||||||
case R_PPC_REL24:
|
*addr = value;
|
||||||
{
|
break;
|
||||||
Elf64_Sxword delta = value - (Elf64_Xword) addr;
|
case R_SPARC_WDISP30: /* 7 V-disp30 */
|
||||||
|
if (((value - (Elf64_Addr) addr) & 0xFFFFFFFF00000000) &&
|
||||||
if (delta << 6 >> 6 != delta)
|
((value - (Elf64_Addr) addr) & 0xFFFFFFFF00000000
|
||||||
return grub_error (GRUB_ERR_BAD_MODULE, "Relocation overflow");
|
!= 0xFFFFFFFF00000000))
|
||||||
*addr = (*addr & 0xfc000003) | (delta & 0x3fffffc);
|
return grub_error (GRUB_ERR_BAD_MODULE,
|
||||||
break;
|
"Displacement out of 30 bits range");
|
||||||
}
|
*addr = (*addr & 0xC0000000) |
|
||||||
|
(((grub_int32_t) ((value - (Elf64_Addr) addr) >> 2)) &
|
||||||
case R_PPC_ADDR16_HA:
|
0x3FFFFFFF);
|
||||||
*(Elf64_Half *) addr = (value + 0x8000) >> 16;
|
break;
|
||||||
break;
|
case R_SPARC_HI22: /* 9 V-imm22 */
|
||||||
|
if (((grub_int32_t) value) & 0xFF00000000)
|
||||||
case R_PPC_ADDR32:
|
return grub_error (GRUB_ERR_BAD_MODULE,
|
||||||
*addr = value;
|
"High address out of 22 bits range");
|
||||||
break;
|
*addr = (*addr & 0xFFC00000) | ((value >> 10) & 0x3FFFFF);
|
||||||
|
break;
|
||||||
case R_PPC_REL32:
|
case R_SPARC_LO10: /* 12 T-simm13 */
|
||||||
*addr = value - (Elf64_Xword) addr;
|
*addr = (*addr & 0xFFFFFC00) | (value & 0x3FF);
|
||||||
break;
|
break;
|
||||||
|
case R_SPARC_64: /* 32 V-xwords64 */
|
||||||
|
*(Elf64_Xword *) addr = value;
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
|
return grub_error (GRUB_ERR_NOT_IMPLEMENTED_YET,
|
||||||
"This relocation (%d) is not implemented yet",
|
"This relocation (%d) is not implemented yet",
|
||||||
ELF32_R_TYPE (rel->r_info));
|
ELF64_R_TYPE (rel->r_info));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue