diff options
| author | Jörg Frings-Fürst <debian@jff.email> | 2018-03-07 05:54:53 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff.email> | 2018-03-07 05:54:53 +0100 |
| commit | 76ef1d8e3249e82a6965fd17157bee00a7857ff3 (patch) | |
| tree | 7d3d34b059039faf525d1e95bbdc1945a9fa103c /gnulib-m4/asm-underscore.m4 | |
| parent | 0cb66c451a1a4e717878b8296b79c8d7cfd38b30 (diff) | |
| parent | 93e8e16be294d19261c7378dd2e46d3f35f06926 (diff) | |
Merge branch 'feature/upstream' into develop
Diffstat (limited to 'gnulib-m4/asm-underscore.m4')
| -rw-r--r-- | gnulib-m4/asm-underscore.m4 | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gnulib-m4/asm-underscore.m4 b/gnulib-m4/asm-underscore.m4 index 07270c9..58a5299 100644 --- a/gnulib-m4/asm-underscore.m4 +++ b/gnulib-m4/asm-underscore.m4 @@ -1,5 +1,5 @@ -# asm-underscore.m4 serial 3 -dnl Copyright (C) 2010-2017 Free Software Foundation, Inc. +# asm-underscore.m4 serial 4 +dnl Copyright (C) 2010-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -14,6 +14,7 @@ dnl From Bruno Haible. Based on as-underscore.m4 in GNU clisp. AC_DEFUN([gl_ASM_SYMBOL_PREFIX], [ + AC_REQUIRE([AC_PROG_EGREP]) dnl We don't use GCC's __USER_LABEL_PREFIX__ here, because dnl 1. It works only for GCC. dnl 2. It is incorrectly defined on some platforms, in some GCC versions. @@ -29,7 +30,7 @@ int foo(void) { return 0; } EOF # Look for the assembly language name in the .s file. AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c) >/dev/null 2>&1 - if LC_ALL=C grep -E '(^|[[^a-zA-Z0-9_]])_foo([[^a-zA-Z0-9_]]|$)' conftest.$gl_asmext >/dev/null; then + if LC_ALL=C $EGREP '(^|[[^a-zA-Z0-9_]])_foo([[^a-zA-Z0-9_]]|$)' conftest.$gl_asmext >/dev/null; then gl_cv_prog_as_underscore=yes else gl_cv_prog_as_underscore=no |