wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 240267 - link error when doing make profiledbuild. r=bsmedberg

Browse Source
This commit is contained in:
ted.mielczarek@gmail.com 2008-02-16 14:23:07 -08:00
parent 4210eeeb0a
commit 54a26abd81
4 changed files with 21 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client.mk
View File

@ -1162,4 +1162,4 @@ endif
echo-variable-%:
@echo $($*)
.PHONY: checkout real_checkout depend build export libs alldep install clean realclean distclean cleansrcdir pull_all build_all clobber clobber_all pull_and_build_all everything configure preflight_all preflight postflight postflight_all
.PHONY: checkout real_checkout depend build profiledbuild export libs alldep install clean realclean distclean cleansrcdir pull_all build_all clobber clobber_all pull_and_build_all everything configure preflight_all preflight postflight postflight_all

2
config/autoconf.mk.in
View File

@ -284,7 +284,9 @@ MOZ_OPTIMIZE_LDFLAGS = @MOZ_OPTIMIZE_LDFLAGS@
MOZ_RTTI_FLAGS_ON = @_MOZ_RTTI_FLAGS_ON@
PROFILE_GEN_CFLAGS = @PROFILE_GEN_CFLAGS@
PROFILE_GEN_LDFLAGS = @PROFILE_GEN_LDFLAGS@
PROFILE_USE_CFLAGS = @PROFILE_USE_CFLAGS@
PROFILE_USE_LDFLAGS = @PROFILE_USE_LDFLAGS@
XCFLAGS = @XCFLAGS@
XLDFLAGS = @XLDFLAGS@

42
config/config.mk
View File

@ -278,16 +278,6 @@ endif
endif # MOZ_DEBUG
endif # WINNT && !GNU_CC
# If we're applying MOZ_PROFILE_GENERATE to a non-static build, then we
# need to create a static build _with_ PIC. This allows us to generate
# profile data that will still be valid when the object files are linked into
# shared libraries.
ifdef MOZ_PROFILE_GENERATE
BUILD_STATIC_LIBS=1
STATIC_BUILD_PIC=1
endif
#
# Build using PIC by default
# Do not use PIC if not building a shared lib (see exceptions below)
@ -352,20 +342,6 @@ FORCE_SHARED_LIB=1
endif
endif
ifdef STATIC_BUILD_PIC
ifndef _ENABLE_PIC
# If PIC hasn't been enabled now, object files in this directory will not
# ever be linked into a DSO. Turn PIC on and set ENABLE_PROFILE_GENERATE.
ENABLE_PROFILE_GENERATE=1
_ENABLE_PIC=1
endif
else
# For static builds, always enable profile generation for non-PIC objects.
ifndef _ENABLE_PIC
ENABLE_PROFILE_GENERATE=1
endif
endif
#
# Disable PIC if necessary
#
@ -377,24 +353,28 @@ DSO_PIC_CFLAGS=-mdynamic-no-pic
else
DSO_PIC_CFLAGS=
endif
MKSHLIB=
endif
# Enable profile-based feedback for non-PIC objects
ifdef ENABLE_PROFILE_GENERATE
# Enable profile-based feedback
ifdef MOZ_PROFILE_GENERATE
DSO_PIC_CFLAGS += $(PROFILE_GEN_CFLAGS)
endif
# No sense in profiling tools
ifndef INTERNAL_TOOLS
OS_CFLAGS += $(PROFILE_GEN_CFLAGS)
OS_CXXFLAGS += $(PROFILE_GEN_CFLAGS)
endif # INTERNAL_TOOLS
OS_LDFLAGS += $(PROFILE_GEN_LDFLAGS)
endif
# We always use the profile-use flags, even in cases where we didn't use the
# profile-generate flags. It's harmless, and it saves us from having to
# answer the question "Would these objects have been built using
# the profile-generate flags?" which is not trivial.
ifdef MOZ_PROFILE_USE
DSO_PIC_CFLAGS += $(PROFILE_USE_CFLAGS)
OS_CFLAGS += $(PROFILE_USE_CFLAGS)
OS_CXXFLAGS += $(PROFILE_USE_CFLAGS)
endif
# Does the makefile specifies the internal XPCOM API linkage?
ifneq (,$(MOZILLA_INTERNAL_API)$(LIBXUL_LIBRARY))
DEFINES += -DMOZILLA_INTERNAL_API

7
configure.in
View File

@ -6507,7 +6507,9 @@ AC_TRY_COMPILE([], [return 0;],
AC_MSG_RESULT([$result])
if test $result = "yes"; then
PROFILE_GEN_LDFLAGS="-fprofile-generate"
PROFILE_USE_CFLAGS="-fprofile-use"
PROFILE_USE_LDFLAGS="-fprofile-use"
else
CFLAGS="$_SAVE_CFLAGS -fprofile-arcs"
AC_MSG_CHECKING([whether C compiler supports -fprofile-arcs])
@ -6518,12 +6520,17 @@ else
if test $result = "yes"; then
PROFILE_USE_CFLAGS="-fbranch-probabilities"
fi
# don't really care, this is an old GCC
PROFILE_GEN_LDFLAGS=
PROFILE_USE_LDFLAGS=
fi
CFLAGS="$_SAVE_CFLAGS"
AC_SUBST(PROFILE_GEN_CFLAGS)
AC_SUBST(PROFILE_GEN_LDFLAGS)
AC_SUBST(PROFILE_USE_CFLAGS)
AC_SUBST(PROFILE_USE_LDFLAGS)
AC_LANG_CPLUSPLUS