This is an archive of the discontinued LLVM Phabricator instance.

[make & configure] Don't strip leading underscore on Win64
Needs ReviewPublic

Authored by loladiro on Aug 22 2014, 8:50 PM.

Download Raw Diff

This revision needs review, but there are no reviewers specified.

Details

Reviewers: None

Summary

Unlike the win32 abi, the win64 abi doesn't have leading underscores in symbols, so stripping them from the nm output causes symbols without leading underscores to not appear at all and symbols with leading underscores to be missing said underscore, causing an error when attempting to compile the shared library. This fixes that.

Diff Detail

Event Timeline

loladiro updated this revision to Diff 12874.Aug 22 2014, 8:50 PM

loladiro retitled this revision from to [make & configure] Don't strip leading underscore on Win64.

loladiro updated this object.

loladiro edited the test plan for this revision. (Show Details)

loladiro set the repository for this revision to rL LLVM.

loladiro added a subscriber: Unknown Object (MLST).

asl added a subscriber: asl.Aug 23 2014, 9:58 AM

asl added inline comments.

tools/llvm-shlib/Makefile
92	Can we instead of full copy & paste conditionalize the pattern only?

loladiro added inline comments.Aug 23 2014, 10:08 AM

tools/llvm-shlib/Makefile
92	Sure, any thoughts on how to do that? You can't really put the ifeq inside the command, and using string processing to assemble the command seemed worse to me than this.

bump

yaron.keren added a subscriber: yaron.keren.Aug 25 2014, 1:17 PM

bump

Have you forgot to attach the updated patch? I do not see that something was changed since the original submission.

tools/llvm-shlib/Makefile
92	Put it outside the command into a variable?

Updated as per review comment.

Bump. Does this look good now?

Revision Contents

Path

Size

tools/

llvm-shlib/

Makefile

8 lines

Diff 12874

tools/llvm-shlib/Makefile

	Show First 20 Lines • Show All 82 Lines • ▼ Show 20 Lines
	$(LibName.SO): $(SHLIB_STUBS)			$(LibName.SO): $(SHLIB_STUBS)

	%.syms.txt: %.a.o			%.syms.txt: %.a.o
	$(Echo) Collecting global symbols of $(notdir $*)			$(Echo) Collecting global symbols of $(notdir $*)
	$(Verb) $(NM_PATH) -g $< > $@			$(Verb) $(NM_PATH) -g $< > $@

	$(ObjDir)/$(LIBRARYNAME).exports: $(SHLIB_FRAGS) $(ObjDir)/.dir			$(ObjDir)/$(LIBRARYNAME).exports: $(SHLIB_FRAGS) $(ObjDir)/.dir
	$(Echo) Generating exports for $(LIBRARYNAME)			$(Echo) Generating exports for $(LIBRARYNAME)
				ifeq ($(ARCH),x86_64)
				$(Verb) ($(SED) -n \
				aslUnsubmitted Not Done Reply Inline Actions Can we instead of full copy & paste conditionalize the pattern only? asl: Can we instead of full copy & paste conditionalize the pattern only?
				loladiroAuthorUnsubmitted Not Done Reply Inline Actions Sure, any thoughts on how to do that? You can't really put the ifeq inside the command, and using string processing to assemble the command seemed worse to me than this. loladiro: Sure, any thoughts on how to do that? You can't really put the ifeq inside the command, and…
				aslUnsubmitted Not Done Reply Inline Actions Put it outside the command into a variable? asl: Put it outside the command into a variable?
				-e "s/^.* T $[^.][^.]*$$$/\1/p" \
				-e "s/^.* [BDR] $[^.][^.]*$$$/\1 DATA/p" \
				$(SHLIB_FRAGS) \
				\| sort -u) > $@
				else
	$(Verb) ($(SED) -n \			$(Verb) ($(SED) -n \
	-e "s/^.* T _$[^.][^.]*$$$/\1/p" \			-e "s/^.* T _$[^.][^.]*$$$/\1/p" \
	-e "s/^.* [BDR] _$[^.][^.]*$$$/\1 DATA/p" \			-e "s/^.* [BDR] _$[^.][^.]*$$$/\1 DATA/p" \
	$(SHLIB_FRAGS) \			$(SHLIB_FRAGS) \
	\| sort -u) > $@			\| sort -u) > $@
				endif

	$(ObjDir)/$(LIBRARYNAME).a.o: $(LLVMLibsPaths) $(ObjDir)/.dir			$(ObjDir)/$(LIBRARYNAME).a.o: $(LLVMLibsPaths) $(ObjDir)/.dir
	$(Echo) Linking all LLVMLibs together for $(LIBRARYNAME)			$(Echo) Linking all LLVMLibs together for $(LIBRARYNAME)
	$(Verb) $(Link) -nostartfiles -Wl,-r -nodefaultlibs -o $@ \			$(Verb) $(Link) -nostartfiles -Wl,-r -nodefaultlibs -o $@ \
	-Wl,--whole-archive $(LLVMLibsPaths) \			-Wl,--whole-archive $(LLVMLibsPaths) \
	-Wl,--no-whole-archive			-Wl,--no-whole-archive

	$(ObjDir)/stdc++.a.o: $(ObjDir)/.dir			$(ObjDir)/stdc++.a.o: $(ObjDir)/.dir
	Show All 13 Lines