Use private keyword on makefile target variables

This commit is contained in:
Justine Tunney 2022-08-10 18:00:45 -07:00
parent e015defa70
commit 7b993d561c
71 changed files with 305 additions and 314 deletions

View file

@ -44,7 +44,7 @@ $(LIBC_ALG_A).pkg: \
$(LIBC_ALG_A_OBJS) \
$(foreach x,$(LIBC_ALG_A_DIRECTDEPS),$($(x)_A).pkg)
o/$(MODE)/libc/alg/critbit0.o: \
o/$(MODE)/libc/alg/critbit0.o: private \
DEFAULT_CFLAGS += \
-ffunction-sections \
-fdata-sections

View file

@ -67,14 +67,14 @@ $(LIBC_CALLS_A).pkg: \
# we can't use asan because:
# ucontext_t memory is owned by xnu kernel
o/$(MODE)/libc/calls/sigenter-xnu.o: \
o/$(MODE)/libc/calls/sigenter-xnu.o: private \
OVERRIDE_COPTS += \
-ffreestanding \
-fno-sanitize=address
# we can't use asan because:
# vdso memory is owned by linux kernel
o/$(MODE)/libc/calls/vdsofunc.greg.o: \
o/$(MODE)/libc/calls/vdsofunc.greg.o: private \
OVERRIDE_COPTS += \
-ffreestanding \
-fno-sanitize=address
@ -82,7 +82,7 @@ o/$(MODE)/libc/calls/vdsofunc.greg.o: \
# we can't use asan because:
# asan guard pages haven't been allocated yet
o/$(MODE)/libc/calls/directmap.o \
o/$(MODE)/libc/calls/directmap-nt.o: \
o/$(MODE)/libc/calls/directmap-nt.o: private \
OVERRIDE_COPTS += \
-ffreestanding \
-fno-sanitize=address
@ -91,7 +91,7 @@ o/$(MODE)/libc/calls/directmap-nt.o: \
# ntspawn allocates 128kb of heap memory via win32
o/$(MODE)/libc/calls/ntspawn.o \
o/$(MODE)/libc/calls/mkntcmdline.o \
o/$(MODE)/libc/calls/mkntenvblock.o: \
o/$(MODE)/libc/calls/mkntenvblock.o: private \
OVERRIDE_COPTS += \
-ffreestanding \
-fno-sanitize=address
@ -99,7 +99,7 @@ o/$(MODE)/libc/calls/mkntenvblock.o: \
# we can't use sanitizers because:
# windows owns the data structure
o/$(MODE)/libc/calls/wincrash.o \
o/$(MODE)/libc/calls/ntcontext2linux.o: \
o/$(MODE)/libc/calls/ntcontext2linux.o: private \
OVERRIDE_COPTS += \
-fno-sanitize=all
@ -109,7 +109,7 @@ o/$(MODE)/libc/calls/sigenter-freebsd.o \
o/$(MODE)/libc/calls/sigenter-netbsd.o \
o/$(MODE)/libc/calls/sigenter-openbsd.o \
o/$(MODE)/libc/calls/sigenter-xnu.o \
o/$(MODE)/libc/calls/ntcontext2linux.o: \
o/$(MODE)/libc/calls/ntcontext2linux.o: private \
OVERRIDE_COPTS += \
-O3
@ -120,7 +120,7 @@ o/$(MODE)/libc/calls/execle.o \
o/$(MODE)/libc/calls/execlp.o \
o/$(MODE)/libc/calls/execve-sysv.o \
o/$(MODE)/libc/calls/execve-nt.greg.o \
o/$(MODE)/libc/calls/mkntenvblock.o: \
o/$(MODE)/libc/calls/mkntenvblock.o: private \
OVERRIDE_CPPFLAGS += \
-DSTACK_FRAME_UNLIMITED
@ -130,21 +130,21 @@ o/$(MODE)/libc/calls/copyfile.o \
o/$(MODE)/libc/calls/symlinkat-nt.o \
o/$(MODE)/libc/calls/readlinkat-nt.o \
o/$(MODE)/libc/calls/linkat-nt.o \
o/$(MODE)/libc/calls/renameat-nt.o: \
o/$(MODE)/libc/calls/renameat-nt.o: private \
OVERRIDE_CPPFLAGS += \
-DSTACK_FRAME_UNLIMITED
# we must segregate codegen because:
# file contains multiple independently linkable apis
o/$(MODE)/libc/calls/ioctl-siocgifconf.o \
o/$(MODE)/libc/calls/ioctl-siocgifconf-nt.o: \
o/$(MODE)/libc/calls/ioctl-siocgifconf-nt.o: private \
OVERRIDE_COPTS += \
-ffunction-sections \
-fdata-sections
# we want small code size because:
# to keep .text.head under 4096 bytes
o/$(MODE)/libc/calls/mman.greg.o: \
o/$(MODE)/libc/calls/mman.greg.o: private \
OVERRIDE_COPTS += \
-Os
@ -167,7 +167,7 @@ o//libc/calls/ioctl_tiocgwinsz-nt.o \
o//libc/calls/ioctl_tiocgwinsz.o \
o//libc/calls/ioctl_tiocswinsz-nt.o \
o//libc/calls/ioctl_tiocswinsz.o \
o//libc/calls/fcntl.o: \
o//libc/calls/fcntl.o: private \
OVERRIDE_CFLAGS += \
-Os
@ -175,7 +175,7 @@ o//libc/calls/fcntl.o: \
# it's early runtime mandatory and quite huge without it
o//libc/calls/getcwd.greg.o \
o//libc/calls/getcwd-nt.greg.o \
o//libc/calls/getcwd-xnu.greg.o: \
o//libc/calls/getcwd-xnu.greg.o: private \
OVERRIDE_CFLAGS += \
-Os
@ -184,12 +184,12 @@ o//libc/calls/getcwd-xnu.greg.o: \
o/$(MODE)/libc/calls/_timespec_tomillis.o \
o/$(MODE)/libc/calls/_timespec_tomicros.o \
o/$(MODE)/libc/calls/_timespec_frommillis.o \
o/$(MODE)/libc/calls/_timespec_frommicros.o: \
o/$(MODE)/libc/calls/_timespec_frommicros.o: private \
OVERRIDE_CFLAGS += \
-O2
o/$(MODE)/libc/calls/pledge-linux.o \
o/$(MODE)/libc/calls/unveil.o: \
o/$(MODE)/libc/calls/unveil.o: private \
OVERRIDE_CFLAGS += \
-DSTACK_FRAME_UNLIMITED
@ -197,7 +197,7 @@ o/$(MODE)/libc/calls/unveil.o: \
# it makes a big difference
# we need pic because:
# so it can be an LD_PRELOAD payload
o/$(MODE)/libc/calls/pledge-linux.o: \
o/$(MODE)/libc/calls/pledge-linux.o: private \
OVERRIDE_CFLAGS += \
-Os \
-fPIC

