diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2019-02-11 12:06:19 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2019-02-11 12:06:19 +0000 |
| commit | e66084a445ce22d382afa9fb67f1ed25bf20c298 (patch) | |
| tree | 594ca42fa404b59ae533189f9a6c092d805e45dc /gcc | |
| parent | 60f32352bd14ede43fc7c206158dcd09969d23b8 (diff) | |
| download | gcc-e66084a445ce22d382afa9fb67f1ed25bf20c298.zip gcc-e66084a445ce22d382afa9fb67f1ed25bf20c298.tar.gz gcc-e66084a445ce22d382afa9fb67f1ed25bf20c298.tar.bz2 | |
Restore .init_array etc. detection on 64-bit Solaris
* acinclude.m4 (gcc_AC_INITFINI_ARRAY): Use 8-byte strings with
Solaris ld.
* configure: Regenerate.
From-SVN: r268768
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/acinclude.m4 | 12 | ||||
| -rwxr-xr-x | gcc/configure | 18 |
3 files changed, 21 insertions, 15 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1fa6936..bea63a9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-02-11 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * acinclude.m4 (gcc_AC_INITFINI_ARRAY): Use 8-byte strings with + Solaris ld. + * configure: Regenerate. + 2019-02-11 Jakub Jelinek <jakub@redhat.com> PR bootstrap/88714 diff --git a/gcc/acinclude.m4 b/gcc/acinclude.m4 index 22ded1d..e3d50dc 100644 --- a/gcc/acinclude.m4 +++ b/gcc/acinclude.m4 @@ -374,16 +374,16 @@ EOF cat > conftest.s <<EOF .section $sh_quote.fini_array.65530$sh_quote,$sh_flags,$sh_type .align 4 -.byte 'C', 'C', 'C', 'C' +.byte 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C' .section $sh_quote.init_array.65530$sh_quote,$sh_flags,$sh_type .align 4 -.byte 'D', 'D', 'D', 'D' +.byte 'D', 'D', 'D', 'D', 'D', 'D', 'D', 'D' .section $sh_quote.fini_array.01005$sh_quote,$sh_flags,$sh_type .align 4 -.byte 'G', 'G', 'G', 'G' +.byte 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G' .section $sh_quote.init_array.01005$sh_quote,$sh_flags,$sh_type .align 4 -.byte 'H', 'H', 'H', 'H' +.byte 'H', 'H', 'H', 'H', 'H', 'H', 'H', 'H' .text .globl _start _start: @@ -391,9 +391,9 @@ EOF if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1 \ && $gcc_cv_ld -o conftest conftest.o > /dev/null 2>&1 \ && $gcc_cv_objdump -s -j .init_array conftest \ - | grep HHHHDDDD > /dev/null 2>&1 \ + | grep HHHHHHHHDDDDDDDD > /dev/null 2>&1 \ && $gcc_cv_objdump -s -j .fini_array conftest \ - | grep GGGGCCCC > /dev/null 2>&1; then + | grep GGGGGGGGCCCCCCCC > /dev/null 2>&1; then gcc_cv_initfini_array=yes fi ;; diff --git a/gcc/configure b/gcc/configure index d6a48ef..8baf95f 100755 --- a/gcc/configure +++ b/gcc/configure @@ -18646,7 +18646,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18640 "configure" +#line 18649 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -18752,7 +18752,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 18746 "configure" +#line 18755 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -23309,16 +23309,16 @@ EOF cat > conftest.s <<EOF .section $sh_quote.fini_array.65530$sh_quote,$sh_flags,$sh_type .align 4 -.byte 'C', 'C', 'C', 'C' +.byte 'C', 'C', 'C', 'C', 'C', 'C', 'C', 'C' .section $sh_quote.init_array.65530$sh_quote,$sh_flags,$sh_type .align 4 -.byte 'D', 'D', 'D', 'D' +.byte 'D', 'D', 'D', 'D', 'D', 'D', 'D', 'D' .section $sh_quote.fini_array.01005$sh_quote,$sh_flags,$sh_type .align 4 -.byte 'G', 'G', 'G', 'G' +.byte 'G', 'G', 'G', 'G', 'G', 'G', 'G', 'G' .section $sh_quote.init_array.01005$sh_quote,$sh_flags,$sh_type .align 4 -.byte 'H', 'H', 'H', 'H' +.byte 'H', 'H', 'H', 'H', 'H', 'H', 'H', 'H' .text .globl _start _start: @@ -23326,9 +23326,9 @@ EOF if $gcc_cv_as -o conftest.o conftest.s > /dev/null 2>&1 \ && $gcc_cv_ld -o conftest conftest.o > /dev/null 2>&1 \ && $gcc_cv_objdump -s -j .init_array conftest \ - | grep HHHHDDDD > /dev/null 2>&1 \ + | grep HHHHHHHHDDDDDDDD > /dev/null 2>&1 \ && $gcc_cv_objdump -s -j .fini_array conftest \ - | grep GGGGCCCC > /dev/null 2>&1; then + | grep GGGGGGGGCCCCCCCC > /dev/null 2>&1; then gcc_cv_initfini_array=yes fi ;; @@ -25141,7 +25141,7 @@ if test "${enable_standard_branch_protection+set}" = set; then : no) ;; *) - as_fn_error "'$enableval' is an invalid value for --enable-standard-branch-protection.\ + as_fn_error $? "'$enableval' is an invalid value for --enable-standard-branch-protection.\ Valid choices are 'yes' and 'no'." "$LINENO" 5 ;; esac |