diff options
| author | Ian Lance Taylor <iant@golang.org> | 2022-09-22 06:29:20 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2022-09-22 06:29:20 -0700 |
| commit | 795cffe109e28b248a54b8ee583cbae48368c2a7 (patch) | |
| tree | 0c12b075c51c0d5097f26953835ae540d9f2f501 /zlib | |
| parent | 9f62ed218fa656607740b386c0caa03e65dcd283 (diff) | |
| parent | f35be1268c996d993ab0b4ff329734d467474445 (diff) | |
| download | gcc-795cffe109e28b248a54b8ee583cbae48368c2a7.zip gcc-795cffe109e28b248a54b8ee583cbae48368c2a7.tar.gz gcc-795cffe109e28b248a54b8ee583cbae48368c2a7.tar.bz2 | |
Merge from trunk revision f35be1268c996d993ab0b4ff329734d467474445.
Diffstat (limited to 'zlib')
| -rw-r--r-- | zlib/ChangeLog | 4 | ||||
| -rwxr-xr-x | zlib/configure | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/zlib/ChangeLog b/zlib/ChangeLog index 7d6646b..3459bc6 100644 --- a/zlib/ChangeLog +++ b/zlib/ChangeLog @@ -1,3 +1,7 @@ +2022-08-25 Martin Liska <mliska@suse.cz> + + * configure: Regenerate. + 2021-12-16 H.J. Lu <hjl.tools@gmail.com> Revert: diff --git a/zlib/configure b/zlib/configure index f489f31..05c41b7 100755 --- a/zlib/configure +++ b/zlib/configure @@ -4169,7 +4169,7 @@ case "$host" in case "$enable_cet" in auto) # Check if target supports multi-byte NOPs - # and if assembler supports CET insn. + # and if compiler and assembler support CET insn. cet_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fcf-protection" cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -10735,7 +10735,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10748 "configure" +#line 10738 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10841,7 +10841,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10854 "configure" +#line 10844 "configure" #include "confdefs.h" #if HAVE_DLFCN_H |