Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upUpgrade to SM 60 #21029
Merged
Upgrade to SM 60 #21029
Conversation
highfive
commented
Jun 8, 2018
|
Heads up! This PR modifies the following files:
|
highfive
commented
Jun 8, 2018
|
|
|
Servo running https://webassembly.org/demo/:
|
|
|
asajeffrey
force-pushed the
asajeffrey:smup
branch
2 times, most recently
from
ef85844
to
67c3cc8
|
Rebased. |
asajeffrey
force-pushed the
asajeffrey:smup
branch
2 times, most recently
from
7fce21a
to
9da4649
|
OK, lets see what happens.. @bors-servo try |
bors-servo
added a commit
that referenced
this pull request
Jun 26, 2018
Upgrade to SM 60 <!-- Please describe your changes on the following line: --> This is the mozjs_sys smup PR. Depends on servo/mozjs#138 and servo/rust-mozjs#430. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #20585 <!-- Either: --> - [X] These changes do not require tests because the existing tests will ensure SM is still working <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21029) <!-- Reviewable:end -->
|
|
|
I've pushed my almost-working NDK toolchain changes to:
The necessary change to mozjs_sys is: diff --git a/makefile.cargo b/makefile.cargo
index f7be6532a0..5a0c314967 100644
--- a/makefile.cargo
+++ b/makefile.cargo
@@ -18,7 +18,10 @@ ifneq ($(HOST),$(TARGET))
CONFIGURE_FLAGS += \
--with-arch=armv7-a \
--with-fpu=neon \
+ --enable-linker=bfd \
$(NULL)
+ CFLAGS += --target=$(TARGET) -v
+ CXXFLAGS += --target=$(TARGET) -v
endif
ifeq (android,$(findstring android,$(TARGET)))but the patch is impossible to upload on cottage wifi right now. /me disappears back on vacation. |
|
Sigh... http://build.servo.org/builders/windows-msvc-dev/builds/7523 caused by using a patch pointing to a git repo. |
|
Linux builds are failing because of: e.g. http://build.servo.org/builders/linux-rel-css/builds/9036 |
|
Mac builds are dying for a reason that I find mysterious... e.g. http://build.servo.org/builders/mac-rel-wpt4/builds/4612 @emilio or @fitzgen have you seen errors like that before? This builds fine on travis mac, so it's probably some build config issue. |
|
As @jdm says, the problem with the Android build is using an old toolchain: |
|
|
bors-servo
added a commit
that referenced
this pull request
Aug 20, 2018
Upgrade to SM 60 <!-- Please describe your changes on the following line: --> This is the mozjs_sys smup PR. Depends on servo/mozjs#138 and servo/rust-mozjs#430. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #20585 <!-- Either: --> - [X] These changes do not require tests because the existing tests will ensure SM is still working <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21029) <!-- Reviewable:end -->
|
|
|
@bors-servo r=Manishearth,nox |
|
|
bors-servo
added a commit
that referenced
this pull request
Aug 20, 2018
Upgrade to SM 60 <!-- Please describe your changes on the following line: --> This is the mozjs_sys smup PR. Depends on servo/mozjs#138 and servo/rust-mozjs#430. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #20585 <!-- Either: --> - [X] These changes do not require tests because the existing tests will ensure SM is still working <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/21029) <!-- Reviewable:end -->
|
|
|
@bors-servo retry |
|
|
|
|
This was referenced Aug 23, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
asajeffrey commentedJun 8, 2018
•
edited by SimonSapin
This is the mozjs_sys smup PR. Depends on servo/mozjs#138 and servo/rust-mozjs#430.
./mach build -ddoes not report any errors./mach test-tidydoes not report any errorsThis change is