Skip to content

bits: changes required in order to build on a newer gcc compiler 9.4 #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

bits: changes required in order to build on a newer gcc compiler 9.4 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3cfe27c
compat: fix bug around indentation
ani-sinha May 29, 2022
08dd543
python: do not error out on incompatible function pointer casts
ani-sinha May 31, 2022
a2ef659
updating submodule heads to point to my own fork
ani-sinha Jun 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
[submodule "deps/acpica"]
path = deps/acpica
url = ../acpica
url = git@github.com:ani-sinha/bits-acpica.git
branch = bits
fetchRecurseSubmodules = true
[submodule "deps/fdlibm"]
path = deps/fdlibm
url = ../fdlibm
url = git@github.com:ani-sinha/bits-fdlibm.git
branch = bits
fetchRecurseSubmodules = true
[submodule "deps/grub"]
path = deps/grub
url = ../grub
url = git@github.com:ani-sinha/bits-grub.git
branch = bits
fetchRecurseSubmodules = true
[submodule "deps/libffi"]
path = deps/libffi
url = ../libffi
url = git@github.com:ani-sinha/bits-libffi.git
branch = bits
fetchRecurseSubmodules = true
[submodule "deps/python"]
path = deps/python
url = ../python
url = git@github.com:ani-sinha/bits-python.git
branch = bits
fetchRecurseSubmodules = true
2 changes: 1 addition & 1 deletion deps/fdlibm
Open in desktop
Submodule fdlibm updated 2 files
+6 −5 e_asin.c
+2 −1 k_rem_pio2.c
2 changes: 1 addition & 1 deletion deps/grub
Open in desktop
Submodule grub updated 39 files
+1 −1 acinclude.m4
+1 −1 conf/Makefile.common
+2 −2 configure.ac
+1 −1 gentpl.py
+10 −10 grub-core/Makefile.core.def
+4 −4 grub-core/commands/efi/acpi.c
+1 −1 grub-core/commands/efi/loadbios.c
+1 −0 grub-core/commands/hdparm.c
+1 −0 grub-core/disk/cryptodisk.c
+2 −0 grub-core/disk/diskfilter.c
+3 −0 grub-core/disk/efi/efidisk.c
+1 −0 grub-core/efiemu/mm.c
+2 −0 grub-core/font/font.c
+9 −2 grub-core/fs/btrfs.c
+1 −0 grub-core/fs/udf.c
+1 −0 grub-core/gdb/cstub.c
+1 −1 grub-core/gnulib/regexec.c
+1 −1 grub-core/kern/misc.c
+1 −0 grub-core/lib/legacy_parse.c
+2 −0 grub-core/lib/xzembed/xz_dec_lzma2.c
+8 −0 grub-core/lib/xzembed/xz_dec_stream.c
+3 −0 grub-core/loader/i386/linux.c
+3 −0 grub-core/loader/i386/pc/linux.c
+1 −1 grub-core/loader/i386/xnu.c
+3 −0 grub-core/mmap/efi/mmap.c
+1 −0 grub-core/normal/charset.c
+1 −0 grub-core/script/yylex.l
+1 −0 grub-core/video/bochs.c
+1 −0 grub-core/video/cirrus.c
+2 −0 grub-core/video/i386/pc/vbe.c
+1 −0 grub-core/video/readers/jpeg.c
+1 −1 include/grub/acpi.h
+15 −6 include/grub/efi/api.h
+2 −2 include/grub/efiemu/efiemu.h
+1 −1 include/grub/efiemu/runtime.h
+1 −1 include/grub/gpt_partition.h
+1 −0 util/getroot.c
+2 −0 util/grub-mkimagexx.c
+1 −0 util/raid.c
2 changes: 1 addition & 1 deletion deps/libffi
Open in desktop
Submodule libffi updated 2 files
+1 −0 src/x86/ffi.c
+1 −0 src/x86/ffi64.c
2 changes: 1 addition & 1 deletion deps/python
Open in desktop
Submodule python updated 11 files
+2 −2 Include/pymem.h
+3 −0 Modules/_ctypes/_ctypes.c
+4 −0 Modules/zlib/inflate.c
+1 −0 Objects/stringobject.c
+3 −0 Objects/unicodeobject.c
+4 −1 Python/ast.c
+9 −0 Python/ceval.c
+6 −0 Python/compile.c
+12 −0 Python/dtoa.c
+3 −0 Python/getargs.c
+3 −0 configure.ac
2 changes: 1 addition & 1 deletion rc/python/Makefile.core.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
module = {
name = python;
cppflags = '-I$(top_srcdir)/contrib/python -I$(srcdir)/contrib-deps/python/Include -D_IEEE_LIBM -D__LITTLE_ENDIAN= -I$(srcdir)/contrib-deps/fdlibm $(CONTRIB_CPPFLAGS) -include contrib/acpica/acenv.h -DGRUB2 -DACPI_LIBRARY -I$(top_srcdir)/contrib/acpica -I$(srcdir)/contrib-deps/acpica/source/include -U__ELF__ -I$(srcdir)/contrib-deps/libffi/include -I$(srcdir)/contrib-deps/libffi/src/x86 -I$(srcdir)/contrib-deps/python/Modules/zlib';
cflags = '$(CONTRIB_CFLAGS) -fshort-wchar -maccumulate-outgoing-args -Wno-empty-body -Wno-float-equal -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-missing-declarations -Wno-missing-format-attribute -Wno-missing-noreturn -Wno-missing-prototypes -Wno-nested-externs -Wno-old-style-definition -Wno-parentheses -Wno-redundant-decls -Wno-sign-compare -Wno-shadow -Wno-shift-negative-value -Wno-type-limits -Wno-undef -Wno-uninitialized -Wno-unused -Wno-unused-parameter -Wno-unused-value -Wno-unused-variable -Wno-write-strings';
cflags = '$(CONTRIB_CFLAGS) -fshort-wchar -Wno-cast-function-type -maccumulate-outgoing-args -Wno-empty-body -Wno-float-equal -Wno-maybe-uninitialized -Wno-missing-field-initializers -Wno-missing-declarations -Wno-missing-format-attribute -Wno-missing-noreturn -Wno-missing-prototypes -Wno-nested-externs -Wno-old-style-definition -Wno-parentheses -Wno-redundant-decls -Wno-sign-compare -Wno-shadow -Wno-shift-negative-value -Wno-type-limits -Wno-undef -Wno-uninitialized -Wno-unused -Wno-unused-parameter -Wno-unused-value -Wno-unused-variable -Wno-write-strings';
enable = i386_pc;
enable = i386_efi;
enable = x86_64_efi;
Expand Down
4 changes: 2 additions & 2 deletions rc/python/compat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,10 +417,10 @@ off_t lseek(int fd, off_t offset, int whence)
{
grub_file_t file;

if (fd >= 0 && fd < 3)
if (fd >= 0 && fd < 3) {
grub_printf("Internal error: Python attempted to seek on stdin, stdout, or stderr.\n");
return (off_t)-1;

}
file = fd_to_file(fd);
if (!file)
return (off_t)-1;
Expand Down