Skip to content

/ mozjs

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP SMUP #96

Closed
wants to merge 47 commits into from
Closed

WIP SMUP #96

wants to merge 47 commits into from
+84,924 −25,566

Conversation

@Ms2ger
Copy link
Collaborator

Ms2ger commented Aug 23, 2016 •
edited by larsbergstrom

Recreated the PR to aid collaboration.

This change is Reviewable
@Ms2ger Ms2ger mentioned this pull request Aug 23, 2016
Closed
@bors-servo
Copy link
Contributor

bors-servo commented Aug 23, 2016

☔ The latest upstream changes (presumably #89) made this pull request unmergeable. Please resolve the merge conflicts.
@fitzgen fitzgen force-pushed the smup branch 2 times, most recently from 973d64a to f40ee82 Aug 23, 2016
@fitzgen
Copy link
Member

fitzgen commented Aug 26, 2016

Just rebased this on top of the promise changes -- should no longer have conflicts.
fitzgen and others added 25 commits Aug 18, 2016
@fitzgen @Ms2ger
Remove the upstreamed patch Add-missing-MOZ_ANDROID_CPU_ARCH-call-in-…
762ce77 
…SpiderMonkey.patch
@fitzgen @Ms2ger
Remove the now unnecessary patch Fix-the-build-for-arm64.patch
0e10afd 
This was fixed in upstream bug 1284824 and bug 1286207.
@fitzgen @Ms2ger
Rebase the Hide-GarbageCollectionEvent.patch
ba4f2f4
@fitzgen @Ms2ger
Rebase Hide-some-callbacks-that-use-RefPtr.patch
9931d54
@fitzgen @Ms2ger
Rebase Hide-source-hooks.patch
ae19fef
@fitzgen @Ms2ger
Fold fix-struct-class-winnspr.patch into Add-WinNSPR.cpp-implementati…
4b67bbd 
…on.patch
@fitzgen @Ms2ger
Use `From:` instead of `Author:` in patch files
6b5d2db 
Newer git versions became stricter about user related thing in `git am` and the
patches using `Author:` were causing `git am` to fail.
@fitzgen @Ms2ger
Rebase no-pthread-posixnspr.patch
8fa48f7
@fitzgen @Ms2ger
If autoconf2.13 isn't available, try autoconf-2.13
9e3fd98
@fitzgen @Ms2ger
Update etc/COMMIT
c2d1bb5
@fitzgen @Ms2ger
Update SpiderMonkey
d41f51e
@vvuk @Ms2ger
Add WinNSPR.cpp implementation
4e39326
@nox @Ms2ger
Add mozglue to JS_STANDALONE
9d3ba78
@vvuk @Ms2ger
Build mozglue as a static library when building JS_STANDALONE
ea4fe52
@nox @Ms2ger
Disable __thread on mingw
a4ce1c8
@nox @Ms2ger
Don't try to refresh configure files
bfc5f85
@nox @Ms2ger
Dumb down LinkedList for rust-bindgen
0d67266
@nox @Ms2ger
Dumb down the pointer type in Rooted<T>
cc7f9a7 
Luckily in Servo, we never use Rooted<T> where T is a special traceable
snowflake.
@nox @Ms2ger
Fix the static library build
6210daf
@nox @Ms2ger
Hide GarbageCollectionEvent
2851d98
@nox @Ms2ger
Hide JSPrincipals::dump
0d5237e
@nox @Ms2ger
Hide JS_Enumerate
72efef9
@nox @Ms2ger
Hide JS_ReportErrorNumberVA
408e64e
@nox @Ms2ger
Hide TraceIncomingCCWs
97f785f
@nox @Ms2ger
Hide some callbacks that use RefPtr
e98f8f5
nox and others added 21 commits Apr 11, 2016
@nox @Ms2ger
Hide some debug stuff that can't compile as such with RUST_BINDGEN
6ee8474 
Because we also hide the unions related to these assertions.
@nox @Ms2ger
Hide some stuff in jsval_layout
b5d824e 
These things are not the same between 32 and 64 bits.
@nox @Ms2ger
Hide some unions in JSPropertySpec
8665b9b 
We need to use that type in constant context.
@nox @Ms2ger
Hide source hooks
a2f0fda
@nox @Ms2ger
Hide unions in JSJitInfo
27ab074 
Need it in constant context.
@michaelwu @Ms2ger
Linker hack
25d26db
@nox @Ms2ger
Make a horrible hack to avoid dllimport/dllexport on Windows
900eced
@nox @Ms2ger
Make js/src/configure honor PYTHON
8eaf77c
@nox @Ms2ger
Use MOZ_FOLD_LIBS
f2f815a
@vvuk @Ms2ger
Don't include pthread.h on Windows in PosixNSPR.h
41f32f0
@vvuk @Ms2ger
When doing RUST_BINDGEN, we'll be using clang/llvm, and should use th…
c52b29e 
…ose visibillity attributes
@vvuk @Ms2ger
win32: allow msys make when in mingw64/msys2
e0778e6
@fitzgen @Ms2ger
Generate configure.
bd053f0
@fitzgen @Ms2ger
Remove m-c's test Cargo.toml files
6dc2f57
@fitzgen @Ms2ger
Add downstream patch to remove m-c's test Cargo.toml files
ca24aa0
@fitzgen @Ms2ger
Hide JS_GetDefaultLocale
4ead8d3
@fitzgen @Ms2ger
Add downstream patch for hiding JS_GetDefaultLocale
ae5daec
@vvuk @Ms2ger
configure needs to be newer than old-configure.in as well
2c70775
@vvuk @Ms2ger
Bug 1300925, change Intl.cpp stubs to an anonymous namespace
2cc8a01
@vvuk @Ms2ger
Undefine WINNT in toolchain.configure to ignore a compiler define for…
618fe0d 
… mingw gcc
@vvuk @Ms2ger
Make sure cargo: paths always use forward slashes on windows
Loading status checks…
cdfedb8
@Ms2ger Ms2ger force-pushed the smup branch from 4b6c4f8 to cdfedb8 Sep 13, 2016
@Ms2ger
Remove checks for makensis from moz.configure.
Loading status checks…
fc2f07c
@Ms2ger
Copy link
Collaborator Author

Ms2ger commented Sep 14, 2016 

make[1]: touch: Command not found
@bors-servo
Copy link
Contributor

bors-servo commented Sep 23, 2016

☔ The latest upstream changes (presumably #105) made this pull request unmergeable. Please resolve the merge conflicts.
@fitzgen
Copy link
Member

fitzgen commented Jun 16, 2017

Closing in favor of #119
@fitzgen fitzgen closed this Jun 16, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
@Ms2ger @bors-servo @fitzgen @vvuk @nox @michaelwu
You can’t perform that action at this time.