From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2010) id E900D383A61D; Sun, 29 May 2022 05:43:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E900D383A61D Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Eric Gallager To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/users/egallager/heads/autotools-tinkering)] minor configure tweaks for libgcc X-Act-Checkin: gcc X-Git-Author: Eric Gallager X-Git-Refname: refs/users/egallager/heads/autotools-tinkering X-Git-Oldrev: aa06c5c1c30457777ea513e1bb719d6263770692 X-Git-Newrev: 7e34d13cfdf766c4d2793f7cbda2e3ee330128bb Message-Id: <20220529054319.E900D383A61D@sourceware.org> Date: Sun, 29 May 2022 05:43:19 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 May 2022 05:43:20 -0000 https://gcc.gnu.org/g:7e34d13cfdf766c4d2793f7cbda2e3ee330128bb commit 7e34d13cfdf766c4d2793f7cbda2e3ee330128bb Author: Eric Gallager Date: Sun May 29 01:43:01 2022 -0400 minor configure tweaks for libgcc Diff: --- libgcc/configure | 9 +++++---- libgcc/configure.ac | 32 ++++++++++++++++---------------- libgcc/configure.scan | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 68 insertions(+), 20 deletions(-) diff --git a/libgcc/configure b/libgcc/configure index 61f3ace2891..ab9ec46d17a 100755 --- a/libgcc/configure +++ b/libgcc/configure @@ -1342,7 +1342,7 @@ Optional Features: --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-shared don't provide a shared libgcc - --enable-vtable-verify Enable vtable verification feature + --enable-vtable-verify Enable vtable verification feature --enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory --enable-maintainer-mode enable make rules and dependencies not useful (and @@ -1364,8 +1364,9 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-target-subdir=SUBDIR Configuring in a subdirectory for target - --with-cross-host=HOST Configuring with a cross compiler + --with-target-subdir=SUBDIR + Configuring in a subdirectory for target + --with-cross-host=HOST Configuring with a cross compiler --with-ld arrange to use the specified ld (full pathname) --with-aix-soname=aix|svr4|both shared library versioning (aka "SONAME") variant to @@ -2653,7 +2654,7 @@ done # We need awk; bail out if it's missing. case ${AWK} in - "") as_fn_error $? "can't build without awk, bailing out" "$LINENO" 5 ;; + "") as_fn_error $? "cannot build without awk, bailing out" "$LINENO" 5 ;; esac diff --git a/libgcc/configure.ac b/libgcc/configure.ac index 2fc9d5d7c93..562da01fe50 100644 --- a/libgcc/configure.ac +++ b/libgcc/configure.ac @@ -14,7 +14,7 @@ sinclude(../config/gthr.m4) sinclude(../config/sjlj.m4) sinclude(../config/cet.m4) -AC_INIT([GNU C Runtime Library], 1.0,,[libgcc]) +AC_INIT([GNU C Runtime Library],[1.0],[],[libgcc]) AC_CONFIG_SRCDIR([static-object.mk]) # The libgcc should not depend on any header files @@ -22,12 +22,13 @@ AC_DEFUN([_AC_INCLUDES_DEFAULT_REQUIREMENTS], [m4_divert_text([DEFAULTS], [ac_includes_default='/* none */'])]) -AC_ARG_WITH(target-subdir, -[ --with-target-subdir=SUBDIR Configuring in a subdirectory for target]) -AC_ARG_WITH(cross-host, -[ --with-cross-host=HOST Configuring with a cross compiler]) -AC_ARG_WITH(ld, -[ --with-ld arrange to use the specified ld (full pathname)]) +AC_ARG_WITH([target-subdir], +[AS_HELP_STRING([--with-target-subdir=SUBDIR], + [Configuring in a subdirectory for target])]) +AC_ARG_WITH([cross-host], +[AS_HELP_STRING([--with-cross-host=HOST],[Configuring with a cross compiler])]) +AC_ARG_WITH([ld], +[AS_HELP_STRING([--with-ld],[arrange to use the specified ld (full pathname)])]) if test "${srcdir}" = "."; then if test -n "${with_build_subdir}"; then @@ -49,8 +50,8 @@ AC_SUBST(libgcc_topdir) AC_CONFIG_AUX_DIR($libgcc_topdir) AC_CONFIG_HEADER(auto-target.h:config.in) -AC_ARG_ENABLE(shared, -[ --disable-shared don't provide a shared libgcc], +AC_ARG_ENABLE([shared], +[AS_HELP_STRING([--disable-shared],[don't provide a shared libgcc])], [ case $enable_shared in yes | no) ;; @@ -69,7 +70,7 @@ AC_ARG_ENABLE(shared, AC_SUBST(enable_shared) AC_ARG_ENABLE(vtable-verify, -[ --enable-vtable-verify Enable vtable verification feature ], +[AS_HELP_STRING([--enable-vtable-verify],[Enable vtable verification feature])], [case "$enableval" in yes) enable_vtable_verify=yes ;; no) enable_vtable_verify=no ;; @@ -133,7 +134,7 @@ AC_SUBST(slibdir) # Command-line options. # Very limited version of AC_MAINTAINER_MODE. AC_ARG_ENABLE([maintainer-mode], - [AC_HELP_STRING([--enable-maintainer-mode], + [AS_HELP_STRING([--enable-maintainer-mode], [enable make rules and dependencies not useful (and sometimes confusing) to the casual installer])], [case ${enable_maintainer_mode} in @@ -150,7 +151,7 @@ AC_PROG_INSTALL AC_PROG_AWK # We need awk; bail out if it's missing. case ${AWK} in - "") AC_MSG_ERROR([can't build without awk, bailing out]) ;; + "") AC_MSG_ERROR([cannot build without awk, bailing out]) ;; esac AC_CANONICAL_HOST @@ -270,7 +271,7 @@ GCC_CET_FLAGS(CET_FLAGS) AC_SUBST(CET_FLAGS) AC_ARG_ENABLE([explicit-exception-frame-registration], - [AC_HELP_STRING([--enable-explicit-exception-frame-registration], + [AS_HELP_STRING([--enable-explicit-exception-frame-registration], [register exception tables explicitly at module start, for use e.g. for compatibility with installations without PT_GNU_EH_FRAME support])], [ @@ -619,8 +620,7 @@ AC_DEFUN([LIBGCC_CHECK_AS_AVX], [ case "${target}" in i[[34567]]86-*-* | x86_64-*-*) AC_CACHE_CHECK([if the assembler supports AVX], libgcc_cv_as_avx, [ - AC_TRY_COMPILE([], [asm("vzeroupper");], - [libgcc_cv_as_avx=yes], [libgcc_cv_as_avx=no]) + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[asm("vzeroupper");]])],[libgcc_cv_as_avx=yes],[libgcc_cv_as_avx=no]) ]) if test x$libgcc_cv_as_avx = xyes; then AC_DEFINE(HAVE_AS_AVX, 1, [Define to 1 if the assembler supports AVX.]) @@ -633,7 +633,7 @@ dnl Check if as supports LSE instructions. AC_DEFUN([LIBGCC_CHECK_AS_LSE], [ case "${target}" in aarch64*-*-*) - AC_CACHE_CHECK([if the assembler supports LSE], libgcc_cv_as_lse, [ + AC_CACHE_CHECK([if the assembler supports LSE],[libgcc_cv_as_lse],[ AC_TRY_COMPILE([], changequote(,)dnl asm(".arch armv8-a+lse\n\tcas w0, w1, [x2]"); diff --git a/libgcc/configure.scan b/libgcc/configure.scan new file mode 100644 index 00000000000..5e416710fc6 --- /dev/null +++ b/libgcc/configure.scan @@ -0,0 +1,47 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ([2.69]) +AC_INIT([FULL-PACKAGE-NAME], [VERSION], [BUG-REPORT-ADDRESS]) +AC_CONFIG_SRCDIR([gthr-single.h]) +AC_CONFIG_HEADERS([config.h]) + +# Checks for programs. +AC_PROG_CC +AC_PROG_INSTALL +AC_PROG_AWK +AC_PROG_RANLIB + +# Checks for libraries. + +# Checks for header files. +AC_CHECK_HEADERS([fcntl.h fenv.h float.h limits.h stddef.h stdint.h stdlib.h string.h sys/param.h unistd.h]) + +# Checks for typedefs, structures, and compiler characteristics. +AC_CHECK_HEADER_STDBOOL +AC_C_INLINE +AC_TYPE_INT16_T +AC_TYPE_INT32_T +AC_TYPE_INT64_T +AC_TYPE_INT8_T +AC_FUNC_OBSTACK +AC_TYPE_OFF_T +AC_TYPE_PID_T +AC_C_RESTRICT +AC_TYPE_SIZE_T +AC_TYPE_UINT16_T +AC_TYPE_UINT32_T +AC_TYPE_UINT64_T +AC_TYPE_UINT8_T + +# Checks for library functions. +AC_FUNC_ALLOCA +AC_FUNC_ERROR_AT_LINE +AC_FUNC_FORK +AC_FUNC_MALLOC +AC_FUNC_MMAP +AC_FUNC_REALLOC +AC_CHECK_FUNCS([atexit clock_gettime floor getcwd getpagesize memmove memset mkdir munmap sqrt strchr strrchr strstr]) + +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT