Attachment #692367 for bug #777117




if test x$may_have_cet = xyes; then
  if test x$cross_compiling = xno; then
    AC_TRY_RUN([
int
main ()
{
  asm ("endbr32");
  return 0;
}
    ],
    [have_multi_byte_nop=yes],
    [have_multi_byte_nop=no])
    have_cet=no
    if test x$have_multi_byte_nop = xyes; then
      AC_TRY_RUN([
static void
foo (void)
{

  bar ();
  return 0;
}
      ],
      [have_cet=no],
      [have_cet=yes])
    fi
    if test x$enable_cet = xno -a x$have_cet = xyes; then
      AC_MSG_ERROR([Intel CET must be enabled on Intel CET enabled host])
    fi




  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h.  */

int
main ()
{
  asm ("endbr32");
  return 0;
}

_ACEOF
if ac_fn_c_try_run "$LINENO"; then :
  have_multi_byte_nop=yes
else
  have_multi_byte_nop=no
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
  conftest.$ac_objext conftest.beam conftest.$ac_ext
fi

    have_cet=no
    if test x$have_multi_byte_nop = xyes; then
      if test "$cross_compiling" = yes; then :
  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
as_fn_error $? "cannot run test program while cross compiling
See \`config.log' for more details" "$LINENO" 5; }
else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h.  */

static void
foo (void)
{

  conftest.$ac_objext conftest.beam conftest.$ac_ext
fi

    fi
    if test x$enable_cet = xno -a x$have_cet = xyes; then
      as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
    fi
- 

Return to bug 777117

Lines 130-135 fi Link Here

(-)a/config/cet.m4 (-3 / +16 lines)
130	if test x$may_have_cet = xyes; then	130	if test x$may_have_cet = xyes; then
131	if test x$cross_compiling = xno; then	131	if test x$cross_compiling = xno; then
132	AC_TRY_RUN([	132	AC_TRY_RUN([
		133	int
		134	main ()
		135	{
		136	asm ("endbr32");
		137	return 0;
		138	}
		139	],
		140	[have_multi_byte_nop=yes],
		141	[have_multi_byte_nop=no])
		142	have_cet=no
		143	if test x$have_multi_byte_nop = xyes; then
		144	AC_TRY_RUN([
133	static void	145	static void
134	foo (void)	146	foo (void)
135	{	147	{
Lines 155-163 main () Link Here
155	bar ();	167	bar ();
156	return 0;	168	return 0;
157	}	169	}
158	],	170	],
159	[have_cet=no],	171	[have_cet=no],
160	[have_cet=yes])	172	[have_cet=yes])
		173	fi
161	if test x$enable_cet = xno -a x$have_cet = xyes; then	174	if test x$enable_cet = xno -a x$have_cet = xyes; then
162	AC_MSG_ERROR([Intel CET must be enabled on Intel CET enabled host])	175	AC_MSG_ERROR([Intel CET must be enabled on Intel CET enabled host])
163	fi	176	fi

Lines 5396-5401 else Link Here

(-)a/libiberty/configure (-1 / +29 lines)
5396	cat confdefs.h - <<_ACEOF >conftest.$ac_ext	5396	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5397	/* end confdefs.h. */	5397	/* end confdefs.h. */
5398		5398
		5399	int
		5400	main ()
		5401	{
		5402	asm ("endbr32");
		5403	return 0;
		5404	}
		5405
		5406	_ACEOF
		5407	if ac_fn_c_try_run "$LINENO"; then :
		5408	have_multi_byte_nop=yes
		5409	else
		5410	have_multi_byte_nop=no
		5411	fi
		5412	rm -f core .core core.conftest. gmon.out bb.out conftest$ac_exeext \
		5413	conftest.$ac_objext conftest.beam conftest.$ac_ext
		5414	fi
		5415
		5416	have_cet=no
		5417	if test x$have_multi_byte_nop = xyes; then
		5418	if test "$cross_compiling" = yes; then :
		5419	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
		5420	$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
		5421	as_fn_error $? "cannot run test program while cross compiling
		5422	See \`config.log' for more details" "$LINENO" 5; }
		5423	else
		5424	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
		5425	/* end confdefs.h. */
		5426
5399	static void	5427	static void
5400	foo (void)	5428	foo (void)
5401	{	5429	{
Lines 5432-5437 rm -f core .core core.conftest. gmon.out bb.out conftest$ac_exeext \ Link Here
5432	conftest.$ac_objext conftest.beam conftest.$ac_ext	5460	conftest.$ac_objext conftest.beam conftest.$ac_ext
5433	fi	5461	fi
5434		5462
		5463	fi
5435	if test x$enable_cet = xno -a x$have_cet = xyes; then	5464	if test x$enable_cet = xno -a x$have_cet = xyes; then
5436	as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5	5465	as_fn_error $? "Intel CET must be enabled on Intel CET enabled host" "$LINENO" 5
5437	fi	5466	fi
5438	-