diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2023-09-08 03:17:54 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-08 20:17:54 +1000 |
| commit | c8304925da305f5d8fa43fc4ca93f95afd36bcab (patch) | |
| tree | 20484e4f173112001523d851bedceab8d9cfad2e /tools/fado | |
| parent | 4fa13e4132cf8adb2f07bb34927e62e525c8cc79 (diff) | |
Subrepo Updates (#1368)
* git subrepo pull --force tools/asm-processor
subrepo:
subdir: "tools/asm-processor"
merged: "fed1e3ddb"
upstream:
origin: "git@github.com:simonlindholm/asm-processor.git"
branch: "main"
commit: "fed1e3ddb"
git-subrepo:
version: "0.4.6"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "110b9eb"
* git subrepo pull tools/asm-differ
subrepo:
subdir: "tools/asm-differ"
merged: "4ed847317"
upstream:
origin: "https://github.com/simonlindholm/asm-differ"
branch: "main"
commit: "4ed847317"
git-subrepo:
version: "0.4.6"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "110b9eb"
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "7f398831f"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "7f398831f"
git-subrepo:
version: "0.4.6"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "110b9eb"
* git subrepo pull (merge) --force tools/fado
subrepo:
subdir: "tools/fado"
merged: "8ce048376"
upstream:
origin: "git@github.com:EllipticEllipsis/fado.git"
branch: "master"
commit: "8ce048376"
git-subrepo:
version: "0.4.6"
origin: "git@github.com:ingydotnet/git-subrepo.git"
commit: "110b9eb"
Diffstat (limited to 'tools/fado')
| -rw-r--r-- | tools/fado/.gitrepo | 6 | ||||
| -rw-r--r-- | tools/fado/Makefile | 2 | ||||
| -rw-r--r-- | tools/fado/include/mips_elf.h | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tools/fado/.gitrepo b/tools/fado/.gitrepo index 042b904f1..f88c42275 100644 --- a/tools/fado/.gitrepo +++ b/tools/fado/.gitrepo @@ -6,7 +6,7 @@ [subrepo] remote = git@github.com:EllipticEllipsis/fado.git branch = master - commit = 8d896ee97d565508755584803c409fc33bb0c953 - parent = b51c9f4d22d6e7db63700c163418654431a2a61a + commit = 8ce0483766e2857c6f2997880ab7a5381b2cc5c3 + parent = aa8be27d62d8485c61f88889faf6132e4f66590b method = merge - cmdver = 0.4.3 + cmdver = 0.4.6 diff --git a/tools/fado/Makefile b/tools/fado/Makefile index 135f51251..8f61a209e 100644 --- a/tools/fado/Makefile +++ b/tools/fado/Makefile @@ -57,7 +57,7 @@ clean: $(RM) -r build $(ELF) format: - clang-format-11 -i $(C_FILES) $(H_FILES) lib/fairy/* + clang-format-14 -i $(C_FILES) $(H_FILES) lib/fairy/* .PHONY: all clean format diff --git a/tools/fado/include/mips_elf.h b/tools/fado/include/mips_elf.h index 122e98d25..f76a69b79 100644 --- a/tools/fado/include/mips_elf.h +++ b/tools/fado/include/mips_elf.h @@ -476,9 +476,9 @@ typedef struct { /* Relocation table entry with addend (in section of type SHT_RELA). */ typedef struct { - Elf32_Addr r_offset; /* Address */ - Elf32_Word r_info; /* Relocation type and symbol index */ - Elf32_Sword r_addend; /* Addend */ + Elf32_Addr r_offset; /* Address */ + Elf32_Word r_info; /* Relocation type and symbol index */ + Elf32_Sword r_addend; /* Addend */ } Elf32_Rela; /* How to extract and insert information held in the r_info field. */ |