View file

@ -54,14 +54,14 @@ $(LIBC_FMT_A).pkg: \
$(LIBC_FMT_A_OBJS) \
$(foreach x,$(LIBC_FMT_A_DIRECTDEPS),$($(x)_A).pkg)
$(LIBC_FMT_A_OBJS): \
$(LIBC_FMT_A_OBJS): private \
OVERRIDE_CFLAGS += \
-fno-jump-tables
o/$(MODE)/libc/fmt/formatint64.o \
o/$(MODE)/libc/fmt/formatint64thousands.o \
o/$(MODE)/libc/fmt/dosdatetimetounix.o \
o/$(MODE)/libc/fmt/itoa64radix10.greg.o: \
o/$(MODE)/libc/fmt/itoa64radix10.greg.o: private\
OVERRIDE_CFLAGS += \
-O3
@ -73,7 +73,7 @@ o/$(MODE)/libc/fmt/wcstoul.o \
o/$(MODE)/libc/fmt/strtoimax.o \
o/$(MODE)/libc/fmt/strtoumax.o \
o/$(MODE)/libc/fmt/wcstoimax.o \
o/$(MODE)/libc/fmt/wcstoumax.o: \
o/$(MODE)/libc/fmt/wcstoumax.o: private \
OVERRIDE_CFLAGS += \
-Os
@ -81,7 +81,7 @@ o/$(MODE)/libc/fmt/wcstoumax.o: \
# kprintf() depends on these functions
o/$(MODE)/libc/fmt/strerrno.greg.o \
o/$(MODE)/libc/fmt/strerrdoc.greg.o \
o/$(MODE)/libc/fmt/strerror_wr.greg.o: \
o/$(MODE)/libc/fmt/strerror_wr.greg.o: private \
OVERRIDE_CFLAGS += \
-fpie \
-ffreestanding \

