This is an archive of the discontinued LLVM Phabricator instance.

Differential D40661

Error on -no-define-common if the output is not relocatable
ClosedPublic

Authored by • rafael on Nov 30 2017, 10:28 AM.

Download Raw Diff

Details

Reviewers

ruiu
grimar

Summary

The ELF spec says

Symbols with section index SHN_COMMON may appear only in relocatable objects.

Currently lld can produce file that break that requirement.

Diff Detail

Event Timeline

• rafael created this revision.Nov 30 2017, 10:28 AM

Herald added a subscriber: emaste. · View Herald TranscriptNov 30 2017, 10:28 AM

LGTM with this change.

ruiu added inline comments.Nov 30 2017, 12:25 PM

ELF/Driver.cpp
670–671	checkOptions is a better place to add this code.

Committed version LGTM too.

This revision is now accepted and ready to land.Dec 1 2017, 12:45 AM

Was committed as r319473.

Revision Contents

Path

Size

ELF/

3 lines

test/

ELF/

relocatable-common.s

3 lines

Diff 124964

ELF/Driver.cpp

	Show First 20 Lines • Show All 661 Lines • ▼ Show 20 Lines		void LinkerDriver::readConfigs(opt::InputArgList &Args) {
	Config->ZNow = hasZOption(Args, "now");			Config->ZNow = hasZOption(Args, "now");
	Config->ZOrigin = hasZOption(Args, "origin");			Config->ZOrigin = hasZOption(Args, "origin");
	Config->ZRelro = !hasZOption(Args, "norelro");			Config->ZRelro = !hasZOption(Args, "norelro");
	Config->ZRodynamic = hasZOption(Args, "rodynamic");			Config->ZRodynamic = hasZOption(Args, "rodynamic");
	Config->ZStackSize = args::getZOptionValue(Args, OPT_z, "stack-size", 0);			Config->ZStackSize = args::getZOptionValue(Args, OPT_z, "stack-size", 0);
	Config->ZText = !hasZOption(Args, "notext");			Config->ZText = !hasZOption(Args, "notext");
	Config->ZWxneeded = hasZOption(Args, "wxneeded");			Config->ZWxneeded = hasZOption(Args, "wxneeded");

				if (!Config->Relocatable && !Config->DefineCommon)
				error("-no-define-common not supported in non relocatable output");
				ruiuUnsubmitted Not Done Reply Inline Actions checkOptions is a better place to add this code. ruiu: checkOptions is a better place to add this code.

	// Parse LTO plugin-related options for compatibility with gold.			// Parse LTO plugin-related options for compatibility with gold.
	for (auto *Arg : Args.filtered(OPT_plugin_opt, OPT_plugin_opt_eq)) {			for (auto *Arg : Args.filtered(OPT_plugin_opt, OPT_plugin_opt_eq)) {
	StringRef S = Arg->getValue();			StringRef S = Arg->getValue();
	if (S == "disable-verify")			if (S == "disable-verify")
	Config->DisableVerify = true;			Config->DisableVerify = true;
	else if (S == "save-temps")			else if (S == "save-temps")
	Config->SaveTemps = true;			Config->SaveTemps = true;
	else if (S.startswith("O"))			else if (S.startswith("O"))
	▲ Show 20 Lines • Show All 428 Lines • Show Last 20 Lines

test/ELF/relocatable-common.s

	Show All 27 Lines
	# DEFCOMM-NEXT: Value: 0x0			# DEFCOMM-NEXT: Value: 0x0
	# DEFCOMM-NEXT: Size: 4			# DEFCOMM-NEXT: Size: 4
	# DEFCOMM-NEXT: Binding: Global			# DEFCOMM-NEXT: Binding: Global
	# DEFCOMM-NEXT: Type: Object			# DEFCOMM-NEXT: Type: Object
	# DEFCOMM-NEXT: Other: 0			# DEFCOMM-NEXT: Other: 0
	# DEFCOMM-NEXT: Section: COMMON			# DEFCOMM-NEXT: Section: COMMON
	# DEFCOMM-NEXT: }			# DEFCOMM-NEXT: }

				# RUN: not ld.lld -shared --no-define-common %t1.o -o %t 2>&1 \| FileCheck --check-prefix=ERROR %s
				# ERROR: error: -no-define-common not supported in non relocatable output

	.comm common,4,4			.comm common,4,4