c18n: Add -DCHERI_LIB_C18N to CFLAGS for everything in lib/c18n

CTSRD-CHERI · Sep 8, 2024 · a86c9e4 · a86c9e4
1 parent c1d42dc
commit a86c9e4
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 12 deletions.
diff --git a/lib/c18n/Makefile.inc b/lib/c18n/Makefile.inc
@@ -3,4 +3,6 @@ CHERI_LIB_C18N=yes
 SHLIBDIR=       /usr/lib${COMPAT_libcompat:U}/c18n
 LIBDIR=         /usr/lib${COMPAT_libcompat:U}/c18n
 
+CFLAGS+=-DCHERI_LIB_C18N
+
 .include "../Makefile.inc"
diff --git a/lib/libc/Makefile b/lib/libc/Makefile
@@ -66,10 +66,6 @@ CANCELPOINTS_CFLAGS=-fexceptions
 CFLAGS+=${CANCELPOINTS_CFLAGS}
 .endif
 
-.ifdef CHERI_LIB_C18N
-CFLAGS+=-DCHERI_LIB_C18N
-.endif
-
 # Use a more efficient TLS model for libc since we can reasonably assume that
 # it will be loaded during program startup.
 CFLAGS+= -ftls-model=initial-exec

diff --git a/lib/libsys/Makefile b/lib/libsys/Makefile
@@ -41,10 +41,6 @@ PRECIOUSLIB=
 # it will be loaded during program startup.
 CFLAGS+= -ftls-model=initial-exec
 
-.ifdef CHERI_LIB_C18N
-CFLAGS+=-DCHERI_LIB_C18N
-.endif
-
 #
 # Link with static libcompiler_rt.a.
 #

diff --git a/lib/libthr/Makefile b/lib/libthr/Makefile
@@ -59,10 +59,6 @@ CFLAGS+=-fexceptions
 CFLAGS+=-D_PTHREAD_FORCED_UNWIND
 .endif
 
-.ifdef CHERI_LIB_C18N
-CFLAGS+=-DCHERI_LIB_C18N
-.endif
-
 LDFLAGS+=-Wl,-znodelete
 LDFLAGS+=-Wl,--auxiliary,libsys.so.7