This is an archive of the discontinued LLVM Phabricator instance.

Avoid calling basename to compute xdynamiclib_namespec
ClosedPublic

Authored by • rafael on Mar 31 2017, 8:05 AM.

Download Raw Diff

Details

Reviewers

filcab
rnk

Summary

This also exposes a xdynamiclib_filename that can be used to simplify a few tests.

Diff Detail

Event Timeline

• rafael created this revision.Mar 31 2017, 8:05 AM

Herald added a subscriber: kubamracek. · View Herald TranscriptMar 31 2017, 8:05 AM

• rafael updated this revision to Diff 93684.Mar 31 2017, 10:46 AM

A small ping since most other changes depend on this.

lgtm

This revision is now accepted and ready to land.Apr 3 2017, 2:45 PM

• rafael closed this revision.Apr 4 2017, 3:46 PM

Revision Contents

Path

Size

compiler-rt/

test/

asan/

lit.cfg

5 lines

Diff 93684

compiler-rt/test/asan/lit.cfg

	Show First 20 Lines • Show All 196 Lines • ▼ Show 20 Lines
	elif config.host_os == 'FreeBSD':			elif config.host_os == 'FreeBSD':
	config.substitutions.append( ("%ld_flags_rpath_exe", "-Wl,-z,origin -Wl,-rpath,\$ORIGIN -L%T -l%xdynamiclib_namespec") )			config.substitutions.append( ("%ld_flags_rpath_exe", "-Wl,-z,origin -Wl,-rpath,\$ORIGIN -L%T -l%xdynamiclib_namespec") )
	config.substitutions.append( ("%ld_flags_rpath_so", '') )			config.substitutions.append( ("%ld_flags_rpath_so", '') )
	elif config.host_os == 'Linux':			elif config.host_os == 'Linux':
	config.substitutions.append( ("%ld_flags_rpath_exe", "-Wl,-rpath,\$ORIGIN -L%T -l%xdynamiclib_namespec") )			config.substitutions.append( ("%ld_flags_rpath_exe", "-Wl,-rpath,\$ORIGIN -L%T -l%xdynamiclib_namespec") )
	config.substitutions.append( ("%ld_flags_rpath_so", '') )			config.substitutions.append( ("%ld_flags_rpath_so", '') )

	# Must be defined after the substitutions that use %dynamiclib.			# Must be defined after the substitutions that use %dynamiclib.
	config.substitutions.append( ("%dynamiclib", '%T/lib%xdynamiclib_namespec.so') )			config.substitutions.append( ("%dynamiclib", '%T/%xdynamiclib_filename') )
	config.substitutions.append( ("%xdynamiclib_namespec", '$(basename %t).dynamic') )			config.substitutions.append( ("%xdynamiclib_filename", 'lib%xdynamiclib_namespec.so') )
				config.substitutions.append( ("%xdynamiclib_namespec", '%basename_t.dynamic') )

	# Allow tests to use REQUIRES=stable-runtime. For use when you cannot use XFAIL			# Allow tests to use REQUIRES=stable-runtime. For use when you cannot use XFAIL
	# because the test hangs. Adding armhf as we now have two modes.			# because the test hangs. Adding armhf as we now have two modes.
	if config.target_arch != 'arm' and config.target_arch != 'armhf' and config.target_arch != 'aarch64':			if config.target_arch != 'arm' and config.target_arch != 'armhf' and config.target_arch != 'aarch64':
	config.available_features.add('stable-runtime')			config.available_features.add('stable-runtime')

	# Turn on leak detection on 64-bit Linux.			# Turn on leak detection on 64-bit Linux.
	if config.host_os == 'Linux' and (config.target_arch == 'x86_64' or config.target_arch == 'i386'):			if config.host_os == 'Linux' and (config.target_arch == 'x86_64' or config.target_arch == 'i386'):
	Show All 38 Lines