Merge upstream/dev

Author: JohnoKing

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
     - name: Checkout sources
       uses: actions/checkout@main
     - name: Build
-      run: bin/package make -j5
+      run: bin/package make -j5 CCFLAGS=-Og
     - name: Regression tests
       run: |
         PS4="$PS4[ci.yml] "
@@ -30,13 +30,13 @@ jobs:
         sed --regexp-extended --in-place=.orig \
           '/^SHOPT (AUDIT|BGX|BRACEPAT|DEVFD|DYNAMIC|EDPREDICT|ESH|FIXEDARRAY|HISTEXPAND|MULTIBYTE|NAMESPACE|OPTIMIZE|SPAWN|STATS|SUID_EXEC|VSH)=/ s/=1?/=0/' \
           src/cmd/ksh93/SHOPT.sh &&
-        bin/package make -j5 &&
+        bin/package make -j5 CCFLAGS=-Og &&
         : default regression tests with SHOPTs disabled &&
         script -q -e -c "bin/shtests" &&
         : enable SHOPT_SCRIPTONLY, rebuild ksh &&
         sed --regexp-extended --in-place=.orig \
           '/^SHOPT SCRIPTONLY=/ s/=0?/=1/' \
           src/cmd/ksh93/SHOPT.sh &&
-        bin/package make -j5 &&
+        bin/package make -j5 CCFLAGS=-Og &&
         : default regression tests with SHOPT_SCRIPTONLY enabled &&
         script -q -e -c "bin/shtests"

bin/package

