From c6ceaac1afd70ea418c64be83de2784d3a1b488b Mon Sep 17 00:00:00 2001 From: George Koehler Date: Tue, 23 Jan 2018 13:55:39 -0500 Subject: [PATCH] Make osx386 and osxppc use _hol0.s like the other platforms. Because I'm lazy, I didn't make another copy of _hol0.s; I am building plat/linux/libsys/_hol0.s for OS X. --- plat/osx386/boot.s | 2 -- plat/osx386/libsys/build.lua | 1 + plat/osxppc/boot.s | 2 -- plat/osxppc/libsys/build.lua | 1 + 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/plat/osx386/boot.s b/plat/osx386/boot.s index 932a716e9..c10045dd6 100644 --- a/plat/osx386/boot.s +++ b/plat/osx386/boot.s @@ -58,8 +58,6 @@ begdata: .sect .bss begbss: -.define hol0 -.comm hol0, 8 ! line number and filename (for debugging) .define _errno .comm _errno, 4 ! Posix errno storage diff --git a/plat/osx386/libsys/build.lua b/plat/osx386/libsys/build.lua index 6a5b0e58c..3c2e96c3a 100644 --- a/plat/osx386/libsys/build.lua +++ b/plat/osx386/libsys/build.lua @@ -19,6 +19,7 @@ acklibrary { "./sigaction.s", "./stat.s", "./write.s", + "plat/linux/libsys/_hol0.s", "plat/linux386/libsys/trapno.s", "plat/osx/libsys/brk.c", "plat/osx/libsys/creat.c", diff --git a/plat/osxppc/boot.s b/plat/osxppc/boot.s index 1517ee377..8b1b7ab75 100644 --- a/plat/osxppc/boot.s +++ b/plat/osxppc/boot.s @@ -49,8 +49,6 @@ begdata: .sect .bss begbss: -.define hol0 -.comm hol0, 8 ! line number and filename (for debugging) .define _errno .comm _errno, 4 ! Posix errno storage diff --git a/plat/osxppc/libsys/build.lua b/plat/osxppc/libsys/build.lua index 49fc0c934..cff10f29b 100644 --- a/plat/osxppc/libsys/build.lua +++ b/plat/osxppc/libsys/build.lua @@ -19,6 +19,7 @@ acklibrary { "./sigaction.s", "./stat.s", "./write.s", + "plat/linux/libsys/_hol0.s", "plat/osx/libsys/brk.c", "plat/osx/libsys/creat.c", "plat/osx/libsys/isatty.c",