From b53620852a5b8ccd6eb90dad129105e5f193b591 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Fri, 30 Jul 2021 17:46:35 -0700 Subject: [PATCH] Clean up makefile fragments for FreeBSD on 386 * Add LOCK_X_UPDATES * Increase optimization level to -O2 and adjust -g option * Add makefile-init-freebsd.386 in order to do loadups --- bin/makefile-freebsd.386-x | 4 ++-- bin/makefile-init-freebsd.386 | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 bin/makefile-init-freebsd.386 diff --git a/bin/makefile-freebsd.386-x b/bin/makefile-freebsd.386-x index 1187c8b..69c113b 100644 --- a/bin/makefile-freebsd.386-x +++ b/bin/makefile-freebsd.386-x @@ -13,10 +13,10 @@ XFILES = $(OBJECTDIR)xmkicon.o \ $(OBJECTDIR)xwinman.o -XFLAGS = -I/usr/local/include -DXWINDOW +XFLAGS = -I/usr/local/include -DXWINDOW -DLOCK_X_UPDATES # OPTFLAGS is normally -O2. -OPTFLAGS = -O1 -gdwarf-2 +OPTFLAGS = -O2 -g DFLAGS = $(XFLAGS) -DRELEASE=351 LDFLAGS = -L/usr/local/lib -lX11 -lc -lm diff --git a/bin/makefile-init-freebsd.386 b/bin/makefile-init-freebsd.386 new file mode 100644 index 0000000..43ef0f6 --- /dev/null +++ b/bin/makefile-init-freebsd.386 @@ -0,0 +1,27 @@ +# Options for FreeBSD, Intel 386/486 and X Windows + +CC = clang -m32 $(CLANG_CFLAGS) + +XFILES = $(OBJECTDIR)xmkicon.o \ + $(OBJECTDIR)xbbt.o \ + $(OBJECTDIR)dspif.o \ + $(OBJECTDIR)xinit.o \ + $(OBJECTDIR)xscroll.o \ + $(OBJECTDIR)xcursor.o \ + $(OBJECTDIR)xlspwin.o \ + $(OBJECTDIR)xrdopt.o \ + $(OBJECTDIR)xwinman.o + + +XFLAGS = -I/usr/local/include -DXWINDOW -DLOCK_X_UPDATES + +# OPTFLAGS is normally -O0 for init +OPTFLAGS = -O0 -g +DFLAGS = $(XFLAGS) -DRELEASE=351 -DNOVERSION -DINIT + +LDFLAGS = -L/usr/local/lib -lX11 -lc -lm +LDELDFLAGS = -L/usr/local/lib -lX11 -lc -lm + +OBJECTDIR = ../$(RELEASENAME)/ + +default : ../$(OSARCHNAME)/ldeinit