Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/ee92fcc8fee68053f943564a76b7cd400f3fbca5
...commit
http://git.netsurf-browser.org/toolchains.git/commit/ee92fcc8fee68053f943564a76b7cd400f3fbca5
...tree
http://git.netsurf-browser.org/toolchains.git/tree/ee92fcc8fee68053f943564a76b7cd400f3fbca5
The branch, mmu_man/riscos-fix-001 has been updated
discards 8daa31e0116e3ebb496b1b57f9bc29b62a8d7ec5 (commit)
via ee92fcc8fee68053f943564a76b7cd400f3fbca5 (commit)
via a6cd4d1e9f3ac2eb6e729c20b589227549eba42e (commit)
via 902366d30627397208778be38a44e1357f6df1c2 (commit)
via 1ebcfcb08774c1ddf1d69725376f3088833b30a2 (commit)
via bac3e0ec6390348d2d1f44f0fb7ef5e2c43f74d3 (commit)
via 7b3a7410eb447f3fdddd0d369fabe9cc745df675 (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (8daa31e0116e3ebb496b1b57f9bc29b62a8d7ec5)
\
N -- N -- N (ee92fcc8fee68053f943564a76b7cd400f3fbca5)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=ee92fcc8fee68053f943564a76b7cd400f3fbca5
commit ee92fcc8fee68053f943564a76b7cd400f3fbca5
Author: François Revol <[email protected]>
Commit: François Revol <[email protected]>
Fix RO build
- missing S in variable name,
- spaces instead of tab in target command which is invalid in make
syntax.
diff --git a/arm-unknown-riscos/Makefile b/arm-unknown-riscos/Makefile
index dc7c72d..5a3b4b7 100644
--- a/arm-unknown-riscos/Makefile
+++ b/arm-unknown-riscos/Makefile
@@ -149,8 +149,8 @@ $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TARBALL):
$(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TARBALL):
git clone $(UPSTREAM_SQUEEZE_URI) $@
-$(SOURCEDIR)/$(UPSTREAM_INFOZIP_TARBALL):
- $(FETCHSRC) arm-unknown-riscos $(subst $(SOURCEDIR)/,,$@)
$(UPSTREAM_INFOZIP_URI) $@
+$(SOURCESDIR)/$(UPSTREAM_INFOZIP_TARBALL):
+ $(FETCHSRC) arm-unknown-riscos $(subst $(SOURCEDIR)/,,$@)
$(UPSTREAM_INFOZIP_URI) $@
###
# Rule to create buildsteps dir
-----------------------------------------------------------------------
Summary of changes:
m68k-unknown-amigaos/Makefile | 2 +-
.../openssl/Configurations-50-amigaos.conf.p | 2 +-
.../m68k-unknown-amigaos/crypto.bn.bn_div.c | 25 --------------
.../crypto.bn.bn_div.c.p | 0
.../crypto.include.internal.md32_common.h.p | 36 ++++++++++++++++++++
5 files changed, 38 insertions(+), 27 deletions(-)
delete mode 100644
sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c
copy sdk/recipes/patches/openssl/{m68k-atari-mint =>
m68k-unknown-amigaos}/crypto.bn.bn_div.c.p (100%)
create mode 100644
sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.include.internal.md32_common.h.p
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 16ea2bb..8597dcf 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -23,7 +23,7 @@ UPSTREAM_MPFR_URI :=
http://www.mpfr.org/mpfr-$(UPSTREAM_MPFR_VERSION)/$(UPSTREA
UPSTREAM_MPC_VERSION := 0.8.2
UPSTREAM_MPC_TARBALL := mpc-$(UPSTREAM_MPC_VERSION).tar.gz
-UPSTREAM_MPC_URI :=
http://www.multiprecision.org/mpc/download/$(UPSTREAM_MPC_TARBALL)
+UPSTREAM_MPC_URI :=
http://www.multiprecision.org/downloads/$(UPSTREAM_MPC_TARBALL)
UPSTREAM_CLIB2_VERSION := 1_214
UPSTREAM_CLIB2_TARBALL := V$(UPSTREAM_CLIB2_VERSION).tar.gz
diff --git a/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
index f4519ef..3012ad2 100644
--- a/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
+++ b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p
@@ -20,7 +20,7 @@
+ "m68k-unknown-amigaos" => {
+ inherit_from => [ "BASE_unix" ],
+ cc => "m68k-unknown-amigaos-gcc",
-+ cflags => picker(default => "-DB_ENDIAN -DTERMIOS
-DNO_SYS_UN_H -DNO_SYS_PARAM_H -DNO_SYSLOG -m68020 -std=c99",
++ cflags => picker(default => "-DB_ENDIAN -DTERMIOS
-DNO_SYS_UN_H -DNO_SYS_PARAM_H -DNO_SYSLOG -m68020 -std=gnu99",
+ debug => "-O0 -g",
+ release => "-O3 -fomit-frame-pointer",
+ threads("-D_REENTRANT")),
diff --git
a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c
b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c
deleted file mode 100644
index 0d5492f..0000000
--- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c
+++ /dev/null
@@ -1,25 +0,0 @@
---- crypto/bn/bn_div.c 2017-01-26 13:22:03.000000000 +0000
-+++ crypto/bn/bn_div.c 2017-02-11 16:06:29.437010335 +0000
-@@ -175,6 +175,22 @@ int BN_div(BIGNUM *dv, BIGNUM *rem, cons
- q; \
- })
- # define REMAINDER_IS_ALREADY_CALCULATED
-+# elif defined(__mc68020__)
-+ /* Same rationale as for i386. On the 68020-60/CPU32 the divu
-+ * instruction will take a 64 bit dividend in a register pair
-+ * and overwrite that pair with the remainder:quotient.
-+ * Howard Chu
-+ */
-+# undef bn_div_words
-+# define bn_div_words(n0,n1,d0) \
-+ ({ asm volatile ( \
-+ "divu.l %4,%2:%3" \
-+ : "=d"(rem), "=d"(q) \
-+ : "0"(n0), "1"(n1), "d"(d0) \
-+ : "cc"); \
-+ q; \
-+ })
-+# define REMAINDER_IS_ALREADY_CALCULATED
- # endif /* __<cpu> */
- # endif /* __GNUC__ */
- # endif /* OPENSSL_NO_ASM */
diff --git a/sdk/recipes/patches/openssl/m68k-atari-mint/crypto.bn.bn_div.c.p
b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c.p
similarity index 100%
copy from sdk/recipes/patches/openssl/m68k-atari-mint/crypto.bn.bn_div.c.p
copy to sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c.p
diff --git
a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.include.internal.md32_common.h.p
b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.include.internal.md32_common.h.p
new file mode 100644
index 0000000..7447d54
--- /dev/null
+++
b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.include.internal.md32_common.h.p
@@ -0,0 +1,36 @@
+--- crypto/include/internal/md32_common.h 2017-11-02 14:29:03.000000000
+0000
++++ crypto/include/internal/md32_common.h 2018-07-23 20:12:11.228066913
+0100
+@@ -182,6 +182,9 @@
+ # define HOST_l2c(l,c) (*((unsigned int *)(c))=(l), (c)+=4, (l))
+ # endif
+ # endif
++# elif defined(__mc68020)
++# define HOST_c2l(c,l) ({ asm volatile ("movel %0@+,%1" : "=a"(c), "=d"(l)
: "0"(c)); })
++# define HOST_l2c(l,c) ({ asm volatile ("movel %1,%0@+" : "=a"(c) :
"d"(l), "0"(c)); })
+ # endif
+ # endif
+ # if defined(__s390__) || defined(__s390x__)
+@@ -215,6 +218,22 @@
+ # define HOST_l2c(l,c) ({ asm ("strv %1,%0" \
+ :"=m"(*(unsigned int *)(c)) :"d"(l));\
+ (c)+=4; (l); })
++# elif defined(__mc68020)
++# define HOST_c2l(c,l) ({ unsigned int r; \
++ asm volatile ("movel %1@+,%0\n" \
++ "rorw #8,%0\n" \
++ "swap %0\n" \
++ "rorw #8,%0\n" \
++ : "=d"(r), "=a"(c) \
++ : "1"(c)); \
++ (l)=r; })
++# define HOST_l2c(l,c) ({ unsigned int r=(l); \
++ asm volatile ("rorw #8,%0\n" \
++ "swap %0\n" \
++ "rorw #8,%0\n" \
++ "movel %0,%1@+\n" \
++ : "=d"(r), "=a"(c) \
++ : "0"(r), "1"(c)); })
+ # endif
+ # endif
+ # if defined(__i386) || defined(__i386__) || defined(__x86_64) ||
defined(__x86_64__)
+
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
