Merge remote-tracking branch 'origin/nasm-3.00.xx'

Author: H. Peter Anvin

.github/workflows/test.yml

@@ -0,0 +1,37 @@
+name: NASM CI/CD
+
+on:
+  push:
+    branches: [ "*" ]
+  pull_request:
+    branches: [ "*" ]
+
+jobs:
+  build:
+    name: Build and test
+    runs-on: ubuntu-latest
+
+    container:
+      image: ubuntu:24.04
+
+    steps:
+      - name: Install dependencies
+        run: |
+          apt-get update && apt-get install -y automake perl python3 build-essential
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Prepare build system
+        run: |
+          sh autogen.sh
+          sh configure
+
+      - name: Build
+        run: |
+          make
+          ./nasm --version
+
+      - name: Run travis tests
+        run: |
+          make travis

Makefile.in

@@ -103,9 +103,12 @@ endif
 .SUFFIXES:
 .SUFFIXES: $(X) .$(O) .$(A) .xml .1 .c .i .s .txt .time
 
+# Use to mark phony targets in global lists
+PHONY =
+
 .PHONY: all doc misc install clean distclean cleaner spotless test
-.PHONY: install_doc everything install_everything strip perlreq dist tags TAGS
-.PHONY: nothing manpages nsis editors
+.PHONY: install_doc everything install_everything strip perlreq warnings
+.PHONY: dist tags TAGS nothing manpages nsis editors
 
 .c.$(O):
 	$(CC) -c $(ALL_CFLAGS) -o $@ $<
@@ -131,7 +134,7 @@ NDISASM = disasm/ndisasm.$(O)
 PROGOBJ = $(NASM) $(NDISASM)
 PROGS   = nasm$(X) ndisasm$(X)
 
-# Files dependent on extracted warnings
+# Files dependent on warnings.dat
 WARNOBJ   = asm/warnings.$(O)
 WARNFILES = asm/warnings_c.h include/warnings.h doc/warnings.src
 
@@ -257,11 +260,8 @@ ndisasm$(X): $(NDISASM) $(MANIFEST) $(DISLIB) $(NASMLIB)
 	$(CC) $(ALL_LDFLAGS) -o $@ $(NDISASM) $(MANIFEST) \
 		$(DISLIB) $(NASMLIB) $(LIBS)
 
-# These are specific to certain Makefile syntaxes...
-WARNSRCS  = $(ALLOBJ_W:.$(O)=.c)
-
 # Make sure we have subdirectories set up...
-$(LIBOBJ) $(LIBOBJ_DIS) $(WARNTIMES) $(WARNSRCS): $(DIRS)
+$(LIBOBJ) $(LIBOBJ_DIS): $(DIRS)
 
 #-- Begin Generated File Rules --#
 
@@ -399,58 +399,27 @@ editors/nasmtok.json: editors/nasmtok.pl asm/tokhash.c asm/pptok.c \
 		 version.mak
 	$(RUNPERL) $(srcdir)/editors/nasmtok.pl -json $@ $(srcdir) $(objdir)
 
-editors: $(EDITORS)
-
-#-- End Generated File Rules --#
-
-# Extract warnings from source code. This is done automatically if any
-# C files have changed; the script is fast enough that that is
-# reasonable, but doesn't update the time stamp if the files aren't
-# changed, to avoid rebuilding everything every time. Track the actual
-# dependency by the empty file asm/warnings.time.
-#
-# This doesn't seem to work for non-Unix Makefile variants, so don't
-# export those rules here (non-Unix Makefiles only guaranteed to build
-# a distribution ball anyway.)
-
-WARNTIMES = $(WARNFILES:=.time)
-
-.PHONY: warnings
-warnings:
-	$(RM_F) $(WARNFILES) $(WARNTIMES) asm/warnings.time
-	$(MAKE) asm/warnings.time
+editors: $(EDITORS) $(PHONY)
 
-asm/warnings.time: $(WARNSRCS) asm/warnings.pl
-	$(EMPTY) asm/warnings.time
-	$(MAKE) $(WARNTIMES)
-
-asm/warnings_c.h.time: asm/warnings.pl asm/warnings.time
+asm/warnings_c.h: asm/warnings.pl asm/warnings.dat
 	$(RUNPERL) $(srcdir)/asm/warnings.pl c asm/warnings_c.h \
