File tree Expand file tree Collapse file tree 6 files changed +28
-5
lines changed
Expand file tree Collapse file tree 6 files changed +28
-5
lines changed Original file line number Diff line number Diff line change 1- ace35ffba59c926d401a6d3f918bd3c85f48c8fd
1+ 6e421340885c87c4987f27be4a16b7bedb86faaa
22
33The first line of this file holds the git revision number of the last
44merge done from the gofrontend repository.
Original file line number Diff line number Diff line change @@ -837,7 +837,8 @@ libgo_go_objs = \
837837 $(golangorg_x_sys_cpu_gccgo_x86_lo )
838838
839839libgo_ldflags = \
840- -version-info $(libtool_VERSION ) $(PTHREAD_CFLAGS ) $(AM_LDFLAGS )
840+ -version-info $(libtool_VERSION ) $(PTHREAD_CFLAGS ) $(AM_LDFLAGS ) \
841+ $(OSLDFLAGS )
841842
842843libgo_libadd = \
843844 $(libgo_go_objs ) ../libbacktrace/libbacktrace.la \
Original file line number Diff line number Diff line change @@ -453,6 +453,7 @@ OBJCOPY = @OBJCOPY@
453453OBJDUMP = @OBJDUMP@
454454OBJEXT = @OBJEXT@
455455OSCFLAGS = @OSCFLAGS@
456+ OSLDFLAGS = @OSLDFLAGS@
456457OTOOL = @OTOOL@
457458OTOOL64 = @OTOOL64@
458459PACKAGE = @PACKAGE@
@@ -972,7 +973,8 @@ libgo_go_objs = \
972973 $(golangorg_x_sys_cpu_gccgo_x86_lo )
973974
974975libgo_ldflags = \
975- -version-info $(libtool_VERSION ) $(PTHREAD_CFLAGS ) $(AM_LDFLAGS )
976+ -version-info $(libtool_VERSION ) $(PTHREAD_CFLAGS ) $(AM_LDFLAGS ) \
977+ $(OSLDFLAGS )
976978
977979libgo_libadd = \
978980 $(libgo_go_objs ) ../libbacktrace/libbacktrace.la \
Original file line number Diff line number Diff line change @@ -658,6 +658,7 @@ GO_SPLIT_STACK
658658USING_SPLIT_STACK_FALSE
659659USING_SPLIT_STACK_TRUE
660660SPLIT_STACK
661+ OSLDFLAGS
661662HWCAP_CFLAGS
662663OSCFLAGS
663664GO_SYSCALL_OS_ARCH_FILE
@@ -11547,7 +11548,7 @@ else
1154711548 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1154811549 lt_status=$lt_dlunknown
1154911550 cat > conftest.$ac_ext <<_LT_EOF
11550- #line 11550 "configure"
11551+ #line 11551 "configure"
1155111552#include "confdefs.h"
1155211553
1155311554#if HAVE_DLFCN_H
@@ -11653,7 +11654,7 @@ else
1165311654 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
1165411655 lt_status=$lt_dlunknown
1165511656 cat > conftest.$ac_ext <<_LT_EOF
11656- #line 11656 "configure"
11657+ #line 11657 "configure"
1165711658#include "confdefs.h"
1165811659
1165911660#if HAVE_DLFCN_H
@@ -14457,6 +14458,15 @@ $as_echo "$ac_hwcap_flags" >&6; }
1445714458
1445814459
1445914460
14461+ case "$target" in
14462+ *86*-*-solaris2.*)
14463+ # Link with -shared-libgcc on Solaris 11+/x86 as a workaround for
14464+ # PR go/64900.
14465+ OSLDFLAGS="-Wc,-shared-libgcc"
14466+ ;;
14467+ esac
14468+
14469+
1446014470{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -fsplit-stack is supported" >&5
1446114471$as_echo_n "checking whether -fsplit-stack is supported... " >&6; }
1446214472if ${libgo_cv_c_split_stack_supported+:} false; then :
Original file line number Diff line number Diff line change @@ -442,6 +442,15 @@ AC_SUBST(OSCFLAGS)
442442dnl Check if assembler supports disabling hardware capability support.
443443GCC_CHECK_ASSEMBLER_HWCAP
444444
445+ case "$target" in
446+ *86*-*-solaris2.*)
447+ # Link with -shared-libgcc on Solaris 11+/x86 as a workaround for
448+ # PR go/64900.
449+ OSLDFLAGS="-Wc,-shared-libgcc"
450+ ;;
451+ esac
452+ AC_SUBST ( OSLDFLAGS )
453+
445454dnl Use -fsplit-stack when compiling C code if available.
446455AC_CACHE_CHECK ( [ whether -fsplit-stack is supported] ,
447456[ libgo_cv_c_split_stack_supported] ,
Original file line number Diff line number Diff line change @@ -202,6 +202,7 @@ OBJCOPY = @OBJCOPY@
202202OBJDUMP = @OBJDUMP@
203203OBJEXT = @OBJEXT@
204204OSCFLAGS = @OSCFLAGS@
205+ OSLDFLAGS = @OSLDFLAGS@
205206OTOOL = @OTOOL@
206207OTOOL64 = @OTOOL64@
207208PACKAGE = @PACKAGE@
You can’t perform that action at this time.
0 commit comments