FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libatomic: Consider '--with-build-sysroot=[...]' for target libraries' build-tree testing (instead of build-time 'CC' etc.) [PR109951]

Browse source 
Similar to commit fb5d27be27
"libgomp: Consider '--with-build-sysroot=[...]' for target libraries' build-tree testing (instead of build-time 'CC' etc.) [PR91884, PR109951]",
this is commit 5ff06d762a
"libatomic/test: Fix compilation for build sysroot" done differently,
avoiding build-tree testing use of any random gunk that may appear in
build-time 'CC'.

	PR testsuite/109951
	libatomic/
	* configure.ac: 'AC_SUBST(SYSROOT_CFLAGS_FOR_TARGET)'.
	* Makefile.in: Regenerate.
	* configure: Likewise.
	* testsuite/Makefile.in: Likewise.
	* testsuite/lib/libatomic.exp (libatomic_init): If
	'--with-build-sysroot=[...]' was specified, use it for build-tree
	testing.
	* testsuite/libatomic-site-extra.exp.in (GCC_UNDER_TEST): Don't
	set.
	(SYSROOT_CFLAGS_FOR_TARGET): Set.
This commit is contained in:
Thomas Schwinge 2023-09-11 11:36:31 +02:00
parent 967d4171b2
commit d8ff4b96b4
6 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
libatomic/Makefile.in
View file

@ -328,6 +328,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SIZES = @SIZES@ SIZES = @SIZES@
STRIP = @STRIP@ STRIP = @STRIP@
SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
VERSION = @VERSION@ VERSION = @VERSION@
XCFLAGS = @XCFLAGS@ XCFLAGS = @XCFLAGS@
XLDFLAGS = @XLDFLAGS@ XLDFLAGS = @XLDFLAGS@

7
libatomic/configure vendored
View file

@ -656,6 +656,7 @@ LIBAT_BUILD_VERSIONED_SHLIB_FALSE
LIBAT_BUILD_VERSIONED_SHLIB_TRUE LIBAT_BUILD_VERSIONED_SHLIB_TRUE
OPT_LDFLAGS OPT_LDFLAGS
SECTION_LDFLAGS SECTION_LDFLAGS
SYSROOT_CFLAGS_FOR_TARGET
enable_aarch64_lse enable_aarch64_lse
libtool_VERSION libtool_VERSION
ENABLE_DARWIN_AT_RPATH_FALSE ENABLE_DARWIN_AT_RPATH_FALSE
@ -11455,7 +11456,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 11458 "configure" #line 11459 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -11561,7 +11562,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF cat > conftest.$ac_ext <<_LT_EOF
#line 11564 "configure" #line 11565 "configure"
#include "confdefs.h" #include "confdefs.h"
#if HAVE_DLFCN_H #if HAVE_DLFCN_H
@ -11928,6 +11929,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
;; ;;
esac esac
# Get target configury. # Get target configury.
. ${srcdir}/configure.tgt . ${srcdir}/configure.tgt
if test -n "$UNSUPPORTED"; then if test -n "$UNSUPPORTED"; then

2
libatomic/configure.ac
View file

@ -172,6 +172,8 @@ case "$target" in
;; ;;
esac esac
AC_SUBST(SYSROOT_CFLAGS_FOR_TARGET)
# Get target configury. # Get target configury.
. ${srcdir}/configure.tgt . ${srcdir}/configure.tgt
if test -n "$UNSUPPORTED"; then if test -n "$UNSUPPORTED"; then

1
libatomic/testsuite/Makefile.in
View file

@ -198,6 +198,7 @@ SET_MAKE = @SET_MAKE@
SHELL = @SHELL@ SHELL = @SHELL@
SIZES = @SIZES@ SIZES = @SIZES@
STRIP = @STRIP@ STRIP = @STRIP@
SYSROOT_CFLAGS_FOR_TARGET = @SYSROOT_CFLAGS_FOR_TARGET@
VERSION = @VERSION@ VERSION = @VERSION@
XCFLAGS = @XCFLAGS@ XCFLAGS = @XCFLAGS@
XLDFLAGS = @XLDFLAGS@ XLDFLAGS = @XLDFLAGS@

5
libatomic/testsuite/lib/libatomic.exp
View file

@ -146,6 +146,11 @@ proc libatomic_init { args } {
set ALWAYS_CFLAGS "" set ALWAYS_CFLAGS ""
if { $blddir != "" } { if { $blddir != "" } {
# If '--with-build-sysroot=[...]' was specified, use it for build-tree
# testing.
global SYSROOT_CFLAGS_FOR_TARGET
lappend ALWAYS_CFLAGS "additional_flags=${SYSROOT_CFLAGS_FOR_TARGET}"
lappend ALWAYS_CFLAGS "additional_flags=-B${blddir}/" lappend ALWAYS_CFLAGS "additional_flags=-B${blddir}/"
lappend ALWAYS_CFLAGS "additional_flags=-I${blddir}" lappend ALWAYS_CFLAGS "additional_flags=-I${blddir}"
if [istarget *-*-darwin*] { if [istarget *-*-darwin*] {

2
libatomic/testsuite/libatomic-site-extra.exp.in
View file

@ -1 +1 @@
set GCC_UNDER_TEST {@CC@} set SYSROOT_CFLAGS_FOR_TARGET {@SYSROOT_CFLAGS_FOR_TARGET@}