From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1256) id 784263856DF7; Fri, 13 May 2022 16:10:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 784263856DF7 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Maciej W. Rozycki To: glibc-cvs@sourceware.org Subject: [glibc] m68k: Use an autoconf template to produce `preconfigure' X-Act-Checkin: glibc X-Git-Author: Maciej W. Rozycki X-Git-Refname: refs/heads/master X-Git-Oldrev: 7c20479d082eb85ac1179df0411ef3e4a0634298 X-Git-Newrev: fe7dd93db3a5ea9246cf32dc713995e78fcaffb9 Message-Id: <20220513161023.784263856DF7@sourceware.org> Date: Fri, 13 May 2022 16:10:23 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 May 2022 16:10:23 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=fe7dd93db3a5ea9246cf32dc713995e78fcaffb9 commit fe7dd93db3a5ea9246cf32dc713995e78fcaffb9 Author: Maciej W. Rozycki Date: Fri May 13 17:07:23 2022 +0100 m68k: Use an autoconf template to produce `preconfigure' Switch to using AC_MSG_ERROR rather than `echo' and `exit' directly for error handling. Owing to the lack of any kind of error annotation it makes it difficult to spot the message in the flood in a parallel build and neither it is logged in `config.log'. Diff: --- sysdeps/m68k/preconfigure | 6 ++++-- sysdeps/m68k/preconfigure.ac | 23 +++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/sysdeps/m68k/preconfigure b/sysdeps/m68k/preconfigure index 1028dac080..b1c4d11091 100644 --- a/sysdeps/m68k/preconfigure +++ b/sysdeps/m68k/preconfigure @@ -1,3 +1,6 @@ +# This file is generated from configure.ac by Autoconf. DO NOT EDIT! +# Local preconfigure fragment for sysdeps/m68k + # This fragment canonicalizes the machine names for m68k variants. case "$machine" in @@ -10,8 +13,7 @@ m68k) variant=`(echo "#ifdef __mcoldfire__" $CC $CFLAGS $CPPFLAGS -E - | grep '^[a-z]'` if test -z "$variant"; then - echo >&2 "Cannot determine m68k processor variant" - exit 1 + as_fn_error 1 "Cannot determine m68k processor variant" "$LINENO" 5 fi base_machine=m68k machine=m68k/$variant if test "$variant" = "coldfire"; then diff --git a/sysdeps/m68k/preconfigure.ac b/sysdeps/m68k/preconfigure.ac new file mode 100644 index 0000000000..1b0c1370a6 --- /dev/null +++ b/sysdeps/m68k/preconfigure.ac @@ -0,0 +1,23 @@ +GLIBC_PROVIDES[]dnl See aclocal.m4 in the top level source directory. +# Local preconfigure fragment for sysdeps/m68k + +# This fragment canonicalizes the machine names for m68k variants. + +case "$machine" in +m680?0) base_machine=m68k machine=m68k/m680x0/$machine ;; +m68k) variant=`(echo "#ifdef __mcoldfire__" + echo "coldfire" + echo "#else" + echo "m680x0/m68020" + echo "#endif") | + $CC $CFLAGS $CPPFLAGS -E - | + grep '^[[a-z]]'` + if test -z "$variant"; then + AC_MSG_ERROR([Cannot determine m68k processor variant], [1]) + fi + base_machine=m68k machine=m68k/$variant + if test "$variant" = "coldfire"; then + with_fp_cond="defined __mcffpu__" + fi + ;; +esac