[PATCH] D23350: Fix building builtins via plain "make"

[Martin Storsjö via llvm-commits]

mstorsjo created this revision.
mstorsjo added a reviewer: beanz.
mstorsjo added a subscriber: llvm-commits.

When the autoconf support was removed in SVN rev 258863, the
references to profiling were removed from clang_darwin.mk, but
not from clang_linux.mk.

This fixes e.g. "make clang_linux-builtins-x86_64", which previously
errored out with this:
Makefile:267: *** SelectFunctionDir: invalid function name "GCDAProfiling" (no such function).  Stop.

https://reviews.llvm.org/D23350

Files:
  make/platform/clang_linux.mk

Index: make/platform/clang_linux.mk
===================================================================
--- make/platform/clang_linux.mk
+++ make/platform/clang_linux.mk
@@ -49,16 +49,14 @@
 
 # Build runtime libraries for i386.
 ifeq ($(call contains,$(SupportedArches),i386),true)
-Configs += builtins-i386 profile-i386
+Configs += builtins-i386
 Arch.builtins-i386 := i386
-Arch.profile-i386 := i386
 endif
 
 # Build runtime libraries for x86_64.
 ifeq ($(call contains,$(SupportedArches),x86_64),true)
-Configs += builtins-x86_64 profile-x86_64
+Configs += builtins-x86_64
 Arch.builtins-x86_64 := x86_64
-Arch.profile-x86_64 := x86_64
 endif
 
 endif
@@ -71,17 +69,9 @@
 
 CFLAGS.builtins-i386 := $(CFLAGS) -m32
 CFLAGS.builtins-x86_64 := $(CFLAGS) -m64
-CFLAGS.profile-i386 := $(CFLAGS) -m32
-CFLAGS.profile-x86_64 := $(CFLAGS) -m64
 
 FUNCTIONS.builtins-i386 := $(CommonFunctions) $(ArchFunctions.i386)
 FUNCTIONS.builtins-x86_64 := $(CommonFunctions) $(ArchFunctions.x86_64)
-FUNCTIONS.profile-i386 := GCDAProfiling InstrProfiling InstrProfilingBuffer \
-                          InstrProfilingFile InstrProfilingPlatformOther \
-                          InstrProfilingRuntime InstrProfilingUtil \
-                          InstrProfilingWriter InstrProfilingValue \
-                          InstrProfilingMerge InstrProfilingMergeFile
-FUNCTIONS.profile-x86_64 := $(FUNCTIONS.profile-i386)
 
 # Always use optimized variants.
 OPTIMIZED := 1


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D23350.67508.patch
Type: text/x-patch
Size: 1457 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160810/db64efe5/attachment.bin>