View file

@ -46,12 +46,12 @@ $(LIBC_INTRIN_A).pkg: \
# we can't use asan and ubsan because:
# this is asan and ubsan
o/$(MODE)/libc/intrin/asan.o \
o/$(MODE)/libc/intrin/ubsan.o: \
o/$(MODE)/libc/intrin/ubsan.o: private \
OVERRIDE_CFLAGS += \
-fno-sanitize=all \
-fno-stack-protector
o/$(MODE)/libc/intrin/asan.o: \
o/$(MODE)/libc/intrin/asan.o: private \
OVERRIDE_CFLAGS += \
-O2 \
-finline \
@ -63,7 +63,7 @@ o/$(MODE)/libc/intrin/getmagnumstr.greg.o \
o/$(MODE)/libc/intrin/strerrno.greg.o \
o/$(MODE)/libc/intrin/strerrdoc.greg.o \
o/$(MODE)/libc/intrin/strerror_wr.greg.o \
o/$(MODE)/libc/intrin/kprintf.greg.o: \
o/$(MODE)/libc/intrin/kprintf.greg.o: private \
OVERRIDE_CFLAGS += \
-fpie \
-fwrapv \
@ -84,7 +84,7 @@ o/$(MODE)/libc/intrin/pthread_mutex_wake.o \
o/$(MODE)/libc/intrin/pthread_mutex_unlock.o \
o/$(MODE)/libc/intrin/pthread_mutex_trylock.o \
o/$(MODE)/libc/intrin/_trylock_debug_4.o \
o/$(MODE)/libc/intrin/_spinlock_debug_4.o: \
o/$(MODE)/libc/intrin/_spinlock_debug_4.o: private \
OVERRIDE_CFLAGS += \
-fwrapv \
-x-no-pg \
@ -97,7 +97,7 @@ o/$(MODE)/libc/intrin/_spinlock_debug_4.o: \
# we can't use asan because:
# global gone could be raised
o/$(MODE)/libc/intrin/exit.o \
o/$(MODE)/libc/intrin/restorewintty.o: \
o/$(MODE)/libc/intrin/restorewintty.o: private \
OVERRIDE_CFLAGS += \
-fno-sanitize=all
@ -106,7 +106,7 @@ o/$(MODE)/libc/intrin/restorewintty.o: \
o/$(MODE)/libc/intrin/describeflags.o \
o/$(MODE)/libc/intrin/describeframe.o \
o/$(MODE)/libc/intrin/describemapflags.o \
o/$(MODE)/libc/intrin/describeprotflags.o: \
o/$(MODE)/libc/intrin/describeprotflags.o: private \
OVERRIDE_CFLAGS += \
-fno-sanitize=address
@ -145,7 +145,7 @@ o/$(MODE)/libc/intrin/createfilemapping.o \
o/$(MODE)/libc/intrin/createfilemappingnuma.o \
o/$(MODE)/libc/intrin/waitformultipleobjects.o \
o/$(MODE)/libc/intrin/generateconsolectrlevent.o \
o/$(MODE)/libc/intrin/wsawaitformultipleevents.o: \
o/$(MODE)/libc/intrin/wsawaitformultipleevents.o: private\
OVERRIDE_CFLAGS += \
-Os \
-fwrapv \
@ -153,20 +153,20 @@ o/$(MODE)/libc/intrin/wsawaitformultipleevents.o: \
-fno-stack-protector \
-fno-sanitize=all
o//libc/intrin/memmove.o: \
o//libc/intrin/memmove.o: private \
OVERRIDE_CFLAGS += \
-fno-toplevel-reorder
o//libc/intrin/bzero.o \
o//libc/intrin/memcmp.o \
o//libc/intrin/memset.o \
o//libc/intrin/memmove.o: \
o//libc/intrin/memmove.o: private \
OVERRIDE_CFLAGS += \
-O2 -finline
o/$(MODE)/libc/intrin/bzero.o \
o/$(MODE)/libc/intrin/memcmp.o \
o/$(MODE)/libc/intrin/memmove.o: \
o/$(MODE)/libc/intrin/memmove.o: private \
OVERRIDE_CFLAGS += \
-fpie

View file

