Gitweb links:
...log
http://git.netsurf-browser.org/toolchains.git/shortlog/16cb382a2799089a88cf8a4893f483ef2e84f7a9
...commit
http://git.netsurf-browser.org/toolchains.git/commit/16cb382a2799089a88cf8a4893f483ef2e84f7a9
...tree
http://git.netsurf-browser.org/toolchains.git/tree/16cb382a2799089a88cf8a4893f483ef2e84f7a9
The branch, ashmew2/kolibrios has been updated
discards 04e12e28d9e4b86d277c46050faf3cbb235161bc (commit)
discards 0d9d471b107efcd1c30aee66048cf1fa27ddbaa1 (commit)
discards 1d7c14ca7736483bca06070b85eeb53021034391 (commit)
discards 206201519dc2d9cd1a13a080933c2b922d9e68d6 (commit)
discards 45faca6bc7c600e56d641339ed1edb25e8a92280 (commit)
discards 9fd123fffcc03b0bc943dc94446a5757e5c63047 (commit)
discards 45c332a4a206373dcf14030492b6fa46d1b3185c (commit)
discards 165c08130b035b25d7ca203d2ffb078b17e83e2b (commit)
via 16cb382a2799089a88cf8a4893f483ef2e84f7a9 (commit)
via 7e8c73de15f566a6a81a9ce40ae1ab6de6663969 (commit)
via 836f0488b2ca6805ea8bfa8ce16a0a510a1ae248 (commit)
via 36e90e858e27b203df41a0103fd090f06899c0a9 (commit)
via 884aa5a1c51ea19a6582c63e45781c7a42cfd8f5 (commit)
via cfb2381e4c57899fbb674f95467364932c0fc4b3 (commit)
via e844e53b2ed5886e84c0f4f075dd88bca5d945a1 (commit)
via b4aed204c6adb1a63490e0723be92df5937b7cac (commit)
via ece908c181c835f4b162aeb248ce347a7c520449 (commit)
via 4838ef05426ab4bef15f7385631c5ba0965b9699 (commit)
via 3749e6a9e8f28a398dfa814b28e3928167f94873 (commit)
via 4b5012317ee8fb905b427cc1ca129e6b2451d66e (commit)
via a04a4d532b4a48abbc47afcc01488171e7a411d8 (commit)
via d5187bc8ab0bde743c7963cffce047915f271231 (commit)
via 8d364349083bd20ea45cd0ffda4a00ad3c123d82 (commit)
via 6582b5657d78bfb6b5923a9a2d908679f6781ab6 (commit)
via 41bba10ad7e11b9a3431f7a187ba2a8455eeb945 (commit)
via 80b51e851716e92eee32e7750ad0f05dba60b2c1 (commit)
via c743a1968ffec8ca2b22f7cb5595cc36e1f3e018 (commit)
via 35109d6b7f56395379d2a054c539a4240267f09f (commit)
via 006f5fdddceaea8641759cb630131583477b2817 (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 (04e12e28d9e4b86d277c46050faf3cbb235161bc)
\
N -- N -- N (16cb382a2799089a88cf8a4893f483ef2e84f7a9)
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=16cb382a2799089a88cf8a4893f483ef2e84f7a9
commit 16cb382a2799089a88cf8a4893f483ef2e84f7a9
Author: Ashish Gupta <[email protected]>
Commit: Ashish Gupta <[email protected]>
Add header
diff --git a/kos32-gcc/build.sh b/kos32-gcc/build.sh
index 5734838..37fb92c 100755
--- a/kos32-gcc/build.sh
+++ b/kos32-gcc/build.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
set -x
COMPILER=x86_64-linux-kos32-4.8.5.7z
SDK=sdk-28-10-16.7z
@@ -58,3 +60,5 @@ $GCC ${SVN_CHECKOUT}/programs/fs/unzip60/kolibri/dirent.c -o
${OBJ_PATH}/dirent.
$GCC ${SVN_CHECKOUT}/programs/develop/libraries/iconv/iconv.c -o
${OBJ_PATH}/iconv.o
$ASM ${SVN_CHECKOUT}/contrib/C_Layer/ASM/loadhttp.asm ${OBJ_PATH}/loadhttp.obj
+
+
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=7e8c73de15f566a6a81a9ce40ae1ab6de6663969
commit 7e8c73de15f566a6a81a9ce40ae1ab6de6663969
Author: Ashish Gupta <[email protected]>
Commit: Ashish Gupta <[email protected]>
Fix toolchains
diff --git a/kos32-gcc/build.sh b/kos32-gcc/build.sh
index d270837..5734838 100755
--- a/kos32-gcc/build.sh
+++ b/kos32-gcc/build.sh
@@ -27,11 +27,12 @@ done
# download sdk and friends
svn checkout ${SVN_URL} ${SVN_CHECKOUT}
wget -v ${COMPILER_URL} --directory-prefix=${CROSS_PATH}
-wget -v ${SDK_URL} --directory-prefix=${INSTALL_PATH}
+wget -v ${SDK_URL} --directory-prefix=${CROSS_PATH}
# verify checksums
for file in COMPILER SDK; do
- [[ $(sha1sum $INSTALL_PATH/${!file} | awk '{print $1}') !=
${!SHA512_${!file}} ]] && exit 1
+ VARNAME=SHA512_${file}
+ [[ $(sha512sum $CROSS_PATH/${!file} | awk '{print $1}') != ${!VARNAME}
]] && exit 1
done
# set up toolchain
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=836f0488b2ca6805ea8bfa8ce16a0a510a1ae248
commit 836f0488b2ca6805ea8bfa8ce16a0a510a1ae248
Author: Ashish Gupta <[email protected]>
Commit: Ashish Gupta <[email protected]>
Add SDK
diff --git a/kos32-gcc/build.sh b/kos32-gcc/build.sh
index ab7ebdb..d270837 100755
--- a/kos32-gcc/build.sh
+++ b/kos32-gcc/build.sh
@@ -40,6 +40,11 @@ pushd $PWD
cd $CROSS_PATH
7z x $COMPILER
+mv $SDK win32/
+
+cd win32
+7z x $SDK
+
popd
# fix up environment
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=36e90e858e27b203df41a0103fd090f06899c0a9
commit 36e90e858e27b203df41a0103fd090f06899c0a9
Author: Ashish Gupta <[email protected]>
Commit: Ashish Gupta <[email protected]>
Fix makefile
diff --git a/kos32-gcc/Makefile b/kos32-gcc/Makefile
index 84abde0..e023a4b 100644
--- a/kos32-gcc/Makefile
+++ b/kos32-gcc/Makefile
@@ -1,4 +1,4 @@
-all: builder
+install: builder
builder:
./build.sh
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=884aa5a1c51ea19a6582c63e45781c7a42cfd8f5
commit 884aa5a1c51ea19a6582c63e45781c7a42cfd8f5
Author: Ashish Gupta <[email protected]>
Commit: Ashish Gupta <[email protected]>
Add makefile
diff --git a/kos32-gcc/Makefile b/kos32-gcc/Makefile
new file mode 100644
index 0000000..84abde0
--- /dev/null
+++ b/kos32-gcc/Makefile
@@ -0,0 +1,4 @@
+all: builder
+
+builder:
+ ./build.sh
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=cfb2381e4c57899fbb674f95467364932c0fc4b3
commit cfb2381e4c57899fbb674f95467364932c0fc4b3
Author: Ashish Gupta <[email protected]>
Commit: Ashish Gupta <[email protected]>
add build.sh
diff --git a/kos32-gcc/Makefile b/kos32-gcc/Makefile
deleted file mode 100644
index 6cd119a..0000000
--- a/kos32-gcc/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-KOLIBRI_SVN_URL := svn://kolibrios.org
-
-KOS32_DIR := /opt/netsurf/kos32-gcc/
-ENVDIR := $(KOS32_DIR)/env
-SVN_CHECKOUT := $(ENVDIR)/kolibrios
-PATH := $(PATH):/opt/netsurf/kos32-gcc/cross/autobuild/tools/win32/bin
-COMPILER_INSTALL_PATH := /opt/netsurf/kos32-gcc/cross/autobuild/tools
-
-COMPILER_NAME := x86_64-linux-kos32-4.8.5.7z
-COMPILER_URL :=
http://ftp.kolibrios.org/users/Serge/new/Toolchain/$(COMPILER_NAME)
-SDK_NAME := sdk-28-10-16.7z
-SDK_URL := http://ftp.kolibrios.org/users/Serge/new/Toolchain/$(SDK_NAME)
-
-OBJDIR := $(ENVDIR)/obj
-
-COMPILE := kos32-gcc -c -fno-ident -fomit-frame-pointer -U__WIN32__
-I$(SVN_CHECKOUT)/contrib/sdk/sources/newlib/libc/include -U_Win32 -U_WIN32
-U__MINGW32__ -UWIN32 -U__BSD_VISIBLE
-
-all: clean kolibri-svn kolibri-compiler kolibri-sdk kolibri-libs
-kolibri-compiler:
- mkdir -p $(COMPILER_INSTALL_PATH)
- wget $(COMPILER_URL)
- mv $(COMPILER_NAME) $(COMPILER_INSTALL_PATH)
- cd $(COMPILER_INSTALL_PATH) && 7z x $(COMPILER_NAME)
- rm -f $(COMPILER_INSTALL_PATH)/$(COMPILER_NAME)
-
-kolibri-svn:
- mkdir -p $(ENVDIR)
- mkdir -p $(OBJDIR)
- svn checkout $(KOLIBRI_SVN_URL) $(ENVDIR)/kolibrios
-
-kolibri-libs:
- $(COMPILE) $(SVN_CHECKOUT)/programs/fs/unzip60/kolibri/dirent.c -o
$(OBJDIR)/dirent.o
- $(COMPILE) $(SVN_CHECKOUT)/programs/develop/libraries/iconv/iconv.c -o
$(OBJDIR)/iconv.o
- fasm $(SVN_CHECKOUT)/contrib/C_Layer/ASM/loadhttp.asm
$(OBJDIR)/loadhttp.obj
-
-kolibri-sdk:
- mkdir -p $(COMPILER_INSTALL_PATH)/win32
- wget $(SDK_URL)
- mv $(SDK_NAME) $(COMPILER_INSTALL_PATH)/win32/
- cd $(COMPILER_INSTALL_PATH)/win32/ && 7z x $(SDK_NAME)
- rm -f $(COMPILER_INSTALL_PATH)/win32/$(SDK_NAME)
-
-clean:
- rm -f $(OBJDIR)/*
- rm -rf $(KOS32_DIR)/cross
diff --git a/kos32-gcc/build.sh b/kos32-gcc/build.sh
new file mode 100755
index 0000000..ab7ebdb
--- /dev/null
+++ b/kos32-gcc/build.sh
@@ -0,0 +1,54 @@
+set -x
+COMPILER=x86_64-linux-kos32-4.8.5.7z
+SDK=sdk-28-10-16.7z
+
+SVN_URL=svn://kolibrios.org
+SDK_URL=http://ftp.kolibrios.org/users/Serge/new/Toolchain/$SDK
+COMPILER_URL=http://ftp.kolibrios.org/users/Serge/new/Toolchain/$COMPILER
+
+INSTALL_PATH=/opt/netsurf/kos32-gcc
+CROSS_PATH=$INSTALL_PATH/cross/autobuild/tools/
+ENV_PATH=$INSTALL_PATH/env
+OBJ_PATH=$ENV_PATH/obj
+
+SVN_CHECKOUT=$ENV_PATH/kolibrios
+
+SHA512_SDK=e37226c1421104f9025c644277080a0adad1cb5db560fe04bbcc6c41797fe87e57d337da314bde4abc4decfbedf3087ffb16b1d71d2587e317933204255ead1a
+SHA512_COMPILER=28555b2247848c5d85be6b18e10dc903b9a161179230b65d35f7f3bf40dff3b135972e84f6c25db23fee2a90c7a96b5a755dba9a2eaa9dbc4735e717436db1ce
+
+# clean
+# rm -rf $INSTALL_PATH
+
+# set up directories
+for dir in $INSTALL_PATH $CROSS_PATH $ENV_PATH $OBJ_PATH; do
+ mkdir -p $dir
+done
+
+# download sdk and friends
+svn checkout ${SVN_URL} ${SVN_CHECKOUT}
+wget -v ${COMPILER_URL} --directory-prefix=${CROSS_PATH}
+wget -v ${SDK_URL} --directory-prefix=${INSTALL_PATH}
+
+# verify checksums
+for file in COMPILER SDK; do
+ [[ $(sha1sum $INSTALL_PATH/${!file} | awk '{print $1}') !=
${!SHA512_${!file}} ]] && exit 1
+done
+
+# set up toolchain
+pushd $PWD
+
+cd $CROSS_PATH
+7z x $COMPILER
+
+popd
+
+# fix up environment
+PATH=${PATH}:/opt/netsurf/kos32-gcc/cross/autobuild/tools/win32/bin
+GCC="kos32-gcc -c -fno-ident -fomit-frame-pointer -U__WIN32__
-I${SVN_CHECKOUT}/contrib/sdk/sources/newlib/libc/include -U_Win32 -U_WIN32
-U__MINGW32__ -UWIN32 -U__BSD_VISIBLE"
+ASM=fasm
+
+# build stuff
+$GCC ${SVN_CHECKOUT}/programs/fs/unzip60/kolibri/dirent.c -o
${OBJ_PATH}/dirent.o
+$GCC ${SVN_CHECKOUT}/programs/develop/libraries/iconv/iconv.c -o
${OBJ_PATH}/iconv.o
+$ASM ${SVN_CHECKOUT}/contrib/C_Layer/ASM/loadhttp.asm ${OBJ_PATH}/loadhttp.obj
+
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=e844e53b2ed5886e84c0f4f075dd88bca5d945a1
commit e844e53b2ed5886e84c0f4f075dd88bca5d945a1
Author: Ashish Gupta <[email protected]>
Commit: Ashish Gupta <[email protected]>
Pull SDK and set up libs for kos32-gcc
diff --git a/kos32-gcc/Makefile b/kos32-gcc/Makefile
index 10a6f86..6cd119a 100644
--- a/kos32-gcc/Makefile
+++ b/kos32-gcc/Makefile
@@ -4,15 +4,18 @@ KOS32_DIR := /opt/netsurf/kos32-gcc/
ENVDIR := $(KOS32_DIR)/env
SVN_CHECKOUT := $(ENVDIR)/kolibrios
PATH := $(PATH):/opt/netsurf/kos32-gcc/cross/autobuild/tools/win32/bin
+COMPILER_INSTALL_PATH := /opt/netsurf/kos32-gcc/cross/autobuild/tools
-COMPILER_INSTALL_PATH := /opt/netsurf/kos32-gcc/cross/autobuild/tools/
COMPILER_NAME := x86_64-linux-kos32-4.8.5.7z
COMPILER_URL :=
http://ftp.kolibrios.org/users/Serge/new/Toolchain/$(COMPILER_NAME)
+SDK_NAME := sdk-28-10-16.7z
+SDK_URL := http://ftp.kolibrios.org/users/Serge/new/Toolchain/$(SDK_NAME)
+
OBJDIR := $(ENVDIR)/obj
COMPILE := kos32-gcc -c -fno-ident -fomit-frame-pointer -U__WIN32__
-I$(SVN_CHECKOUT)/contrib/sdk/sources/newlib/libc/include -U_Win32 -U_WIN32
-U__MINGW32__ -UWIN32 -U__BSD_VISIBLE
-all: clean kolibri-compiler kolibri-svn kolibri-libs
+all: clean kolibri-svn kolibri-compiler kolibri-sdk kolibri-libs
kolibri-compiler:
mkdir -p $(COMPILER_INSTALL_PATH)
wget $(COMPILER_URL)
@@ -30,6 +33,13 @@ kolibri-libs:
$(COMPILE) $(SVN_CHECKOUT)/programs/develop/libraries/iconv/iconv.c -o
$(OBJDIR)/iconv.o
fasm $(SVN_CHECKOUT)/contrib/C_Layer/ASM/loadhttp.asm
$(OBJDIR)/loadhttp.obj
+kolibri-sdk:
+ mkdir -p $(COMPILER_INSTALL_PATH)/win32
+ wget $(SDK_URL)
+ mv $(SDK_NAME) $(COMPILER_INSTALL_PATH)/win32/
+ cd $(COMPILER_INSTALL_PATH)/win32/ && 7z x $(SDK_NAME)
+ rm -f $(COMPILER_INSTALL_PATH)/win32/$(SDK_NAME)
+
clean:
rm -f $(OBJDIR)/*
- rm -rf $(KOS32_DIR)
+ rm -rf $(KOS32_DIR)/cross
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=b4aed204c6adb1a63490e0723be92df5937b7cac
commit b4aed204c6adb1a63490e0723be92df5937b7cac
Author: Ashish Gupta <[email protected]>
Commit: Ashish Gupta <[email protected]>
Set up kos32-gcc compiler in crossdir
diff --git a/kos32-gcc/Makefile b/kos32-gcc/Makefile
index 48f8ad5..10a6f86 100644
--- a/kos32-gcc/Makefile
+++ b/kos32-gcc/Makefile
@@ -1,14 +1,24 @@
KOLIBRI_SVN_URL := svn://kolibrios.org
-ENVDIR := /opt/netsurf/kos32-gcc/env
+KOS32_DIR := /opt/netsurf/kos32-gcc/
+ENVDIR := $(KOS32_DIR)/env
SVN_CHECKOUT := $(ENVDIR)/kolibrios
PATH := $(PATH):/opt/netsurf/kos32-gcc/cross/autobuild/tools/win32/bin
+COMPILER_INSTALL_PATH := /opt/netsurf/kos32-gcc/cross/autobuild/tools/
+COMPILER_NAME := x86_64-linux-kos32-4.8.5.7z
+COMPILER_URL :=
http://ftp.kolibrios.org/users/Serge/new/Toolchain/$(COMPILER_NAME)
OBJDIR := $(ENVDIR)/obj
COMPILE := kos32-gcc -c -fno-ident -fomit-frame-pointer -U__WIN32__
-I$(SVN_CHECKOUT)/contrib/sdk/sources/newlib/libc/include -U_Win32 -U_WIN32
-U__MINGW32__ -UWIN32 -U__BSD_VISIBLE
-all: clean kolibri-svn kolibri-libs
+all: clean kolibri-compiler kolibri-svn kolibri-libs
+kolibri-compiler:
+ mkdir -p $(COMPILER_INSTALL_PATH)
+ wget $(COMPILER_URL)
+ mv $(COMPILER_NAME) $(COMPILER_INSTALL_PATH)
+ cd $(COMPILER_INSTALL_PATH) && 7z x $(COMPILER_NAME)
+ rm -f $(COMPILER_INSTALL_PATH)/$(COMPILER_NAME)
kolibri-svn:
mkdir -p $(ENVDIR)
@@ -22,3 +32,4 @@ kolibri-libs:
clean:
rm -f $(OBJDIR)/*
+ rm -rf $(KOS32_DIR)
commitdiff
http://git.netsurf-browser.org/toolchains.git/commit/?id=ece908c181c835f4b162aeb248ce347a7c520449
commit ece908c181c835f4b162aeb248ce347a7c520449
Author: Ashish Gupta <[email protected]>
Commit: Ashish Gupta <[email protected]>
Add makefile for kos32-gcc
diff --git a/kos32-gcc/Makefile b/kos32-gcc/Makefile
new file mode 100644
index 0000000..48f8ad5
--- /dev/null
+++ b/kos32-gcc/Makefile
@@ -0,0 +1,24 @@
+KOLIBRI_SVN_URL := svn://kolibrios.org
+
+ENVDIR := /opt/netsurf/kos32-gcc/env
+SVN_CHECKOUT := $(ENVDIR)/kolibrios
+PATH := $(PATH):/opt/netsurf/kos32-gcc/cross/autobuild/tools/win32/bin
+
+OBJDIR := $(ENVDIR)/obj
+
+COMPILE := kos32-gcc -c -fno-ident -fomit-frame-pointer -U__WIN32__
-I$(SVN_CHECKOUT)/contrib/sdk/sources/newlib/libc/include -U_Win32 -U_WIN32
-U__MINGW32__ -UWIN32 -U__BSD_VISIBLE
+
+all: clean kolibri-svn kolibri-libs
+
+kolibri-svn:
+ mkdir -p $(ENVDIR)
+ mkdir -p $(OBJDIR)
+ svn checkout $(KOLIBRI_SVN_URL) $(ENVDIR)/kolibrios
+
+kolibri-libs:
+ $(COMPILE) $(SVN_CHECKOUT)/programs/fs/unzip60/kolibri/dirent.c -o
$(OBJDIR)/dirent.o
+ $(COMPILE) $(SVN_CHECKOUT)/programs/develop/libraries/iconv/iconv.c -o
$(OBJDIR)/iconv.o
+ fasm $(SVN_CHECKOUT)/contrib/C_Layer/ASM/loadhttp.asm
$(OBJDIR)/loadhttp.obj
+
+clean:
+ rm -f $(OBJDIR)/*
-----------------------------------------------------------------------
Summary of changes:
i686-w64-mingw32/Makefile | 1 +
.../recipes/patches/gcc4/cp_cfns_gperf.p | 17 +
i686-w64-mingw32/recipes/patches/gcc4/cp_cfns_h.p | 17 +
i686-w64-mingw32/recipes/patches/gcc4/gcc_texi.p | 20 +
kos32-gcc/build.sh | 4 +
m68k-atari-mint/Makefile | 2 +-
m68k-unknown-amigaos/Makefile | 35 +-
.../recipes/patches/binutils/missing-files.p | 531 +-------------------
sdk/Makefile | 9 +-
9 files changed, 99 insertions(+), 537 deletions(-)
create mode 100644 i686-w64-mingw32/recipes/patches/gcc4/cp_cfns_gperf.p
create mode 100644 i686-w64-mingw32/recipes/patches/gcc4/cp_cfns_h.p
create mode 100644 i686-w64-mingw32/recipes/patches/gcc4/gcc_texi.p
diff --git a/i686-w64-mingw32/Makefile b/i686-w64-mingw32/Makefile
index 4a5a7e7..04ecd05 100644
--- a/i686-w64-mingw32/Makefile
+++ b/i686-w64-mingw32/Makefile
@@ -104,6 +104,7 @@ $(BUILDSTEPS)/mingw-srcdir.d:
$(SOURCESDIR)/$(UPSTREAM_MINGW_TARBALL)
###
$(BUILDSTEPS)/srcdir-step3.d: $(BUILDSTEPS)/srcdir-step2.d
+ for p in `ls $(RECIPES)/patches/gcc4/*.p` ; do patch -d $(GCC_SRCDIR)
-p0 <$$p ; done
touch $@
$(BUILDSTEPS)/srcdir-step2.d: $(BUILDSTEPS)/srcdir-step1.d
$(SOURCESDIR)/$(UPSTREAM_GMP_TARBALL) $(SOURCESDIR)/$(UPSTREAM_MPFR_TARBALL)
$(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL)
diff --git a/i686-w64-mingw32/recipes/patches/gcc4/cp_cfns_gperf.p
b/i686-w64-mingw32/recipes/patches/gcc4/cp_cfns_gperf.p
new file mode 100644
index 0000000..f0598e5
--- /dev/null
+++ b/i686-w64-mingw32/recipes/patches/gcc4/cp_cfns_gperf.p
@@ -0,0 +1,17 @@
+--- gcc/cp/cfns.gperf.orig 2017-09-15 16:17:49.249145794 +0100
++++ gcc/cp/cfns.gperf 2017-09-15 16:18:26.468005263 +0100
+@@ -16,14 +16,6 @@
+ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3. If not see
+ <http://www.gnu.org/licenses/>. */
+-#ifdef __GNUC__
+-__inline
+-#endif
+-static unsigned int hash (const char *, unsigned int);
+-#ifdef __GNUC__
+-__inline
+-#endif
+-const char * libc_name_p (const char *, unsigned int);
+ %}
+ %%
+ # The standard C library functions, for feeding to gperf; the result is used
diff --git a/i686-w64-mingw32/recipes/patches/gcc4/cp_cfns_h.p
b/i686-w64-mingw32/recipes/patches/gcc4/cp_cfns_h.p
new file mode 100644
index 0000000..8f89f8a
--- /dev/null
+++ b/i686-w64-mingw32/recipes/patches/gcc4/cp_cfns_h.p
@@ -0,0 +1,17 @@
+--- gcc/cp/cfns.h.orig 2017-09-15 16:50:55.872127506 +0100
++++ gcc/cp/cfns.h 2017-09-15 16:51:18.147443810 +0100
+@@ -47,14 +47,6 @@
+ You should have received a copy of the GNU General Public License
+ along with GCC; see the file COPYING3. If not see
+ <http://www.gnu.org/licenses/>. */
+-#ifdef __GNUC__
+-__inline
+-#endif
+-static unsigned int hash (const char *, unsigned int);
+-#ifdef __GNUC__
+-__inline
+-#endif
+-const char * libc_name_p (const char *, unsigned int);
+ /* maximum key range = 391, duplicates = 0 */
+
+ #ifdef __GNUC__
diff --git a/i686-w64-mingw32/recipes/patches/gcc4/gcc_texi.p
b/i686-w64-mingw32/recipes/patches/gcc4/gcc_texi.p
new file mode 100644
index 0000000..056edfa
--- /dev/null
+++ b/i686-w64-mingw32/recipes/patches/gcc4/gcc_texi.p
@@ -0,0 +1,20 @@
+--- gcc/doc/gcc.texi.orig 2017-09-15 17:46:47.157490325 +0100
++++ gcc/doc/gcc.texi 2017-09-15 17:47:58.714929743 +0100
+@@ -85,9 +85,15 @@
+ @item GNU Press
+ @tab Website: www.gnupress.org
+ @item a division of the
+-@tab General: @tex press@@gnu.org @end tex
++@tab General:
++@tex
++press@@gnu.org
++@end tex
+ @item Free Software Foundation
+-@tab Orders: @tex sales@@gnu.org @end tex
++@tab Orders:
++@tex
++sales@@gnu.org
++@end tex
+ @item 51 Franklin Street, Fifth Floor
+ @tab Tel 617-542-5942
+ @item Boston, MA 02110-1301 USA
diff --git a/kos32-gcc/build.sh b/kos32-gcc/build.sh
index 5734838..37fb92c 100755
--- a/kos32-gcc/build.sh
+++ b/kos32-gcc/build.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
set -x
COMPILER=x86_64-linux-kos32-4.8.5.7z
SDK=sdk-28-10-16.7z
@@ -58,3 +60,5 @@ $GCC ${SVN_CHECKOUT}/programs/fs/unzip60/kolibri/dirent.c -o
${OBJ_PATH}/dirent.
$GCC ${SVN_CHECKOUT}/programs/develop/libraries/iconv/iconv.c -o
${OBJ_PATH}/iconv.o
$ASM ${SVN_CHECKOUT}/contrib/C_Layer/ASM/loadhttp.asm ${OBJ_PATH}/loadhttp.obj
+
+
diff --git a/m68k-atari-mint/Makefile b/m68k-atari-mint/Makefile
index 27abd82..d60f818 100644
--- a/m68k-atari-mint/Makefile
+++ b/m68k-atari-mint/Makefile
@@ -31,7 +31,7 @@ UPSTREAM_MINTBIN_VERSION := CVS-20110527
UPSTREAM_MINTBIN_TARBALL := mintbin-$(UPSTREAM_MINTBIN_VERSION).tar.gz
UPSTREAM_MINTBIN_URI :=
http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_MINTBIN_TARBALL)
-UPSTREAM_MINTLIB_VERSION := CVS-20160320
+UPSTREAM_MINTLIB_VERSION := Git-20170304
UPSTREAM_MINTLIB_TARBALL := mintlib-$(UPSTREAM_MINTLIB_VERSION).tar.gz
UPSTREAM_MINTLIB_URI :=
http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_MINTLIB_TARBALL)
diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile
index 29c7aad..8cbb7e5 100644
--- a/m68k-unknown-amigaos/Makefile
+++ b/m68k-unknown-amigaos/Makefile
@@ -1,3 +1,8 @@
+#!/bin/make
+# NetSurf cross compilation for amiga m68k
+
+# sources
+
UPSTREAM_GCC_VERSION := 3.4.6
UPSTREAM_GCC_TARBALL := gcc-$(UPSTREAM_GCC_VERSION).tar.bz2
UPSTREAM_GCC_URI :=
http://ftp.gnu.org/gnu/gcc/gcc-$(UPSTREAM_GCC_VERSION)/$(UPSTREAM_GCC_TARBALL)
@@ -37,6 +42,11 @@ UPSTREAM_GUIGFX_URI :=
http://neoscientists.org/~bifat/binarydistillery/$(UPSTRE
UPSTREAM_RENDER_TARBALL := renderlib.lha
UPSTREAM_RENDER_URI :=
http://neoscientists.org/~bifat/binarydistillery/$(UPSTREAM_RENDER_TARBALL)
+# need to build a suitable version of bison or compiler build fails
+UPSTREAM_BISON_VERSION := 2.7.1
+UPSTREAM_BISON_TARBALL := bison-$(UPSTREAM_BISON_VERSION).tar.gz
+UPSTREAM_BISON_URI := https://ftp.gnu.org/gnu/bison/$(UPSTREAM_BISON_TARBALL)
+
# need to force the auto* version in use
GCC_AUTOCONF := autoconf2.64
GCC_AUTOHEADER := autoheader2.64
@@ -49,8 +59,10 @@ SOURCESDIR := $(TOP)/sources
BUILDDIR := $(TOP)/builddir
BUILDSTEPS := $(BUILDDIR)/build-steps
SRCDIR := $(BUILDDIR)/srcdir
+
GCC_SRCDIR := $(SRCDIR)/gcc
BINUTILS_SRCDIR := $(SRCDIR)/binutils
+BISON_SRCDIR := $(SRCDIR)/bison
TARGET_NAME := m68k-unknown-amigaos
@@ -117,7 +129,7 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL)
$(SOURCESDIR)/$(UPSTR
# Rules to build and install the bootstrap compiler
###
-$(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d
$(BUILDSTEPS)/binutils.d
+$(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/bison.d
$(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/binutils.d
cd $(BUILDDIR) && $(GCC_ENV_PARAMS) $(GCC_SRCDIR)/configure \
--prefix=$(PREFIX) \
--target=$(TARGET_NAME) \
@@ -160,6 +172,25 @@ $(BUILDSTEPS)/$(UPSTREAM_GCC_TARBALL).d:
$(BUILDSTEPS)/buildsteps.d $(SOURCESDIR
touch $@
###
+# Rules to build bison for the bootstrap compiler build
+###
+
+$(BUILDSTEPS)/bison.d: $(BUILDSTEPS)/srcdir-bison.d
+ mkdir -p $(BUILDDIR)/bison
+ cd $(BUILDDIR)/bison && $(BISON_SRCDIR)/configure --prefix=$(PREFIX)
+ cd $(BUILDDIR)/bison && make
+ cd $(BUILDDIR)/bison && make install
+ touch $@
+
+$(BUILDSTEPS)/srcdir-bison.d: $(BUILDSTEPS)/$(UPSTREAM_BISON_TARBALL).d
+ tar axf $(SOURCESDIR)/$(UPSTREAM_BISON_TARBALL)
+ mv bison-$(UPSTREAM_BISON_VERSION) $(BISON_SRCDIR)
+ touch $@
+
+$(BUILDSTEPS)/$(UPSTREAM_BISON_TARBALL).d: $(BUILDSTEPS)/buildsteps.d
$(SOURCESDIR)/$(UPSTREAM_BISON_TARBALL)
+ touch $@
+
+###
# Rules to build and install binutils
###
@@ -211,6 +242,8 @@ $(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL):
$(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL):
wget -q -O $@ $(UPSTREAM_RENDER_URI)
+$(SOURCESDIR)/$(UPSTREAM_BISON_TARBALL):
+ wget -q -O $@ $(UPSTREAM_BISON_URI) $@
###
# Rule to create buildsteps dir
diff --git a/ppc-amigaos/recipes/patches/binutils/missing-files.p
b/ppc-amigaos/recipes/patches/binutils/missing-files.p
index be93e0f..7911090 100644
--- a/ppc-amigaos/recipes/patches/binutils/missing-files.p
+++ b/ppc-amigaos/recipes/patches/binutils/missing-files.p
@@ -12489,533 +12489,4 @@
+ ${LDEMUL_NEW_VERS_PATTERN-NULL}
+};
+EOF
---- /dev/null 2015-09-06 08:42:34.091999986 +0100
-+++ ld/scripttempl/amigaos.sc 2016-01-03 01:46:50.663001071 +0000
-@@ -0,0 +1,527 @@
-+#
-+# Unusual variables checked by this code:
-+# NOP - four byte opcode for no-op (defaults to 0)
-+# NO_SMALL_DATA - no .sbss/.sbss2/.sdata/.sdata2 sections if not
-+# empty.
-+# SMALL_DATA_CTOR - .ctors contains small data.
-+# SMALL_DATA_DTOR - .dtors contains small data.
-+# DATA_ADDR - if end-of-text-plus-one-page isn't right for data start
-+# INITIAL_READONLY_SECTIONS - at start of text segment
-+# OTHER_READONLY_SECTIONS - other than .text .init .rodata ...
-+# (e.g., .PARISC.milli)
-+# OTHER_TEXT_SECTIONS - these get put in .text when relocating
-+# OTHER_READWRITE_SECTIONS - other than .data .bss .ctors .sdata ...
-+# (e.g., .PARISC.global)
-+# OTHER_RELRO_SECTIONS - other than .data.rel.ro ...
-+# (e.g. PPC32 .fixup, .got[12])
-+# OTHER_BSS_SECTIONS - other than .bss .sbss ...
-+# ATTRS_SECTIONS - at the end
-+# OTHER_SECTIONS - at the end
-+# EXECUTABLE_SYMBOLS - symbols that must be defined for an
-+# executable (e.g., _DYNAMIC_LINK)
-+# TEXT_START_ADDR - the first byte of the text segment, after any
-+# headers.
-+# TEXT_BASE_ADDRESS - the first byte of the text segment.
-+# TEXT_START_SYMBOLS - symbols that appear at the start of the
-+# .text section.
-+# DATA_START_SYMBOLS - symbols that appear at the start of the
-+# .data section.
-+# DATA_END_SYMBOLS - symbols that appear at the end of the
-+# writeable data sections.
-+# OTHER_GOT_SYMBOLS - symbols defined just before .got.
-+# OTHER_GOT_SECTIONS - sections just after .got.
-+# OTHER_SDATA_SECTIONS - sections just after .sdata.
-+# OTHER_BSS_SYMBOLS - symbols that appear at the start of the
-+# .bss section besides __bss_start.
-+# DATA_PLT - .plt should be in data segment, not text segment.
-+# PLT_BEFORE_GOT - .plt just before .got when .plt is in data segement.
-+# BSS_PLT - .plt should be in bss segment
-+# TEXT_DYNAMIC - .dynamic in text segment, not data segment.
-+# EMBEDDED - whether this is for an embedded system.
-+# SHLIB_TEXT_START_ADDR - if set, add to SIZEOF_HEADERS to set
-+# start address of shared library.
-+# INPUT_FILES - INPUT command of files to always include
-+# WRITABLE_RODATA - if set, the .rodata section should be writable
-+# INIT_START, INIT_END - statements just before and just after
-+# combination of .init sections.
-+# FINI_START, FINI_END - statements just before and just after
-+# combination of .fini sections.
-+# STACK_ADDR - start of a .stack section.
-+# OTHER_SYMBOLS - symbols to place right at the end of the script.
-+# ETEXT_NAME - name of a symbol for the end of the text section,
-+# normally etext.
-+# SEPARATE_GOTPLT - if set, .got.plt should be separate output section,
-+# so that .got can be in the RELRO area. It should be set to
-+# the number of bytes in the beginning of .got.plt which can be
-+# in the RELRO area as well.
-+# USER_LABEL_PREFIX - prefix to add to user-visible symbols.
-+#
-+# When adding sections, do note that the names of some sections are used
-+# when specifying the start address of the next.
-+#
-+
-+# Many sections come in three flavours. There is the 'real' section,
-+# like ".data". Then there are the per-procedure or per-variable
-+# sections, generated by -ffunction-sections and -fdata-sections in GCC,
-+# and useful for --gc-sections, which for a variable "foo" might be
-+# ".data.foo". Then there are the linkonce sections, for which the linker
-+# eliminates duplicates, which are named like ".gnu.linkonce.d.foo".
-+# The exact correspondences are:
-+#
-+# Section Linkonce section
-+# .text .gnu.linkonce.t.foo
-+# .rodata .gnu.linkonce.r.foo
-+# .data .gnu.linkonce.d.foo
-+# .bss .gnu.linkonce.b.foo
-+# .sdata .gnu.linkonce.s.foo
-+# .sbss .gnu.linkonce.sb.foo
-+# .sdata2 .gnu.linkonce.s2.foo
-+# .sbss2 .gnu.linkonce.sb2.foo
-+# .debug_info .gnu.linkonce.wi.foo
-+# .tdata .gnu.linkonce.td.foo
-+# .tbss .gnu.linkonce.tb.foo
-+# .lrodata .gnu.linkonce.lr.foo
-+# .ldata .gnu.linkonce.l.foo
-+# .lbss .gnu.linkonce.lb.foo
-+#
-+# Each of these can also have corresponding .rel.* and .rela.* sections.
-+
-+test -z "$ENTRY" && ENTRY=_start
-+test -z "${BIG_OUTPUT_FORMAT}" && BIG_OUTPUT_FORMAT=${OUTPUT_FORMAT}
-+test -z "${LITTLE_OUTPUT_FORMAT}" && LITTLE_OUTPUT_FORMAT=${OUTPUT_FORMAT}
-+if [ -z "$MACHINE" ]; then OUTPUT_ARCH=${ARCH}; else
OUTPUT_ARCH=${ARCH}:${MACHINE}; fi
-+test -z "${ELFSIZE}" && ELFSIZE=32
-+test -z "${ALIGNMENT}" && ALIGNMENT="${ELFSIZE} / 8"
-+test "$LD_FLAG" = "N" && DATA_ADDR=.
-+test -z "${ETEXT_NAME}" && ETEXT_NAME=etext
-+test -n "$CREATE_SHLIB$CREATE_PIE" && test -n "$SHLIB_DATA_ADDR" &&
COMMONPAGESIZE=""
-+test -z "$CREATE_SHLIB$CREATE_PIE" && test -n "$DATA_ADDR" &&
COMMONPAGESIZE=""
-+test -n "$RELRO_NOW" && unset SEPARATE_GOTPLT
-+test -z "$ATTRS_SECTIONS" && ATTRS_SECTIONS=".gnu.attributes 0 : { KEEP
(*(.gnu.attributes)) }"
-+DATA_SEGMENT_ALIGN="ALIGN(${SEGMENT_SIZE})"
-+#DATA_SEGMENT_ALIGN="ALIGN(${SEGMENT_SIZE}) + (. & (${MAXPAGESIZE} - 1))"
-+DATA_SEGMENT_RELRO_END=""
-+DATA_SEGMENT_END=""
-+if test -n "${COMMONPAGESIZE}"; then
-+ DATA_SEGMENT_ALIGN="ALIGN (${SEGMENT_SIZE}) - ((${MAXPAGESIZE} - .) &
(${MAXPAGESIZE} - 1)); . = DATA_SEGMENT_ALIGN (${MAXPAGESIZE},
${COMMONPAGESIZE})"
-+ DATA_SEGMENT_END=". = DATA_SEGMENT_END (.);"
-+ DATA_SEGMENT_RELRO_END=". = DATA_SEGMENT_RELRO_END (${SEPARATE_GOTPLT-0},
.);"
-+fi
-+if test -z "${INITIAL_READONLY_SECTIONS}${CREATE_SHLIB}"; then
-+ INITIAL_READONLY_SECTIONS=".interp ${RELOCATING-0} : { *(.interp) }"
-+fi
-+if test -z "$PLT"; then
-+ PLT=".plt ${RELOCATING-0} : { *(.plt) }"
-+fi
-+test -n "${DATA_PLT-${BSS_PLT-text}}" && TEXT_PLT=yes
-+if test -z "$GOT"; then
-+ if test -z "$SEPARATE_GOTPLT"; then
-+ GOT=".got ${RELOCATING-0} : { *(.got.plt) *(.got) }"
-+ else
-+ GOT=".got ${RELOCATING-0} : { *(.got) }"
-+ GOTPLT=".got.plt ${RELOCATING-0} : { *(.got.plt) }"
-+ fi
-+fi
-+DYNAMIC=".dynamic ${RELOCATING-0} : { *(.dynamic) }"
-+RODATA=".rodata ${RELOCATING-0} : { *(.rodata${RELOCATING+ .rodata.*
.gnu.linkonce.r.*}) }"
-+DATARELRO=".data.rel.ro : { *(.data.rel.ro.local*
.gnu.linkonce.d.rel.ro.local.*) *(.data.rel.ro* .gnu.linkonce.d.rel.ro.*) }"
-+DISCARDED="/DISCARD/ : { *(.note.GNU-stack) *(.gnu_debuglink) }"
-+if test -z "${NO_SMALL_DATA}"; then
-+ SBSS=".sbss ${RELOCATING-0} :
-+ {
-+ ${RELOCATING+${SBSS_START_SYMBOLS}}
-+ ${CREATE_SHLIB+*(.sbss2 .sbss2.* .gnu.linkonce.sb2.*)}
-+ *(.dynsbss)
-+ *(.sbss${RELOCATING+ .sbss.* .gnu.linkonce.sb.*})
-+ *(.scommon)
-+ ${RELOCATING+${SBSS_END_SYMBOLS}}
-+ }"
-+ SBSS2=".sbss2 ${RELOCATING-0} : { *(.sbss2${RELOCATING+ .sbss2.*
.gnu.linkonce.sb2.*}) }"
-+ SDATA="/* We want the small data sections together, so single-instruction
offsets
-+ can access them all, and initialized data all before uninitialized, so
-+ we can shorten the on-disk segment size. */
-+ .sdata ${RELOCATING-0} :
-+ {
-+ ${RELOCATING+${SDATA_START_SYMBOLS}}
-+ ${CREATE_SHLIB+*(.sdata2 .sdata2.* .gnu.linkonce.s2.*)}
-+ *(.sdata${RELOCATING+ .sdata.* .gnu.linkonce.s.*})
-+ }"
-+ SDATA2=".sdata2 ${RELOCATING-0} :
-+ {
-+ ${RELOCATING+${SDATA2_START_SYMBOLS}}
-+ *(.sdata2${RELOCATING+ .sdata2.* .gnu.linkonce.s2.*})
-+ }"
-+ REL_SDATA=".rel.sdata ${RELOCATING-0} : { *(.rel.sdata${RELOCATING+
.rel.sdata.* .rel.gnu.linkonce.s.*}) }
-+ .rela.sdata ${RELOCATING-0} : { *(.rela.sdata${RELOCATING+ .rela.sdata.*
.rela.gnu.linkonce.s.*}) }"
-+ REL_SBSS=".rel.sbss ${RELOCATING-0} : { *(.rel.sbss${RELOCATING+
.rel.sbss.* .rel.gnu.linkonce.sb.*}) }
-+ .rela.sbss ${RELOCATING-0} : { *(.rela.sbss${RELOCATING+ .rela.sbss.*
.rela.gnu.linkonce.sb.*}) }"
-+ REL_SDATA2=".rel.sdata2 ${RELOCATING-0} : { *(.rel.sdata2${RELOCATING+
.rel.sdata2.* .rel.gnu.linkonce.s2.*}) }
-+ .rela.sdata2 ${RELOCATING-0} : { *(.rela.sdata2${RELOCATING+
.rela.sdata2.* .rela.gnu.linkonce.s2.*}) }"
-+ REL_SBSS2=".rel.sbss2 ${RELOCATING-0} : { *(.rel.sbss2${RELOCATING+
.rel.sbss2.* .rel.gnu.linkonce.sb2.*}) }
-+ .rela.sbss2 ${RELOCATING-0} : { *(.rela.sbss2${RELOCATING+ .rela.sbss2.*
.rela.gnu.linkonce.sb2.*}) }"
-+else
-+ NO_SMALL_DATA=" "
-+fi
-+if test -z "${DATA_GOT}"; then
-+ if test -n "${NO_SMALL_DATA}"; then
-+ DATA_GOT=" "
-+ fi
-+fi
-+if test -z "${SDATA_GOT}"; then
-+ if test -z "${NO_SMALL_DATA}"; then
-+ SDATA_GOT=" "
-+ fi
-+fi
-+test -n "$SEPARATE_GOTPLT" && SEPARATE_GOTPLT=" "
-+test "${LARGE_SECTIONS}" = "yes" && REL_LARGE="
-+ .rel.ldata ${RELOCATING-0} : { *(.rel.ldata${RELOCATING+ .rel.ldata.*
.rel.gnu.linkonce.l.*}) }
-+ .rela.ldata ${RELOCATING-0} : { *(.rela.ldata${RELOCATING+ .rela.ldata.*
.rela.gnu.linkonce.l.*}) }
-+ .rel.lbss ${RELOCATING-0} : { *(.rel.lbss${RELOCATING+ .rel.lbss.*
.rel.gnu.linkonce.lb.*}) }
-+ .rela.lbss ${RELOCATING-0} : { *(.rela.lbss${RELOCATING+ .rela.lbss.*
.rela.gnu.linkonce.lb.*}) }
-+ .rel.lrodata ${RELOCATING-0} : { *(.rel.lrodata${RELOCATING+
.rel.lrodata.* .rel.gnu.linkonce.lr.*}) }
-+ .rela.lrodata ${RELOCATING-0} : { *(.rela.lrodata${RELOCATING+
.rela.lrodata.* .rela.gnu.linkonce.lr.*}) }"
-+test "${LARGE_SECTIONS}" = "yes" && OTHER_BSS_SECTIONS="
-+ ${OTHER_BSS_SECTIONS}
-+ .lbss ${RELOCATING-0} :
-+ {
-+ *(.dynlbss)
-+ *(.lbss${RELOCATING+ .lbss.* .gnu.linkonce.lb.*})
-+ *(LARGE_COMMON)
-+ }"
-+test "${LARGE_SECTIONS}" = "yes" && LARGE_SECTIONS="
-+ .lrodata ${RELOCATING-0} ${RELOCATING+ALIGN(${MAXPAGESIZE}) + (. &
(${MAXPAGESIZE} - 1))} :
-+ {
-+ *(.lrodata${RELOCATING+ .lrodata.* .gnu.linkonce.lr.*})
-+ }
-+ .ldata ${RELOCATING-0} ${RELOCATING+ALIGN(${MAXPAGESIZE}) + (. &
(${MAXPAGESIZE} - 1))} :
-+ {
-+ *(.ldata${RELOCATING+ .ldata.* .gnu.linkonce.l.*})
-+ ${RELOCATING+. = ALIGN(. != 0 ? ${ALIGNMENT} : 1);}
-+ }"
-+CTOR=".ctors ${CONSTRUCTING-0} :
-+ {
-+ ${CONSTRUCTING+${CTOR_START}}
-+ /* gcc uses crtbegin.o to find the start of
-+ the constructors, so we make sure it is
-+ first. Because this is a wildcard, it
-+ doesn't matter if the user does not
-+ actually link against crtbegin.o; the
-+ linker won't look for a file to match a
-+ wildcard. The wildcard also means that it
-+ doesn't matter which directory crtbegin.o
-+ is in. */
-+
-+ KEEP (*crtbegin.o(.ctors))
-+ KEEP (*crtbegin?.o(.ctors))
-+
-+ /* We don't want to include the .ctor section from
-+ the crtend.o file until after the sorted ctors.
-+ The .ctor section from the crtend file contains the
-+ end of ctors marker and it must be last */
-+
-+ KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .ctors))
-+ KEEP (*(SORT(.ctors.*)))
-+ KEEP (*(.ctors))
-+ ${CONSTRUCTING+${CTOR_END}}
-+ }"
-+DTOR=".dtors ${CONSTRUCTING-0} :
-+ {
-+ ${CONSTRUCTING+${DTOR_START}}
-+ KEEP (*crtbegin.o(.dtors))
-+ KEEP (*crtbegin?.o(.dtors))
-+ KEEP (*(EXCLUDE_FILE (*crtend.o *crtend?.o $OTHER_EXCLUDE_FILES) .dtors))
-+ KEEP (*(SORT(.dtors.*)))
-+ KEEP (*(.dtors))
-+ ${CONSTRUCTING+${DTOR_END}}
-+ }"
-+STACK=" .stack ${RELOCATING-0}${RELOCATING+${STACK_ADDR}} :
-+ {
-+ ${RELOCATING+_stack = .;}
-+ *(.stack)
-+ }"
-+
-+# if this is for an embedded system, don't add SIZEOF_HEADERS.
-+if [ -z "$EMBEDDED" ]; then
-+ test -z "${TEXT_BASE_ADDRESS}" && TEXT_BASE_ADDRESS="${TEXT_START_ADDR} +
SIZEOF_HEADERS"
-+else
-+ test -z "${TEXT_BASE_ADDRESS}" && TEXT_BASE_ADDRESS="${TEXT_START_ADDR}"
-+fi
-+
-+cat <<EOF
-+OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}",
-+ "${LITTLE_OUTPUT_FORMAT}")
-+OUTPUT_ARCH(${OUTPUT_ARCH})
-+ENTRY(${ENTRY})
-+
-+${RELOCATING+${LIB_SEARCH_DIRS}}
-+${RELOCATING+${EXECUTABLE_SYMBOLS}}
-+${RELOCATING+${INPUT_FILES}}
-+${RELOCATING- /* For some reason, the Solaris linker makes bad executables
-+ if gld -r is used and the intermediate file has sections starting
-+ at non-zero addresses. Could be a Solaris ld bug, could be a GNU ld
-+ bug. But for now assigning the zero vmas works. */}
-+
-+SECTIONS
-+{
-+ /* Read-only sections, merged into text segment: */
-+ ${CREATE_SHLIB-${CREATE_PIE-${RELOCATING+PROVIDE (__executable_start =
${TEXT_START_ADDR}); . = ${TEXT_BASE_ADDRESS};}}}
-+ ${CREATE_SHLIB+${RELOCATING+. = ${SHLIB_TEXT_START_ADDR:-0} +
SIZEOF_HEADERS;}}
-+ ${CREATE_PIE+${RELOCATING+. = ${SHLIB_TEXT_START_ADDR:-0} +
SIZEOF_HEADERS;}}
-+ ${INITIAL_READONLY_SECTIONS}
-+ .note.gnu.build-id : { *(.note.gnu.build-id) }
-+ ${TEXT_DYNAMIC+${DYNAMIC}}
-+ .hash ${RELOCATING-0} : { *(.hash) }
-+ .gnu.hash ${RELOCATING-0} : { *(.gnu.hash) }
-+ .dynsym ${RELOCATING-0} : { *(.dynsym) }
-+ .dynstr ${RELOCATING-0} : { *(.dynstr) }
-+ .gnu.version ${RELOCATING-0} : { *(.gnu.version) }
-+ .gnu.version_d ${RELOCATING-0}: { *(.gnu.version_d) }
-+ .gnu.version_r ${RELOCATING-0}: { *(.gnu.version_r) }
-+
-+EOF
-+if [ "x$COMBRELOC" = x ]; then
-+ COMBRELOCCAT=cat
-+else
-+ COMBRELOCCAT="cat > $COMBRELOC"
-+fi
-+eval $COMBRELOCCAT <<EOF
-+ .rel.init ${RELOCATING-0} : { *(.rel.init) }
-+ .rela.init ${RELOCATING-0} : { *(.rela.init) }
-+ .rel.text ${RELOCATING-0} : { *(.rel.text${RELOCATING+ .rel.text.*
.rel.gnu.linkonce.t.*}) }
-+ .rela.text ${RELOCATING-0} : { *(.rela.text${RELOCATING+ .rela.text.*
.rela.gnu.linkonce.t.*}) }
-+ .rel.fini ${RELOCATING-0} : { *(.rel.fini) }
-+ .rela.fini ${RELOCATING-0} : { *(.rela.fini) }
-+ .rel.rodata ${RELOCATING-0} : { *(.rel.rodata${RELOCATING+ .rel.rodata.*
.rel.gnu.linkonce.r.*}) }
-+ .rela.rodata ${RELOCATING-0} : { *(.rela.rodata${RELOCATING+
.rela.rodata.* .rela.gnu.linkonce.r.*}) }
-+ ${OTHER_READONLY_RELOC_SECTIONS}
-+ .rel.data.rel.ro ${RELOCATING-0} : { *(.rel.data.rel.ro${RELOCATING+*
.rel.gnu.linkonce.d.rel.ro.*}) }
-+ .rela.data.rel.ro ${RELOCATING-0} : { *(.rela.data.rel.ro${RELOCATING+*
.rela.gnu.linkonce.d.rel.ro.*}) }
-+ .rel.data ${RELOCATING-0} : { *(.rel.data${RELOCATING+ .rel.data.*
.rel.gnu.linkonce.d.*}) }
-+ .rela.data ${RELOCATING-0} : { *(.rela.data${RELOCATING+ .rela.data.*
.rela.gnu.linkonce.d.*}) }
-+ .rel.tdata ${RELOCATING-0} : { *(.rel.tdata${RELOCATING+ .rel.tdata.*
.rel.gnu.linkonce.td.*}) }
-+ .rela.tdata ${RELOCATING-0} : { *(.rela.tdata${RELOCATING+ .rela.tdata.*
.rela.gnu.linkonce.td.*}) }
-+ .rel.tbss ${RELOCATING-0} : { *(.rel.tbss${RELOCATING+ .rel.tbss.*
.rel.gnu.linkonce.tb.*}) }
-+ .rela.tbss ${RELOCATING-0} : { *(.rela.tbss${RELOCATING+ .rela.tbss.*
.rela.gnu.linkonce.tb.*}) }
-+ .rel.ctors ${RELOCATING-0} : { *(.rel.ctors) }
-+ .rela.ctors ${RELOCATING-0} : { *(.rela.ctors) }
-+ .rel.dtors ${RELOCATING-0} : { *(.rel.dtors) }
-+ .rela.dtors ${RELOCATING-0} : { *(.rela.dtors) }
-+ .rel.got ${RELOCATING-0} : { *(.rel.got) }
-+ .rela.got ${RELOCATING-0} : { *(.rela.got) }
-+ ${OTHER_GOT_RELOC_SECTIONS}
-+ ${REL_SDATA}
-+ ${REL_SBSS}
-+ ${REL_SDATA2}
-+ ${REL_SBSS2}
-+ .rel.bss ${RELOCATING-0} : { *(.rel.bss${RELOCATING+ .rel.bss.*
.rel.gnu.linkonce.b.*}) }
-+ .rela.bss ${RELOCATING-0} : { *(.rela.bss${RELOCATING+ .rela.bss.*
.rela.gnu.linkonce.b.*}) }
-+ ${REL_LARGE}
-+EOF
-+if [ -n "$COMBRELOC" ]; then
-+cat <<EOF
-+ .rel.dyn ${RELOCATING-0} :
-+ {
-+EOF
-+sed -e '/^[ ]*[{}][ ]*$/d;/:[ ]*$/d;/\.rela\./d;s/^.*: {
*\(.*\)}$/ \1/' $COMBRELOC
-+cat <<EOF
-+ }
-+ .rela.dyn ${RELOCATING-0} :
-+ {
-+EOF
-+sed -e '/^[ ]*[{}][ ]*$/d;/:[ ]*$/d;/\.rel\./d;s/^.*: {
*\(.*\)}/ \1/' $COMBRELOC
-+cat <<EOF
-+ }
-+EOF
-+fi
-+cat <<EOF
-+ .rel.plt ${RELOCATING-0} : { *(.rel.plt) }
-+ .rela.plt ${RELOCATING-0} : { *(.rela.plt) }
-+ ${OTHER_PLT_RELOC_SECTIONS}
-+
-+ .init ${RELOCATING-0} :
-+ {
-+ ${RELOCATING+${INIT_START}}
-+ KEEP (*(.init))
-+ ${RELOCATING+${INIT_END}}
-+ } =${NOP-0}
-+
-+ ${TINY_READONLY_SECTION}
-+ .text ${RELOCATING-0} :
-+ {
-+ ${RELOCATING+${TEXT_START_SYMBOLS}}
-+ *(.text .stub${RELOCATING+ .text.* .gnu.linkonce.t.*})
-+ KEEP (*(.text.*personality*))
-+ /* .gnu.warning sections are handled specially by elf32.em. */
-+ *(.gnu.warning)
-+ ${RELOCATING+${OTHER_TEXT_SECTIONS}}
-+ } =${NOP-0}
-+ . = ALIGN(4096);
-+ ${TEXT_PLT+${PLT}}
-+ . = ALIGN(4096);
-+ .fini ${RELOCATING-0} :
-+ {
-+ ${RELOCATING+${FINI_START}}
-+ KEEP (*(.fini))
-+ ${RELOCATING+${FINI_END}}
-+ } =${NOP-0}
-+ ${RELOCATING+PROVIDE (__${ETEXT_NAME} = .);}
-+ ${RELOCATING+PROVIDE (_${ETEXT_NAME} = .);}
-+ ${RELOCATING+PROVIDE (${ETEXT_NAME} = .);}
-+ ${WRITABLE_RODATA-${RODATA}}
-+ .rodata1 ${RELOCATING-0} : { *(.rodata1) }
-+ ${CREATE_SHLIB-${SDATA2}}
-+ ${CREATE_SHLIB-${SBSS2}}
-+ ${OTHER_READONLY_SECTIONS}
-+ .eh_frame_hdr : { *(.eh_frame_hdr) }
-+ .eh_frame ${RELOCATING-0} : ONLY_IF_RO { KEEP (*(.eh_frame)) }
-+ .gcc_except_table ${RELOCATING-0} : ONLY_IF_RO { *(.gcc_except_table
.gcc_except_table.*) }
-+
-+ /* Adjust the address for the data segment. We want to adjust up to
-+ the same address within the page on the next page up. */
-+ ${CREATE_SHLIB-${CREATE_PIE-${RELOCATING+. =
${DATA_ADDR-${DATA_SEGMENT_ALIGN}};}}}
-+ ${CREATE_SHLIB+${RELOCATING+. = ${SHLIB_DATA_ADDR-${DATA_SEGMENT_ALIGN}};}}
-+ ${CREATE_PIE+${RELOCATING+. = ${SHLIB_DATA_ADDR-${DATA_SEGMENT_ALIGN}};}}
-+
-+ /* Exception handling */
-+ .eh_frame ${RELOCATING-0} : ONLY_IF_RW { KEEP (*(.eh_frame)) }
-+ .gcc_except_table ${RELOCATING-0} : ONLY_IF_RW { *(.gcc_except_table
.gcc_except_table.*) }
-+
-+ /* Thread Local Storage sections */
-+ .tdata ${RELOCATING-0} : { *(.tdata${RELOCATING+ .tdata.*
.gnu.linkonce.td.*}) }
-+ .tbss ${RELOCATING-0} : { *(.tbss${RELOCATING+ .tbss.*
.gnu.linkonce.tb.*})${RELOCATING+ *(.tcommon)} }
-+
-+ .preinit_array ${RELOCATING-0} :
-+ {
-+ ${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN
(${USER_LABEL_PREFIX}__preinit_array_start = .);}}
-+ KEEP (*(.preinit_array))
-+ ${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN
(${USER_LABEL_PREFIX}__preinit_array_end = .);}}
-+ }
-+ .init_array ${RELOCATING-0} :
-+ {
-+ ${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN
(${USER_LABEL_PREFIX}__init_array_start = .);}}
-+ KEEP (*(SORT(.init_array.*)))
-+ KEEP (*(.init_array))
-+ ${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN
(${USER_LABEL_PREFIX}__init_array_end = .);}}
-+ }
-+ .fini_array ${RELOCATING-0} :
-+ {
-+ ${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN
(${USER_LABEL_PREFIX}__fini_array_start = .);}}
-+ KEEP (*(.fini_array))
-+ KEEP (*(SORT(.fini_array.*)))
-+ ${RELOCATING+${CREATE_SHLIB-PROVIDE_HIDDEN
(${USER_LABEL_PREFIX}__fini_array_end = .);}}
-+ }
-+ ${SMALL_DATA_CTOR-${RELOCATING+${CTOR}}}
-+ ${SMALL_DATA_DTOR-${RELOCATING+${DTOR}}}
-+ .jcr ${RELOCATING-0} : { KEEP (*(.jcr)) }
-+
-+ ${RELOCATING+${DATARELRO}}
-+ ${OTHER_RELRO_SECTIONS}
-+ ${TEXT_DYNAMIC-${DYNAMIC}}
-+ ${DATA_GOT+${RELRO_NOW+${GOT}}}
-+ ${DATA_GOT+${RELRO_NOW+${GOTPLT}}}
-+ ${DATA_GOT+${RELRO_NOW-${SEPARATE_GOTPLT+${GOT}}}}
-+ ${RELOCATING+${DATA_SEGMENT_RELRO_END}}
-+ ${DATA_GOT+${RELRO_NOW-${SEPARATE_GOTPLT-${GOT}}}}
-+ ${DATA_GOT+${RELRO_NOW-${GOTPLT}}}
-+
-+ ${DATA_PLT+${PLT_BEFORE_GOT-${PLT}}}
-+
-+ .data ${RELOCATING-0} :
-+ {
-+ ${RELOCATING+${DATA_START_SYMBOLS}}
-+ *(.data${RELOCATING+ .data.* .gnu.linkonce.d.*})
-+ ${RELOCATING+KEEP (*(.gnu.linkonce.d.*personality*))}
-+ ${CONSTRUCTING+SORT(CONSTRUCTORS)}
-+ }
-+ .data1 ${RELOCATING-0} : { *(.data1) }
-+ ${WRITABLE_RODATA+${RODATA}}
-+ ${OTHER_READWRITE_SECTIONS}
-+ ${SMALL_DATA_CTOR+${RELOCATING+${CTOR}}}
-+ ${SMALL_DATA_DTOR+${RELOCATING+${DTOR}}}
-+ ${DATA_PLT+${PLT_BEFORE_GOT+${PLT}}}
-+ ${SDATA_GOT+${RELOCATING+${OTHER_GOT_SYMBOLS}}}
-+ ${SDATA_GOT+${GOT}}
-+ ${SDATA_GOT+${OTHER_GOT_SECTIONS}}
-+ ${SDATA}
-+ ${OTHER_SDATA_SECTIONS}
-+ ${RELOCATING+${DATA_END_SYMBOLS-${USER_LABEL_PREFIX}_edata = .; PROVIDE
(${USER_LABEL_PREFIX}edata = .);}}
-+ ${RELOCATING+__bss_start = .;}
-+ ${RELOCATING+${OTHER_BSS_SYMBOLS}}
-+ ${SBSS}
-+ ${BSS_PLT+${PLT}}
-+ .bss ${RELOCATING-0} :
-+ {
-+ *(.dynbss)
-+ *(.bss${RELOCATING+ .bss.* .gnu.linkonce.b.*})
-+ *(COMMON)
-+ /* Align here to ensure that the .bss section occupies space up to
-+ _end. Align after .bss to ensure correct alignment even if the
-+ .bss section disappears because there are no input sections.
-+ FIXME: Why do we need it? When there is no .bss section, we don't
-+ pad the .data section. */
-+ ${RELOCATING+. = ALIGN(. != 0 ? ${ALIGNMENT} : 1);}
-+ }
-+ ${OTHER_BSS_SECTIONS}
-+ ${RELOCATING+${OTHER_BSS_END_SYMBOLS}}
-+ ${RELOCATING+. = ALIGN(${ALIGNMENT});}
-+ ${LARGE_SECTIONS}
-+ ${RELOCATING+. = ALIGN(${ALIGNMENT});}
-+ ${RELOCATING+${OTHER_END_SYMBOLS}}
-+ ${RELOCATING+${END_SYMBOLS-${USER_LABEL_PREFIX}_end = .; PROVIDE
(${USER_LABEL_PREFIX}end = .);}}
-+ ${RELOCATING+${DATA_SEGMENT_END}}
-+
-+ /* Stabs debugging sections. */
-+ .stab 0 : { *(.stab) }
-+ .stabstr 0 : { *(.stabstr) }
-+ .stab.excl 0 : { *(.stab.excl) }
-+ .stab.exclstr 0 : { *(.stab.exclstr) }
-+ .stab.index 0 : { *(.stab.index) }
-+ .stab.indexstr 0 : { *(.stab.indexstr) }
-+
-+ .comment 0 : { *(.comment) }
-+
-+ /* DWARF debug sections.
-+ Symbols in the DWARF debugging sections are relative to the beginning
-+ of the section so we begin them at 0. */
-+
-+ /* DWARF 1 */
-+ .debug 0 : { *(.debug) }
-+ .line 0 : { *(.line) }
-+
-+ /* GNU DWARF 1 extensions */
-+ .debug_srcinfo 0 : { *(.debug_srcinfo) }
-+ .debug_sfnames 0 : { *(.debug_sfnames) }
-+
-+ /* DWARF 1.1 and DWARF 2 */
-+ .debug_aranges 0 : { *(.debug_aranges) }
-+ .debug_pubnames 0 : { *(.debug_pubnames) }
-+
-+ /* DWARF 2 */
-+ .debug_info 0 : { *(.debug_info${RELOCATING+ .gnu.linkonce.wi.*}) }
-+ .debug_abbrev 0 : { *(.debug_abbrev) }
-+ .debug_line 0 : { *(.debug_line) }
-+ .debug_frame 0 : { *(.debug_frame) }
-+ .debug_str 0 : { *(.debug_str) }
-+ .debug_loc 0 : { *(.debug_loc) }
-+ .debug_macinfo 0 : { *(.debug_macinfo) }
-+
-+ /* SGI/MIPS DWARF 2 extensions */
-+ .debug_weaknames 0 : { *(.debug_weaknames) }
-+ .debug_funcnames 0 : { *(.debug_funcnames) }
-+ .debug_typenames 0 : { *(.debug_typenames) }
-+ .debug_varnames 0 : { *(.debug_varnames) }
-+
-+ /* DWARF 3 */
-+ .debug_pubtypes 0 : { *(.debug_pubtypes) }
-+ .debug_ranges 0 : { *(.debug_ranges) }
-+
-+ ${TINY_DATA_SECTION}
-+ ${TINY_BSS_SECTION}
-+
-+ ${STACK_ADDR+${STACK}}
-+ ${ATTRS_SECTIONS}
-+ ${OTHER_SECTIONS}
-+ ${RELOCATING+${OTHER_SYMBOLS}}
-+ ${RELOCATING+${DISCARDED}}
-+}
-+EOF
+
diff --git a/sdk/Makefile b/sdk/Makefile
index 629ddc8..863009b 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -27,15 +27,15 @@ VERSION_ZLIB := 1.2.11
VERSION_LIBICONV := 1.15
VERSION_LIBTRE := 0.8.0
VERSION_OPENSSL := 1.0.2k
-VERSION_LIBPNG := 1.6.28
+VERSION_LIBPNG := 1.6.29
VERSION_LIBJPEG := 8d
VERSION_LIBJPEG_TURBO := 1.5.1
-VERSION_LIBCARES := 1.12.0
-VERSION_LIBCURL := 7.53.1
+VERSION_LIBCARES := 1.13.0
+VERSION_LIBCURL := 7.54.1
VERSION_LIBGNURX := 2.5.1
VERSION_LIBPBL := 1_04
VERSION_LIBCF := CVS-20130415
-VERSION_LIBEXPAT := 2.2.0
+VERSION_LIBEXPAT := 2.2.1
VERSION_LDG := 2.32
VERSION_WINDOM := 2.0.1
VERSION_HERMES := 1.3.3
@@ -114,7 +114,6 @@ ifeq ($(TARGET),ppc-amigaos)
SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d
$(COMMON_SDK_ITEMS) libjpeg-turbo.d)
EXTRAARGS_LIBCARES := --disable-shared
EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random
--enable-threaded-resolver LIBS=-lpthread
- EXTRAARGS_OPENSSL := --openssldir="/env/openssl"
endif
ifeq ($(TARGET),i686-w64-mingw32)
--
Cross-compilation toolchains and environments
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