@@ -125,7 +125,7 @@ command=${0##*/}
 case $(getopts '[-][123:xyz]' opt --xyz 2>/dev/null; echo 0$opt) in
 0123)	USAGE=$'
 [-?
-@(#)$Id: '$command$' (ksh 93u+m) 2026-02-10 $
+@(#)$Id: '$command$' (ksh 93u+m) 2026-03-31 $
 ]
 [-author?Glenn Fowler <gsf@research.att.com>]
 [-author?Contributors to https://github.com/ksh93/ksh]
@@ -145,8 +145,9 @@ case $(getopts '[-][123:xyz]' opt --xyz 2>/dev/null; echo 0$opt) in
 [+?Note that no environment variables need be set by the user;
     \b'$command$'\b determines the environment based on the current working
     directory. The \buse\b action starts a \bsh\b(1) with the environment
-    initialized. \bCC\b, \bCCFLAGS\b, \bHOSTTYPE\b and \bSHELL\b may be set
-    by explicit command argument assignments to override the defaults.]
+    initialized. \bCC\b, \bCCFLAGS\b, \bHOSTTYPE\b, \bHOSTTAG\b and \bSHELL\b
+    may be set by explicit command argument assignments to override the
+    defaults.]
 [+?The command arguments are composed of a sequence of words: zero or
     more \aqualifiers\a, one \aaction\a, and zero or more action-specific
     \aarguments\a, and zero or more \aname=value\a definitions.
@@ -277,6 +278,13 @@ case $(getopts '[-][123:xyz]' opt --xyz 2>/dev/null; echo 0$opt) in
     shared libraries. All other architecture-dependent logic is handled
     either by the \bAST\b \biffe\b(1) command or by component-specific
     configure scripts.]
+[+?\b$HOSTTAG\b may contain a short string that, if present, will be added
+    to the detected \b$HOSTTYPE\b separated by a comma. This is useful to
+    maintain several object code directories for the same architecture (for
+    example, with different \bCCFLAGS\b or built from different \bgit\b(1)
+    branches) under \barch\b while still auto-detecting \b$HOSTTYPE\b.
+    The value must not contain whitespace or other shell-unsafe characters.
+    If \bHOSTTYPE\b is specified manually, \bHOSTTAG\b is ignored.]
 [+?Each component contains a \bMAM\b (make abstract machine)
     file (\bMamfile\b). A Mamfile contains a portable makefile description
     written in a simple dependency tree language using indented
@@ -406,9 +414,9 @@ DESCRIPTION
 
   Note that no environment variables need be set by the user; package
   determines the environment based on the current working directory. The use
-  action starts a sh(1) with the environment initialized. CC, CCFLAGS, HOSTTYPE
-  and SHELL may be set by explicit command argument assignments to override the
-  defaults.
+  action starts a sh(1) with the environment initialized. CC, CCFLAGS,
+  HOSTTYPE, HOSTTAG and SHELL may be set by explicit command argument
+  assignments to override the defaults.
 
   The command arguments are composed of a sequence of words: zero or more
   qualifiers, one action, and zero or more action-specific arguments, and zero
@@ -481,8 +489,8 @@ DESCRIPTION
           build is done in the $INSTALLROOT directory tree viewpathed on top of
           the $PACKAGEROOT directory tree. Leaf directory names matching the
           |-separated shell pattern $MAKESKIP are ignored. The view action is
-          done before making. option operands are passed to the underlying make
-          command.
+          done before making. option operands are passed to the underlying
+          mamake command.
     results [ failed ] [ path ] [ old ] [make | test | write ]
           List results and interesting messages captured by the most recent
           make (default), test or write action. old specifies the previous
@@ -527,6 +535,14 @@ DETAILS
   libraries. All other architecture-dependent logic is handled either by the
   AST iffe(1) command or by component-specific configure scripts.
 
+  $HOSTTAG may contain a short string that, if present, will be added to the
+  detected $HOSTTYPE separated by a comma. This is useful to maintain several
+  object code directories for the same architecture (for example, with
+  different CCFLAGS or built from different git(1) branches) under arch while
+  still auto-detecting $HOSTTYPE. The value must not contain whitespace or
+  other shell-unsafe characters. If HOSTTYPE is specified manually, HOSTTAG is
+  ignored.
+
   Each component contains a MAM (make abstract machine) file (Mamfile). A
   Mamfile contains a portable makefile description written in a simple
   dependency tree language using indented make...done blocks.
@@ -543,7 +559,7 @@ SEE ALSO
   pkgadd(1), pkgmk(1), rpm(1), sh(1), tar(1), optget(3)
 
 IMPLEMENTATION
-  version         package (ksh 93u+m) 2026-02-10
+  version         package (ksh 93u+m) 2026-03-31
   author          Glenn Fowler <gsf@research.att.com>
   author          Contributors to https://github.com/ksh93/ksh
   copyright       (c) 1994-2012 AT&T Intellectual Property
@@ -605,7 +621,8 @@ do	case $i in
 			assign="$assign $n=$vq"
 			eval "$n=\$v"
 			;;
-		CC)	eval "$n=\$v"
+		CC | HOSTTAG)
+			eval "$n=\$v"
 			;;
 		CCFLAGS)
 			eval "$n=\$v"
@@ -1545,6 +1562,11 @@ int b(void) { return 0; }
 	set -- $_hostinfo_
 	_hostinfo_=$*
 
+	# add host tag if given
+	case $HOSTTAG in
+	?*)	_hostinfo_=${_hostinfo_},$HOSTTAG ;;
+	esac
+
 	# restore the global state
 
 	PATH=$path

src/cmd/INIT/Mamfile

@@ -13,7 +13,7 @@ note *
 make install virtual
 	loop DIR bin include/ast lib/lib lib/probe/C/make lib/probe/C/mam
 		make %{INSTALLROOT}/%{DIR}
-			exec - test -d %{@} && touch %{@} || mkdir -p %{@}
+			exec - mkdir -p %{@}
 		done
 	done
 

src/cmd/INIT/README-mamake.md

@@ -245,9 +245,6 @@ The *operand string* is any arbitrary text until the end of the line.
 A `make`...`done` block defines the rule named *target* using the other commands described here.
 Unless the `virtual` attribute is used, *target* names the pathname of the file generated or referenced by the rule.
 
