Skip to content
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.

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

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
[submodule "deps/acpica"]
path = deps/acpica
url = ../acpica
url = [email protected]:ani-sinha/bits-acpica.git
branch = bits
fetchRecurseSubmodules = true
[submodule "deps/fdlibm"]
path = deps/fdlibm
url = ../fdlibm
url = [email protected]:ani-sinha/bits-fdlibm.git
branch = bits
fetchRecurseSubmodules = true
[submodule "deps/grub"]
path = deps/grub
url = ../grub
url = [email protected]:ani-sinha/bits-grub.git
branch = bits
fetchRecurseSubmodules = true
[submodule "deps/libffi"]
path = deps/libffi
url = ../libffi
url = [email protected]:ani-sinha/bits-libffi.git
branch = bits
fetchRecurseSubmodules = true
[submodule "deps/python"]
path = deps/python
url = ../python
url = [email protected]:ani-sinha/bits-python.git
branch = bits
fetchRecurseSubmodules = true
2 changes: 1 addition & 1 deletion deps/fdlibm
Submodule fdlibm updated 2 files
+6 −5 e_asin.c
+2 −1 k_rem_pio2.c
2 changes: 1 addition & 1 deletion deps/libffi
Submodule libffi updated 2 files
+1 −0 src/x86/ffi.c
+1 −0 src/x86/ffi64.c
2 changes: 1 addition & 1 deletion rc/python/Makefile.core.def
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
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