@ -60,11 +60,11 @@ $(LIBC_LOG_A).pkg: \
$(foreach x,$(LIBC_LOG_A_DIRECTDEPS),$($(x)_A).pkg)
o/$(MODE)/libc/log/backtrace2.o \
o/$(MODE)/libc/log/backtrace3.o: \
o/$(MODE)/libc/log/backtrace3.o: private \
OVERRIDE_CFLAGS += \
-fno-sanitize=all
o/$(MODE)/libc/log/checkfail.o: \
o/$(MODE)/libc/log/checkfail.o: private \
OVERRIDE_CFLAGS += \
-mgeneral-regs-only
@ -78,7 +78,7 @@ o/$(MODE)/libc/log/onkill.o \
o/$(MODE)/libc/log/startfatal.o \
o/$(MODE)/libc/log/startfatal_ndebug.o \
o/$(MODE)/libc/log/ubsan.o \
o/$(MODE)/libc/log/die.o: \
o/$(MODE)/libc/log/die.o: private \
OVERRIDE_CFLAGS += \
$(NO_MAGIC)

View file

@ -42,7 +42,7 @@ $(LIBC_NEXGEN32E_A).pkg: \
$(LIBC_NEXGEN32E_A_OBJS) \
$(foreach x,$(LIBC_NEXGEN32E_A_DIRECTDEPS),$($(x)_A).pkg)
o/$(MODE)/libc/nexgen32e/threaded.o: \
o/$(MODE)/libc/nexgen32e/threaded.o: private \
OVERRIDE_CFLAGS += \
$(NO_MAGIC) \
-fno-sanitize=all

View file

@ -45,7 +45,7 @@ $(LIBC_RAND_A).pkg: \
$(LIBC_RAND_A_OBJS) \
$(foreach x,$(LIBC_RAND_A_DIRECTDEPS),$($(x)_A).pkg)
o/$(MODE)/libc/rand/mt19937-64.o: \
o/$(MODE)/libc/rand/mt19937-64.o: private \
OVERRIDE_CFLAGS += \
-ffunction-sections

View file

@ -63,7 +63,7 @@ $(LIBC_RUNTIME_A).pkg: \
# asan and ubsan can be function traced
# we can't use function tracing because:
# this is the function tracing runtime
o/$(MODE)/libc/runtime/ftracer.o: \
o/$(MODE)/libc/runtime/ftracer.o: private \
OVERRIDE_CFLAGS += \
-x-no-pg \
-mno-fentry \
@ -88,7 +88,7 @@ o/$(MODE)/libc/runtime/print.greg.o \
o/$(MODE)/libc/runtime/stackchkfail.o \
o/$(MODE)/libc/runtime/stackchkfaillocal.o \
o/$(MODE)/libc/runtime/winmain.greg.o \
o/$(MODE)/libc/runtime/opensymboltable.o: \
o/$(MODE)/libc/runtime/opensymboltable.o: private \
OVERRIDE_CFLAGS += \
-Os \
-ffreestanding \
@ -96,11 +96,11 @@ o/$(MODE)/libc/runtime/opensymboltable.o: \
# must use alloca()
# can't use asan or any runtime services
o/$(MODE)/libc/runtime/fork-nt.o: \
o/$(MODE)/libc/runtime/fork-nt.o: private \
OVERRIDE_CPPFLAGS += \
-DSTACK_FRAME_UNLIMITED
o/$(MODE)/libc/runtime/qsort.o: \
o/$(MODE)/libc/runtime/qsort.o: private \
OVERRIDE_CFLAGS += \
-Og
@ -108,11 +108,11 @@ o/$(MODE)/libc/runtime/qsort.o: \
o//libc/runtime/mmap.o \
o//libc/runtime/munmap.o \
o//libc/runtime/memtrack.greg.o \
o//libc/runtime/opensymboltable.greg.o: \
o//libc/runtime/opensymboltable.greg.o: private \
OVERRIDE_CFLAGS += \
-Os
o/$(MODE)/libc/runtime/ftrace.greg.o: \
o/$(MODE)/libc/runtime/ftrace.greg.o: private \
OVERRIDE_CFLAGS += \
-mgeneral-regs-only

View file

@ -51,11 +51,11 @@ $(LIBC_STDIO_A).pkg: \
$(LIBC_STDIO_A_OBJS) \
$(foreach x,$(LIBC_STDIO_A_DIRECTDEPS),$($(x)_A).pkg)
o/$(MODE)/libc/stdio/fputc.o: \
o/$(MODE)/libc/stdio/fputc.o: private \
OVERRIDE_CFLAGS += \
-O3
o//libc/stdio/appendw.o: \
o//libc/stdio/appendw.o: private \
OVERRIDE_CFLAGS += \
-Os

