wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-27 01:27:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Revert "Issue #1676 - Part 13: Split perf sources out of js/src/moz.build"

Browse source 
This reverts commit 383bc182e3a3fe53cf79a51bc36c6218334d93b5.
This commit is contained in:
Moonchild 2022-09-05 13:14:42 +00:00 • committed by roytam1
commit b15c6109e9
2 changed files with 13 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

14
js/src/moz.build
View file

@ -49,6 +49,7 @@ EXPORTS += [
'jstypes.h', 'jstypes.h',
'jsversion.h', 'jsversion.h',
'jswrapper.h', 'jswrapper.h',
'perf/jsperf.h',
] ]
# If you add a header here, add it to js/src/jsapi-tests/testIntTypesABI.cpp so # If you add a header here, add it to js/src/jsapi-tests/testIntTypesABI.cpp so
@ -109,7 +110,6 @@ DIRS += [
'gc', 'gc',
'irregexp', 'irregexp',
'jit', 'jit',
'perf',
] ]
if CONFIG['JS_BUNDLED_EDITLINE']: if CONFIG['JS_BUNDLED_EDITLINE']:
@ -143,6 +143,7 @@ SOURCES += [
'jsscript.cpp', 'jsscript.cpp',
'jsstr.cpp', 'jsstr.cpp',
'jsweakmap.cpp', 'jsweakmap.cpp',
'perf/jsperf.cpp',
'proxy/BaseProxyHandler.cpp', 'proxy/BaseProxyHandler.cpp',
'proxy/CrossCompartmentWrapper.cpp', 'proxy/CrossCompartmentWrapper.cpp',
'proxy/DeadObjectProxy.cpp', 'proxy/DeadObjectProxy.cpp',
@ -296,6 +297,17 @@ if CONFIG['MOZ_VTUNE']:
'vtune/jitprofiling.c' 'vtune/jitprofiling.c'
] ]
if CONFIG['HAVE_LINUX_PERF_EVENT_H']:
SOURCES += [
'perf/pm_linux.cpp'
]
if CONFIG['LINUX_HEADERS_INCLUDES']:
SOURCES['perf/pm_linux.cpp'].flags += [CONFIG['LINUX_HEADERS_INCLUDES']]
else:
SOURCES += [
'perf/pm_stub.cpp'
]
# JavaScript must be built shared, even for static builds, as it is used by # JavaScript must be built shared, even for static builds, as it is used by
# other modules which are always built shared. Failure to do so results in # other modules which are always built shared. Failure to do so results in
# the js code getting copied into xpinstall and jsd as well as mozilla-bin, # the js code getting copied into xpinstall and jsd as well as mozilla-bin,

29
js/src/perf/moz.build
View file

@ -1,29 +0,0 @@
# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
include('../js-config.mozbuild')
include('../js-cxxflags.mozbuild')
FINAL_LIBRARY = "js"
# Includes should be relative to parent path
LOCAL_INCLUDES += ["!..", ".."]
EXPORTS += ['jsperf.h']
SOURCES += [
'jsperf.cpp',
]
if CONFIG['HAVE_LINUX_PERF_EVENT_H']:
SOURCES += [
'pm_linux.cpp'
]
if CONFIG['LINUX_HEADERS_INCLUDES']:
SOURCES['pm_linux.cpp'].flags += [CONFIG['LINUX_HEADERS_INCLUDES']]
else:
SOURCES += [
'pm_stub.cpp'
]