-`mamake` processes the commands within the block if the *target* is out
-of date or if the rule has the `virtual` attribute (see below).
-
 The *target* may be repeated as the operand to the `done` command.
 In that case, it is matched against the current `make` *target* and
 any mismatch will produce a "mismatched done statement" error.
@@ -262,7 +259,9 @@ Dependencies may be defined in two ways:
    The dependency is defined as if that block were repeated at the `prev` command's location.
 
 If the block contains one or more `exec` commands (see **Shell actions** below),
-the `done` command executes the shell script defined by them.
+then the `done` command will execute the shell script defined by them
+if the *target* is out of date
+or if the rule has the `virtual` attribute (see below).
 
 A `make`...`done` rule may lack any `exec` action, in which case it declares a
 dependency (a file that must be present and whose timestamp is propagated to
@@ -274,17 +273,19 @@ by `done`. The one-line `makp` command (see below) may be used as a shorthand
 for the latter case.
 
 Making a prerequisite that is currently being made, or one that has already
-been made, produces a warning; at strict level 3 and up, this is an error.
+been made, is an error.
 
 One or more *attribute*s may be specified by appending them to the `make` command.
-(At strict levels < 2, they may also be appended to the `done` command; the effect
-is the same either way. At strict level 1, this produces a deprecation warning.)
 Attributes apply to the current rule only and do not propagate down to nested rules.
 The following *attribute*s are available:
 
 * `dontcare`: Marks files that do not need to exist.
   If the file exists then its last-modified timestamp is checked and propagated,
   otherwise it is silently ignored. 
+* `force`: The associated shell action (if any) is always run, regardless of
+  whether the target file is outdated. In addition, no error is thrown if a
+  regular target file's timestamp wasn't updated after running the associated
+  shell action.
 * `ignore`: The timestamp associated with the *target* is ignored in dependency resolution.
 * `notrace`: Disables echoing (xtrace) of shell action commands.
   This does not disable the trace header for the containing rule (see *Shell actions* below).
@@ -294,6 +295,15 @@ The following *attribute*s are available:
   By convention, a virtual rule with target `install` performs pre-installation.
 
 > *Obsolete:*
+> 
+> At strict levels < 2:
+> 
+> * Making a prerequisite that is currently being made, or one that has
+>   already been made, is not an error, but produces a warning.
+> * Attributes may also be appended to the `done` command; the effect is the
+>   same as appending them to `make`. At strict level 1, this produces a
+>   deprecation warning.
+> 
 > At strict level 4 and up, the following *attribute* is not available.
 > 
 > * `implicit`: Equivalent to `dontcare`.
@@ -303,14 +313,14 @@ The following *attribute*s are available:
 > specifying these is an error.
 > 
 > * `archive`: Ignored.
->   Historically used to mark the generation of an `ar`(1) archive.
+>   Historically a no-op used to mark the generation of an `ar`(1) archive.
 > * `generated`: Marks rules that produce output files generated by a shell action.
 >   The explicit assignment of this attribute is ignored at strict level 1.
 >   The `exec` command implicitly assigns this attribute.
 >   If a rule has this attribute, other rules dependent on this rule
 >   will avoid applying viewpathing based on this rule.
 > * `joint`: Ignored.
->   Historically used to mark one of a group of rules that are built by a single shell action.
+>   Historically a no-op used to mark a group of rules that are built by a single shell action.
 
 ### Simple prerequisite rules ###
 
@@ -386,9 +396,9 @@ of the automatic variables for any `exec` line depends on the position
 of the line in the rule.
 
 At strict level 5 and up, mamake throws a "target not updated" error if a
-generated file is not newer than the newest prerequisite after its
+generated regular file is not newer than the newest prerequisite after its
 associated shell action has been executed, unless the rule has the
-`dontcare` attribute.
+`dontcare` or `force` attribute.
 
 #### Viewpathing ####
 
@@ -644,6 +654,7 @@ maintain Mamfiles by hand. The following lists the important changes.
   `%{`*variable*`@`*sh-script*`}` have been added, allowing the editing of
   variable value fields. The fields are either written to the script's
   standard input as lines, or passed as positional parameters.
+* The `force` attribute has been added.
 * **At strict level 1 and up:**
     * Appending attributes to `done` instead of `make` is deprecated
       and produces a warning.
@@ -677,7 +688,7 @@ maintain Mamfiles by hand. The following lists the important changes.
       are expected to be compatible with parallel processing.
     * Unless the `dontcare` attribute is specified, it is an error for a
       shell action to fail to update the timestamp of any pre-existing
-      target file associated with its rule.
+      regular target file associated with its rule.
 
 ## Appendix: mamake compiled against libast ##
 

src/cmd/INIT/iffe.sh

@@ -33,7 +33,7 @@ esac
 set -o noglob
 
 command=iffe
-version=2026-02-10
+version=2026-02-30
 
 # DEFPATH should be inherited from package(1)
 case $DEFPATH in
@@ -3019,7 +3019,10 @@ $src
 						execute $tmp.sh <&$nullin || e=1
 						;;
 					run*|norun*)