-		$(srcdir) $(WARNSRCS)
-	$(EMPTY) asm/warnings_c.h.time
-
-asm/warnings_c.h: asm/warnings_c.h.time
-	$(SIDE)
+		$(srcdir)/asm/warnings.dat
 
-include/warnings.h.time: asm/warnings.pl asm/warnings.time
+include/warnings.h: asm/warnings.pl asm/warnings.dat
 	$(RUNPERL) $(srcdir)/asm/warnings.pl h include/warnings.h \
-		$(srcdir) $(WARNSRCS)
-	$(EMPTY) include/warnings.h.time
+		$(srcdir)/asm/warnings.dat
 
-include/warnings.h: include/warnings.h.time
-	$(SIDE)
-
-doc/warnings.src.time: asm/warnings.pl asm/warnings.time
+doc/warnings.src: asm/warnings.pl asm/warnings.dat
 	$(RUNPERL) $(srcdir)/asm/warnings.pl doc doc/warnings.src \
-		$(srcdir) $(WARNSRCS)
-	$(EMPTY) doc/warnings.src.time
-
-doc/warnings.src : doc/warnings.src.time
-	$(SIDE)
+		$(srcdir)/asm/warnings.dat
 
 $(PERLREQ): $(DIRS)
 
-perlreq: $(PERLREQ)
+perlreq: $(PERLREQ) $(PHONY)
+
+warnings: $(WARNFILES) $(PHONY)
+
+#-- End Generated File Rules --#
 
 #-- Begin NSIS Rules --#
 
@@ -560,7 +529,7 @@ editor_builtin: nasm$(X)
 
 dist:
 	$(MAKE) alldeps
-	$(MAKE) perlreq warnings spec
+	$(MAKE) perlreq spec
 	$(MAKE) editor_builtin
 	$(MAKE) editors $(MANPAGES)
 	$(MAKE) distclean

Mkfiles/msvc.mak

@@ -344,7 +344,25 @@ editors\nasmtok.json: editors\nasmtok.pl asm\tokhash.c asm\pptok.c \
 		 version.mak
 	$(RUNPERL) $(srcdir)\editors\nasmtok.pl -json $@ $(srcdir) $(objdir)
 
-editors: $(EDITORS)
+editors: $(EDITORS) $(PHONY)
+
+asm\warnings_c.h: asm\warnings.pl asm\warnings.dat
+	$(RUNPERL) $(srcdir)\asm\warnings.pl c asm\warnings_c.h \
+		$(srcdir)\asm\warnings.dat
+
+include\warnings.h: asm\warnings.pl asm\warnings.dat
+	$(RUNPERL) $(srcdir)\asm\warnings.pl h include\warnings.h \
+		$(srcdir)\asm\warnings.dat
+
+doc\warnings.src: asm\warnings.pl asm\warnings.dat
+	$(RUNPERL) $(srcdir)\asm\warnings.pl doc doc\warnings.src \
+		$(srcdir)\asm\warnings.dat
+
+$(PERLREQ): $(DIRS)
+
+perlreq: $(PERLREQ) $(PHONY)
+
+warnings: $(WARNFILES) $(PHONY)
 
 #-- End Generated File Rules --#
 

Mkfiles/openwcom.mak

@@ -353,7 +353,25 @@ editors\nasmtok.json: editors\nasmtok.pl asm\tokhash.c asm\pptok.c &
 		 version.mak
 	$(RUNPERL) $(srcdir)\editors\nasmtok.pl -json $@ $(srcdir) $(objdir)
 
-editors: $(EDITORS)
+editors: $(EDITORS) $(PHONY)
+
+asm\warnings_c.h: asm\warnings.pl asm\warnings.dat
+	$(RUNPERL) $(srcdir)\asm\warnings.pl c asm\warnings_c.h &
+		$(srcdir)\asm\warnings.dat
+
+include\warnings.h: asm\warnings.pl asm\warnings.dat
+	$(RUNPERL) $(srcdir)\asm\warnings.pl h include\warnings.h &
+		$(srcdir)\asm\warnings.dat
+
+doc\warnings.src: asm\warnings.pl asm\warnings.dat
+	$(RUNPERL) $(srcdir)\asm\warnings.pl doc doc\warnings.src &
+		$(srcdir)\asm\warnings.dat
+
+$(PERLREQ): $(DIRS)
+
+perlreq: $(PERLREQ) $(PHONY)
+
+warnings: $(WARNFILES) $(PHONY)
 
 #-- End Generated File Rules --#