--- a/build/mozconfig.common.override
+++ b/build/mozconfig.common.override
@@ -4,10 +4,8 @@
# Common mozconfig for all users
#
# Add options to this file that will be inherited by all in-tree mozconfigs.
# This file is included at the *end* of the mozconfigs, and so may be used
# to override anything done previously.
#
# The common expected usage is for try builds with nondefault options.
-
-ac_add_options --enable-strip
--- a/build/unix/mozconfig.linux
+++ b/build/unix/mozconfig.linux
@@ -25,10 +25,8 @@ else
fi
. "$topsrcdir/build/unix/mozconfig.stdcxx"
if [ -f /etc/redhat-release ]; then
# PKG_CONFIG_LIBDIR is appropriately overridden in mozconfig.linux32
export PKG_CONFIG_LIBDIR=/usr/local/lib64/pkgconfig:/usr/lib64/pkgconfig:/usr/share/pkgconfig
fi
-
-export STRIP_FLAGS=" "
--- a/gfx/cairo/cairo/src/cairo-ft-font.c
+++ b/gfx/cairo/cairo/src/cairo-ft-font.c
@@ -2305,17 +2305,17 @@ static cairo_int_status_t
if ((info & CAIRO_SCALED_GLYPH_INFO_PATH) != 0 &&
(info & CAIRO_SCALED_GLYPH_INFO_SURFACE) == 0)
load_flags |= FT_LOAD_NO_BITMAP;
/*
* Don't pass FT_LOAD_VERTICAL_LAYOUT to FT_Load_Glyph here as
* suggested by freetype people.
*/
- if (load_flags & (long)FT_LOAD_VERTICAL_LAYOUT) {
+ if (load_flags & FT_LOAD_VERTICAL_LAYOUT) {
load_flags &= ~FT_LOAD_VERTICAL_LAYOUT;
vertical_layout = TRUE;
}
#ifdef FT_LOAD_COLOR
/* Color-glyph support:
*
* This flags needs plumbing through fontconfig (does it?), and--- a/ipc/chromium/src/third_party/libevent/http.c
+++ b/ipc/chromium/src/third_party/libevent/http.c
@@ -23,35 +23,35 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "event2/event-config.h"
#include "evconfig-private.h"
-#ifdef EVENT__HAVE_SYS_WAIT_H
-#include <sys/wait.h>
-#endif
#ifdef EVENT__HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
#ifdef EVENT__HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif
#ifdef HAVE_SYS_IOCCOM_H
#include <sys/ioccom.h>
#endif
#ifdef EVENT__HAVE_SYS_RESOURCE_H
#include <sys/resource.h>
#endif
#ifdef EVENT__HAVE_SYS_TIME_H
#include <sys/time.h>
#endif
+#ifdef EVENT__HAVE_SYS_WAIT_H
+#include <sys/wait.h>
+#endif
#ifndef _WIN32
#include <sys/socket.h>
#include <sys/stat.h>
#else
#include <winsock2.h>
#include <ws2tcpip.h>
#endif
--- a/js/src/perf/pm_linux.cpp
+++ b/js/src/perf/pm_linux.cpp
@@ -134,26 +134,23 @@ Impl::~Impl()
EventMask
Impl::init(EventMask toMeasure)
{
MOZ_ASSERT(group_leader == -1);
if (!toMeasure)
return EventMask(0);
EventMask measured = EventMask(0);
- union {
- struct perf_event_attr attr;
- char dummy[256];
- };
+ struct perf_event_attr attr;
for (const auto& slot : kSlots) {
if (!(toMeasure & slot.bit))
continue;
- memset(&dummy, 0, sizeof(dummy));
- attr.size = sizeof(dummy);
+ memset(&attr, 0, sizeof(attr));
+ attr.size = sizeof(attr);
// Set the type and config fields to indicate the counter we
// want to enable. We want read format 0, and we're not using
// sampling, so leave those fields unset.
attr.type = slot.type;
attr.config = slot.config;
// If this will be the group leader it should start off
@@ -291,22 +288,19 @@ PerfMeasurement::canMeasureSomething()
// API. If it doesn't, syscall(__NR_perf_event_open, ...) is
// guaranteed to return -1 and set errno to ENOSYS.
//
// We set up input parameters that should provoke an EINVAL error
// from a kernel that does implement perf_event_open, but we can't
// be sure it will (newer kernels might add more event types), so
// we have to take care to close any valid fd it might return.
- union {
- struct perf_event_attr attr;
- char dummy[256];
- };
- memset(&dummy, 0, sizeof(dummy));
- attr.size = sizeof(dummy);
+ struct perf_event_attr attr;
+ memset(&attr, 0, sizeof(attr));
+ attr.size = sizeof(attr);
attr.type = PERF_TYPE_MAX;
int fd = sys_perf_event_open(&attr, 0, -1, -1, 0);
if (fd >= 0) {
close(fd);
return true;
}
return errno != ENOSYS;--- a/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
+++ b/media/webrtc/trunk/webrtc/modules/video_capture/linux/device_info_linux.cc
@@ -3,17 +3,16 @@
*
* Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source
* tree. An additional intellectual property rights grant can be found
* in the file PATENTS. All contributing project authors may
* be found in the AUTHORS file in the root of the source tree.
*/
-#include <linux/types.h>
#include "webrtc/modules/video_capture/linux/device_info_linux.h"
#include <errno.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdlib.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
--- a/moz.configure
+++ b/moz.configure
@@ -543,20 +543,16 @@ def nsis_flags(host):
if host.kernel != 'WINNT':
return '-nocd'
return ''
set_config('MAKENSISU_FLAGS', nsis_flags)
check_prog('7Z', ('7z', '7za'), allow_missing=True, when=target_is_windows)
-set_define(
- '__NO_MATH_INLINES', True,
- when=depends(target)(lambda t: t.kernel == 'Linux' and t.cpu == 'x86'))
-
# Fallthrough to autoconf-based configure
include('build/moz.configure/old.configure')
@imports('__sandbox__')
def all_paths():
return __sandbox__._all_paths
set_config('ALL_CONFIGURE_PATHS', all_paths())--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -21,47 +21,16 @@ linux64/opt:
tooltool-downloads: public
need-xvfb: true
toolchains:
- linux64-clang
- linux64-gcc
- linux64-rust
- linux64-sccache
-linux64-deb/opt:
- description: "Linux64 Opt"
- index:
- product: firefox
- job-name: linux64-deb-opt
- treeherder:
- platform: linux64/opt
- symbol: tc(Bdeb)
- worker-type: aws-provisioner-v1/gecko-{level}-b-linux
- worker:
- docker-image: {in-tree: debian7-amd64-build}
- max-run-time: 36000
- env:
- PERFHERDER_EXTRA_OPTIONS: deb
- run:
- using: mozharness
- actions: [get-secrets build check-test update]
- config:
- - builds/releng_base_firefox.py
- - builds/releng_base_linux_64_builds.py
- - balrog/production.py
- script: "mozharness/scripts/fx_desktop_build.py"
- secrets: true
- tooltool-downloads: public
- need-xvfb: true
- toolchains:
- - linux64-clang
- - linux64-gcc
- - linux64-rust
- - linux64-sccache
-
linux64-dmd/opt:
description: "Linux64 DMD Opt"
index:
product: firefox
job-name: linux64-dmd-opt
treeherder:
platform: linux64-dmd/opt
symbol: tc(Bdmd)
@@ -298,47 +267,16 @@ linux/opt:
tooltool-downloads: public
need-xvfb: true
toolchains:
- linux64-clang
- linux64-gcc
- linux64-rust
- linux64-sccache
-linux-deb/opt:
- description: "Linux32 Opt"
- index:
- product: firefox
- job-name: linux-deb-opt
- treeherder:
- platform: linux32/opt
- symbol: tc(Bdeb)
- worker-type: aws-provisioner-v1/gecko-{level}-b-linux
- worker:
- docker-image: {in-tree: debian7-i386-build}
- max-run-time: 36000
- env:
- PERFHERDER_EXTRA_OPTIONS: deb
- run:
- using: mozharness
- actions: [get-secrets build check-test update]
- config:
- - builds/releng_base_firefox.py
- - builds/releng_base_linux_32_builds.py
- - balrog/production.py
- script: "mozharness/scripts/fx_desktop_build.py"
- secrets: true
- tooltool-downloads: public
- need-xvfb: true
- toolchains:
- - linux64-clang
- - linux64-gcc
- - linux64-rust
- - linux64-sccache
-
linux/debug:
description: "Linux32 Debug"
index:
product: firefox
job-name: linux-debug
treeherder:
platform: linux32/debug
symbol: tc(B)--- a/taskcluster/ci/build/macosx.yml
+++ b/taskcluster/ci/build/macosx.yml
@@ -58,50 +58,16 @@ macosx64/opt:
- linux64-cctools-port
- linux64-clang
- linux64-hfsplus
- linux64-libdmg
- linux64-llvm-dsymutil
- linux64-rust-macos
- linux64-sccache
-macosx64-deb/opt:
- description: "MacOS X x64 Cross-compile"
- index:
- product: firefox
- job-name: macosx64-deb-opt
- treeherder:
- platform: osx-cross/opt
- symbol: tc(Bdeb)
- tier: 1
- worker-type: aws-provisioner-v1/gecko-{level}-b-macosx64
- worker:
- docker-image: {in-tree: debian7-amd64-build}
- max-run-time: 36000
- env:
- TOOLTOOL_MANIFEST: "browser/config/tooltool-manifests/macosx64/cross-releng.manifest"
- PERFHERDER_EXTRA_OPTIONS: deb
- run:
- using: mozharness
- actions: [get-secrets build update]
- config:
- - builds/releng_base_firefox.py
- - builds/releng_base_mac_64_cross_builds.py
- script: "mozharness/scripts/fx_desktop_build.py"
- secrets: true
- tooltool-downloads: internal
- toolchains:
- - linux64-cctools-port
- - linux64-clang
- - linux64-hfsplus
- - linux64-libdmg
- - linux64-llvm-dsymutil
- - linux64-rust-macos
- - linux64-sccache
-
macosx64-dmd/opt:
description: "MacOS X x64 DMD Cross-compile"
index:
product: firefox
job-name: macosx64-dmd-opt
treeherder:
platform: osx-10-10-dmd/opt
symbol: tc(Bdmd)--- a/taskcluster/ci/diffoscope/kind.yml
+++ b/taskcluster/ci/diffoscope/kind.yml
@@ -23,18 +23,16 @@ transforms:
# generated for each build.
job-defaults:
args: >-
--no-default-limits
--max-page-size 100000000
--max-page-diff-block-lines 10000
--exclude-directory-metadata
--exclude-command .--line-numbers
- --exclude-command .--hex-dump=\.dynstr
- --exclude-command .--hex-dump=\.gnu_debuglink
--exclude **/*freeblpriv3.chk
--exclude **/*nssdbm3.chk
--exclude **/*softokn3.chk
# Make a task for each diff we might want. The following are just examples,
# Both original and new can point to builds from the full set of tasks or
# from other sets through an index-search. Other kinds than `build` can be
# compared (for example, static-analysis), provided you adjust the
@@ -54,22 +52,8 @@ job-defaults:
# macosx-build-vs-previous-try:
# symbol: M
# new: build-macosx64/opt
# original: {index-search: gecko.v2.try.revision.aabd5deb0156f9b55ab60ad6a01ebfc4580bf2e1.firefox.macosx64-opt}
# win32-build-vs-previous-try:
# symbol: W
# new: build-win32/opt
# original: {index-search: gecko.v2.try.revision.aabd5deb0156f9b55ab60ad6a01ebfc4580bf2e1.firefox.win32-opt}
-
-jobs:
- linux64-diff:
- symbol: L64
- original: build-linux64/opt
- new: build-linux64-deb/opt
- linux-diff:
- symbol: L32
- original: build-linux/opt
- new: build-linux-deb/opt
- macosx64-diff:
- symbol: M
- original: build-macosx64/opt
- new: build-macosx64-deb/opt--- a/toolkit/xre/nsX11ErrorHandler.cpp
+++ b/toolkit/xre/nsX11ErrorHandler.cpp
@@ -15,17 +15,17 @@
#define BUFSIZE 2048 // What Xlib uses with XGetErrorDatabaseText
extern "C" {
int
X11Error(Display *display, XErrorEvent *event) {
// Get an indication of how long ago the request that caused the error was
// made.
- unsigned long age = (((_XPrivDisplay)(display))->request + 1) - event->serial;
+ unsigned long age = NextRequest(display) - event->serial;
// Get a string to represent the request that caused the error.
nsAutoCString message;
if (event->request_code < 128) {
// Core protocol request
message.AppendInt(event->request_code);
} else {
// Extension request