-						(eval "$src") <&$nullin || e=1
+						case $verbose in
+						0)	(eval "$src") 9>&$nullout ;;
+						*)	(eval "$src") 9>&$stderr ;;
+						esac <&$nullin || e=1
 						;;
 					mac*|nomac*)
 						if	compile $cc -E -P $tmp.c <&$nullin >$tmp.i

src/cmd/INIT/mamake.c

@@ -28,7 +28,7 @@
  * coded for portability
  */
 
-#define RELEASE_DATE "2026-03-26"
+#define RELEASE_DATE "2026-03-30"
 static char id[] = "\n@(#)$Id: mamake (ksh 93u+m) " RELEASE_DATE " $\0\n";
 
 #if _PACKAGE_ast
@@ -178,6 +178,7 @@ static const char usage[] =
 #define RULE_notrace	0x0100		/* do not xtrace shell action	*/
 #define RULE_updated	0x0200		/* rule was outdated and remade */
 #define RULE_preexisted	0x0400		/* the rule's target preexisted	*/
+#define RULE_force	0x0800		/* always run the shell action	*/
 
 #define STREAM_KEEP	0x0001		/* don't fclose() on pop()	*/
 #define STREAM_MUST	0x0002		/* push() file must exist	*/
@@ -1323,7 +1324,7 @@ static char *find(Buf_t *buf, char *file, struct stat *st)
 }
 
 /*
- * bind r to a file and return the modify time
+ * bind r to a file
  */
 
 static void bindfile(Rule_t *r)
@@ -1462,9 +1463,13 @@ static void print_nice_hdr(Rule_t *r)
 		fname, r->line, r->endline, rnamepre, rname);
 	/* -e option */
 	if (state.explain)
+	{
 		fprintf(stderr, "# reason: target %s\n",
+			r->flags & RULE_virtual ? "is virtual" :
+			r->flags & RULE_force ? "is forced" :
 			r->flags & RULE_preexisted ? "older than prerequisites" :
-				r->flags & RULE_virtual ? "is virtual" : "not found");
+			"not found");
+	}
 }
 
 /*
@@ -1480,7 +1485,9 @@ static void check_shellaction(Rule_t *r, int e)
 		;
 	else if (status(NULL, 0, r->name, &fstat))	/* target file exists? */
 	{
-		if (fstat.st_mtime < r->origtime && (r->flags & (RULE_exists | RULE_dontcare)) == RULE_exists && state.strict >= 5)
+		char	existed = (r->flags & RULE_exists) && !(r->flags & RULE_dontcare);
+		char	notnew = fstat.st_mtime <= r->origtime && !(r->flags & RULE_force);
+		if (existed && notnew && S_ISREG(fstat.st_mode) && state.strict >= 5)
 			error_making(r, -2);		/* "target not updated" */
 		r->time = fstat.st_mtime;
 		r->flags |= RULE_exists;
@@ -1913,6 +1920,10 @@ static void attributes(Rule_t *r, char *s)
 			if (n == 7 && !strncmp(t, "notrace", n))
 				flag = RULE_notrace;
 			break;
+		case 'f':
+			if (n == 5 && !strncmp(t, "force", n))
+				flag = RULE_force;
+			break;
 		}
 		if (flag > 0)
 			r->flags |= flag;