View file

@ -45,11 +45,11 @@ $(LIBC_STR_A).pkg: \
$(LIBC_STR_A_OBJS) \
$(foreach x,$(LIBC_STR_A_DIRECTDEPS),$($(x)_A).pkg)
o/$(MODE)/libc/str/memmem.o: \
o/$(MODE)/libc/str/memmem.o: private \
OVERRIDE_CPPFLAGS += \
-DSTACK_FRAME_UNLIMITED
o/$(MODE)/libc/str/dosdatetimetounix.o: \
o/$(MODE)/libc/str/dosdatetimetounix.o: private \
OVERRIDE_CFLAGS += \
-O3
@ -64,14 +64,14 @@ o/$(MODE)/libc/str/getzipcfileoffset.o \
o/$(MODE)/libc/str/getzipcfileuncompressedsize.o \
o/$(MODE)/libc/str/getziplfilecompressedsize.o \
o/$(MODE)/libc/str/getziplfileuncompressedsize.o \
o/$(MODE)/libc/str/getzipcfiletimestamps.o: \
o/$(MODE)/libc/str/getzipcfiletimestamps.o: private \
OVERRIDE_CFLAGS += \
-Os
o/$(MODE)/libc/str/iswpunct.o \
o/$(MODE)/libc/str/iswupper.o \
o/$(MODE)/libc/str/iswlower.o \
o/$(MODE)/libc/str/iswseparator.o: \
o/$(MODE)/libc/str/iswseparator.o: private \
OVERRIDE_CFLAGS += \
-fno-jump-tables
@ -82,16 +82,16 @@ o/$(MODE)/libc/str/windowsdurationtotimespec.o \
o/$(MODE)/libc/str/timevaltowindowstime.o \
o/$(MODE)/libc/str/timespectowindowstime.o \
o/$(MODE)/libc/str/windowstimetotimeval.o \
o/$(MODE)/libc/str/windowstimetotimespec.o: \
o/$(MODE)/libc/str/windowstimetotimespec.o: private \
OVERRIDE_CFLAGS += \
-O2
# we can't use compiler magic because:
# kprintf() depends on these functions
o/$(MODE)/libc/fmt/strsignal.greg.o: \
OVERRIDE_CFLAGS += \
-fpie \
-ffreestanding \
o/$(MODE)/libc/fmt/strsignal.greg.o: private \
OVERRIDE_CFLAGS += \
-fpie \
-ffreestanding \
$(NO_MAGIC)
LIBC_STR_LIBS = $(foreach x,$(LIBC_STR_ARTIFACTS),$($(x)))

View file

@ -46,7 +46,7 @@ $(LIBC_THREAD_A).pkg: \
$(LIBC_THREAD_A_OBJS) \
$(foreach x,$(LIBC_THREAD_A_DIRECTDEPS),$($(x)_A).pkg)
o/tinylinux/libc/thread/clone.o: \
o/tinylinux/libc/thread/clone.o: private \
OVERRIDE_CFLAGS += \
-ffunction-sections

View file

@ -53,16 +53,16 @@ $(LIBC_TIME_A).pkg: \
$(LIBC_TIME_A_OBJS) \
$(foreach x,$(LIBC_TIME_A_DIRECTDEPS),$($(x)_A).pkg)
o/$(MODE)/libc/time/strftime.o: \
o/$(MODE)/libc/time/strftime.o: private \
OVERRIDE_CFLAGS += \
-fno-jump-tables
o/$(MODE)/libc/time/localtime.o: \
o/$(MODE)/libc/time/localtime.o: private \
OVERRIDE_CFLAGS += \
-fdata-sections \
-ffunction-sections
o/$(MODE)/libc/time/now.o: \
o/$(MODE)/libc/time/now.o: private \
OVERRIDE_CFLAGS += \
-O3

View file

@ -44,7 +44,7 @@ $(LIBC_TINYMATH_A).pkg: \
o/$(MODE)/libc/tinymath/cpow.o \
o/$(MODE)/libc/tinymath/cpowf.o \
o/$(MODE)/libc/tinymath/cpowl.o \
o/$(MODE)/libc/tinymath/powfin.o : \
o/$(MODE)/libc/tinymath/powfin.o : private \
OVERRIDE_CFLAGS += \
-ffast-math