[SCM] gawk branch, feature/m1-pma, updated. gawk-4.1.0-4935-g4dc118c4

[Arnold Robbins]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, feature/m1-pma has been updated
       via  4dc118c46554003b64365114fb07ab1e2a90b2b3 (commit)
      from  76a602a0034b506e59aa6819c8d89912a05b0a32 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=4dc118c46554003b64365114fb07ab1e2a90b2b3

commit 4dc118c46554003b64365114fb07ab1e2a90b2b3
Author: Arnold D. Robbins <arnold@skeeve.com>
Date:   Sun Oct 23 14:22:31 2022 +0300

    Simplify macos stuff in m4/pma.m4.

diff --git a/configure b/configure
index 869872e5..64552707 100755
--- a/configure
+++ b/configure
@@ -12618,20 +12618,14 @@ fi
 
                        ;;
                *darwin*)
-                       # 30 September 2022: PMA works on Intel but not
-                       # on M1, disable it, until it gets fixed
-                       case $host in
-                       x86_64-*)
-                               LDFLAGS="${LDFLAGS} -Xlinker -no_pie"
-                               export LDFLAGS
-                               ;;
-                       *)
-                               # hack! on M1 compile it as x86 executable
-                               CFLAGS="${CFLAGS} -arch x86_64"
-                               LDFLAGS="${LDFLAGS} -Xlinker -no_pie"
-                               export CFLAGS LDFLAGS
-                               ;;
-                       esac
+                       # 23 October 2022: See README_d/README.macosx for
+                       # the details on what's happening here. See also
+                       # the manual.
+
+                       # Compile as Intel binary all the time, even on M1.
+                       CFLAGS="${CFLAGS} -arch x86_64"
+                       LDFLAGS="${LDFLAGS} -Xlinker -no_pie"
+                       export CFLAGS LDFLAGS
                        ;;
                *cygwin* | *CYGWIN* | *solaris2.11* | freebsd13.* | openbsd7.* )
                        true    # nothing do, exes on these systems are not PIE
diff --git a/extension/configure b/extension/configure
index 9ec2de1d..a87f23b1 100755
--- a/extension/configure
+++ b/extension/configure
@@ -8833,20 +8833,14 @@ fi
 
                        ;;
                *darwin*)
-                       # 30 September 2022: PMA works on Intel but not
-                       # on M1, disable it, until it gets fixed
-                       case $host in
-                       x86_64-*)
-                               LDFLAGS="${LDFLAGS} -Xlinker -no_pie"
-                               export LDFLAGS
-                               ;;
-                       *)
-                               # hack! on M1 compile it as x86 executable
-                               CFLAGS="${CFLAGS} -arch x86_64"
-                               LDFLAGS="${LDFLAGS} -Xlinker -no_pie"
-                               export CFLAGS LDFLAGS
-                               ;;
-                       esac
+                       # 23 October 2022: See README_d/README.macosx for
+                       # the details on what's happening here. See also
+                       # the manual.
+
+                       # Compile as Intel binary all the time, even on M1.
+                       CFLAGS="${CFLAGS} -arch x86_64"
+                       LDFLAGS="${LDFLAGS} -Xlinker -no_pie"
+                       export CFLAGS LDFLAGS
                        ;;
                *cygwin* | *CYGWIN* | *solaris2.11* | freebsd13.* | openbsd7.* )
                        true    # nothing do, exes on these systems are not PIE
diff --git a/m4/pma.m4 b/m4/pma.m4
index bef86cc2..00f29722 100644
--- a/m4/pma.m4
+++ b/m4/pma.m4
@@ -24,20 +24,14 @@ then
                                export LDFLAGS])
                        ;;
                *darwin*)
-                       # 30 September 2022: PMA works on Intel but not
-                       # on M1, disable it, until it gets fixed
-                       case $host in
-                       x86_64-*)
-                               LDFLAGS="${LDFLAGS} -Xlinker -no_pie"
-                               export LDFLAGS
-                               ;;
-                       *)
-                               # hack! on M1 compile it as x86 executable
-                               CFLAGS="${CFLAGS} -arch x86_64"
-                               LDFLAGS="${LDFLAGS} -Xlinker -no_pie"
-                               export CFLAGS LDFLAGS
-                               ;;
-                       esac
+                       # 23 October 2022: See README_d/README.macosx for
+                       # the details on what's happening here. See also
+                       # the manual.
+
+                       # Compile as Intel binary all the time, even on M1.
+                       CFLAGS="${CFLAGS} -arch x86_64"
+                       LDFLAGS="${LDFLAGS} -Xlinker -no_pie"
+                       export CFLAGS LDFLAGS
                        ;;
                *cygwin* | *CYGWIN* | *solaris2.11* | freebsd13.* | openbsd7.* )
                        true    # nothing do, exes on these systems are not PIE

-----------------------------------------------------------------------

Summary of changes:
 configure           | 22 ++++++++--------------
 extension/configure | 22 ++++++++--------------
 m4/pma.m4           | 22 ++++++++--------------
 3 files changed, 24 insertions(+), 42 deletions(-)


hooks/post-receive
-- 
gawk