diff options
| author | Thomas Schwinge <tschwinge@baylibre.com> | 2024-03-10 23:19:06 +0100 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@baylibre.com> | 2024-03-10 23:19:31 +0100 |
| commit | bcc6fe58251b317127ec9c3291a798da7459d377 (patch) | |
| tree | d605c81790211c53ad33338fd6e28385812c37e2 | |
| parent | be82a46963a2b08db29ec2fa5e941943bf0c7835 (diff) | |
| parent | ea1cd66f2200839d46a8b4dc140d18c00b849c82 (diff) | |
| download | gcc-bcc6fe58251b317127ec9c3291a798da7459d377.zip gcc-bcc6fe58251b317127ec9c3291a798da7459d377.tar.gz gcc-bcc6fe58251b317127ec9c3291a798da7459d377.tar.bz2 | |
Merge commit 'ea1cd66f2200839d46a8b4dc140d18c00b849c82' into HEAD
| -rwxr-xr-x | gcc/configure | 4 | ||||
| -rw-r--r-- | zlib/Makefile.in | 2 | ||||
| -rwxr-xr-x | zlib/configure | 4 |
3 files changed, 6 insertions, 4 deletions
diff --git a/gcc/configure b/gcc/configure index 3f6ae7a..21703a7 100755 --- a/gcc/configure +++ b/gcc/configure @@ -19861,7 +19861,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 19862 "configure" +#line 19864 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19967,7 +19967,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 19968 "configure" +#line 19970 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/zlib/Makefile.in b/zlib/Makefile.in index 3f5102d..80fe3b6 100644 --- a/zlib/Makefile.in +++ b/zlib/Makefile.in @@ -353,6 +353,8 @@ datadir = @datadir@ datarootdir = @datarootdir@ docdir = @docdir@ dvidir = @dvidir@ +enable_host_pie = @enable_host_pie@ +enable_host_shared = @enable_host_shared@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ diff --git a/zlib/configure b/zlib/configure index 77be6c2..9308866 100755 --- a/zlib/configure +++ b/zlib/configure @@ -10763,7 +10763,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10778 "configure" +#line 10766 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10869,7 +10869,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10884 "configure" +#line 10872 "configure" #include "confdefs.h" #if HAVE_DLFCN_H |