@@ -2288,26 +2299,32 @@ static void make(Rule_t *r, Makestate_t *parentstate)
 				st.bg = st.bg->next;
 				free(prev);
 			}
-			if (st.cmd && state.active && (state.force || r->time < st.modtime || !r->time && !st.modtime))
-			{
-				/* flag for -e */
-				if (r->time)
-					r->flags |= RULE_preexisted;
-				/* show a nice trace header */
-				if ((!PARALLEL(r) || state.chaos) && !(r->flags & RULE_error))
-					print_nice_hdr(r);
-				/* run the shell action */
-				run(r, use(st.cmd));
-				if (!r->pid)
-					propagate(r, NULL, &st.modtime);
-				r->flags |= RULE_updated;
-			}
-			else if (st.modtime > r->parenttime && r->flags & RULE_generated)
+			if (state.active)
 			{
-				/* if we didn't generate the target in this run, but it's newer than the parent
-				 * target, then the generation of the parent target was probably interrupted
-				 * and then resumed in this run, so include this target in %{?} for consistency */
-				r->flags |= RULE_updated;
+				char	outdated;
+				outdated = r->time < st.modtime || !r->time && !st.modtime || state.force || r->flags & RULE_force;
+				s = st.cmd ? use(st.cmd) : NULL;
+				if (s && outdated)
+				{
+					/* flag for -e */
+					if (r->time)
+						r->flags |= RULE_preexisted;
+					/* show a nice trace header */
+					if ((!PARALLEL(r) || state.chaos) && !(r->flags & RULE_error))
+						print_nice_hdr(r);
+					/* run the shell action */
+					run(r, s);
+					if (!r->pid)
+						propagate(r, NULL, &st.modtime);
+					r->flags |= RULE_updated;
+				}
+				else if (st.modtime > r->parenttime && r->flags & RULE_generated)
+				{
+					/* if we didn't generate the target in this run, but it's newer than the parent
+					 * target, then the generation of the parent target was probably interrupted
+					 * and then resumed in this run, so include this target in %{?} for consistency */
+					r->flags |= RULE_updated;
+				}
 			}
 			r->flags |= RULE_made;
 			if (!(r->flags & (RULE_dontcare|RULE_error|RULE_exists|RULE_generated|RULE_virtual)))

src/cmd/builtin/Mamfile

@@ -9,7 +9,7 @@ setv INSTALLROOT ../../..
 setv CC cc
 setv mam_cc_FLAGS %{mam_cc_TARGET} %{mam_cc_DLL} %{-debug-symbols?1?%{mam_cc_DEBUG} -D_BLD_DEBUG?%{mam_cc_OPTIMIZE}?} %{mam_cc_STDC}
 setv CCFLAGS
-setv CCLDFLAGS %{-strip-symbols?1?%{mam_cc_LD_STRIP}??}
+setv CCLDFLAGS %{-strip-symbols?1?%{mam_cc_LD_STRIP}??} %{mam_cc_EXPORT_DYNAMIC}
 setv IFFEFLAGS
 setv LDFLAGS
 
@@ -59,7 +59,7 @@ make install virtual
 	note *
 
 	make %{INSTALLROOT}/bin
-		exec - test -d %{@} && touch %{@} || mkdir -p %{@}
+		exec - mkdir -p %{@}
 	done
 	make %{INSTALLROOT}/bin/pty
 		prev pty