diff options
159 files changed, 16289 insertions, 11741 deletions
@@ -5,7 +5,13 @@ Pre-requisites for Debian systems $ apt-get install build-essential autoconf automake autogen flex bison $ apt-get install libtool texinfo help2man subversion cvs git - $ apt-get install lhasa unzip autoconf2.64 + $ apt-get install lhasa unzip autoconf2.64 automake1.11 + + If you've not got automake 1.15 by default, you'll need: + + $ apt-get install automake-1.15 + + Depending on your platform you may also need libfl-dev On multiarch-aware systems: @@ -19,8 +25,14 @@ RISC OS It is important that the output prefix (/opt/netsurf by default) is writable or use sudo to do the make - $ cd arm-unknown-riscos - $ make - $ cd ../sdk - $ GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/arm-unknown-riscos/cross/bin GCCSDK_INSTALL_ENV=/opt/netsurf/arm-unknown-riscos/env make + $ make -C arm-unknown-riscos + $ GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/arm-unknown-riscos/cross/bin GCCSDK_INSTALL_ENV=/opt/netsurf/arm-unknown-riscos/env make -C sdk + + +Windows +------- + +The mingw cross build toolchain is made by + $ make -C i686-w64-mingw32 + $ GCCSDK_INSTALL_CROSSBIN=/opt/netsurf/i686-w64-mingw32/cross/bin GCCSDK_INSTALL_ENV=/opt/netsurf/i686-w64-mingw32/env make -C sdk diff --git a/arm-riscos-gnueabi/.gitignore b/arm-riscos-gnueabi/.gitignore new file mode 100644 index 0000000..e6483c4 --- /dev/null +++ b/arm-riscos-gnueabi/.gitignore @@ -0,0 +1,2 @@ +builddir +sources diff --git a/arm-riscos-gnueabi/Makefile b/arm-riscos-gnueabi/Makefile new file mode 100644 index 0000000..11b93c6 --- /dev/null +++ b/arm-riscos-gnueabi/Makefile @@ -0,0 +1,201 @@ +# Use a tested trunk version of GCCSDK +UPSTREAM_GCCSDK_VERSION := 7698 +UPSTREAM_GCCSDK_TARBALL := gccsdk$(UPSTREAM_GCCSDK_VERSION).tar.gz +UPSTREAM_GCCSDK_URI := svn://svn.riscos.info/gccsdk/trunk/autobuilder/develop/gcc@$(UPSTREAM_GCCSDK_VERSION) +UPSTREAM_GCCSDK_SGP_URI := svn://svn.riscos.info/gccsdk/trunk/gcc4/setup-gccsdk-params@$(UPSTREAM_GCCSDK_VERSION) +UPSTREAM_GCCSDK_ROINSTALL_URI := svn://svn.riscos.info/gccsdk/trunk/gcc4/porting-scripts/ro-install@$(UPSTREAM_GCCSDK_VERSION) +UPSTREAM_GCCSDK_AMP_URI := svn://svn.riscos.info/gccsdk/trunk/gcc4/recipe/patches/automake-for-binutils@$(UPSTREAM_GCCSDK_VERSION) +UPSTREAM_GCCSDK_UNIXLIB_URI := svn://svn.riscos.info/gccsdk/trunk/gcc4/recipe/files/gcc/libunixlib@$(UPSTREAM_GCCSDK_VERSION) +UPSTREAM_GCCSDK_LD_URI := svn://svn.riscos.info/gccsdk/trunk/gcc4/riscos/soloader/dynamic/ld.so-1.9.9@$(UPSTREAM_GCCSDK_VERSION) +UPSTREAM_GCCSDK_ASASM_URI := svn://svn.riscos.info/gccsdk/trunk/tools/asasm@$(UPSTREAM_GCCSDK_VERSION) +UPSTREAM_GCCSDK_ELF2AIF_URI := svn://svn.riscos.info/gccsdk/trunk/gcc4/riscos/elf2aif@$(UPSTREAM_GCCSDK_VERSION) +UPSTREAM_GCCSDK_LN_URI := svn://svn.riscos.info/gccsdk/trunk/gcc4/riscos/ln@$(UPSTREAM_GCCSDK_VERSION) +UPSTREAM_GCCSDK_MKRESFS_URI := svn://svn.riscos.info/gccsdk/trunk/gcc4/riscos/mkresfs@$(UPSTREAM_GCCSDK_VERSION) + +# OSLib 7.00 +UPSTREAM_OSLIB_VERSION := 700 +UPSTREAM_OSLIB_TARBALL := oslib$(UPSTREAM_OSLIB_VERSION).tar.gz +UPSTREAM_OSLIB_URI := https://svn.code.sf.net/p/ro-oslib/code/tags/oslib-$(UPSTREAM_OSLIB_VERSION)/!OSLib + +# Known tested version of trunk for CCRes +UPSTREAM_CCRES_VERSION := 96 +UPSTREAM_CCRES_TARBALL := ccres$(UPSTREAM_CCRES_VERSION).tar.gz +UPSTREAM_CCRES_URI := svn://svn.riscos.info/ccres/trunk@$(UPSTREAM_CCRES_VERSION) + +# Makerun +UPSTREAM_MAKERUN_VERSION := fe55b6bf +UPSTREAM_MAKERUN_TARBALL := makerun$(UPSTREAM_MAKERUN_VERSION).tar.gz +UPSTREAM_MAKERUN_URI := git://git.netsurf-browser.org/makerun.git + +# Squeeze +UPSTREAM_SQUEEZE_VERSION := d54d441 +UPSTREAM_SQUEEZE_TARBALL := squeeze$(UPSTREAM_SQUEEZE_VERSION).tar.gz +UPSTREAM_SQUEEZE_URI := git://git.netsurf-browser.org/squeeze.git + +# Infozip +UPSTREAM_INFOZIP_VERSION := 30 +UPSTREAM_INFOZIP_TARBALL := zip$(UPSTREAM_INFOZIP_VERSION).tar.gz +UPSTREAM_INFOZIP_URI := https://downloads.sourceforge.net/project/infozip/Zip%203.x%20%28latest%29/3.0/$(UPSTREAM_INFOZIP_TARBALL) + +Q ?= @ +TOP := $(CURDIR) +RECIPES := $(TOP)/recipes +SOURCESDIR := $(TOP)/sources +BUILDDIR := $(TOP)/builddir +BUILDSTEPS := $(BUILDDIR)/build-steps + +TARGET_NAME := arm-riscos-gnueabi + +PREFIX ?= /opt/netsurf/$(TARGET_NAME) + +# tools +FETCHSRC:=$(CURDIR)/fetchsrc + +.PHONY: all clean distclean +all: $(BUILDSTEPS)/toolchain.d + +clean: + rm -fr $(BUILDDIR) + +distclean: clean + rm -fr $(SOURCESDIR) + +### +# Rules to build the full toolchain +### + +$(BUILDSTEPS)/toolchain.d: $(BUILDSTEPS)/ccres.d $(BUILDSTEPS)/makerun.d $(BUILDSTEPS)/squeeze.d $(BUILDSTEPS)/infozip.d + touch $@ + +### +# Rules to build and install Infozip +### + +$(BUILDSTEPS)/infozip.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_INFOZIP_TARBALL) + tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_INFOZIP_TARBALL) + for p in `ls $(RECIPES)/patches/infozip/*.p` ; do patch -d $(BUILDDIR)/zip$(UPSTREAM_INFOZIP_VERSION) -p0 <$$p ; done + cd $(BUILDDIR)/zip$(UPSTREAM_INFOZIP_VERSION) && make -f unix/Makefile generic LOCAL_ZIP=-DFORRISCOS + cp $(BUILDDIR)/zip$(UPSTREAM_INFOZIP_VERSION)/zip $(PREFIX)/cross/bin/zip + @# Yuck. Build host tooling should not be installed into the target environment + mkdir -p $(PREFIX)/env/bin + ln -fs $(PREFIX)/cross/bin/zip $(PREFIX)/env/bin/zip + touch $@ + +### +# Rules to build and install Makerun +### + +$(BUILDSTEPS)/makerun.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TARBALL) + tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TARBALL) + cd $(BUILDDIR)/makerun && GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install + touch $@ + +### +# Rules to build and install Squeeze +### + +$(BUILDSTEPS)/squeeze.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TARBALL) + tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TARBALL) + cd $(BUILDDIR)/squeeze && GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install + touch $@ + +### +# Rules to build and install CCRes +### + +$(BUILDSTEPS)/ccres.d: $(BUILDSTEPS)/oslib.d $(SOURCESDIR)/$(UPSTREAM_CCRES_TARBALL) + tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_CCRES_TARBALL) + cd $(BUILDDIR)/ccres && GCCSDK_INSTALL_ENV=$(PREFIX)/env GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make + cd $(BUILDDIR)/ccres && GCCSDK_INSTALL_ENV=$(PREFIX)/env GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install + touch $@ + +### +# Rules to build and install OSLib +### + +$(BUILDSTEPS)/oslib.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL) + tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL) + for p in `ls $(RECIPES)/patches/oslib/*.p` ; do patch -d $(BUILDDIR)/oslib -p0 <$$p ; done + cd $(BUILDDIR)/oslib && GCCSDK_INSTALL_ENV=$(PREFIX)/env GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install-elfeabi + touch $@ + +### +# Rules to build and install GCCSDK +### + +$(BUILDSTEPS)/gcc.d: $(BUILDSTEPS)/gccsdk-srcdir.d + cd $(BUILDDIR)/gccsdk && make + @# Install ro-install + mkdir -p $(PREFIX)/env + sed -e s:GCCSDK_ENV:$(PREFIX)/env:g < $(BUILDDIR)/gccsdk/ro-install > $(PREFIX)/env/ro-install + chmod 755 $(PREFIX)/env/ro-install + @# Install empty libraries needed to fool configure scripts + for l in c pthread gcc_s ; do $(PREFIX)/cross/bin/$(TARGET_NAME)-ar mv $(PREFIX)/cross/$(TARGET_NAME)/lib/lib$$l.a ; done + @# Newer GCCSDK adds these trampoline binaries that for us + @# serve no purpose and get in the way. + $(RM) $(PREFIX)/cross/bin/$(TARGET_NAME)-gcc-ar $(PREFIX)/cross/bin/$(TARGET_NAME)-gcc-nm $(PREFIX)/cross/bin/$(TARGET_NAME)-gcc-ranlib + touch $@ + +$(BUILDSTEPS)/gccsdk-srcdir.d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL) + tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL) + cp -p $(RECIPES)/files/gccsdk/gccsdk-params $(BUILDDIR)/gccsdk/gccsdk-params + sed -i 's#{PREFIX}#$(PREFIX)#' $(BUILDDIR)/gccsdk/gccsdk-params + sed -i \ + -e "s#GCCSDK_SUPPORTED_GCC_RELEASE=[0-9.]\+#GCCSDK_SUPPORTED_GCC_RELEASE=$$(grep '^GCC_VERSION=[0-9.]\+' $(BUILDDIR)/gccsdk/gcc/setvars | sed -e 's/^GCC_VERSION=//')#" \ + -e "s#GCCSDK_SUPPORTED_BINUTILS_RELEASE=[0-9.]\+#GCCSDK_SUPPORTED_BINUTILS_RELEASE=$$(grep '^BINUTILS_VERSION=[0-9.]\+' $(BUILDDIR)/gccsdk/gcc/setvars | sed -e 's/^BINUTILS_VERSION=//')#" \ + $(BUILDDIR)/gccsdk/setup-gccsdk-params + cp -p $(RECIPES)/files/gccsdk/Makefile $(BUILDDIR)/gccsdk/Makefile + $(Q)for p in $$(ls $(RECIPES)/files/gccsdk/*.p 2>/dev/null) ; do echo " COPY: $$p -> $(BUILDDIR)/gccsdk/gcc/" ; cp -p $$p $(BUILDDIR)/gccsdk/gcc/ ; done + $(Q)for p in $$(ls $(RECIPES)/files/gccsdk/*.pp 2>/dev/null) ; do echo " COPY: $$p -> $(BUILDDIR)/gccsdk/gcc/" ; cp -p $$p $(BUILDDIR)/gccsdk/gcc/ ; done + $(Q)for p in $$(ls $(RECIPES)/patches/gccsdk/*.p 2>/dev/null) ; do echo "PATCH: $$p" ; patch -d $(BUILDDIR)/gccsdk -p0 <$$p ; done + touch $@ + +### +# Rules to fetch upstream sources +### + +$(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL): + svn export $(UPSTREAM_GCCSDK_URI) $(SOURCESDIR)/gccsdk/gcc + svn export $(UPSTREAM_GCCSDK_SGP_URI) $(SOURCESDIR)/gccsdk/ + svn export $(UPSTREAM_GCCSDK_ROINSTALL_URI) $(SOURCESDIR)/gccsdk/ + svn export $(UPSTREAM_GCCSDK_AMP_URI) $(SOURCESDIR)/gccsdk/automake + svn export $(UPSTREAM_GCCSDK_UNIXLIB_URI) $(SOURCESDIR)/gccsdk/libunixlib + svn export $(UPSTREAM_GCCSDK_LD_URI) $(SOURCESDIR)/gccsdk/ld + svn export $(UPSTREAM_GCCSDK_ASASM_URI) $(SOURCESDIR)/gccsdk/asasm + svn export $(UPSTREAM_GCCSDK_ELF2AIF_URI) $(SOURCESDIR)/gccsdk/elf2aif + svn export $(UPSTREAM_GCCSDK_LN_URI) $(SOURCESDIR)/gccsdk/ln + svn export $(UPSTREAM_GCCSDK_MKRESFS_URI) $(SOURCESDIR)/gccsdk/mkresfs + tar -C $(SOURCESDIR) -caf $@ gccsdk + +$(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL): + svn co $(UPSTREAM_OSLIB_URI) $(SOURCESDIR)/oslib + tar -C $(SOURCESDIR) -caf $@ oslib + +$(SOURCESDIR)/$(UPSTREAM_CCRES_TARBALL): + svn co $(UPSTREAM_CCRES_URI) $(SOURCESDIR)/ccres + tar -C $(SOURCESDIR) -caf $@ ccres + +$(SOURCESDIR)/$(UPSTREAM_MAKERUN_TARBALL): + $(RM) -rf $(SOURCESDIR)/makerun + git clone $(UPSTREAM_MAKERUN_URI) $(SOURCESDIR)/makerun + tar -C $(SOURCESDIR) -caf $@ makerun + +$(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TARBALL): + $(RM) -rf $(SOURCESDIR)/squeeze + git clone $(UPSTREAM_SQUEEZE_URI) $(SOURCESDIR)/squeeze + tar -C $(SOURCESDIR) -caf $@ squeeze + +$(SOURCESDIR)/$(UPSTREAM_INFOZIP_TARBALL): + $(FETCHSRC) arm-unknown-riscos $(subst $(SOURCESDIR)/,,$@) $(UPSTREAM_INFOZIP_URI) $@ + +### +# Rule to create buildsteps dir +### + +$(BUILDSTEPS)/buildsteps.d: $(SOURCESDIR) + mkdir -p $(BUILDSTEPS) + touch $@ + +$(SOURCESDIR): + mkdir -p $@ + diff --git a/arm-riscos-gnueabi/fetchsrc b/arm-riscos-gnueabi/fetchsrc new file mode 100755 index 0000000..92ae5bf --- /dev/null +++ b/arm-riscos-gnueabi/fetchsrc @@ -0,0 +1,16 @@ +#!/bin/bash + +# script to fetch toolchain source tar using ci.netsurf-browser.org as a cache + +# Usage fetchsrc <target> <source> <upstream> <output> + +NSSRV="https://ci.netsurf-browser.org/toolchain/" + +wget -q -O ${4} ${NSSRV}/${1}/${2} +if [ $? -ne 0 ];then + wget -q -O ${4} ${3} + if [ $? -ne 0 ];then + rm ${4} + exit 1 + fi +fi diff --git a/arm-riscos-gnueabi/recipes/files/gccsdk/Makefile b/arm-riscos-gnueabi/recipes/files/gccsdk/Makefile new file mode 100644 index 0000000..01b4cbd --- /dev/null +++ b/arm-riscos-gnueabi/recipes/files/gccsdk/Makefile @@ -0,0 +1,447 @@ +# To build GCCSDK cross-compiler. +# Written by John Tytgat / BASS +# Copyright (c) 2009-2021 GCCSDK Developers +# +# Build requirements: +# - apt-get install flex bison libgmp3-dev libmpfr-dev texinfo build-essential +# - binutils 2.30 and gcc 10.2 needs automake 1.11.1 and autoconf 2.64 and +# a recent libtool version. +# Note the required automake/autoconf/libtool sources will be fetched +# & built automatically. +# - gcc 10.2 needs at least GMP 6.1.0, ISL 0.18, MPFR 3.1.4 and MPC 1.0.3 (MPFR needs GMP, MPC needs GMP & MPFR) +# For MPFR/GMP/ISL/MPC version numbers, a good set can be found mentioned at gcc/contrib/download_prerequisites. + +# TARGET can have following values: arm-riscos-gnueabi +TARGET=arm-riscos-gnueabi +GCC_LANGUAGES="c,c++" +# Enable shared library support in the cross compiler ? +CROSS_ENABLE_SHARED=yes + +# Release ID for GCCSDK RISC OS release (eg 4.7.4 release 6) +GCCSDK_GCC_RISCOS_RELEASE=1 + +# Versions of binutils/autotools needed to build our tools +AUTOCONF_FOR_BINUTILS_VERSION=2.64 +AUTOMAKE_FOR_BINUTILS_VERSION=1.11.1 +LIBTOOL_FOR_BINUTILS_VERSION=2.4.2 +BINUTILS_VERSION=$(GCCSDK_SUPPORTED_BINUTILS_RELEASE) +AUTOCONF_FOR_GCC_VERSION=2.69 +AUTOMAKE_FOR_GCC_VERSION=1.15.1 +LIBTOOL_FOR_GCC_VERSION=2.4.2 + +# Versions of upstream components we need +# XXX: fetch these ourselves, rather than using download_prerequisites +GCC_VERSION=$(GCCSDK_SUPPORTED_GCC_RELEASE) +GMP_VERSION=6.1.0 +ISL_VERSION=0.18 +MPFR_VERSION=3.1.4 +MPC_VERSION=1.1.0 + +# Whether to enable link-time optimisation +GCC_USE_LTO=no + +# If $(AUTOCONF_AUTOMAKE_LIBTOOL_FOR_BINUTILS_VERSIONS) equals +# $(AUTOCONF_AUTOMAKE_LIBTOOL_FOR_GCC_VERSIONS) we can reuse the installed +# buildtools for binutils for building gcc. +AUTOCONF_AUTOMAKE_LIBTOOL_FOR_BINUTILS_VERSIONS := $(AUTOCONF_FOR_BINUTILS_VERSION)-$(AUTOMAKE_FOR_BINUTILS_VERSION)-$(LIBTOOL_FOR_BINUTILS_VERSION) +AUTOCONF_AUTOMAKE_LIBTOOL_FOR_GCC_VERSIONS := $(AUTOCONF_FOR_GCC_VERSION)-$(AUTOMAKE_FOR_GCC_VERSION)-$(LIBTOOL_FOR_GCC_VERSION) + +# Notes: +# 1) Configure options are explained at http://gcc.gnu.org/install/configure.html +# but note that this explanation is for the latest gcc version released and +# not necessary the gcc version we're building here. +# Specifying --disable-multilib will significantly reduce build times but then +# you only end up with UnixLib/softfloat support. +# Note: --enable-multilib is the default. Don't specify it unless you want to get hit +# by PR43328/PR45174. +GCC_CONFIG_ARGS := \ + --enable-threads=posix \ + --enable-sjlj-exceptions=no \ + --enable-c99 \ + --enable-cmath \ + --disable-c-mbchar \ + --disable-wchar_t \ + --disable-libstdcxx-pch \ + --disable-tls \ + --enable-__cxa_atexit \ + --disable-libssp \ + --disable-libgomp \ + --disable-libitm \ + --with-abi=aapcs-linux \ + --with-arch=armv4 \ + --with-float=soft +BINUTILS_CONFIG_ARGS := +GCC_CONFIG_ARGS += --with-pkgversion='GCCSDK GCC $(GCC_VERSION) Release $(GCCSDK_GCC_RISCOS_RELEASE)' \ + --with-bugurl=http://gccsdk.riscos.info/ +BINUTILS_CONFIG_ARGS += --with-pkgversion='GCCSDK GCC $(GCC_VERSION) Release $(GCCSDK_GCC_RISCOS_RELEASE)' \ + --with-bugurl=http://gccsdk.riscos.info/ +BINUTILS_CONFIG_ARGS += --disable-werror --with-gcc --enable-interwork --disable-nls #--enable-maintainer-mode +# --disable-werror is added because --enable-maintainer-mode turns all warnings into errors and +# the gcc build is not 100% warning free. +# However, this does not help for libstdc++ builds when newlib is used, cfr http://gcc.gnu.org/PR47058. +GCC_CONFIG_ARGS += --enable-maintainer-mode --disable-werror +GCC_CONFIG_ARGS += --enable-interwork --disable-nls --disable-libquadmath + +# When debugging/testing/validating the compiler add "--enable-checking=all", +# otherwise add "--enable-checking=release" or even "--enable-checking=no" +GCC_CONFIG_ARGS += --enable-checking=release +# Configure args shared between different targets: +# For debugging: +# FIXME: add to GCC_BUILD_FLAGS for optimized ARM libraries: CFLAGS_FOR_TARGET="-O3 -march=armv5" CXXFLAGS_FOR_TARGET="-O3 -march=armv5" +# Or perhaps better, at GCC configure time something like --with-arch=armv6 --with-tune=cortex-a8 --with-float=softfp --with-fpu=vfp ? +##GCC_BUILD_FLAGS := CFLAGS="-O0 -g" LIBCXXFLAGS="-O0 -g" +##BINUTILS_BUILD_FLAGS = CFLAGS="-O0 -g" + +ROOT := $(CURDIR) +PREFIX_CROSS := $(GCCSDK_CROSS_PREFIX) +PREFIX_RONATIVE := $(GCCSDK_RISCOS_PREFIX)/\!GCC +BUILDDIR := $(GCCSDK_BUILDDIR) +BUILDSTEPSDIR := buildstepsdir +# PREFIX_BUILDTOOL_BINUTILS will contain the built autoconf/automake/libtool versions used during building binutils. +PREFIX_BUILDTOOL_BINUTILS := $(BUILDDIR)/installed-buildtools-for-binutils +# PREFIX_BUILDTOOL_GCC will contain the built autoconf/automake/libtool versions used during building gcc. +# When the autoconf/automake/libtool versions needed to build gcc are the same as the autoconf/automake/libtool versions +# needed to build binutils, PREFIX_BUILDTOOL_GCC will be a symlink to PREFIX_BUILDTOOL_BINUTILS +# (compare $(AUTOCONF_AUTOMAKE_LIBTOOL_FOR_BINUTILS_VERSIONS) with $(AUTOCONF_AUTOMAKE_LIBTOOL_FOR_GCC_VERSIONS)). +PREFIX_BUILDTOOL_GCC := $(BUILDDIR)/installed-buildtools-for-gcc +PREFIX_CROSSGCC_LIBS := $(BUILDDIR)/installed-libs-for-cross-gcc +SRCDIR := $(GCCSDK_SRCDIR) +SRCORIGDIR := $(GCCSDK_SRCDIR).orig + +ifeq ($(CROSS_ENABLE_SHARED),yes) +CROSS_GCC_CONFIG_ARGS += target_configargs=--enable-shared=libunixlib,libgcc,libstdc++,libbacktrace +else +CROSS_GCC_CONFIG_ARGS += target_configargs=--disable-shared +endif +ifeq ($(GCC_USE_LTO),yes) +CROSS_GCC_CONFIG_ARGS += --enable-lto +else +CROSS_GCC_CONFIG_ARGS += --disable-lto +endif + +# Configure arguments Binutils & GCC: +CROSS_CONFIG_ARGS := --target=$(TARGET) --prefix=$(PREFIX_CROSS) + +# To respawn Makefile with setup-gccsdk-param environment loaded. +GCCSDK_INTERNAL_GETENV=getenv +ifeq ($(MAKECMDGOALS),) +MAKECMDGOALS=all +endif + +.NOTPARALLEL: +.PHONY: all all-done cross clean clean-done clean-cross clean-cross-done distclean distclean-done getenv +VPATH = $(BUILDSTEPSDIR) + +# Default target is to build the cross-compiler (including the RISC OS tools): +all: $(GCCSDK_INTERNAL_GETENV) +all-done: cross-done + +# Builds the cross compiler: +cross: $(GCCSDK_INTERNAL_GETENV) +cross-done: cross-gcc-built cross-riscostools-built + touch $(BUILDSTEPSDIR)/$@ + +clean: $(GCCSDK_INTERNAL_GETENV) +clean-done: + -rm -rf $(BUILDDIR) $(BUILDSTEPSDIR) $(SRCDIR) $(GCCSDK_CROSS_PREFIX) + +# Return to a state for doing a full fresh cross build (using the current binutils/gcc sources). +clean-cross: $(GCCSDK_INTERNAL_GETENV) +clean-cross-done: + -rm -rf $(BUILDSTEPSDIR)/cross-* $(BUILDDIR)/cross* $(GCCSDK_CROSS_PREFIX) + +distclean: $(GCCSDK_INTERNAL_GETENV) +distclean-done: clean-done + -rm -rf release-area $(SRCORIGDIR) + +# Respawn Makefile again after having loaded all our GCCSDK environment variables. +ifeq ($(GCCSDK_INTERNAL_GETENV),getenv) +getenv: + test -d $(BUILDSTEPSDIR) || mkdir $(BUILDSTEPSDIR) + @bash -c ". ./setup-gccsdk-params && $(MAKE) $(patsubst %,%-done,$(MAKECMDGOALS)) GCCSDK_INTERNAL_GETENV=" +endif + +# -- Configure & building: + +# Configure & build autoconf-for-binutils tool: +buildtool-autoconf-for-binutils-built: src-autoconf-for-binutils-copied + -rm -rf $(BUILDDIR)/buildtool-autoconf-for-binutils + mkdir -p $(BUILDDIR)/buildtool-autoconf-for-binutils + cd $(BUILDDIR)/buildtool-autoconf-for-binutils && $(SRCDIR)/autoconf-for-binutils/configure --prefix=$(PREFIX_BUILDTOOL_BINUTILS) && $(MAKE) && $(MAKE) install + touch $(BUILDSTEPSDIR)/$@ + +ifneq ($(AUTOCONF_AUTOMAKE_LIBTOOL_FOR_BINUTILS_VERSIONS),$(AUTOCONF_AUTOMAKE_LIBTOOL_FOR_GCC_VERSIONS)) +# Configure & build autoconf-for-gcc tool: +buildtool-autoconf-for-gcc-built: src-autoconf-for-gcc-copied + -rm -rf $(BUILDDIR)/buildtool-autoconf-for-gcc + mkdir -p $(BUILDDIR)/buildtool-autoconf-for-gcc + cd $(BUILDDIR)/buildtool-autoconf-for-gcc && $(SRCDIR)/autoconf-for-gcc/configure --prefix=$(PREFIX_BUILDTOOL_GCC) && $(MAKE) && $(MAKE) install +else +# autoconf-for-gcc, automake-for-gcc and libtool-for-gcc are the same as autoconf-for-binutils, automake-for-binutils and libtool-for-binutils so we can use PREFIX_BUILDTOOL_GCC as PREFIX_BUILDTOOL_BINUTILS +buildtool-autoconf-for-gcc-built: buildtool-autoconf-for-binutils-built + ln -f -s $(PREFIX_BUILDTOOL_BINUTILS) $(PREFIX_BUILDTOOL_GCC) +endif + touch $(BUILDSTEPSDIR)/$@ + +# Configure & build automake-for-binutils tool: +buildtool-automake-for-binutils-built: src-automake-for-binutils-copied buildtool-autoconf-for-binutils-built + -rm -rf $(BUILDDIR)/buildtool-automake-for-binutils + mkdir -p $(BUILDDIR)/buildtool-automake-for-binutils + cd $(BUILDDIR)/buildtool-automake-for-binutils && PATH="$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" && $(SRCDIR)/automake-for-binutils/configure --prefix=$(PREFIX_BUILDTOOL_BINUTILS) && $(MAKE) && $(MAKE) install + touch $(BUILDSTEPSDIR)/$@ + +ifneq ($(AUTOCONF_AUTOMAKE_LIBTOOL_FOR_BINUTILS_VERSIONS),$(AUTOCONF_AUTOMAKE_LIBTOOL_FOR_GCC_VERSIONS)) +# Configure & build automake-for-gcc tool: +buildtool-automake-for-gcc-built: src-automake-for-gcc-copied buildtool-autoconf-for-gcc-built + -rm -rf $(BUILDDIR)/buildtool-automake-for-gcc + mkdir -p $(BUILDDIR)/buildtool-automake-for-gcc + cd $(BUILDDIR)/buildtool-automake-for-gcc && PATH="$(PREFIX_BUILDTOOL_GCC)/bin:$(PATH)" && $(SRCDIR)/automake-for-gcc/configure --prefix=$(PREFIX_BUILDTOOL_GCC) && $(MAKE) && $(MAKE) install +else +# autoconf-for-gcc, automake-for-gcc and libtool-for-gcc are the same as autoconf-for-binutils, automake-for-binutils and libtool-for-binutils so we can use PREFIX_BUILDTOOL_GCC as PREFIX_BUILDTOOL_BINUTILS +buildtool-automake-for-gcc-built: buildtool-automake-for-binutils-built +endif + touch $(BUILDSTEPSDIR)/$@ + +# Configure & build libtool-for-binutils tool: +buildtool-libtool-for-binutils-built: src-libtool-for-binutils-copied buildtool-autoconf-for-binutils-built buildtool-automake-for-binutils-built + -rm -rf $(BUILDDIR)/buildtool-libtool-for-binutils + mkdir -p $(BUILDDIR)/buildtool-libtool-for-binutils + cd $(BUILDDIR)/buildtool-libtool-for-binutils && PATH="$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" && $(SRCDIR)/libtool-for-binutils/configure --prefix=$(PREFIX_BUILDTOOL_BINUTILS) && $(MAKE) && $(MAKE) install + touch $(BUILDSTEPSDIR)/$@ + +ifneq ($(AUTOCONF_AUTOMAKE_LIBTOOL_FOR_BINUTILS_VERSIONS),$(AUTOCONF_AUTOMAKE_LIBTOOL_FOR_GCC_VERSIONS)) +# Configure & build libtool-for-gcc tool: +buildtool-libtool-for-gcc-built: src-libtool-for-gcc-copied buildtool-autoconf-for-gcc-built buildtool-automake-for-gcc-built + -rm -rf $(BUILDDIR)/buildtool-libtool-for-gcc + mkdir -p $(BUILDDIR)/buildtool-libtool-for-gcc + cd $(BUILDDIR)/buildtool-libtool-for-gcc && PATH="$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" && $(SRCDIR)/libtool-for-gcc/configure --prefix=$(PREFIX_BUILDTOOL_GCC) && $(MAKE) && $(MAKE) install +else +# autoconf-for-gcc, automake-for-gcc and libtool-for-gcc are the same as autoconf-for-binutils, automake-for-binutils and libtool-for-binutils so we can use PREFIX_BUILDTOOL_GCC as PREFIX_BUILDTOOL_BINUTILS +buildtool-libtool-for-gcc-built: buildtool-libtool-for-binutils-built +endif + touch $(BUILDSTEPSDIR)/$@ + +# Configure binutils cross: +cross-binutils-configured: src-binutils-copied + -rm -rf $(BUILDDIR)/cross-binutils + mkdir -p $(BUILDDIR)/cross-binutils + cd $(BUILDDIR)/cross-binutils && PATH="$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" && $(SRCDIR)/binutils/configure $(CROSS_CONFIG_ARGS) $(BINUTILS_CONFIG_ARGS) + touch $(BUILDSTEPSDIR)/$@ + +# Build binutils cross: +cross-binutils-built: cross-binutils-configured + cd $(BUILDDIR)/cross-binutils && PATH="$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" && $(SRCDIR)/binutils/configure $(CROSS_CONFIG_ARGS) $(BINUTILS_CONFIG_ARGS) && $(MAKE) $(BINUTILS_BUILD_FLAGS) && $(MAKE) install + touch $(BUILDSTEPSDIR)/$@ + +# Configure gcc cross: +cross-gcc-configured: src-gcc-copied cross-binutils-built + -rm -rf $(BUILDDIR)/cross-gcc + mkdir -p $(BUILDDIR)/cross-gcc + mkdir -p $(PREFIX_CROSS)/$(TARGET)/lib + for l in c pthread gcc_s; do $(PREFIX_CROSS)/bin/$(TARGET)-ar mv $(PREFIX_CROSS)/$(TARGET)/lib/lib$${l}.a; done + cd $(BUILDDIR)/cross-gcc && PATH="$(PREFIX_BUILDTOOL_GCC)/bin:$(PREFIX_CROSS)/bin:$(PATH)" && $(SRCDIR)/gcc/configure $(CROSS_CONFIG_ARGS) $(CROSS_GCC_CONFIG_ARGS) $(GCC_CONFIG_ARGS) --enable-languages=$(GCC_LANGUAGES) + touch $(BUILDSTEPSDIR)/$@ + +# Build gcc cross: +cross-gcc-built: cross-gcc-configured + cd $(BUILDDIR)/cross-gcc && PATH="$(PREFIX_BUILDTOOL_GCC)/bin:$(PREFIX_CROSS)/bin:$(PATH)" && $(MAKE) $(GCC_BUILD_FLAGS) && $(MAKE) install + touch $(BUILDSTEPSDIR)/$@ + +# Build the RISC OS related tools (elf2aif, asasm, etc) cross: +cross-riscostools-built: cross-gcc-built + @# LD + -rm -rf $(BUILDDIR)/cross-ld + mkdir -p $(BUILDDIR)/cross-ld + cd $(ROOT)/ld && PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" autoreconf -f --install + cd $(BUILDDIR)/cross-ld && PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" CC=$(GCCSDK_INSTALL_CROSSBIN)/$(TARGET)-gcc $(ROOT)/ld/configure --prefix=$(PREFIX_CROSS)/$(TARGET) --host=$(TARGET) --target=$(TARGET) + cd $(BUILDDIR)/cross-ld && PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" make install + @# asasm + -rm -rf $(BUILDDIR)/cross-asasm + mkdir -p $(BUILDDIR)/cross-asasm + cd $(ROOT)/asasm && PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" ACLOCAL='aclocal -I $(ROOT)/asasm/m4' autoreconf -f --install + cd $(BUILDDIR)/cross-asasm && PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" $(ROOT)/asasm/configure --prefix=$(PREFIX_CROSS) --target=$(TARGET) --disable-building-tools + cd $(BUILDDIR)/cross-asasm && PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" make install-minimum + @# elf2aif + -rm -rf $(BUILDDIR)/cross-elf2aif + mkdir -p $(BUILDDIR)/cross-elf2aif + cd $(ROOT)/elf2aif && PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" autoreconf -f --install + cd $(BUILDDIR)/cross-elf2aif && PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" $(ROOT)/elf2aif/configure --prefix=$(PREFIX_CROSS) --target=$(TARGET) + cd $(BUILDDIR)/cross-elf2aif && PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" make install + @# ln + -rm -rf $(BUILDDIR)/cross-ln + mkdir -p $(BUILDDIR)/cross-ln + cd $(ROOT)/ln && PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" autoreconf -f --install + cd $(BUILDDIR)/cross-ln && PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" $(ROOT)/ln/configure --prefix=$(PREFIX_CROSS) --target=$(TARGET) + cd $(BUILDDIR)/cross-ln && PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" make install + @# mkresfs + -rm -rf $(BUILDDIR)/cross-mkresfs + mkdir -p $(BUILDDIR)/cross-mkresfs + cd $(ROOT)/mkresfs && PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" autoreconf -f --install + cd $(BUILDDIR)/cross-mkresfs && PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" $(ROOT)/mkresfs/configure --prefix=$(PREFIX_CROSS) --target=$(TARGET) + cd $(BUILDDIR)/cross-mkresfs && PATH="$(PREFIX_CROSS)/bin:$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" make install + touch $(BUILDSTEPSDIR)/$@ + +# -- Source unpacking. + +# Unpack & copy autoconf-for-binutils source: +src-autoconf-for-binutils-copied: $(SRCORIGDIR)/autoconf-$(AUTOCONF_FOR_BINUTILS_VERSION).tar.xz + -rm -rf $(SRCORIGDIR)/autoconf-$(AUTOCONF_FOR_BINUTILS_VERSION) $(SRCDIR)/autoconf-for-binutils + cd $(SRCORIGDIR) && tar xf $< + -mkdir -p $(SRCDIR)/autoconf-for-binutils + cp -T -p -r $(SRCORIGDIR)/autoconf-$(AUTOCONF_FOR_BINUTILS_VERSION) $(SRCDIR)/autoconf-for-binutils + touch $(BUILDSTEPSDIR)/$@ + +ifneq ($(AUTOCONF_AUTOMAKE_LIBTOOL_FOR_BINUTILS_VERSIONS),$(AUTOCONF_AUTOMAKE_LIBTOOL_FOR_GCC_VERSIONS)) +# Unpack & copy autoconf-for-gcc source: +src-autoconf-for-gcc-copied: $(SRCORIGDIR)/autoconf-$(AUTOCONF_FOR_GCC_VERSION).tar.xz + -rm -rf $(SRCORIGDIR)/autoconf-$(AUTOCONF_FOR_GCC_VERSION) $(SRCDIR)/autoconf-for-gcc + cd $(SRCORIGDIR) && tar xf $< + -mkdir -p $(SRCDIR)/autoconf-for-gcc + cp -T -p -r $(SRCORIGDIR)/autoconf-$(AUTOCONF_FOR_GCC_VERSION) $(SRCDIR)/autoconf-for-gcc + touch $(BUILDSTEPSDIR)/$@ +endif + +# Unpack & copy automake-for-binutils source: +src-automake-for-binutils-copied: $(SRCORIGDIR)/automake-$(AUTOMAKE_FOR_BINUTILS_VERSION).tar.bz2 + -rm -rf $(SRCORIGDIR)/automake-$(AUTOMAKE_FOR_BINUTILS_VERSION) $(SRCDIR)/automake-for-binutils + cd $(SRCORIGDIR) && tar xf $< + -mkdir -p $(SRCDIR)/automake-for-binutils + cp -T -p -r $(SRCORIGDIR)/automake-$(AUTOMAKE_FOR_BINUTILS_VERSION) $(SRCDIR)/automake-for-binutils + for p in $$(ls $(ROOT)/automake/*.p); do patch -d $(SRCDIR)/automake-for-binutils -p0 -l < $$p; done + touch $(BUILDSTEPSDIR)/$@ + +ifneq ($(AUTOCONF_AUTOMAKE_LIBTOOL_FOR_BINUTILS_VERSIONS),$(AUTOCONF_AUTOMAKE_LIBTOOL_FOR_GCC_VERSIONS)) +# Unpack & copy automake-for-gcc source: +src-automake-for-gcc-copied: $(SRCORIGDIR)/automake-$(AUTOMAKE_FOR_GCC_VERSION).tar.xz + -rm -rf $(SRCORIGDIR)/automake-$(AUTOMAKE_FOR_GCC_VERSION) $(SRCDIR)/automake-for-gcc + cd $(SRCORIGDIR) && tar xf $< + -mkdir -p $(SRCDIR)/automake-for-gcc + cp -T -p -r $(SRCORIGDIR)/automake-$(AUTOMAKE_FOR_GCC_VERSION) $(SRCDIR)/automake-for-gcc + touch $(BUILDSTEPSDIR)/$@ +endif + +# Unpack & copy libtool-for-binutils source: +src-libtool-for-binutils-copied: $(SRCORIGDIR)/libtool-$(LIBTOOL_FOR_BINUTILS_VERSION).tar.gz + -rm -rf $(SRCORIGDIR)/libtool-$(LIBTOOL_FOR_BINUTILS_VERSION) $(SRCDIR)/libtool-for-binutils + cd $(SRCORIGDIR) && tar xf $< + -mkdir -p $(SRCDIR)/libtool-for-binutils + cp -T -p -r $(SRCORIGDIR)/libtool-$(LIBTOOL_FOR_BINUTILS_VERSION) $(SRCDIR)/libtool-for-binutils + touch $(BUILDSTEPSDIR)/$@ + +ifneq ($(AUTOCONF_AUTOMAKE_LIBTOOL_FOR_BINUTILS_VERSIONS),$(AUTOCONF_AUTOMAKE_LIBTOOL_FOR_GCC_VERSIONS)) +# Unpack & copy libtool-for-gcc source: +src-libtool-for-gcc-copied: $(SRCORIGDIR)/libtool-$(LIBTOOL_FOR_GCC_VERSION).tar.gz + -rm -rf $(SRCORIGDIR)/libtool-$(LIBTOOL_FOR_GCC_VERSION) $(SRCDIR)/libtool-for-gcc + cd $(SRCORIGDIR) && tar xf $< + -mkdir -p $(SRCDIR)/libtool-for-gcc + cp -T -p -r $(SRCORIGDIR)/libtool-$(LIBTOOL_FOR_GCC_VERSION) $(SRCDIR)/libtool-for-gcc + touch $(BUILDSTEPSDIR)/$@ +endif + +# Unpack & copy (and optionally patch) binutils source: +# As we're patching and (re)configuring, we need built & installed versions of +# autoconf, automake and libtool. +src-binutils-copied: $(SRCORIGDIR)/binutils-$(BINUTILS_VERSION).tar.bz2 buildtool-autoconf-for-binutils-built buildtool-automake-for-binutils-built buildtool-libtool-for-binutils-built + -rm -rf $(SRCORIGDIR)/binutils-$(BINUTILS_VERSION) $(SRCDIR)/binutils + cd $(SRCORIGDIR) && tar xf $< + -mkdir -p $(SRCDIR)/binutils + cp -T -p -r $(SRCORIGDIR)/binutils-$(BINUTILS_VERSION) $(SRCDIR)/binutils + cp $(ROOT)/gcc/ld.emulparams.armelf_riscos_eabi.sh $(SRCDIR)/binutils/ld/emulparams/armelf_riscos_eabi.sh + cp $(ROOT)/gcc/gas.config.te-riscos.h $(SRCDIR)/binutils/gas/config/te-riscos.h + for p in $$(ls $(ROOT)/gcc/*.pp); do patch -d $(SRCDIR)/binutils -p0 -l < $$p ; done + cd $(SRCDIR)/binutils/ld && PATH="$(PREFIX_BUILDTOOL_BINUTILS)/bin:$(PATH)" autoreconf + touch $(BUILDSTEPSDIR)/$@ + +# Unpack & copy or checkout the gcc source: +# As we're patching and (re)configuring, we need built & installed versions of +# autoconf, automake and libtool. +src-gcc-copied: buildtool-autoconf-for-gcc-built buildtool-automake-for-gcc-built buildtool-libtool-for-gcc-built +src-gcc-copied: $(SRCORIGDIR)/gcc-$(GCC_VERSION).tar.xz + -rm -rf $(SRCORIGDIR)/gcc-$(GCC_VERSION) $(SRCDIR)/gcc + cd $(SRCORIGDIR) && tar xf $< + -mkdir -p $(SRCDIR)/gcc + cp -T -p -r $(SRCORIGDIR)/gcc-$(GCC_VERSION) $(SRCDIR)/gcc + mkdir -p $(SRCDIR)/gcc/libstdc++-v3/config/os/riscos + cp -T -p $(ROOT)/gcc//gcc.config.arm.riscos-elf.h $(SRCDIR)/gcc/gcc/config/arm/riscos-elf.h + cp -T -p $(ROOT)/gcc/gcc.config.arm.riscos-gnueabihf.h $(SRCDIR)/gcc/gcc/config/arm/riscos-gnueabihf.h + cp -T -p $(ROOT)/gcc/gcc.config.arm.riscos-gcc.c $(SRCDIR)/gcc/gcc/config/arm/riscos-gcc.c + cp -T -p $(ROOT)/gcc/gcc.config.arm.riscos.c $(SRCDIR)/gcc/gcc/config/arm/riscos.c + cp -T -p $(ROOT)/gcc/gcc.config.arm.riscos.md $(SRCDIR)/gcc/gcc/config/arm/riscos.md + cp -T -p $(ROOT)/gcc/gcc.config.arm.riscos.opt $(SRCDIR)/gcc/gcc/config/arm/riscos.opt + cp -T -p $(ROOT)/gcc/gcc.config.arm.t-arm-riscos-elf $(SRCDIR)/gcc/gcc/config/arm/t-arm-riscos-elf + cp -T -p $(ROOT)/gcc/gcc.config.arm.t-riscos-gnueabihf $(SRCDIR)/gcc/gcc/config/arm/t-riscos-gnueabihf + cp -T -p $(ROOT)/gcc/gcc.config.arm.xm-riscos.h $(SRCDIR)/gcc/gcc/config/arm/xm-riscos.h + cp -T -p $(ROOT)/gcc/libgcc.config.arm.t-arm-riscos-elf $(SRCDIR)/gcc/libgcc/config/arm/t-arm-riscos-elf + cp -T -p $(ROOT)/gcc/libgcc.config.arm.t-riscos-gnueabihf $(SRCDIR)/gcc/libgcc/config/arm/t-riscos-gnueabihf + cp -T -p $(ROOT)/gcc/libstdc++-v3.config.os.riscos.ctype_base.h $(SRCDIR)/gcc/libstdc++-v3/config/os/riscos/ctype_base.h + cp -T -p $(ROOT)/gcc/libstdc++-v3.config.os.riscos.ctype_configure_char.cc $(SRCDIR)/gcc/libstdc++-v3/config/os/riscos/ctype_configure_char.cc + cp -T -p $(ROOT)/gcc/libstdc++-v3.config.os.riscos.ctype_inline.h $(SRCDIR)/gcc/libstdc++-v3/config/os/riscos/ctype_inline.h + cp -T -p $(ROOT)/gcc/libstdc++-v3.config.os.riscos.error_constants.h $(SRCDIR)/gcc/libstdc++-v3/config/os/riscos/error_constants.h + cp -T -p $(ROOT)/gcc/libstdc++-v3.config.os.riscos.os_defines.h $(SRCDIR)/gcc/libstdc++-v3/config/os/riscos/os_defines.h + for p in $$(ls $(ROOT)/gcc/*.p); do patch -d $(SRCDIR)/gcc -p0 -l < $$p ; done + cp -T -p -r $(ROOT)/libunixlib $(SRCDIR)/gcc/libunixlib + cd $(SRCDIR)/gcc && $(SRCDIR)/gcc/contrib/download_prerequisites + cd $(SRCDIR)/gcc && PATH="$(PREFIX_BUILDTOOL_GCC)/bin:$(PATH)" autogen Makefile.def + cd $(SRCDIR)/gcc && PATH="$(PREFIX_BUILDTOOL_GCC)/bin:$(PATH)" autoconf + cd $(SRCDIR)/gcc/libcpp && PATH="$(PREFIX_BUILDTOOL_GCC)/bin:$(PATH)" ACLOCAL="aclocal -I .. -I ../config" autoreconf -v + cd $(SRCDIR)/gcc/libiberty && PATH="$(PREFIX_BUILDTOOL_GCC)/bin:$(PATH)" ACLOCAL="aclocal -I .. -I ../config" autoreconf -v + cd $(SRCDIR)/gcc/libstdc++-v3 && PATH="$(PREFIX_BUILDTOOL_GCC)/bin:$(PATH)" ACLOCAL="aclocal -I .. -I ../config" autoreconf -v + cd $(SRCDIR)/gcc && PATH="$(PREFIX_BUILDTOOL_GCC)/bin:$(PATH)" $(SRCDIR)/gcc/libunixlib/gen-auto.pl + cd $(SRCDIR)/gcc/libunixlib && PATH="$(PREFIX_BUILDTOOL_GCC)/bin:$(PATH)" ACLOCAL="aclocal -I .. -I ../config" autoreconf -v + touch $(BUILDSTEPSDIR)/$@ + +# -- Source downloading. + +# Download autoconf source to be used to build binutils: +$(SRCORIGDIR)/autoconf-$(AUTOCONF_FOR_BINUTILS_VERSION).tar.xz: + -mkdir -p $(SRCORIGDIR) + cd $(SRCORIGDIR) && wget -c https://ftpmirror.gnu.org/autoconf/autoconf-$(AUTOCONF_FOR_BINUTILS_VERSION).tar.xz + touch $@ + +# Download automake source to be used to build binutils/autoconf-for-binutils: +$(SRCORIGDIR)/automake-$(AUTOMAKE_FOR_BINUTILS_VERSION).tar.bz2: + -mkdir -p $(SRCORIGDIR) + cd $(SRCORIGDIR) && wget -c https://ftpmirror.gnu.org/automake/automake-$(AUTOMAKE_FOR_BINUTILS_VERSION).tar.bz2 + touch $@ + +# Download libtool source to be used to build binutils/autoconf-for-binutils: +$(SRCORIGDIR)/libtool-$(LIBTOOL_FOR_BINUTILS_VERSION).tar.gz: + -mkdir -p $(SRCORIGDIR) + cd $(SRCORIGDIR) && wget -c https://ftpmirror.gnu.org/libtool/libtool-$(LIBTOOL_FOR_BINUTILS_VERSION).tar.gz + touch $@ + +ifneq ($(AUTOCONF_FOR_BINUTILS_VERSION),$(AUTOCONF_FOR_GCC_VERSION)) +# Download autoconf source to be used to build gcc: +$(SRCORIGDIR)/autoconf-$(AUTOCONF_FOR_GCC_VERSION).tar.xz: + -mkdir -p $(SRCORIGDIR) + cd $(SRCORIGDIR) && wget -c https://ftpmirror.gnu.org/autoconf/autoconf-$(AUTOCONF_FOR_GCC_VERSION).tar.xz + touch $@ +endif + +ifneq ($(AUTOMAKE_FOR_BINUTILS_VERSION),$(AUTOMAKE_FOR_GCC_VERSION)) +# Download automake source to be used to build gcc: +$(SRCORIGDIR)/automake-$(AUTOMAKE_FOR_GCC_VERSION).tar.xz: + -mkdir -p $(SRCORIGDIR) + cd $(SRCORIGDIR) && wget -c https://ftpmirror.gnu.org/automake/automake-$(AUTOMAKE_FOR_GCC_VERSION).tar.xz + touch $@ +endif + +ifneq ($(LIBTOOL_FOR_BINUTILS_VERSION),$(LIBTOOL_FOR_GCC_VERSION)) +# Download libtool source to be used to build gcc: +$(SRCORIGDIR)/libtool-$(LIBTOOL_FOR_GCC_VERSION).tar.gz: + -mkdir -p $(SRCORIGDIR) + cd $(SRCORIGDIR) && wget -c https://ftpmirror.gnu.org/libtool/libtool-$(LIBTOOL_FOR_GCC_VERSION).tar.gz + touch $@ +endif + +# Download binutils source: +$(SRCORIGDIR)/binutils-$(BINUTILS_VERSION).tar.bz2: + -mkdir -p $(SRCORIGDIR) + cd $(SRCORIGDIR) && wget -c https://ftpmirror.gnu.org/binutils/binutils-$(BINUTILS_VERSION).tar.bz2 + touch $@ + +# Download gcc source: +$(SRCORIGDIR)/gcc-$(GCC_VERSION).tar.xz: + -mkdir -p $(SRCORIGDIR) + cd $(SRCORIGDIR) && wget -c https://ftpmirror.gnu.org/gcc/gcc-$(GCC_VERSION)/gcc-$(GCC_VERSION).tar.xz + touch $@ diff --git a/arm-riscos-gnueabi/recipes/files/gccsdk/config.sub.p b/arm-riscos-gnueabi/recipes/files/gccsdk/config.sub.p new file mode 100644 index 0000000..181b56f --- /dev/null +++ b/arm-riscos-gnueabi/recipes/files/gccsdk/config.sub.p @@ -0,0 +1,11 @@ +--- config.sub.orig 2022-06-01 07:47:44.364644855 +0100 ++++ config.sub 2022-06-01 07:48:02.892796689 +0100 +@@ -135,7 +135,7 @@ + | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \ + | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ + | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ +- | storm-chaos* | os2-emx* | rtmk-nova*) ++ | storm-chaos* | os2-emx* | rtmk-nova* | riscos-gnu*) + basic_machine=$field1 + os=$maybe_os + ;; diff --git a/arm-riscos-gnueabi/recipes/files/gccsdk/gccsdk-params b/arm-riscos-gnueabi/recipes/files/gccsdk/gccsdk-params new file mode 100644 index 0000000..4f48c3c --- /dev/null +++ b/arm-riscos-gnueabi/recipes/files/gccsdk/gccsdk-params @@ -0,0 +1,8 @@ +# -- Following section is user configurable: +# This is where the cross compiler will be installed. It needs to end in 'bin'. +export GCCSDK_INSTALL_CROSSBIN={PREFIX}/cross/bin +# This is where the porting tools and any libraries you build will be installed. +export GCCSDK_INSTALL_ENV={PREFIX}/env + +# -- Do not change following section: + diff --git a/arm-riscos-gnueabi/recipes/patches/gccsdk/01-relax-abi-matching.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/01-relax-abi-matching.p new file mode 100644 index 0000000..b1dd8cd --- /dev/null +++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/01-relax-abi-matching.p @@ -0,0 +1,100 @@ +Index: gcc/bfd.config.bfd.pp +=================================================================== +--- gcc/bfd.config.bfd.pp (revision 7698) ++++ gcc/bfd.config.bfd.pp (working copy) +@@ -4,7 +4,7 @@ + targ_defvec=arm_elf32_le_vec + targ_selvecs=arm_elf32_be_vec + ;; +-+ arm-riscos-gnueabihf) +++ arm-riscos-gnueabi*) + + targ_defvec=arm_elf32_le_vec + + targ_selvecs=arm_elf32_be_vec + + targ_cflags=-D__RISCOS_TARGET__ +Index: gcc/configure.ac.p +=================================================================== +--- gcc/configure.ac.p (revision 7698) ++++ gcc/configure.ac.p (working copy) +@@ -13,7 +13,7 @@ + esac + + +case "${target}" in +-+ arm*-*-riscos | *riscos-gnueabihf) +++ arm*-*-riscos | *riscos-gnueabi*) + + ;; + + *) + + noconfigdirs="$noconfigdirs target-libunixlib" +Index: gcc/gas.configure.tgt.pp +=================================================================== +--- gcc/gas.configure.tgt.pp (revision 7698) ++++ gcc/gas.configure.tgt.pp (working copy) +@@ -4,7 +4,7 @@ + arm-*-coff) fmt=coff ;; + arm-*-phoenix*) fmt=elf ;; + arm-*-elf) fmt=elf ;; +-+ arm-riscos-gnueabihf) fmt=elf em=riscos ;; +++ arm-riscos-gnueabi*) fmt=elf em=riscos ;; + arm-*-eabi* | arm-*-rtems*) fmt=elf em=armeabi ;; + arm-*-symbianelf*) fmt=elf em=symbian ;; + arm-*-kaos*) fmt=elf ;; +Index: gcc/gcc.config.gcc.p +=================================================================== +--- gcc/gcc.config.gcc.p (revision 7698) ++++ gcc/gcc.config.gcc.p (working copy) +@@ -13,7 +13,7 @@ + esac + tm_file="${tm_file} arm/aout.h arm/arm.h" + ;; +-+arm*-riscos-gnueabihf) +++arm*-riscos-gnueabi*) + + gas=yes + + gnu_ld=yes + + tm_file="dbxelf.h elfos.h glibc-stdint.h arm/elf.h arm/aout.h arm/arm.h arm/riscos-gnueabihf.h" +Index: gcc/ld.configure.tgt.pp +=================================================================== +--- gcc/ld.configure.tgt.pp (revision 7698) ++++ gcc/ld.configure.tgt.pp (working copy) +@@ -4,7 +4,7 @@ + arm-*-phoenix*) targ_emul=armelf ;; + armeb-*-elf | armeb-*-eabi*) + targ_emul=armelfb ;; +-+arm-riscos-gnueabihf) targ_emul=armelf_riscos_eabi ;; +++arm-riscos-gnueabi*) targ_emul=armelf_riscos_eabi ;; + arm-*-elf | arm*-*-eabi* | arm-*-rtems*) + targ_emul=armelf ;; + arm*-*-symbianelf*) targ_emul=armsymbian;; +Index: gcc/libgcc.config.host.p +=================================================================== +--- gcc/libgcc.config.host.p (revision 7698) ++++ gcc/libgcc.config.host.p (working copy) +@@ -4,7 +4,7 @@ + tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip t-slibgcc t-slibgcc-fuchsia" + extra_parts="crtbegin.o crtend.o" + ;; +-+arm*-riscos-gnueabihf) +++arm*-riscos-gnueabi*) + + tmake_file="$tmake_file t-crtstuff-pic t-libgcc-pic t-eh-dw2-dip t-slibgcc t-slibgcc-gld t-slibgcc-elf-ver t-linux" + + extra_parts="crtbegin.o crtbeginS.o crtbeginT.o crtend.o crtendS.o crti.o crtn.o" + + if test x$enable_vtable_verify = xyes; then +@@ -18,7 +18,7 @@ + ;; + esac + ;; +-+arm*-riscos-gnueabihf) +++arm*-riscos-gnueabi*) + + tmake_file="${tmake_file} arm/t-arm t-fixedpoint-gnu-prefix t-crtfm" + + tmake_file="${tmake_file} arm/t-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc t-slibgcc-nolc-override" + + tm_file="$tm_file arm/bpabi-lib.h" +Index: gcc/libstdc++-v3.configure.host.p +=================================================================== +--- gcc/libstdc++-v3.configure.host.p (revision 7698) ++++ gcc/libstdc++-v3.configure.host.p (working copy) +@@ -4,7 +4,7 @@ + linux-musl*) + os_include_dir="os/generic" + ;; +-+ gnueabihf) +++ gnueabi*) + + os_include_dir="os/riscos" + + ;; + gnu* | linux* | kfreebsd*-gnu | uclinux*) diff --git a/arm-riscos-gnueabi/recipes/patches/gccsdk/elf2aif-eabi-support.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/elf2aif-eabi-support.p new file mode 100644 index 0000000..afac755 --- /dev/null +++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/elf2aif-eabi-support.p @@ -0,0 +1,394 @@ +Index: elf2aif/src/elf2aif.c +=================================================================== +--- elf2aif/src/elf2aif.c (revision 7698) ++++ elf2aif/src/elf2aif.c (working copy) +@@ -54,7 +54,7 @@ + typedef struct + { + uint8_t decompress[4]; /* BL to decompression code for compressed images */ +- uint8_t selfreloc[4]; /* BL to self-relocation code */ ++ uint8_t selfreloc[4]; /* BL to self-relocation code (*) */ + uint8_t zeroinit[4]; /* BL to zero init code */ + uint8_t entrypoint[4]; /* BL to image entry point (*) */ + uint8_t exitinst[4]; /* Exit instruction */ +@@ -72,47 +72,50 @@ + } aifheader_t; + + static int opt_verbose = 0; ++static int opt_eabi = 0; + + static Elf32_External_Ehdr elf_ehdr; + static phdr_list_t *elf_phdrlistP; + static const char *elf_filename; ++static uint32_t got_addr = 0; + +-static const unsigned int aifcode[] = { +- 0xE1A00000, /* NOP (BL decompress) */ +- 0xE1A00000, /* NOP (BL self-relocate) */ +- 0xEB00000C, /* BL zero-init */ +- 0xEB000000, /* BL entrypoint (*) */ +- 0xEF000011, /* SWI OS_Exit */ +- 0x00000000, /* Image R/O size (*) */ +- 0x00000000, /* Image R/W size (*) */ +- 0x00000000, /* Image debug size */ +- 0x00000000, /* Image zero-init size (*) */ +- 0x00000000, /* Image debug type */ +- 0x00000000, /* Image base (*) */ +- 0x00000000, /* Workspace size */ +- 0x00000020, /* 32-bit addressing */ +- 0x00000000, /* Data base */ +- 0x00000000, /* Reserved */ +- 0x00000000, /* Reserved */ +- 0xE1A00000, /* MOV R0, R0 */ +- 0xE04EC00F, /* SUB R12, R14, PC */ +- 0xE08FC00C, /* ADD R12, PC, R12 */ +- 0xE99C0017, /* LDMIB R12, {R0-R2, R4} */ +- 0xE24CC010, /* SUB R12, R12, #0x10 */ +- 0xE08CC000, /* ADD R12, R12, R0 */ +- 0xE08CC001, /* ADD R12, R12, R1 */ +- 0xE3A00000, /* MOV R0, #0 */ +- 0xE3A01000, /* MOV R1, #0 */ +- 0xE3A02000, /* MOV R2, #0 */ +- 0xE3A03000, /* MOV R3, #0 */ +- 0xE3540000, /* CMP R4, #0 */ ++static const uint32_t aifcode[] = { ++ 0xE1A00000, /* NOP (BL decompress) */ ++ 0xE1A00000, /* NOP (BL self-relocate) (*) */ ++ 0xEB00000C, /* BL zero-init */ ++ 0xEB000000, /* BL entrypoint (*) */ ++ 0xEF000011, /* SWI OS_Exit */ ++ 0x00000000, /* Image R/O size (*) */ ++ 0x00000000, /* Image R/W size (*) */ ++ 0x00000000, /* Image debug size */ ++ 0x00000000, /* Image zero-init size (*) */ ++ 0x00000000, /* Image debug type */ ++ 0x00000000, /* Image base (*) */ ++ 0x00000000, /* Workspace size */ ++ 0x00000020, /* 32-bit addressing */ ++ 0x00000000, /* Data base */ ++ 0x00000000, /* Reserved */ ++ 0x00000000, /* Reserved */ ++ 0xE1A00000, /* MOV R0, R0 */ ++ 0xE04EC00F, /* SUB R12, R14, PC */ ++ 0xE08FC00C, /* ADD R12, PC, R12 */ ++ 0xE99C0017, /* LDMIB R12, {R0-R2, R4} */ ++ 0xE24CC010, /* SUB R12, R12, #16 */ ++ 0xE08CC000, /* ADD R12, R12, R0 */ ++ 0xE08CC001, /* ADD R12, R12, R1 */ ++ 0xE3A00000, /* MOV R0, #0 */ ++ 0xE3A01000, /* MOV R1, #0 */ ++ 0xE3A02000, /* MOV R2, #0 */ ++ 0xE3A03000, /* MOV R3, #0 */ ++ 0xE3540000, /* CMP R4, #0 */ + /* zeroloop: */ +- 0xD1A0F00E, /* MOVLE PC, R14 */ +- 0xE8AC000F, /* STMIA R12!, {R0-R3} */ +- 0xE2544010, /* SUBS R4, R4, #16 */ +- 0xEAFFFFFB /* B zeroloop */ ++ 0xD1A0F00E, /* MOVLE PC, R14 */ ++ 0xE8AC000F, /* STMIA R12!, {R0-R3} */ ++ 0xE2544010, /* SUBS R4, R4, #16 */ ++ 0xEAFFFFFB /* B zeroloop */ + }; + ++ + /* Read a little-endian 'short' value. */ + static uint16_t + RdShort (const uint8_t sh[2]) +@@ -143,6 +146,7 @@ + fprintf (stderr, "Usage: elf2aif [options] <ELF file> [<AIF file>]\n" + "Convert static ARM ELF binary to AIF (Acorn Image Format) binary.\n" + "Options:\n" ++ " -e, --eabi source binary uses EABI\n" + " -v, --verbose prints informational messages during processing\n" + " --help display this help and exit\n" + " --version output version information and exit\n"); +@@ -201,7 +205,8 @@ + return EXIT_FAILURE; + } + +- if (elf_ehdr.e_ident[EI_OSABI] != ELFOSABI_ARM) ++ if ((!opt_eabi && elf_ehdr.e_ident[EI_OSABI] != ELFOSABI_ARM) || ++ (opt_eabi && elf_ehdr.e_ident[EI_OSABI] != ELFOSABI_NONE)) + { + fprintf (stderr, "ELF file '%s' is not for ARM\n", elf_filename); + return EXIT_FAILURE; +@@ -344,6 +349,97 @@ + } + + static int ++e2a_readshdr (FILE * elfhandle) ++{ ++ Elf32_External_Shdr shstentry; ++ uint32_t shoffset, shentrysize, shentrycount, shstrndx; ++ uint32_t shstoffset, shstsize; ++ char *shst; ++ ++ if ((shoffset = RdLong (elf_ehdr.e_shoff)) == 0 ++ || (shentrycount = RdShort (elf_ehdr.e_shnum)) == 0) ++ { ++ fprintf (stderr, "ELF file '%s' does not have section headers\n", ++ elf_filename); ++ return EXIT_FAILURE; ++ } ++ ++ if ((shentrysize = RdShort (elf_ehdr.e_shentsize)) < sizeof (Elf32_External_Shdr)) ++ { ++ fprintf (stderr, "Size section header entry is too small\n"); ++ return EXIT_FAILURE; ++ } ++ ++ if ((shstrndx = RdShort (elf_ehdr.e_shstrndx)) >= shentrycount) { ++ fprintf (stderr, "String table index out of bounds\n"); ++ return EXIT_FAILURE; ++ } ++ ++ if (fseek (elfhandle, shoffset + (shstrndx * shentrysize), SEEK_SET) != 0 ++ || fread (&shstentry, sizeof (Elf32_External_Shdr), 1, elfhandle) != 1) ++ { ++ fprintf (stderr, "Failed to read section header string table header\n"); ++ return EXIT_FAILURE; ++ } ++ ++ if ((shstoffset = RdLong (shstentry.sh_offset)) == 0) ++ { ++ fprintf (stderr, "Section header string table data missing\n"); ++ return EXIT_FAILURE; ++ } ++ ++ if ((shstsize = RdLong (shstentry.sh_size)) == 0) ++ { ++ fprintf (stderr, "Invalid section header string table size\n"); ++ return EXIT_FAILURE; ++ } ++ ++ if ((shst = malloc (shstsize)) == NULL) ++ { ++ fprintf (stderr, "Out of memory\n"); ++ return EXIT_FAILURE; ++ } ++ ++ if (fseek (elfhandle, shstoffset, SEEK_SET) != 0 ++ || fread (shst, 1, shstsize, elfhandle) != shstsize) ++ { ++ fprintf (stderr, "Failed to read section header string table\n"); ++ return EXIT_FAILURE; ++ } ++ ++ while (shentrycount) ++ { ++ Elf32_External_Shdr shentry; ++ uint32_t shnameoff; ++ ++ if (fseek (elfhandle, shoffset, SEEK_SET) != 0 ++ || fread (&shentry, sizeof (Elf32_External_Shdr), 1, elfhandle) != 1) ++ { ++ fprintf (stderr, "Failed to read section header entry\n"); ++ return EXIT_FAILURE; ++ } ++ ++ if ((shnameoff = RdLong (shentry.sh_name)) >= shstsize) ++ { ++ fprintf (stderr, "Section name out of bounds\n"); ++ return EXIT_FAILURE; ++ } ++ ++ if (strcmp ((shst + shnameoff), ".got") == 0) ++ { ++ got_addr = RdLong (shentry.sh_addr); ++ } ++ ++ shoffset += shentrysize; ++ --shentrycount; ++ } ++ ++ free (shst); ++ ++ return EXIT_SUCCESS; ++} ++ ++static int + e2a_copy (FILE * elfhandle, FILE * aifhandle) + { + const phdr_list_t *phdrP; +@@ -488,21 +584,156 @@ + } + + memcpy (&aifhdr, aifcode, sizeof (aifcode)); +- WrLong (aifhdr.entrypoint, +- RdLong (aifhdr.entrypoint) + +- ((exec_addr - load_addr - +- (offsetof (aifheader_t, entrypoint) + 8)) >> 2)); ++ if (opt_eabi) ++ { ++ /* BL to relocation code */ ++ WrLong (aifhdr.selfreloc, ++ /* Default is a NOP, so reading it is useless */ ++ 0xEB000000 + ++ ((aifend - (offsetof (aifheader_t, selfreloc) + 8)) >> 2)); ++ ++ /* BL to EABI startcode */ ++ WrLong (aifhdr.entrypoint, ++ RdLong (aifhdr.entrypoint) + ++ ((sizeof(aifcode) - (offsetof (aifheader_t, entrypoint) + 8)) >> 2)); ++ } ++ else ++ { ++ /* BL to program entrypoint */ ++ WrLong (aifhdr.entrypoint, ++ RdLong (aifhdr.entrypoint) + ++ ((exec_addr - load_addr - ++ (offsetof (aifheader_t, entrypoint) + 8)) >> 2)); ++ } + WrLong (aifhdr.rosize, rosize); + WrLong (aifhdr.rwsize, rwsize); + WrLong (aifhdr.zisize, zisize); + WrLong (aifhdr.imagebase, load_addr); +- if (fwrite (&aifhdr, sizeof (aifhdr), 1, aifhandle) != 1 +- || fseek (aifhandle, aifend, SEEK_SET) != 0) ++ if (fwrite (&aifhdr, sizeof (aifhdr), 1, aifhandle) != 1) + { + fprintf (stderr, "Failed to write aif header\n"); + return EXIT_FAILURE; + } + ++ /* In the EABI case we need to inject the code to install ++ * the ARMEABISupport abort handler */ ++ if (opt_eabi) ++ { ++ assert (128 == sizeof (aifcode)); ++ uint32_t entrycode[] = { ++ /* Space for GOTT_BASE injection (see below) */ ++ 0xE1A00000, /* MOV R0, R0 */ ++ 0xE1A00000, /* MOV R0, R0 */ ++ /* Install the abort handler */ ++ 0xE3A00002, /* MOV R0, #2 */ ++ 0xEF059D01, /* SWI ARMEABISupport_AbortOp */ ++ /* Proceed to the real program start */ ++ 0xEA000000, /* B <program_start> (*) */ ++ /* Offset of the GOT relative to the load address (or 0 if none) */ ++ 0x00000000, /* DCD <got_offset> (*) */ ++ }; ++ ++ const uint32_t reloccode[] = { ++ /* RelocCode: */ ++ 0xE1A00000, /* MOV R0, R0 */ ++ /* Dynamically compute the program load address */ ++ 0xE04EC00F, /* SUB R12, LR, PC */ ++ 0xE08FC00C, /* ADD R12, PC, R12 */ ++ 0xE24CC00C, /* SUB R12, R12, #12 */ ++ /* Prevent reentry by replacing the branch to the relocation code. */ ++ 0xE51F0018, /* LDR R0, =RelocCode */ ++ 0xE58C0004, /* STR R0, [R12, #4] */ ++ /* Relocate the GOT offset (above) to its absolute address */ ++ 0xE59C0094, /* LDR R0, [R12, #&94] */ ++ 0xE3300000, /* TEQ R0, #0 */ ++ 0x1080000C, /* ADDNE R0, R0, R12 */ ++ 0x158C0094, /* STRNE R0, [R12, #&94] */ ++ /* Fill in GOTT_BASE at load + 0x38, unless running under DDT */ ++ 0xE59C0038, /* LDR R0, [R12, #&38] */ ++ 0xE3300000, /* TEQ R0, #0 */ ++ 0x1A000002, /* BNE ddt_hack */ ++ 0xE28C0094, /* ADD R0, R12, #&94 */ ++ 0xE58C0038, /* STR R0, [R12, #&38] */ ++ 0xE1A0F00E, /* MOV PC, LR */ ++ /* Hack for DDT (which uses the reserved field at &8038 to ++ * temporarily store the address of the zero-initialisation code ++ * during program start, which is reinstated after DDT's ++ * replacement is called). In this case, modify the entrycode ++ * (above) to inject it for us. ++ * ++ * This does prevent the RO area being marked non-writeable if ++ * the modified entrycode gets executed, however (in the non-DDT ++ * case, the entrycode does not write to the AIF header, so ++ * there is no reason the RO area can't be non-writeable then). ++ * By definition the RO area must be writeable for relocations to ++ * work, so it is perfectly safe to assume that it is when this ++ * code runs. ++ */ ++ /* ddt_hack: */ ++ 0xE59F001C, /* LDR R0, =ddt_hack_data */ ++ 0xE59F101C, /* LDR R1, =ddt_hack_data+4 */ ++ 0xE58C0080, /* STR R0, [R12, #&80] */ ++ 0xE58C1084, /* STR R1, [R12, #&84] */ ++ /* Invalidate instruction cache */ ++ 0xE3A00001, /* MOV R0, #1 */ ++ 0xE28C1080, /* ADD R1, R12, #&80 */ ++ 0xE28C2088, /* ADD R2, R12, #&88 */ ++ 0xEF02006E, /* SWI XOSSynchroniseCodeAreas */ ++ 0xE1A0F00E, /* MOV PC, LR */ ++ /* Instructions to inject into entrycode. Uses PC-relative ++ * addressing, so must be kept in sync with changes to entrycode ++ * or the location of entrycode within memory. */ ++ /* ddt_hack_data: */ ++ /* Compute address of GOT field after entrycode */ ++ 0xE28F000C, /* ADR R0, got_address */ ++ /* Store computed address in GOTT_BASE (load + 0x38) */ ++ 0xE50F0054, /* STR R0, [pc, #-&54] */ ++ /* Relocation sentinel: just in case anything expects one */ ++ 0xFFFFFFFF, /* DCD -1 */ ++ }; ++ ++ /* Ensure there is sufficient space for the EABI entry code */ ++ if (opt_eabi && exec_addr - load_addr < sizeof (aifcode) + sizeof (entrycode)) ++ { ++ fprintf (stderr, "First program segment is not what we hoped to be " ++ "(not enough place before _start symbol for EABI entrycode)\n"); ++ return EXIT_FAILURE; ++ } ++ ++ if (opt_verbose) ++ printf ("Writing EABI entry code at offset 0x%x\n", sizeof (aifcode)); ++ ++ entrycode[4] |= (exec_addr - load_addr - (sizeof (aifcode) + 4*4 + 8)) >> 2; ++ if (got_addr) ++ { ++ if (opt_verbose) ++ printf ("Found GOT at 0x%x\n", got_addr); ++ entrycode[5] = (got_addr - load_addr); ++ } ++ if (fseek (aifhandle, sizeof (aifcode), SEEK_SET) != 0 ++ || fwrite (&entrycode, sizeof (entrycode), 1, aifhandle) != 1) ++ { ++ fprintf (stderr, "Failed to write EABI entrycode\n"); ++ return EXIT_FAILURE; ++ } ++ ++ if (opt_verbose) ++ printf ("Writing relocation code at offset 0x%x\n", aifend); ++ ++ if (fseek (aifhandle, aifend, SEEK_SET) != 0 ++ || fwrite (&reloccode, sizeof (reloccode), 1, aifhandle) != 1) ++ { ++ fprintf (stderr, "Failed to write relocation code\n"); ++ return EXIT_FAILURE; ++ } ++ } ++ ++ if (fseek (aifhandle, aifend, SEEK_SET) != 0) ++ { ++ fprintf (stderr, "Failed to seek to end of file\n"); ++ return EXIT_FAILURE; ++ } ++ + return EXIT_SUCCESS; + } + +@@ -557,6 +788,7 @@ + elf_filename = elffilename; + + if (e2a_readehdr (elfhandle) == EXIT_SUCCESS ++ && e2a_readshdr (elfhandle) == EXIT_SUCCESS + && e2a_readphdr (elfhandle) == EXIT_SUCCESS + && e2a_copy (elfhandle, aifhandle) == EXIT_SUCCESS) + status = EXIT_SUCCESS; +@@ -683,6 +915,9 @@ + fprintf (stderr, "Warning: extra options/arguments ignored\n"); + return EXIT_SUCCESS; + } ++ else if (!strcmp (&argv[i][1], "-eabi") ++ || !strcmp (&argv[i][1], "e")) ++ opt_eabi = 1; + else if (!strcmp (&argv[i][1], "-verbose") + || !strcmp (&argv[i][1], "v")) + ++opt_verbose; diff --git a/arm-riscos-gnueabi/recipes/patches/gccsdk/gcc-add-mhalfword-access.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/gcc-add-mhalfword-access.p new file mode 100644 index 0000000..43061b9 --- /dev/null +++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/gcc-add-mhalfword-access.p @@ -0,0 +1,153 @@ +Index: gcc/gcc.config.arm.arm.h.p +=================================================================== +--- gcc/gcc.config.arm.arm.h.p (nonexistent) ++++ gcc/gcc.config.arm.arm.h.p (working copy) +@@ -0,0 +1,33 @@ ++--- gcc/config/arm/arm.h.orig 2020-07-23 07:35:17.344384552 +0100 +++++ gcc/config/arm/arm.h 2022-05-28 22:48:25.064918314 +0100 ++@@ -1338,7 +1338,9 @@ ++ : (TARGET_IWMMXT && (CLASS) == IWMMXT_REGS) \ ++ ? coproc_secondary_reload_class (MODE, X, TRUE) \ ++ : TARGET_32BIT \ ++- ? (((MODE) == HImode && ! arm_arch4 && true_regnum (X) == -1) \ +++ ? (((MODE) == HImode && \ +++ (!arm_arch4 || !halfword_access) && \ +++ true_regnum (X) == -1) \ ++ ? GENERAL_REGS : NO_REGS) \ ++ : THUMB_SECONDARY_OUTPUT_RELOAD_CLASS (CLASS, MODE, X)) ++ ++@@ -1353,7 +1355,7 @@ ++ (((CLASS) == IWMMXT_REGS || (CLASS) == IWMMXT_GR_REGS) \ ++ && CONSTANT_P (X)) \ ++ ? GENERAL_REGS : \ ++- (((MODE) == HImode && ! arm_arch4 \ +++ (((MODE) == HImode && (!arm_arch4 || !halfword_access) \ ++ && (MEM_P (X) \ ++ || ((REG_P (X) || GET_CODE (X) == SUBREG) \ ++ && true_regnum (X) == -1))) \ ++@@ -2016,7 +2018,9 @@ ++ done, UNKNOWN if none. */ ++ #define LOAD_EXTEND_OP(MODE) \ ++ (TARGET_THUMB ? ZERO_EXTEND : \ ++- ((arm_arch4 || (MODE) == QImode) ? ZERO_EXTEND \ +++ (((arm_arch4 && (halfword_access || (MODE) != HImode)) || \ +++ (MODE) == QImode) \ +++ ? ZERO_EXTEND \ ++ : ((BYTES_BIG_ENDIAN && (MODE) == HImode) ? SIGN_EXTEND : UNKNOWN))) ++ ++ /* Nonzero if access to memory by bytes is slow and undesirable. */ +Index: gcc/gcc.config.arm.arm.md.p +=================================================================== +--- gcc/gcc.config.arm.arm.md.p (revision 7698) ++++ gcc/gcc.config.arm.arm.md.p (working copy) +@@ -8,6 +8,42 @@ + (IP_REGNUM 12) ; Scratch register + (SP_REGNUM 13) ; Stack pointer + (LR_REGNUM 14) ; Return address register ++@@ -5546,7 +5547,7 @@ ++ (zero_extend:SI (match_operand:HI 1 "nonimmediate_operand")))] ++ "TARGET_EITHER" ++ { ++- if (TARGET_ARM && !arm_arch4 && MEM_P (operands[1])) +++ if (TARGET_ARM && (!arm_arch4 || !halfword_access) && MEM_P (operands[1])) ++ { ++ emit_insn (gen_movhi_bytes (operands[0], operands[1])); ++ DONE; ++@@ -5574,7 +5575,7 @@ ++ (define_insn "*arm_zero_extendhisi2" ++ [(set (match_operand:SI 0 "s_register_operand" "=r,r") ++ (zero_extend:SI (match_operand:HI 1 "nonimmediate_operand" "r,m")))] ++- "TARGET_ARM && arm_arch4 && !arm_arch6" +++ "TARGET_ARM && arm_arch4 && halfword_access && !arm_arch6" ++ "@ ++ # ++ ldrh%?\\t%0, %1" ++@@ -5735,7 +5736,7 @@ ++ emit_insn (gen_thumb1_extendhisi2 (operands[0], operands[1])); ++ DONE; ++ } ++- if (MEM_P (operands[1]) && TARGET_ARM && !arm_arch4) +++ if (MEM_P (operands[1]) && TARGET_ARM && (!arm_arch4 || !halfword_access)) ++ { ++ emit_insn (gen_extendhisi2_mem (operands[0], operands[1])); ++ DONE; ++@@ -5813,7 +5814,7 @@ ++ (define_insn "*arm_extendhisi2" ++ [(set (match_operand:SI 0 "s_register_operand" "=r,r") ++ (sign_extend:SI (match_operand:HI 1 "nonimmediate_operand" "r,Uh")))] ++- "TARGET_ARM && arm_arch4 && !arm_arch6" +++ "TARGET_ARM && arm_arch4 && halfword_access && !arm_arch6" ++ "@ ++ # ++ ldrsh%?\\t%0, %1" + @@ -6693,7 +6694,7 @@ + (mem:SI (plus:SI (match_operand:SI 1 "register_operand" "r") + (unspec:SI [(match_operand:SI 2 "" "X")] +@@ -17,3 +53,49 @@ + "ldr%?\\t%0, [%1,%2]" + [(set_attr "type" "load_4")] + ) ++@@ -6845,7 +6846,7 @@ ++ (define_expand "storehi_single_op" ++ [(set (match_operand:HI 0 "memory_operand") ++ (match_operand:HI 1 "general_operand"))] ++- "TARGET_32BIT && arm_arch4" +++ "TARGET_32BIT && arm_arch4 && halfword_access" ++ " ++ if (!s_register_operand (operands[1], HImode)) ++ operands[1] = copy_to_mode_reg (HImode, operands[1]); ++@@ -6865,7 +6865,7 @@ ++ { ++ if (MEM_P (operands[0])) ++ { ++- if (arm_arch4) +++ if (arm_arch4 && halfword_access) ++ { ++ emit_insn (gen_storehi_single_op (operands[0], operands[1])); ++ DONE; ++@@ -6905,15 +6905,15 @@ ++ emit_insn (gen_movsi (reg, GEN_INT (val))); ++ operands[1] = gen_lowpart (HImode, reg); ++ } ++- else if (arm_arch4 && optimize && can_create_pseudo_p () ++- && MEM_P (operands[1])) +++ else if (arm_arch4 && halfword_access && optimize +++ && can_create_pseudo_p () && MEM_P (operands[1])) ++ { ++ rtx reg = gen_reg_rtx (SImode); ++ ++ emit_insn (gen_zero_extendhisi2 (reg, operands[1])); ++ operands[1] = gen_lowpart (HImode, reg); ++ } ++- else if (!arm_arch4) +++ else if (!arm_arch4 || !halfword_access) ++ { ++ if (MEM_P (operands[1])) ++ { ++@@ -7099,7 +7100,7 @@ ++ [(set (match_operand:HI 0 "nonimmediate_operand" "=r,r,r,m,r") ++ (match_operand:HI 1 "general_operand" "rIk,K,n,r,mi"))] ++ "TARGET_ARM ++- && arm_arch4 && !TARGET_HARD_FLOAT +++ && arm_arch4 && halfword_access && !TARGET_HARD_FLOAT ++ && (register_operand (operands[0], HImode) ++ || register_operand (operands[1], HImode))" ++ "@ +Index: gcc/gcc.config.arm.arm.opt.p +=================================================================== +--- gcc/gcc.config.arm.arm.opt.p (nonexistent) ++++ gcc/gcc.config.arm.arm.opt.p (working copy) +@@ -0,0 +1,13 @@ ++--- gcc/config/arm/arm.opt.orig 2020-07-23 07:35:17.344384552 +0100 +++++ gcc/config/arm/arm.opt 2022-05-28 22:39:28.543576700 +0100 ++@@ -271,6 +271,10 @@ ++ Avoid overlapping destination and address registers on LDRD instructions ++ that may trigger Cortex-M3 errata. ++ +++mhalfword-access +++Target Report Var(halfword_access) Init(1) +++Enable halfword memory accesses. +++ ++ munaligned-access ++ Target Report Var(unaligned_access) Init(2) Save ++ Enable unaligned word and halfword accesses to packed data. diff --git a/arm-riscos-gnueabi/recipes/patches/gccsdk/gcc-default-no-halfword-access.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/gcc-default-no-halfword-access.p new file mode 100644 index 0000000..400341f --- /dev/null +++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/gcc-default-no-halfword-access.p @@ -0,0 +1,13 @@ +Index: gcc/gcc.config.arm.arm.opt.p +=================================================================== +--- gcc/gcc.config.arm.arm.opt.p (nonexistent) ++++ gcc/gcc.config.arm.arm.opt.p (working copy) +@@ -5,7 +5,7 @@ + that may trigger Cortex-M3 errata. + + +mhalfword-access +-+Target Report Var(halfword_access) Init(1) +++Target Report Var(halfword_access) Init(0) + +Enable halfword memory accesses. + + + munaligned-access diff --git a/arm-riscos-gnueabi/recipes/patches/gccsdk/gcc-libgcc-no-linux-atomics.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/gcc-libgcc-no-linux-atomics.p new file mode 100644 index 0000000..5f93dbe --- /dev/null +++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/gcc-libgcc-no-linux-atomics.p @@ -0,0 +1,56 @@ +Index: gcc/libgcc.config.arm.t-riscos-gnueabihf +=================================================================== +--- gcc/libgcc.config.arm.t-riscos-gnueabihf (revision 7698) ++++ gcc/libgcc.config.arm.t-riscos-gnueabihf (working copy) +@@ -1,36 +1,2 @@ +-# Copyright (C) 2011-2012 Free Software Foundation, Inc. +-# Contributed by John Tytgat (John.Tytgat@aaug.net). +-# +-# This file is part of GCC. +-# +-# GCC is free software; you can redistribute it and/or modify +-# it under the terms of the GNU General Public License as published by +-# the Free Software Foundation; either version 3, or (at your option) +-# any later version. +-# +-# GCC is distributed in the hope that it will be useful, +-# but WITHOUT ANY WARRANTY; without even the implied warranty of +-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +-# GNU General Public License for more details. +-# +-# 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/>. +- +-# vvv Part of config/arm/t-bpabi +-LIB2ADD_ST += $(srcdir)/config/arm/fp16.c +- +-LIB2ADDEH = $(srcdir)/config/arm/unwind-arm.c \ +- $(srcdir)/config/arm/libunwind.S \ +- $(srcdir)/config/arm/pr-support.c $(srcdir)/unwind-c.c +-# ^^^ +- +-ifeq (,$(findstring mlibscl,$(CFLAGS))$(findstring mmodule,$(CFLAGS))) +-# For shared libgcc building: +-EXTRA_PARTS += crtbeginS.o crtendS.o +-gcc_s_compile += -fPIC +-SHLIB_LDFLAGS=-fPIC +-include $(srcdir)/config/t-slibgcc +-include $(srcdir)/config/t-slibgcc-nolc-override +-endif +- ++# Use a version of div0 which raises SIGFPE, and a special __clear_cache. ++LIB1ASMFUNCS := $(filter-out _dvmd_tls,$(LIB1ASMFUNCS)) _dvmd_lnx _clear_cache +Index: gcc/libgcc.config.host.p +=================================================================== +--- gcc/libgcc.config.host.p (revision 7698) ++++ gcc/libgcc.config.host.p (working copy) +@@ -20,7 +20,7 @@ + ;; + +arm*-riscos-gnueabi*) + + tmake_file="${tmake_file} arm/t-arm t-fixedpoint-gnu-prefix t-crtfm" +-+ tmake_file="${tmake_file} arm/t-elf arm/t-bpabi arm/t-linux-eabi t-slibgcc-libgcc t-slibgcc-nolc-override" +++ tmake_file="${tmake_file} arm/t-elf arm/t-bpabi arm/t-riscos-gnueabihf t-slibgcc-libgcc t-slibgcc-nolc-override" + + tm_file="$tm_file arm/bpabi-lib.h" + + unwind_header=config/arm/unwind-arm.h + + tmake_file="$tmake_file t-softfp-sfdf t-softfp-excl arm/t-softfp t-softfp" diff --git a/arm-riscos-gnueabi/recipes/patches/gccsdk/ld-armv4.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/ld-armv4.p new file mode 100644 index 0000000..ae85eb0 --- /dev/null +++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/ld-armv4.p @@ -0,0 +1,13 @@ +Index: ld/d-link/Makefile.am +=================================================================== +--- ld/d-link/Makefile.am (revision 7698) ++++ ld/d-link/Makefile.am (working copy) +@@ -68,7 +68,7 @@ + + ld_riscos_eabihf_so_CPPFLAGS = -I$(top_srcdir)/d-link -I$(top_srcdir)/d-link/riscos \ + -DNO_UNDERSCORE -DVERBOSE_DLINKER -D__TARGET_SOLOADER__ +-ld_riscos_eabihf_so_CFLAGS = -fPIC -O4 -Wall -std=gnu99 -march=armv7-a+fp+neon ++ld_riscos_eabihf_so_CFLAGS = -fPIC -O4 -Wall -std=gnu99 -march=armv4 + ld_riscos_eabihf_so_LDFLAGS = --shared -Wl,--no-undefined -nostdlib -nostartfiles -Wl,-e -Wl,_dl_start \ + -Wl,-soname -Wl,ld-riscos/so/2 + diff --git a/arm-riscos-gnueabi/recipes/patches/gccsdk/libtool.m4.p.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/libtool.m4.p.p new file mode 100644 index 0000000..8061b92 --- /dev/null +++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/libtool.m4.p.p @@ -0,0 +1,119 @@ +Index: gcc/libtool.m4.p +=================================================================== +--- gcc/libtool.m4.p (revision 7698) ++++ gcc/libtool.m4.p (working copy) +@@ -5,7 +5,7 @@ + ]) + ;; + + +-+ *riscos | *linux-gnueabihf) +++ *riscos*) + + lt_cv_dlopen="dlopen" + + lt_cv_dlopen_libs="-ldl" + + lt_cv_dlopen_self=yes +@@ -17,7 +17,7 @@ + shlibpath_var=LD_LIBRARY_PATH + ;; + +-+*riscos | linux-gnueabihf) +++*riscos*) + + version_type=linux + + library_names_spec='${libname}$versuffix.so ${libname}.so$major $libname.so' + + soname_spec='${libname}.so$major' +@@ -32,7 +32,7 @@ + # it will coredump. + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' + ;; +-+ *linux-gnueabihf) +++ riscos-gnu*) + + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +@@ -48,7 +48,7 @@ + esac + else + case $host_os in +-+ linux-gnueabihf) +++ riscos-gnu*) + + # RISC OS + + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' +@@ -61,7 +61,7 @@ + ;; + vxworks*) + ;; +-+ *linux-gnueabihf) +++ riscos-gnu*) + + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +@@ -78,13 +78,13 @@ + fi + ;; + +-+ *linux-gnueabihf) +++ riscos-gnu*) + + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + + ;; + + +-+ *riscos | linux-gnueabihf) +++ *riscos*) + + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +@@ -97,7 +97,7 @@ + else + # PORTME Check for flag to pass linker flags through the system compiler. + case $host_os in +-+ linux-gnueabihf) +++ riscos-gnu*) + + # RISC OS + + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' +@@ -110,7 +110,7 @@ + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; + +-+ *linux-gnueabihf) +++ riscos-gnu*) + + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' +@@ -129,7 +129,7 @@ + else + # PORTME fill in a description of your system's linker (not GNU ld) + case $host_os in +-+ linux-gnueabihf) +++ riscos-gnu*) + + # RISC OS + + _LT_TAGVAR(ld_shlibs, $1)=yes + + ;; +@@ -140,7 +140,7 @@ + _LT_TAGVAR(hardcode_shlibpath_var, $1)=no + ;; + +-+ *riscos | *linux-gnueabihf) +++ *riscos*) + + _LT_TAGVAR(ld_shlibs, $1)=yes + + ;; + + +@@ -151,7 +151,7 @@ + AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) + _LT_TAGVAR(ld_shlibs, $1)=yes + case $host_os in +-+ linux-gnueabihf) +++ riscos-gnu*) + + # RISC OS + + _LT_TAGVAR(ld_shlibs, $1)=yes + + ;; +@@ -162,7 +162,7 @@ + _LT_TAGVAR(ld_shlibs, $1)=no + ;; + +-+ *riscos | *linux-gnueabihf) +++ *riscos*) + + _LT_TAGVAR(ld_shlibs, $1)=yes + + ;; + + diff --git a/arm-riscos-gnueabi/recipes/patches/gccsdk/posix-extended-locale.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/posix-extended-locale.p new file mode 100644 index 0000000..e422786 --- /dev/null +++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/posix-extended-locale.p @@ -0,0 +1,1920 @@ +Index: libunixlib/Makefile.am +=================================================================== +--- libunixlib/Makefile.am (revision 7698) ++++ libunixlib/Makefile.am (working copy) +@@ -583,11 +583,11 @@ + else + locale_src = \ + locale/localeconv.c \ ++ locale/newlocale.c \ + locale/nl_langinfo.c \ + locale/setlocale.c \ + locale/strcoll.c \ +- locale/strxfrm.c \ +- locale/territory.c ++ locale/strxfrm.c + endif + locale_src += \ + locale/iconv.c +@@ -1312,6 +1312,7 @@ + bits/in.h \ + bits/libc-lock.h \ + bits/locale.h \ ++ bits/locale_t.h \ + bits/mathcalls.h \ + bits/mathdef.h \ + bits/mathinline.h \ +Index: libunixlib/ctype/ctypetable.c +=================================================================== +--- libunixlib/ctype/ctypetable.c (revision 7698) ++++ libunixlib/ctype/ctypetable.c (working copy) +@@ -10,36 +10,35 @@ + #include <internal/os.h> + #include <internal/unix.h> + +-/* Note the offset 1 and depth 257 instead of 0 and 256: ISO C says we must +- support EOF. */ +-static unsigned char ctype[257]; +-const unsigned char * const __ctype = &ctype[1]; ++/* Global containing current locale settings. */ ++struct _locale __locale_global; ++/* Offset 1 as the first entry is reserved for EOF. */ ++const unsigned char * const __ctype = &__locale_global.ctype[1]; ++const short * const __ctype_upper = &__locale_global.ctype_upper[1]; ++const short * const __ctype_lower = &__locale_global.ctype_lower[1]; + +-static short ctype_upper[257]; +-const short * const __ctype_upper = &ctype_upper[1]; +- +-static short ctype_lower[257]; +-const short * const __ctype_lower = &ctype_lower[1]; +- + void +-__build_ctype_tables (int territory) ++__build_ctype_tables (locale_t locobj, int territory) + { + PTHREAD_UNSAFE + + if (territory == -2) + { +- /* Initialise the array. This is only done by __unixinit(). */ ++ /* Initialise the array. This is only done by __unixinit()/newlocale(). */ + territory = -1; +- for (int x = 0; x <= LC_ALL; x++) +- __locale_territory[x] = -1; ++ for (int x = 0; x < LC_ALL; x++) ++ locobj->locale_territory[x] = -1; ++ __localeconv_lconv_init(&locobj->lc); ++ locobj->lc_needs_refresh = 1; + } + + /* Initialise ctype_upper/ctype_lower tables. */ + for (int x = 0; x < 257; x++) + { +- /* In the C/POSIX locate, tolower(top bit set char) ++ /* In the C/POSIX locale, tolower(top bit set char) + should return the character unchanged. */ +- ctype_lower[x] = ctype_upper[x] = x - 1; ++ locobj->ctype_lower[x] = locobj->ctype_upper[x] = x - 1; ++ locobj->ctype[x] = 0; + } + + int regs[10]; +@@ -61,7 +60,7 @@ + for (int offset = 1; bits; bits = bits >> 1, offset += 1) + { + if (bits & 1) +- ctype[pos + offset] |= 1 << code; ++ locobj->ctype[pos + offset] |= 1 << code; + } + pos += 32; + } +@@ -80,7 +79,7 @@ + int y = (territory == -1) ? 128 : 256; + for (int x = 1; x <= y; x++) + { +- ctype_lower[x] = (short)*p++; +- ctype_upper[x] = (short)*q++; ++ locobj->ctype_lower[x] = (short)*p++; ++ locobj->ctype_upper[x] = (short)*q++; + } + } +Index: libunixlib/ctype/isalnum.c +=================================================================== +--- libunixlib/ctype/isalnum.c (revision 7698) ++++ libunixlib/ctype/isalnum.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (isalnum) (int c) +@@ -10,3 +11,8 @@ + return isalnum (c); + } + ++int ++isalnum_l (int c, locale_t locobj) ++{ ++ return ((&locobj->ctype[1])[c] & (___ctype_alpha | ___ctype_digit)); ++} +Index: libunixlib/ctype/isalpha.c +=================================================================== +--- libunixlib/ctype/isalpha.c (revision 7698) ++++ libunixlib/ctype/isalpha.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (isalpha) (int c) +@@ -10,3 +11,8 @@ + return isalpha (c); + } + ++int ++isalpha_l (int c, locale_t locobj) ++{ ++ return ((&locobj->ctype[1])[c] & ___ctype_alpha); ++} +Index: libunixlib/ctype/isascii.c +=================================================================== +--- libunixlib/ctype/isascii.c (revision 7698) ++++ libunixlib/ctype/isascii.c (working copy) +@@ -10,3 +10,9 @@ + return isascii (c); + } + ++int ++isascii_l (int c, locale_t locobj) ++{ ++ (void) locobj; ++ return isascii (c); ++} +Index: libunixlib/ctype/isblank.c +=================================================================== +--- libunixlib/ctype/isblank.c (revision 7698) ++++ libunixlib/ctype/isblank.c (working copy) +@@ -9,3 +9,10 @@ + { + return isblank (c); + } ++ ++int ++isblank_l (int c, locale_t locobj) ++{ ++ (void) locobj; ++ return isblank (c); ++} +Index: libunixlib/ctype/iscntrl.c +=================================================================== +--- libunixlib/ctype/iscntrl.c (revision 7698) ++++ libunixlib/ctype/iscntrl.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (iscntrl) (int c) +@@ -10,3 +11,8 @@ + return iscntrl (c); + } + ++int ++iscntrl_l (int c, locale_t locobj) ++{ ++ return ((&locobj->ctype[1])[c] & ___ctype_ctrl); ++} +Index: libunixlib/ctype/isdigit.c +=================================================================== +--- libunixlib/ctype/isdigit.c (revision 7698) ++++ libunixlib/ctype/isdigit.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (isdigit) (int c) +@@ -10,3 +11,8 @@ + return isdigit (c); + } + ++int ++isdigit_l (int c, locale_t locobj) ++{ ++ return ((&locobj->ctype[1])[c] & ___ctype_digit); ++} +Index: libunixlib/ctype/isgraph.c +=================================================================== +--- libunixlib/ctype/isgraph.c (revision 7698) ++++ libunixlib/ctype/isgraph.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (isgraph) (int c) +@@ -10,3 +11,8 @@ + return isgraph (c); + } + ++int ++isgraph_l (int c, locale_t locobj) ++{ ++ return ((&locobj->ctype[1])[c] & ~(___ctype_white | ___ctype_ctrl)); ++} +Index: libunixlib/ctype/islower.c +=================================================================== +--- libunixlib/ctype/islower.c (revision 7698) ++++ libunixlib/ctype/islower.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (islower) (int c) +@@ -10,3 +11,8 @@ + return islower (c); + } + ++int ++islower_l (int c, locale_t locobj) ++{ ++ return ((&locobj->ctype[1])[c] & ___ctype_lower); ++} +Index: libunixlib/ctype/isprint.c +=================================================================== +--- libunixlib/ctype/isprint.c (revision 7698) ++++ libunixlib/ctype/isprint.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (isprint) (int c) +@@ -10,3 +11,10 @@ + return isprint (c); + } + ++int ++isprint_l (int c, locale_t locobj) ++{ ++ return ((&locobj->ctype[1])[c] & ++ (___ctype_upper | ___ctype_lower | ___ctype_digit | ___ctype_punc | ++ ___ctype_white)) && !((&locobj->ctype[1])[c] & ___ctype_ctrl); ++} +Index: libunixlib/ctype/ispunct.c +=================================================================== +--- libunixlib/ctype/ispunct.c (revision 7698) ++++ libunixlib/ctype/ispunct.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (ispunct) (int c) +@@ -10,3 +11,8 @@ + return ispunct (c); + } + ++int ++ispunct_l (int c, locale_t locobj) ++{ ++ return ((&locobj->ctype[1])[c] & ___ctype_punc); ++} +Index: libunixlib/ctype/isspace.c +=================================================================== +--- libunixlib/ctype/isspace.c (revision 7698) ++++ libunixlib/ctype/isspace.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (isspace) (int c) +@@ -10,3 +11,8 @@ + return isspace (c); + } + ++int ++isspace_l (int c, locale_t locobj) ++{ ++ return ((&locobj->ctype[1])[c] & ___ctype_white); ++} +Index: libunixlib/ctype/isupper.c +=================================================================== +--- libunixlib/ctype/isupper.c (revision 7698) ++++ libunixlib/ctype/isupper.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (isupper) (int c) +@@ -10,3 +11,8 @@ + return isupper (c); + } + ++int ++isupper_l (int c, locale_t locobj) ++{ ++ return ((&locobj->ctype[1])[c] & ___ctype_upper); ++} +Index: libunixlib/ctype/isxdigit.c +=================================================================== +--- libunixlib/ctype/isxdigit.c (revision 7698) ++++ libunixlib/ctype/isxdigit.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (isxdigit) (int c) +@@ -10,3 +11,8 @@ + return isxdigit (c); + } + ++int ++isxdigit_l (int c, locale_t locobj) ++{ ++ return ((&locobj->ctype[1])[c] & ___ctype_xdigit); ++} +Index: libunixlib/ctype/toascii.c +=================================================================== +--- libunixlib/ctype/toascii.c (revision 7698) ++++ libunixlib/ctype/toascii.c (working copy) +@@ -10,3 +10,9 @@ + return toascii (c); + } + ++int ++toascii_l (int c, locale_t locobj) ++{ ++ (void) locobj; ++ return toascii (c); ++} +Index: libunixlib/ctype/tolower.c +=================================================================== +--- libunixlib/ctype/tolower.c (revision 7698) ++++ libunixlib/ctype/tolower.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (tolower) (int c) +@@ -10,3 +11,8 @@ + return tolower (c); + } + ++int ++tolower_l (int c, locale_t locobj) ++{ ++ return (&locobj->ctype_lower[1])[c]; ++} +Index: libunixlib/ctype/toupper.c +=================================================================== +--- libunixlib/ctype/toupper.c (revision 7698) ++++ libunixlib/ctype/toupper.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (toupper) (int c) +@@ -10,3 +11,8 @@ + return toupper (c); + } + ++int ++toupper_l (int c, locale_t locobj) ++{ ++ return (&locobj->ctype_upper[1])[c]; ++} +Index: libunixlib/incl-local/locale.h +=================================================================== +--- libunixlib/incl-local/locale.h (revision 7698) ++++ libunixlib/incl-local/locale.h (working copy) +@@ -13,15 +13,36 @@ + + #ifndef __TARGET_SCL__ + +-/* Territory number for each locale. C locale is -1. */ +-extern int __locale_territory[LC_ALL + 1]; ++struct _locale { ++ /* Map from locale category to territory number. C locale is -1. */ ++ int locale_territory[LC_ALL]; + +-/* Set to 1 is setlocale has been called since the last call to +- localeconv. localeconv uses this flag to cache the lconv structure. */ +-extern int __setlocale_called; ++ /* Character type LUTs: EOF + one entry per character ++ * ++ * EOF is defined as -1, so character entries start at offset 1. ++ */ ++ short ctype_upper[257]; ++ short ctype_lower[257]; ++ unsigned char ctype[257]; + +-extern void __build_ctype_tables (int __territory) __THROW; ++ /* Set to 1 if the locale information has changed since the last time ++ * the lconv structure was updated. */ ++ int lc_needs_refresh; ++ /* Numeric formatting information for locale */ ++ struct lconv lc; ++}; + ++extern struct _locale __locale_global; ++ ++extern void __build_ctype_tables (locale_t locobj, int __territory) __THROW; ++ ++extern char *__setlocale_l (locale_t locobj, int __category, ++ const char *__locale) __THROW; ++ ++void __localeconv_lconv_init (struct lconv *lc); ++void __localeconv_lconv_fini (struct lconv *lc); ++void __localeconv_l (locale_t locobj); ++ + #endif + + __END_DECLS +Index: libunixlib/include/bits/locale_t.h +=================================================================== +--- libunixlib/include/bits/locale_t.h (nonexistent) ++++ libunixlib/include/bits/locale_t.h (working copy) +@@ -0,0 +1,10 @@ ++/* ++ * Copyright (c) 2022 UnixLib Developers ++ */ ++ ++#ifndef _BITS_LOCALE_T_H_ ++#define _BITS_LOCALE_T_H_ ++ ++typedef struct _locale *locale_t; ++ ++#endif +Index: libunixlib/include/ctype.h +=================================================================== +--- libunixlib/include/ctype.h (revision 7698) ++++ libunixlib/include/ctype.h (working copy) +@@ -51,6 +51,48 @@ + extern int isblank (int __c) __THROW; + + #ifndef __TARGET_SCL__ ++# ifdef __USE_XOPEN2K8 ++# include <bits/locale_t.h> ++ ++/* c is alphabetic or numeric. */ ++extern int isalnum_l (int __c, locale_t locobj) __THROW; ++ ++/* c is alphabetic. */ ++extern int isalpha_l (int __c, locale_t locobj) __THROW; ++ ++/* c is a control character. */ ++extern int iscntrl_l (int __c, locale_t locobj) __THROW; ++ ++/* c is a decimal digit. */ ++extern int isdigit_l (int __c, locale_t locobj) __THROW; ++ ++/* c is any printable character other than a space. */ ++extern int isgraph_l (int __c, locale_t locobj) __THROW; ++ ++/* c is a lower-case letter. */ ++extern int islower_l (int __c, locale_t locobj) __THROW; ++ ++/* c is an upper-case letter. */ ++extern int isupper_l (int __c, locale_t locobj) __THROW; ++ ++/* c is a printable character. */ ++extern int isprint_l (int __c, locale_t locobj) __THROW; ++ ++/* c is a printable character other than a space or a ++ alphanumeric character. */ ++extern int ispunct_l (int __c, locale_t locobj) __THROW; ++ ++/* c is a white space character e.g. space, newline, tab, linefeed, ++ return, vertical tab. */ ++extern int isspace_l (int __c, locale_t locobj) __THROW; ++ ++/* c is a hex digit. */ ++extern int isxdigit_l (int __c, locale_t locobj) __THROW; ++ ++/* c is tab or space. */ ++extern int isblank_l (int __c, locale_t locobj) __THROW; ++# endif ++ + /* Characteristics. */ + extern const unsigned char * const __ctype; + /* Lower case table. */ +@@ -108,6 +150,10 @@ + extern int toupper (int __c) __THROW; + #ifndef __TARGET_SCL__ + # define toupper(c) ((int) __ctype_upper[(int) (c)]) ++ ++# ifdef __USE_XOPEN2K8 ++extern int toupper_l (int __c, locale_t locobj) __THROW; ++# endif + #endif + + /* Convert c to lower case. */ +@@ -114,6 +160,10 @@ + extern int tolower (int __c) __THROW; + #ifndef __TARGET_SCL__ + # define tolower(c) ((int) __ctype_lower[(int) (c)]) ++ ++# ifdef __USE_XOPEN2K8 ++extern int tolower_l (int __c, locale_t locobj) __THROW; ++# endif + #endif + + #ifndef __TARGET_SCL__ +@@ -135,6 +185,11 @@ + /* Is c an ASCII character. */ + extern int isascii (int __c) __THROW; + # define isascii(c) ((unsigned)(c) <= 0x7f) ++ ++# ifdef __USE_XOPEN2K8 ++extern int toascii_l (int __c, locale_t locobj) __THROW; ++extern int isascii_l (int __c, locale_t locobj) __THROW; ++# endif + # endif + #endif + +Index: libunixlib/include/langinfo.h +=================================================================== +--- libunixlib/include/langinfo.h (revision 7698) ++++ libunixlib/include/langinfo.h (working copy) +@@ -580,18 +580,12 @@ + extern char *nl_langinfo (nl_item __item) __THROW; + + +-#if 0 +-#ifdef __USE_GNU +-/* This interface is for the extended locale model. See <locale.h> for +- more information. */ ++#ifdef __USE_XOPEN2K8 ++# include <bits/locale_t.h> + +-/* Get locale datatype definition. */ +-# include <xlocale.h> +- + /* Just like nl_langinfo but get the information from the locale object L. */ +-extern char *nl_langinfo_l (nl_item __item, __locale_t l); ++extern char *nl_langinfo_l (nl_item __item, locale_t __l); + #endif +-#endif + + __END_DECLS + +Index: libunixlib/include/locale.h +=================================================================== +--- libunixlib/include/locale.h (revision 7698) ++++ libunixlib/include/locale.h (working copy) +@@ -33,16 +33,16 @@ + /* Entire locale. */ + # define LC_ALL 6 + +-#define LC_COLLATE_MASK (1L << 1) +-#define LC_CTYPE_MASK (1L << 2) +-#define LC_MESSAGES_MASK (1L << 3) +-#define LC_MONETARY_MASK (1L << 4) +-#define LC_NUMERIC_MASK (1L << 5) +-#define LC_TIME_MASK (1L << 6) +-#define LC_ALL_MASK (LC_COLLATE_MASK | LC_CTYPE_MASK | LC_MESSAGES_MASK | LC_MONETARY_MASK | LC_NUMERIC_MASK | LC_TIME_MASK) ++# ifdef __USE_XOPEN2K8 ++# define LC_COLLATE_MASK (1L << 0) ++# define LC_CTYPE_MASK (1L << 1) ++# define LC_MESSAGES_MASK (1L << 2) ++# define LC_MONETARY_MASK (1L << 3) ++# define LC_NUMERIC_MASK (1L << 4) ++# define LC_TIME_MASK (1L << 5) ++# define LC_ALL_MASK (LC_COLLATE_MASK | LC_CTYPE_MASK | LC_MESSAGES_MASK | LC_MONETARY_MASK | LC_NUMERIC_MASK | LC_TIME_MASK) ++# endif + +-typedef struct _locale *locale_t; +- + #else + /* String collation (functions 'strcoll' and 'strxfrm'). */ + # define LC_COLLATE 1 +@@ -121,6 +121,9 @@ + extern struct lconv *localeconv (void) __THROW; + + #ifndef __TARGET_SCL__ ++# ifdef __USE_XOPEN2K8 ++# include <bits/locale_t.h> ++ + extern locale_t uselocale(locale_t newloc); + + extern void freelocale(locale_t locobj); +@@ -127,7 +130,11 @@ + + extern locale_t newlocale(int category_mask, const char *locale, + locale_t base); +-# define LC_GLOBAL_LOCALE ((locale_t) -1L) ++ ++extern locale_t duplocale(locale_t locobj); ++ ++# define LC_GLOBAL_LOCALE ((locale_t) -1L) ++# endif + #endif + + __END_NAMESPACE_STD +Index: libunixlib/include/string.h +=================================================================== +--- libunixlib/include/string.h (revision 7698) ++++ libunixlib/include/string.h (working copy) +@@ -93,6 +93,16 @@ + const char *__restrict __src, size_t __n) + __THROW __nonnull ((2)); + ++#ifdef __USE_XOPEN2K8 ++#include <bits/locale_t.h> ++ ++extern int strcoll_l (const char *__s1, const char *__s2, locale_t __l) ++ __THROW __attribute_pure__ __nonnull ((1, 2, 3)); ++ ++extern size_t strxfrm_l (char *__dest, const char *__src, size_t __n, ++ locale_t __l) __THROW __nonnull ((2, 4)); ++#endif ++ + /* Find the first occurrence of c in s. */ + extern char *strchr (const char *__s, int __c) + __THROW __attribute_pure__ __nonnull ((1)) __wur; +@@ -281,6 +291,17 @@ + /* Compare no more than N chars of S1 and S2, ignoring case. */ + extern int strncasecmp (const char *__s1, const char *__s2, size_t __n) + __THROW __attribute_pure__ __nonnull ((1, 2)) __wur; ++ ++# ifdef __USE_XOPEN2K8 ++# include <bits/locale_t.h> ++ ++extern int strcasecmp_l (const char *__s1, const char *__s2, locale_t __loc) ++ __THROW __attribute_pure__ __nonnull ((1, 2, 3)); ++ ++extern int strncasecmp_l (const char *__s1, const char *__s2, ++ size_t __n, locale_t __loc) ++ __THROW __attribute_pure__ __nonnull ((1, 2, 4)); ++# endif + #endif /* Use BSD. */ + + #if defined __USE_XOPEN2K || defined __USE_MISC +@@ -289,6 +310,11 @@ + __THROW __nonnull ((2)); + #endif + ++#ifdef __USE_XOPEN2K8 ++/* Translate error number to string according to the locale L. */ ++extern char *strerror_l (int __errnum, locale_t __l) __THROW; ++#endif ++ + #ifndef __TARGET_SCL__ + # ifndef basename + /* Return the file name within directory of FILENAME. We don't +Index: libunixlib/include/strings.h +=================================================================== +--- libunixlib/include/strings.h (revision 7698) ++++ libunixlib/include/strings.h (working copy) +@@ -37,7 +37,17 @@ + /* Compare n chars of S1 and S2, ignoring case. */ + extern int strncasecmp (const char *__s1, const char *__s2, size_t __n); + ++# ifdef __USE_XOPEN2K8 ++# include <bits/locale_t.h> + ++extern int strcasecmp_l (const char *__s1, const char *__s2, locale_t __loc) ++ __THROW __attribute_pure__ __nonnull ((1, 2, 3)); ++ ++extern int strncasecmp_l (const char *__s1, const char *__s2, ++ size_t __n, locale_t __loc) ++ __THROW __attribute_pure__ __nonnull ((1, 2, 4)); ++# endif ++ + /* Return the position of the first bit set in I, or 0 if none are set. + The least-significant bit is position 1, the most-significant 32. */ + extern int ffs (int __i); +Index: libunixlib/include/wchar.h +=================================================================== +--- libunixlib/include/wchar.h (revision 7698) ++++ libunixlib/include/wchar.h (working copy) +@@ -1,7 +1,7 @@ + /* + * File taken from glibc 2.11. + * Following changes were made: +- * - Disabled non-standard reentrant locale prototypes. ++ * - None + */ + + /* Copyright (C) 1995-2008, 2009 Free Software Foundation, Inc. +@@ -172,7 +172,6 @@ + __END_NAMESPACE_STD + #endif + +-#if 0 + #ifdef __USE_XOPEN2K8 + /* Compare S1 and S2, ignoring case. */ + extern int wcscasecmp (__const wchar_t *__s1, __const wchar_t *__s2) __THROW; +@@ -183,15 +182,14 @@ + + /* Similar to the two functions above but take the information from + the provided locale and not the global locale. */ +-# include <xlocale.h> ++# include <bits/locale_t.h> + + extern int wcscasecmp_l (__const wchar_t *__s1, __const wchar_t *__s2, +- __locale_t __loc) __THROW; ++ locale_t __loc) __THROW; + + extern int wcsncasecmp_l (__const wchar_t *__s1, __const wchar_t *__s2, +- size_t __n, __locale_t __loc) __THROW; ++ size_t __n, locale_t __loc) __THROW; + #endif +-#endif + + __BEGIN_NAMESPACE_STD + /* Compare S1 and S2, both interpreted as appropriate to the +@@ -205,7 +203,6 @@ + __END_NAMESPACE_STD + + #ifdef __USE_XOPEN2K8 +-#if 0 + /* Similar to the two functions above but take the information from + the provided locale and not the global locale. */ + +@@ -212,14 +209,13 @@ + /* Compare S1 and S2, both interpreted as appropriate to the + LC_COLLATE category of the given locale. */ + extern int wcscoll_l (__const wchar_t *__s1, __const wchar_t *__s2, +- __locale_t __loc) __THROW; ++ locale_t __loc) __THROW; + + /* Transform S2 into array pointed to by S1 such that if wcscmp is + applied to two transformed strings the result is the as applying + `wcscoll' to the original strings. */ + extern size_t wcsxfrm_l (wchar_t *__s1, __const wchar_t *__s2, +- size_t __n, __locale_t __loc) __THROW; +-#endif ++ size_t __n, locale_t __loc) __THROW; + + #ifndef __TARGET_SCL__ + /* Duplicate S, returning an identical malloc'd string. */ +Index: libunixlib/include/wctype.h +=================================================================== +--- libunixlib/include/wctype.h (revision 7698) ++++ libunixlib/include/wctype.h (working copy) +@@ -3,7 +3,6 @@ + * Following changes were made: + * - Replaced "#include <bits/types.h>" into "#include <unixlib/types.h>" + * - Add wint_t typedef when it hasn't been defined in stddef.h. +- * - Disabled non-standard reentrant locale prototypes. + */ + + /* Copyright (C) 1996-2002,2005,2007,2008,2009 Free Software Foundation, Inc. +@@ -191,7 +190,6 @@ + /* Determine whether the wide-character WC has the property described by + DESC. */ + extern int iswctype (wint_t __wc, wctype_t __desc) __THROW; +-#define iswctype_l(c, d, l) iswctype(c, d) + + __END_NAMESPACE_C99 + +@@ -241,73 +239,71 @@ + extern wint_t towctrans (wint_t __wc, wctrans_t __desc) __THROW; + __END_NAMESPACE_C99 + +-#if 0 + # ifdef __USE_XOPEN2K8 +-/* Declare the interface to extended locale model. */ +-# include <xlocale.h> ++# include <bits/locale_t.h> + + /* Test for any wide character for which `iswalpha' or `iswdigit' is + true. */ +-extern int iswalnum_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswalnum_l (wint_t __wc, locale_t __locale) __THROW; + + /* Test for any wide character for which `iswupper' or 'iswlower' is + true, or any wide character that is one of a locale-specific set of + wide-characters for which none of `iswcntrl', `iswdigit', + `iswpunct', or `iswspace' is true. */ +-extern int iswalpha_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswalpha_l (wint_t __wc, locale_t __locale) __THROW; + + /* Test for any control wide character. */ +-extern int iswcntrl_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswcntrl_l (wint_t __wc, locale_t __locale) __THROW; + + /* Test for any wide character that corresponds to a decimal-digit + character. */ +-extern int iswdigit_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswdigit_l (wint_t __wc, locale_t __locale) __THROW; + + /* Test for any wide character for which `iswprint' is true and + `iswspace' is false. */ +-extern int iswgraph_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswgraph_l (wint_t __wc, locale_t __locale) __THROW; + + /* Test for any wide character that corresponds to a lowercase letter + or is one of a locale-specific set of wide characters for which + none of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */ +-extern int iswlower_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswlower_l (wint_t __wc, locale_t __locale) __THROW; + + /* Test for any printing wide character. */ +-extern int iswprint_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswprint_l (wint_t __wc, locale_t __locale) __THROW; + + /* Test for any printing wide character that is one of a + locale-specific et of wide characters for which neither `iswspace' + nor `iswalnum' is true. */ +-extern int iswpunct_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswpunct_l (wint_t __wc, locale_t __locale) __THROW; + + /* Test for any wide character that corresponds to a locale-specific + set of wide characters for which none of `iswalnum', `iswgraph', or + `iswpunct' is true. */ +-extern int iswspace_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswspace_l (wint_t __wc, locale_t __locale) __THROW; + + /* Test for any wide character that corresponds to an uppercase letter + or is one of a locale-specific set of wide character for which none + of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */ +-extern int iswupper_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswupper_l (wint_t __wc, locale_t __locale) __THROW; + + /* Test for any wide character that corresponds to a hexadecimal-digit + character equivalent to that performed be the functions described + in the previous subclause. */ +-extern int iswxdigit_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswxdigit_l (wint_t __wc, locale_t __locale) __THROW; + + /* Test for any wide character that corresponds to a standard blank + wide character or a locale-specific set of wide characters for + which `iswalnum' is false. */ +-extern int iswblank_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswblank_l (wint_t __wc, locale_t __locale) __THROW; + + /* Construct value that describes a class of wide characters identified + by the string argument PROPERTY. */ +-extern wctype_t wctype_l (__const char *__property, __locale_t __locale) ++extern wctype_t wctype_l (__const char *__property, locale_t __locale) + __THROW; + + /* Determine whether the wide-character WC has the property described by + DESC. */ +-extern int iswctype_l (wint_t __wc, wctype_t __desc, __locale_t __locale) ++extern int iswctype_l (wint_t __wc, wctype_t __desc, locale_t __locale) + __THROW; + + +@@ -316,22 +312,21 @@ + */ + + /* Converts an uppercase letter to the corresponding lowercase letter. */ +-extern wint_t towlower_l (wint_t __wc, __locale_t __locale) __THROW; ++extern wint_t towlower_l (wint_t __wc, locale_t __locale) __THROW; + + /* Converts an lowercase letter to the corresponding uppercase letter. */ +-extern wint_t towupper_l (wint_t __wc, __locale_t __locale) __THROW; ++extern wint_t towupper_l (wint_t __wc, locale_t __locale) __THROW; + + /* Construct value that describes a mapping between wide characters + identified by the string argument PROPERTY. */ +-extern wctrans_t wctrans_l (__const char *__property, __locale_t __locale) ++extern wctrans_t wctrans_l (__const char *__property, locale_t __locale) + __THROW; + + /* Map the wide character WC using the mapping described by DESC. */ + extern wint_t towctrans_l (wint_t __wc, wctrans_t __desc, +- __locale_t __locale) __THROW; ++ locale_t __locale) __THROW; + + # endif /* Use POSIX 2008. */ +-#endif + + __END_DECLS + +Index: libunixlib/locale/localeconv.c +=================================================================== +--- libunixlib/locale/localeconv.c (revision 7698) ++++ libunixlib/locale/localeconv.c (working copy) +@@ -14,8 +14,6 @@ + + /* #define DEBUG */ + +-int __setlocale_called = 1; +- + static int + read_symbol (int reason_code, int territory) + { +@@ -71,26 +69,44 @@ + *grouping = new_grouping; + } + +-static struct lconv lc = { NULL, NULL, NULL, NULL, NULL, +- NULL, NULL, NULL, NULL, NULL, +- CHAR_MAX, CHAR_MAX, CHAR_MAX, CHAR_MAX, +- CHAR_MAX, CHAR_MAX, CHAR_MAX, CHAR_MAX }; ++void ++__localeconv_lconv_init (struct lconv *lc) ++{ ++ memset(lc, 0, sizeof(*lc)); ++ lc->int_frac_digits = lc->frac_digits = lc->p_cs_precedes = ++ lc->p_sep_by_space = lc->n_cs_precedes = lc->n_sep_by_space = ++ lc->p_sign_posn = lc->n_sign_posn = CHAR_MAX; ++} + +-/* Defined by POSIX as not threadsafe */ +-struct lconv * +-localeconv (void) ++void ++__localeconv_lconv_fini (struct lconv *lc) + { ++ free(lc->decimal_point); ++ free(lc->thousands_sep); ++ free(lc->grouping); ++ free(lc->int_curr_symbol); ++ free(lc->currency_symbol); ++ free(lc->mon_decimal_point); ++ free(lc->mon_thousands_sep); ++ free(lc->mon_grouping); ++ free(lc->positive_sign); ++ free(lc->negative_sign); ++} ++ ++void ++__localeconv_l (locale_t locobj) ++{ + int numeric, monetary; + + /* If setlocale has not been called since the last call to + localeconv, then the lconv structure will be the same. */ +- if (!__setlocale_called) +- return &lc; ++ if (!locobj->lc_needs_refresh) ++ return; + +- __setlocale_called = 0; ++ locobj->lc_needs_refresh = 0; + +- numeric = __locale_territory[LC_NUMERIC]; +- monetary = __locale_territory[LC_MONETARY]; ++ numeric = locobj->locale_territory[LC_NUMERIC]; ++ monetary = locobj->locale_territory[LC_MONETARY]; + + /* See the PRMs regarding SWI Territory_ReadSymbols for the + meanings of the following numbers. */ +@@ -97,71 +113,80 @@ + if (numeric == -1) + { + /* We're using the 'C' locale. */ +- free (lc.decimal_point); +- lc.decimal_point = strdup ("."); +- free (lc.thousands_sep); +- lc.thousands_sep = strdup (""); +- free (lc.grouping); +- lc.grouping = strdup (""); ++ free (locobj->lc.decimal_point); ++ locobj->lc.decimal_point = strdup ("."); ++ free (locobj->lc.thousands_sep); ++ locobj->lc.thousands_sep = strdup (""); ++ free (locobj->lc.grouping); ++ locobj->lc.grouping = strdup (""); + } + else + { +- free (lc.decimal_point); +- lc.decimal_point = strdup ((char *) read_symbol (0, numeric)); +- free (lc.thousands_sep); +- lc.thousands_sep = strdup ((char *) read_symbol (1, numeric)); +- read_byte_list (2, &lc.grouping, numeric); ++ free (locobj->lc.decimal_point); ++ locobj->lc.decimal_point = strdup ((char *) read_symbol (0, numeric)); ++ free (locobj->lc.thousands_sep); ++ locobj->lc.thousands_sep = strdup ((char *) read_symbol (1, numeric)); ++ read_byte_list (2, &locobj->lc.grouping, numeric); + } + if (monetary == -1) + { + /* We using the 'C' locale. Empty strings and CHAR_MAX means + that these fields are unspecified. */ +- free (lc.mon_decimal_point); +- lc.mon_decimal_point = strdup (""); +- free (lc.mon_thousands_sep); +- lc.mon_thousands_sep = strdup (""); +- free (lc.mon_grouping); +- lc.mon_grouping = strdup (""); +- lc.int_frac_digits = CHAR_MAX; +- lc.frac_digits = CHAR_MAX; +- free (lc.currency_symbol); +- lc.currency_symbol = strdup (""); +- free (lc.int_curr_symbol); +- lc.int_curr_symbol = strdup (""); +- lc.p_cs_precedes = CHAR_MAX; +- lc.n_cs_precedes = CHAR_MAX; +- lc.p_sep_by_space = CHAR_MAX; +- lc.n_sep_by_space = CHAR_MAX; +- free (lc.positive_sign); +- lc.positive_sign = strdup (""); +- free (lc.negative_sign); +- lc.negative_sign = strdup (""); +- lc.p_sign_posn = CHAR_MAX; +- lc.n_sign_posn = CHAR_MAX; ++ free (locobj->lc.mon_decimal_point); ++ locobj->lc.mon_decimal_point = strdup (""); ++ free (locobj->lc.mon_thousands_sep); ++ locobj->lc.mon_thousands_sep = strdup (""); ++ free (locobj->lc.mon_grouping); ++ locobj->lc.mon_grouping = strdup (""); ++ locobj->lc.int_frac_digits = CHAR_MAX; ++ locobj->lc.frac_digits = CHAR_MAX; ++ free (locobj->lc.currency_symbol); ++ locobj->lc.currency_symbol = strdup (""); ++ free (locobj->lc.int_curr_symbol); ++ locobj->lc.int_curr_symbol = strdup (""); ++ locobj->lc.p_cs_precedes = CHAR_MAX; ++ locobj->lc.n_cs_precedes = CHAR_MAX; ++ locobj->lc.p_sep_by_space = CHAR_MAX; ++ locobj->lc.n_sep_by_space = CHAR_MAX; ++ free (locobj->lc.positive_sign); ++ locobj->lc.positive_sign = strdup (""); ++ free (locobj->lc.negative_sign); ++ locobj->lc.negative_sign = strdup (""); ++ locobj->lc.p_sign_posn = CHAR_MAX; ++ locobj->lc.n_sign_posn = CHAR_MAX; + } + else + { +- free (lc.int_curr_symbol); +- lc.int_curr_symbol = strdup ((char *)read_symbol (3, monetary)); +- free (lc.currency_symbol); +- lc.currency_symbol = strdup ((char *)read_symbol (4, monetary)); +- free (lc.mon_decimal_point); +- lc.mon_decimal_point = strdup ((char *)read_symbol (5, monetary)); +- free (lc.mon_thousands_sep); +- lc.mon_thousands_sep = strdup ((char *)read_symbol (6, monetary)); +- read_byte_list (7, &lc.mon_grouping, monetary); +- free (lc.positive_sign); +- lc.positive_sign = strdup ((char *)read_symbol (8, monetary)); +- free (lc.negative_sign); +- lc.negative_sign = strdup ((char *)read_symbol (9, monetary)); +- lc.int_frac_digits = (char)read_symbol (10, monetary); +- lc.frac_digits = (char)read_symbol (11, monetary); +- lc.p_cs_precedes = (char)read_symbol (12, monetary); +- lc.p_sep_by_space = (char)read_symbol (13, monetary); +- lc.n_cs_precedes = (char)read_symbol (14, monetary); +- lc.n_sep_by_space = (char)read_symbol (15, monetary); +- lc.p_sign_posn = (char)read_symbol (16, monetary); +- lc.n_sign_posn = (char)read_symbol (17, monetary); ++ free (locobj->lc.int_curr_symbol); ++ locobj->lc.int_curr_symbol = strdup ((char *)read_symbol (3, monetary)); ++ free (locobj->lc.currency_symbol); ++ locobj->lc.currency_symbol = strdup ((char *)read_symbol (4, monetary)); ++ free (locobj->lc.mon_decimal_point); ++ locobj->lc.mon_decimal_point = strdup ((char *)read_symbol (5, monetary)); ++ free (locobj->lc.mon_thousands_sep); ++ locobj->lc.mon_thousands_sep = strdup ((char *)read_symbol (6, monetary)); ++ read_byte_list (7, &locobj->lc.mon_grouping, monetary); ++ free (locobj->lc.positive_sign); ++ locobj->lc.positive_sign = strdup ((char *)read_symbol (8, monetary)); ++ free (locobj->lc.negative_sign); ++ locobj->lc.negative_sign = strdup ((char *)read_symbol (9, monetary)); ++ locobj->lc.int_frac_digits = (char)read_symbol (10, monetary); ++ locobj->lc.frac_digits = (char)read_symbol (11, monetary); ++ locobj->lc.p_cs_precedes = (char)read_symbol (12, monetary); ++ locobj->lc.p_sep_by_space = (char)read_symbol (13, monetary); ++ locobj->lc.n_cs_precedes = (char)read_symbol (14, monetary); ++ locobj->lc.n_sep_by_space = (char)read_symbol (15, monetary); ++ locobj->lc.p_sign_posn = (char)read_symbol (16, monetary); ++ locobj->lc.n_sign_posn = (char)read_symbol (17, monetary); + } +- return &lc; ++ return; + } ++ ++/* Defined by POSIX as not threadsafe */ ++struct lconv * ++localeconv (void) ++{ ++ __localeconv_l (&__locale_global); ++ ++ return &__locale_global.lc; ++} +Index: libunixlib/locale/newlocale.c +=================================================================== +--- libunixlib/locale/newlocale.c (revision 7698) ++++ libunixlib/locale/newlocale.c (working copy) +@@ -1,17 +1,17 @@ + /* Copyright (c) 2019 UnixLib Developers + */ + ++#include <ctype.h> ++#include <errno.h> ++#include <locale.h> + #include <stdlib.h> +-#include <locale.h> + #include <stdio.h> +-#include <errno.h> ++#include <string.h> + +-struct _locale { +- struct lconv lc; +-}; ++#include <internal/unix.h> + + /* This is supposed to be per-thread. */ +-static locale_t current_locale; ++static locale_t current_locale = LC_GLOBAL_LOCALE; + + locale_t uselocale(locale_t newloc) + { +@@ -27,20 +27,94 @@ + + void freelocale(locale_t locobj) + { +- if (locobj) ++ if (locobj) { ++ __localeconv_lconv_fini(&locobj->lc); + free(locobj); ++ } + } + + locale_t newlocale(int category_mask, const char *locale, + locale_t base) + { +- locale_t loc = (locale_t)malloc(sizeof(*loc)); +- if (!loc) { ++ struct _locale tmp; ++ ++ PTHREAD_UNSAFE ++ ++ if ((category_mask & ~LC_ALL_MASK) || locale == NULL) { ++ __set_errno (EINVAL); ++ return 0; ++ } ++ ++ /* The locale provided will be verified by __setlocale_l() */ ++ ++ /* Prepare the temporary locale we will modify */ ++ if (base != 0 && base != LC_GLOBAL_LOCALE) { ++ memcpy(&tmp, base, sizeof(tmp)); ++ } else { ++ if (base == LC_GLOBAL_LOCALE) { ++ /* Undefined: be helpful to client */ ++ memcpy(&tmp, &__locale_global, sizeof(tmp)); ++ } else { ++ /* Initialise to C locale */ ++ __build_ctype_tables(&tmp, -2); ++ } ++ } ++ ++ /* Now, apply the requested locale to each of the categories in the mask */ ++ if (category_mask == LC_ALL_MASK) { ++ /* Special-case LC_ALL to handle the encoded locale string */ ++ if (__setlocale_l(&tmp, LC_ALL, locale) == NULL) { ++ return 0; ++ } ++ } else { ++ int category = 0, mask = category_mask; ++ while (mask != 0) { ++ if (mask & 1) { ++ if (__setlocale_l(&tmp, category, locale) == NULL) { ++ return 0; ++ } ++ } ++ category++; ++ mask >>= 1; ++ } ++ } ++ ++ /* Allocate the result, if necessary */ ++ if (base == 0 || base == LC_GLOBAL_LOCALE) { ++ base = (locale_t)malloc(sizeof(*base)); ++ if (!base) { ++ __set_errno (ENOMEM); ++ return 0; ++ } ++ } ++ /* Fill it in */ ++ memcpy(base, &tmp, sizeof(tmp)); ++ ++ /* Mark the lconv data stale */ ++ base->lc_needs_refresh = 1; ++ ++ return base; ++} ++ ++locale_t duplocale(locale_t locobj) ++{ ++ locale_t loc; ++ ++ loc = (locale_t) malloc(sizeof(*loc)); ++ if (loc == NULL) { + __set_errno (ENOMEM); + return 0; + } + +- loc->lc = *localeconv(); ++ if (locobj == LC_GLOBAL_LOCALE) { ++ memcpy(loc, &__locale_global, sizeof(*loc)); ++ } else { ++ memcpy(loc, locobj, sizeof(*loc)); ++ } + ++ /* Invalidate lconv in the copy */ ++ __localeconv_lconv_init(&loc->lc); ++ loc->lc_needs_refresh = 1; ++ + return loc; + } +Index: libunixlib/locale/nl_langinfo.c +=================================================================== +--- libunixlib/locale/nl_langinfo.c (revision 7698) ++++ libunixlib/locale/nl_langinfo.c (working copy) +@@ -24,3 +24,10 @@ + + return (char *)value; + } ++ ++char * ++nl_langinfo_l (nl_item item, locale_t l) ++{ ++ (void) l; ++ return nl_langinfo(item); ++} +Index: libunixlib/locale/setlocale.c +=================================================================== +--- libunixlib/locale/setlocale.c (revision 7698) ++++ libunixlib/locale/setlocale.c (working copy) +@@ -195,7 +195,7 @@ + } + + static void +-do_lc_all (char *buffer, int size) ++do_lc_all (locale_t locobj, char *buffer, int size) + { + char temp[64]; + int category, same = 1; +@@ -204,13 +204,13 @@ + setlocale to set all locales. If all locales are + the same, then we can produce a very short string. */ + for (category = 1; category < LC_ALL; ++category) +- if (__locale_territory[0] != __locale_territory[category]) ++ if (locobj->locale_territory[0] != locobj->locale_territory[category]) + same = 0; + + if (same) + { + /* All locales are set to the same territory. */ +- territory_name (__locale_territory[0], buffer, size); ++ territory_name (locobj->locale_territory[0], buffer, size); + } + else + { +@@ -218,7 +218,7 @@ + LC_CATEGORY=country;LC_CATEGORY=country; ... */ + for (category = 0; category < LC_ALL; ++category) + { +- territory_name (__locale_territory[category], temp, sizeof (temp)); ++ territory_name (locobj->locale_territory[category], temp, sizeof (temp)); + buffer = stpcpy (buffer, locale_names[category]); + *buffer++ = '='; + buffer = stpcpy (buffer, temp); +@@ -230,15 +230,13 @@ + } + + char * +-setlocale (int category, const char *locale) ++__setlocale_l (locale_t locobj, int category, const char *locale) + { + int new_territory, changed; + static char old_locale[256]; + +- PTHREAD_UNSAFE +- + /* This tells localeconv to re-read data for the lconv structure. */ +- __setlocale_called = 1; ++ locobj->lc_needs_refresh = 1; + + if (locale == NULL) + { +@@ -247,11 +245,11 @@ + { + /* The locale string is specially encoded for LC_ALL so we + could restore all locales at any time. */ +- do_lc_all (old_locale, sizeof (old_locale)); ++ do_lc_all (locobj, old_locale, sizeof (old_locale)); + return old_locale; + } + +- territory_name (__locale_territory[category], old_locale, sizeof (old_locale)); ++ territory_name (locobj->locale_territory[category], old_locale, sizeof (old_locale)); + return old_locale; + } + +@@ -270,7 +268,7 @@ + /* Encode the locale string, as we will be returning this + later. Remember, setlocale returns the locale settings + that are about to be changed. */ +- do_lc_all (old_locale, sizeof (old_locale)); ++ do_lc_all (locobj, old_locale, sizeof (old_locale)); + + /* Check for an encoded (composite) name. Simply looking for + a semi-colon will verify this. */ +@@ -332,11 +330,11 @@ + + /* We now know all locales exist, so set them. */ + for (category = 0; category < LC_ALL; ++category) +- __locale_territory[category] = territory_number (newnames[category]); ++ locobj->locale_territory[category] = territory_number (newnames[category]); + + /* Re-build the character type tables according to the new + locale settings. */ +- __build_ctype_tables (__locale_territory[LC_CTYPE]); ++ __build_ctype_tables (locobj, locobj->locale_territory[LC_CTYPE]); + return old_locale; + } + } +@@ -359,9 +357,9 @@ + /* Change the locale for all categories. old_locale was created + when we previously checked for a composite string. */ + for (category = 0; category < LC_ALL; ++category) +- if (__locale_territory[category] != new_territory) ++ if (locobj->locale_territory[category] != new_territory) + { +- __locale_territory[category] = new_territory; ++ locobj->locale_territory[category] = new_territory; + changed = 1; + } + } +@@ -368,12 +366,12 @@ + else + { + /* Change the locale for just one category. */ +- territory_name (__locale_territory[category], ++ territory_name (locobj->locale_territory[category], + old_locale, sizeof (old_locale)); + +- if (__locale_territory[category] != new_territory) ++ if (locobj->locale_territory[category] != new_territory) + { +- __locale_territory[category] = new_territory; ++ locobj->locale_territory[category] = new_territory; + changed = 1; + } + } +@@ -384,7 +382,16 @@ + is changing. The GNU Java compiler is known to repeatedly call + setlocale. */ + if (changed && (category == LC_ALL || category == LC_CTYPE)) +- __build_ctype_tables (new_territory); ++ __build_ctype_tables (locobj, new_territory); + + return old_locale; + } ++ ++char * ++setlocale (int category, const char *locale) ++{ ++ ++ PTHREAD_UNSAFE ++ ++ return __setlocale_l(&__locale_global, category, locale); ++} +Index: libunixlib/locale/strcoll.c +=================================================================== +--- libunixlib/locale/strcoll.c (revision 7698) ++++ libunixlib/locale/strcoll.c (working copy) +@@ -11,9 +11,15 @@ + int + strcoll (const char *s1, const char *s2) + { ++ return strcoll_l (s1, s2, &__locale_global); ++} ++ ++int ++strcoll_l (const char *s1, const char *s2, locale_t l) ++{ + int regs[10]; + +- regs[0] = __locale_territory[LC_COLLATE]; ++ regs[0] = l->locale_territory[LC_COLLATE]; + regs[1] = (int)s1; + regs[2] = (int)s2; + regs[3] = 0; +@@ -21,3 +27,4 @@ + __os_swi (Territory_Collate, regs); + return regs[0]; + } ++ +Index: libunixlib/locale/strxfrm.c +=================================================================== +--- libunixlib/locale/strxfrm.c (revision 7698) ++++ libunixlib/locale/strxfrm.c (working copy) +@@ -11,9 +11,15 @@ + size_t + strxfrm (char *to, const char *from, size_t size) + { ++ return strxfrm_l (to, from, size, &__locale_global); ++} ++ ++size_t ++strxfrm_l (char *to, const char *from, size_t size, locale_t l) ++{ + int regs[10]; + +- regs[0] = __locale_territory[LC_COLLATE]; ++ regs[0] = l->locale_territory[LC_COLLATE]; + regs[1] = (int)to; + regs[2] = (int)from; + regs[3] = size; +Index: libunixlib/locale/territory.c +=================================================================== +--- libunixlib/locale/territory.c (revision 7698) ++++ libunixlib/locale/territory.c (nonexistent) +@@ -1,10 +0,0 @@ +-/* __locale_territory +- * Copyright (c) 2000-2006 UnixLib Developers +- */ +- +-#include <locale.h> +- +-/* Global used for all calls to the Territory module. These variable +- contain the territory number as set by setlocale. A value of +- -1 means use the C locale. */ +-int __locale_territory[LC_ALL + 1]; +Index: libunixlib/string/stricmp.c +=================================================================== +--- libunixlib/string/stricmp.c (revision 7698) ++++ libunixlib/string/stricmp.c (working copy) +@@ -4,6 +4,7 @@ + #include <string.h> + #include <strings.h> + #include <ctype.h> ++#include <locale.h> + + int + stricmp (const char *s1, const char *s2) +@@ -26,3 +27,24 @@ + return result; + } + strong_alias (stricmp, strcasecmp) ++ ++int ++strcasecmp_l (const char *s1, const char *s2, locale_t locobj) ++{ ++ const unsigned char *p1 = (const unsigned char *) s1; ++ const unsigned char *p2 = (const unsigned char *) s2; ++ int result = 0; ++ ++ if (p1 == p2) ++ return result; ++ ++ while (! result) ++ { ++ result = tolower_l (*p1, locobj) - tolower_l (*p2, locobj); ++ if (*p1++ == '\0') ++ break; ++ p2 ++; ++ } ++ ++ return result; ++} +Index: libunixlib/string/strnicmp.c +=================================================================== +--- libunixlib/string/strnicmp.c (revision 7698) ++++ libunixlib/string/strnicmp.c (working copy) +@@ -5,6 +5,7 @@ + #include <string.h> + #include <strings.h> + #include <ctype.h> ++#include <locale.h> + + int + strnicmp (const char *s1, const char *s2, size_t n) +@@ -26,3 +27,22 @@ + } + strong_alias (strnicmp, strncasecmp) + ++int ++strncasecmp_l (const char *s1, const char *s2, size_t n, locale_t locobj) ++{ ++ int i, j; ++ ++ if (!n) ++ return 0; ++ ++ do ++ { ++ i = *s1++, j = *s2++; ++ i = tolower_l (i, locobj); ++ j = tolower_l (j, locobj); ++ } ++ while (i && i == j && --n); ++ ++ return i - j; ++} ++ +Index: libunixlib/sys/errlist.c +=================================================================== +--- libunixlib/sys/errlist.c (revision 7698) ++++ libunixlib/sys/errlist.c (working copy) +@@ -211,3 +211,10 @@ + + return 0; + } ++ ++char * ++strerror_l (int errnum, locale_t l) ++{ ++ (void) l; ++ return strerror (errnum); ++} +Index: libunixlib/time/broken.c +=================================================================== +--- libunixlib/time/broken.c (revision 7698) ++++ libunixlib/time/broken.c (working copy) +@@ -49,7 +49,7 @@ + #ifdef __TARGET_SCL__ + -1, + #else +- __locale_territory[LC_TIME], ++ __locale_global.locale_territory[LC_TIME], + #endif + riscos_time, ordinals); + } +Index: libunixlib/time/gmtime_r.c +=================================================================== +--- libunixlib/time/gmtime_r.c (revision 7698) ++++ libunixlib/time/gmtime_r.c (working copy) +@@ -46,7 +46,7 @@ + #ifdef __TARGET_SCL__ + -1, + #else +- __locale_territory[LC_TIME], ++ __locale_global.locale_territory[LC_TIME], + #endif + riscos_time, ordinals)) != NULL) + { +Index: libunixlib/time/localtime_r.c +=================================================================== +--- libunixlib/time/localtime_r.c (revision 7698) ++++ libunixlib/time/localtime_r.c (working copy) +@@ -28,7 +28,7 @@ + #ifdef __TARGET_SCL__ + -1, + #else +- __locale_territory[LC_TIME], ++ __locale_global.locale_territory[LC_TIME], + #endif + riscos_time, ordinals)) != NULL) + { +Index: libunixlib/time/mktime.c +=================================================================== +--- libunixlib/time/mktime.c (revision 7698) ++++ libunixlib/time/mktime.c (working copy) +@@ -23,7 +23,7 @@ + #ifdef __TARGET_SCL__ + -1, + #else +- __locale_territory[LC_TIME], ++ __locale_global.locale_territory[LC_TIME], + #endif + riscos_time, + ordinals)) != NULL) +Index: libunixlib/time/stdtime.c +=================================================================== +--- libunixlib/time/stdtime.c (revision 7698) ++++ libunixlib/time/stdtime.c (working copy) +@@ -48,7 +48,7 @@ + #ifdef __TARGET_SCL__ + -1, + #else +- __locale_territory[LC_TIME], ++ __locale_global.locale_territory[LC_TIME], + #endif + riscos_time, + result, +Index: libunixlib/time/strftime.c +=================================================================== +--- libunixlib/time/strftime.c (revision 7698) ++++ libunixlib/time/strftime.c (working copy) +@@ -353,7 +353,7 @@ + int regs[10]; + char buffer[64]; + +- regs[0] = __locale_territory[LC_TIME]; ++ regs[0] = __locale_global.locale_territory[LC_TIME]; + regs[1] = (int)timep; + regs[2] = (int)buffer; + regs[3] = sizeof (buffer) - 1; +@@ -368,7 +368,7 @@ + int regs[10]; + char buffer[64]; + +- regs[0] = __locale_territory[LC_TIME]; ++ regs[0] = __locale_global.locale_territory[LC_TIME]; + regs[1] = (int)timep; + regs[2] = (int)buffer; + regs[3] = sizeof (buffer) - 1; +Index: libunixlib/time/tzset.c +=================================================================== +--- libunixlib/time/tzset.c (revision 7698) ++++ libunixlib/time/tzset.c (working copy) +@@ -36,7 +36,7 @@ + /* Get timezone information for current territory. */ + _kernel_swi_regs regs; + #ifndef __TARGET_SCL__ +- regs.r[0] = __locale_territory[LC_TIME]; ++ regs.r[0] = __locale_global.locale_territory[LC_TIME]; + #else + regs.r[0] = -1; /* Current territory. */ + #endif +Index: libunixlib/unix/unix.c +=================================================================== +--- libunixlib/unix/unix.c (revision 7698) ++++ libunixlib/unix/unix.c (working copy) +@@ -191,7 +191,7 @@ + __pthread_prog_init (); + __unixlib_signal_initialise (__u); + /* Initialise ctype tables to the C locale. */ +- __build_ctype_tables (-2); ++ __build_ctype_tables (&__locale_global, -2); + /* Define and initialise the Unix I/O. */ + initialise_unix_io (); + __stdioinit (); +Index: libunixlib/vscript +=================================================================== +--- libunixlib/vscript (revision 7698) ++++ libunixlib/vscript (working copy) +@@ -58,6 +58,9 @@ + __init_des_r; + __init_des; + __invalidate; ++ __locale_global; ++ __localeconv_lconv_init; ++ __localeconv_lconv_fini; + malloc_trim; + malloc_trim_unlocked; + malloc_unlocked; +@@ -80,6 +83,7 @@ + __res_vinit; + __runtime_features; + __setup_signalhandler_stack; ++ __setlocale_l; + __sdirinit; + __sfixinit; + __sfixfind; +Index: libunixlib/wchar/wctype.c +=================================================================== +--- libunixlib/wchar/wctype.c (revision 7698) ++++ libunixlib/wchar/wctype.c (working copy) +@@ -4,6 +4,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + #include <wctype.h> + + int +@@ -71,3 +72,69 @@ + { + return isxdigit (wc); + } ++ ++int ++iswalnum_l (wint_t wc, locale_t locale) ++{ ++ return isalnum_l (wc, locale); ++} ++ ++int ++iswalpha_l (wint_t wc, locale_t locale) ++{ ++ return isalpha_l (wc, locale); ++} ++ ++int ++iswcntrl_l (wint_t wc, locale_t locale) ++{ ++ return iscntrl_l (wc, locale); ++} ++ ++int ++iswdigit_l (wint_t wc, locale_t locale) ++{ ++ return isdigit_l (wc, locale); ++} ++ ++int ++iswgraph_l (wint_t wc, locale_t locale) ++{ ++ return isgraph_l (wc, locale); ++} ++ ++int ++iswprint_l (wint_t wc, locale_t locale) ++{ ++ return isprint_l (wc, locale); ++} ++ ++int ++iswpunct_l (wint_t wc, locale_t locale) ++{ ++ return ispunct_l (wc, locale); ++} ++ ++int ++iswspace_l (wint_t wc, locale_t locale) ++{ ++ return isspace_l (wc, locale); ++} ++ ++int ++iswxdigit_l (wint_t wc, locale_t locale) ++{ ++ return isxdigit_l (wc, locale); ++} ++ ++wint_t ++towlower_l (wint_t wc, locale_t locale) ++{ ++ return tolower_l (wc, locale); ++} ++ ++wint_t ++towupper_l (wint_t wc, locale_t locale) ++{ ++ return toupper_l (wc, locale); ++} +Index: libunixlib/wchar/wmissing.c +=================================================================== +--- libunixlib/wchar/wmissing.c (revision 7698) ++++ libunixlib/wchar/wmissing.c (working copy) +@@ -1,7 +1,7 @@ ++#include <locale.h> ++#include <stdio.h> + #include <stdlib.h> + #include <wctype.h> +-#include <wctype.h> +-#include <stdio.h> + + int iswupper (wint_t __wc) + { +@@ -9,13 +9,26 @@ + abort(); + } + +-unsigned long int wcstoul (__const wchar_t *__restrict __nptr, +- wchar_t **__restrict __endptr, int __base) ++int ++iswupper_l (wint_t wc, locale_t locale) + { + printf("%s: Not implemented\n", __func__); + abort(); + } + ++int iswlower (wint_t __wc) ++{ ++ printf("%s: Not implemented\n", __func__); ++ abort(); ++} ++ ++int ++iswlower_l (wint_t wc, locale_t locale) ++{ ++ printf("%s: Not implemented\n", __func__); ++ abort(); ++} ++ + int wcscoll (__const wchar_t *__s1, __const wchar_t *__s2) + { + printf("%s: Not implemented\n", __func__); +@@ -22,12 +35,47 @@ + abort(); + } + +-int iswlower (wint_t __wc) ++int wcscoll_l (__const wchar_t *__s1, __const wchar_t *__s2, ++ locale_t loc) + { + printf("%s: Not implemented\n", __func__); + abort(); + } + ++int wcscasecmp (__const wchar_t *__s1, __const wchar_t *__s2) ++{ ++ printf("%s: Not implemented\n", __func__); ++ abort(); ++} ++ ++int wcsncasecmp (__const wchar_t *__s1, __const wchar_t *__s2, ++ size_t __n) ++{ ++ printf("%s: Not implemented\n", __func__); ++ abort(); ++} ++ ++int wcscasecmp_l (__const wchar_t *__s1, __const wchar_t *__s2, ++ locale_t __loc) ++{ ++ printf("%s: Not implemented\n", __func__); ++ abort(); ++} ++ ++int wcsncasecmp_l (__const wchar_t *__s1, __const wchar_t *__s2, ++ size_t __n, locale_t __loc) ++{ ++ printf("%s: Not implemented\n", __func__); ++ abort(); ++} ++ ++unsigned long int wcstoul (__const wchar_t *__restrict __nptr, ++ wchar_t **__restrict __endptr, int __base) ++{ ++ printf("%s: Not implemented\n", __func__); ++ abort(); ++} ++ + long long int wcstoll (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, int __base) + { +@@ -63,6 +111,13 @@ + abort(); + } + ++size_t wcsxfrm_l (wchar_t *__s1, __const wchar_t *__s2, ++ size_t __n, locale_t __loc) ++{ ++ printf("%s: Not implemented\n", __func__); ++ abort(); ++} ++ + float wcstof (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr) + { +@@ -83,6 +138,13 @@ + abort(); + } + ++int ++iswblank_l (wint_t __wc, locale_t __locale) ++{ ++ printf("%s: Not implemented\n", __func__); ++ abort(); ++} ++ + int iswctype (wint_t __wc, wctype_t __desc) + { + printf("%s: Not implemented\n", __func__); +@@ -89,6 +151,12 @@ + abort(); + } + ++int iswctype_l (wint_t __wc, wctype_t __desc, locale_t __locale) ++{ ++ printf("%s: Not implemented\n", __func__); ++ abort(); ++} ++ + unsigned long long int wcstoull (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, + int __base) +@@ -116,6 +184,12 @@ + abort(); + } + ++wctype_t wctype_l (__const char *__property, locale_t __locale) ++{ ++ printf("%s: Not implemented\n", __func__); ++ abort(); ++} ++ + wint_t ungetwc(wint_t wc, FILE *stream) + { + printf("%s: Not implemented\n", __func__); diff --git a/arm-riscos-gnueabi/recipes/patches/gccsdk/roinstall-objdump-name.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/roinstall-objdump-name.p new file mode 100644 index 0000000..73a9abe --- /dev/null +++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/roinstall-objdump-name.p @@ -0,0 +1,13 @@ +Index: ro-install +=================================================================== +--- ro-install (revision 7698) ++++ ro-install (working copy) +@@ -72,7 +72,7 @@ + + # Check that static libraries really do contain static objects + if grep -q "\.a\$" <<< $param || grep -q "\.a-static" <<< $param ; then +- if GCCSDK_BIN/arm-unknown-riscos-objdump -p $param | grep -q "position independent"; then ++ if GCCSDK_BIN/arm-riscos-gnueabi-objdump -p $param | grep -q "position independent"; then + echo "RISC OS Cross installer: static archive $param contains position independent code" 1>&2 + exit 1 + fi diff --git a/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-armv4.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-armv4.p new file mode 100644 index 0000000..1343d13 --- /dev/null +++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-armv4.p @@ -0,0 +1,80 @@ +Index: libunixlib/gcccompat/atomics.c +=================================================================== +--- libunixlib/gcccompat/atomics.c (revision 7698) ++++ libunixlib/gcccompat/atomics.c (working copy) +@@ -378,7 +378,7 @@ + ATOMIC_OP_FETCH(or,(*ptr) |= val,unsigned) + ATOMIC_OP_FETCH(nand,(*ptr) = ~((*ptr) & val),unsigned) + +-#ifdef __ARM_EABI__ ++#if defined(__ARM_EABI__) && defined(__ARM_ARCH) && (__ARM_ARCH >= 6) + + static int __cmpxchg (int oldval, int newval, volatile int *ptr) + { +Index: libunixlib/pthread/_ints.s +=================================================================== +--- libunixlib/pthread/_ints.s (revision 7698) ++++ libunixlib/pthread/_ints.s (working copy) +@@ -14,6 +14,15 @@ + .protected __pthread_enable_ints + .global __pthread_protect_unsafe + ++#if defined(__ARM_ARCH) && (__ARM_ARCH__ < 6) ++ /* Modern gas objects to our runtime-conditional use of LDREX/STREX ++ * in here. If we're building for pre-armv6 architectures, tell gas ++ * that to allow armv6 instructions, but mark the resulting object ++ * as armv4 compatible. */ ++ .arch armv6 ++ .object_arch armv4 ++#endif ++ + @ Disable context switches by incrementing the semaphore + @ May be called from USR or SVC mode + NAME __pthread_disable_ints +@@ -23,7 +32,7 @@ + LDR a1, .L0 @ =__ul_global + PICEQ "LDR a1, [a2, a1]" + LDR ip, [a1, #GBL_PTH_CALLEVERY_RMA] +-#ifdef __ARM_EABI__ ++#if defined(__ARM_EABI__) && defined(__ARM_ARCH) && (__ARM_ARCH >= 6) + ADD a1, ip, #PTHREAD_CALLEVERY_RMA_WORKSEMAPHORE + #else + LDR a4, [a1, #GBL_CPU_FLAGS] +@@ -93,7 +102,7 @@ + LDR a4, .L2 @ =__ul_global + PICEQ "LDR a4, [a1, a4]" + LDR ip, [a4, #GBL_PTH_CALLEVERY_RMA] +-#ifdef __ARM_EABI__ ++#if defined(__ARM_EABI__) && defined(__ARM_ARCH) && (__ARM_ARCH >= 6) + ADD a1, ip, #PTHREAD_CALLEVERY_RMA_WORKSEMAPHORE + #else + LDR a2, [a4, #GBL_CPU_FLAGS] +Index: libunixlib/sys/_syslib.s +=================================================================== +--- libunixlib/sys/_syslib.s (revision 7698) ++++ libunixlib/sys/_syslib.s (working copy) +@@ -49,6 +49,15 @@ + .weak __dynamic_da_max_size + .weak __stack_size + ++#if defined(__ARM_ARCH) && (__ARM_ARCH__ < 6) ++ /* Modern gas objects to our runtime-conditional use of LDREX/STREX ++ * in here. If we're building for pre-armv6 architectures, tell gas ++ * that to allow armv6 instructions, but mark the resulting object ++ * as armv4 compatible. */ ++ .arch armv6 ++ .object_arch armv4 ++#endif ++ + @ RMEnsure the minimum version of the SharedUnixLibrary we need. + @ Now check System modules first as UnixLib package is deprecated. + #if !defined(__SOFTFP__) && defined(__VFP_FP__) +@@ -1414,7 +1423,7 @@ + @ we go for a straight OS_Exit scenario. Anything better we + @ can do ? + ADD a3, a4, #GBL_PANIC_MODE +-#ifndef __ARM_EABI__ ++#if !defined(__ARM_EABI__) || !defined(__ARM_ARCH) || (__ARM_ARCH < 6) + LDR a2, [a4, #GBL_CPU_FLAGS] + TST a2, #__CPUCAP_HAVE_SWP + BEQ 0f diff --git a/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-initial-sp.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-initial-sp.p new file mode 100644 index 0000000..f3309c2 --- /dev/null +++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-initial-sp.p @@ -0,0 +1,31 @@ +Index: libunixlib/sys/_syslib.s +=================================================================== +--- libunixlib/sys/_syslib.s (revision 7698) ++++ libunixlib/sys/_syslib.s (working copy) +@@ -396,8 +396,9 @@ + SWI XOS_ReadVarVal @ Read value of progname$HeapMax + BVS t08 + TEQ v1, #1 @ Should be a number variable +- LDREQ v2, [sp], #4 ++ LDREQ v2, [sp] + MOVEQ v2, v2, LSL#20 @ Convert MB into bytes ++ ADD sp, sp, #4 + + @ v2 = size of DA area + t08: +@@ -512,7 +513,15 @@ + MOVCC a1, #ERR_NO_FPE + BCC __exit_with_error_num + #endif ++#else ++#ifdef __ARM_EABI__ ++ @ EABI with software FP. Burn the top of the stack to appease ++ @ ARMEABISupport (which does not consider the stack top address ++ @ as part of the stack). ++ SUB sp, sp, #4 ++ BIC sp, sp, #7 @ AAPCS wants 8 byte alignment + #endif ++#endif + + @ We need to create this now so that we have its address to give to + @ the callback handler, but we can initialise it later. diff --git a/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-no-armv7-memcpy.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-no-armv7-memcpy.p new file mode 100644 index 0000000..c89d6ab --- /dev/null +++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-no-armv7-memcpy.p @@ -0,0 +1,34 @@ +Index: libunixlib/Makefile.am +=================================================================== +--- libunixlib/Makefile.am (revision 7698) ++++ libunixlib/Makefile.am (working copy) +@@ -1002,18 +1002,11 @@ + string/strtok.c \ + string/swab.c \ + string/_strcpy.s +-if ARM_EABI + string_src += \ +- string/_memcpymove-v7l.s \ +- string/_memset-v7l.s \ +- string/_strlen-v7l.s +-else +-string_src += \ + string/_memcpy.s \ + string/_memset.s \ + string/_strlen.s + endif +-endif + string_src += \ + string/memccpy.c \ + string/memchr.c \ +@@ -1029,10 +1022,8 @@ + string/strtok_r.c \ + string/_ffs.s \ + string/_ffsll.s +-if !ARM_EABI + string_src += \ + string/mempcpy.c +-endif + + if UNIXLIB_BUILDING_SCL + sys_src = diff --git a/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-stdtime.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-stdtime.p new file mode 100644 index 0000000..3ad890a --- /dev/null +++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-stdtime.p @@ -0,0 +1,17 @@ +Index: libunixlib/time/stdtime.c +=================================================================== +--- libunixlib/time/stdtime.c (revision 7698) ++++ libunixlib/time/stdtime.c (working copy) +@@ -23,9 +23,11 @@ + register const char *str __asm ("r4") = __str; + register const _kernel_oserror *err __asm ("r0"); + register char *term __asm ("r1"); ++ register size_t left __asm ("r2"); ++ register const char *ostr __asm ("r3"); + __asm__ volatile ("SWI\t%[SWI_Territory_ConvertDateAndTime]\n\t" + "MOVVC\tr0, #0\n\t" +- : "=r" (err), "=r" (term) ++ : "=r" (err), "=r" (term), "=r" (left), "=r" (ostr) + : "r" (territory), "r" (ro_time), "r" (buf), "r" (size), "r" (str), + [SWI_Territory_ConvertDateAndTime] "i" (Territory_ConvertDateAndTime | (1<<17)) + : "r14", "cc", "memory"); diff --git a/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-sync-and-fetch-atomics.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-sync-and-fetch-atomics.p new file mode 100644 index 0000000..f9764ba --- /dev/null +++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-sync-and-fetch-atomics.p @@ -0,0 +1,22 @@ +Index: libunixlib/gcccompat/atomics.c +=================================================================== +--- libunixlib/gcccompat/atomics.c (revision 7698) ++++ libunixlib/gcccompat/atomics.c (working copy) +@@ -146,8 +146,6 @@ + ATOMIC_COMPARE_AND_EXCHANGE(4,uint32_t) + ATOMIC_COMPARE_AND_EXCHANGE(8,uint64_t) + +-#ifndef __ARM_EABI__ +- + /* These built-in functions perform the operation suggested by the name, + * and return the value that had previously been in *ptr. That is, + * +@@ -200,8 +198,6 @@ + SYNC_FETCH_AND_OP(xor,^,8,long long) + SYNC_FETCH_AND_OP(and,&,8,long long) + +-#endif +- + /* These built-in functions perform the operation suggested by the name, + * and return the new value. That is, + * diff --git a/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-unwind.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-unwind.p new file mode 100644 index 0000000..9ff54c9 --- /dev/null +++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/unixlib-unwind.p @@ -0,0 +1,468 @@ +Index: libunixlib/Makefile.am +=================================================================== +--- libunixlib/Makefile.am (revision 7698) ++++ libunixlib/Makefile.am (working copy) +@@ -33,7 +33,7 @@ + # arguments can not be tested for NULL in UnixLib itself. + if ARM_EABI + AM_CFLAGS = -D__GNU_LIBRARY__ -DNO_LONG_DOUBLE -D_GNU_SOURCE=1 \ +- -D__UNIXLIB_NO_NONNULL -std=c99 $(LIBM_FLAGS) ++ -D__UNIXLIB_NO_NONNULL -std=c99 -mpoke-function-name -funwind-tables $(LIBM_FLAGS) + UNIXLIB_CHUNKED_STACK=0 + else + AM_CFLAGS = -D__GNU_LIBRARY__ -DNO_LONG_DOUBLE -D_GNU_SOURCE=1 \ +Index: libunixlib/signal/_signal.s +=================================================================== +--- libunixlib/signal/_signal.s (revision 7698) ++++ libunixlib/signal/_signal.s (working copy) +@@ -352,8 +352,8 @@ + CHGMODE a1, USR_Mode @ Back to USR mode now we have a stack + + #ifdef __ARM_EABI__ +- STMFD sp!, {v1, v3} +- ADD fp, sp, #4 ++ ANDS v2, sp, #7 @ Align stack ++ SUBEQ sp, sp, #4 + #else + ADR v4, __h_error + 4*3 @ Point at handler name for backtrace + STMFD sp!, {v1, v2, v3, v4} @ Setup an APCS-32 stack frame so we +@@ -758,10 +758,9 @@ + SWINE XOS_Byte @ This calls our escape handler + + #ifdef __ARM_EABI__ +- LDR a3, [sp, #14*4 + 4] @ saved USR lr +- LDR a1, [sp, #11*4 + 4] @ saved USR fp +- STMFD sp!, {a1, a3} @ create signal frame +- MOV fp, sp @ FIXME: check this with compiler output for similar function ++ MOV a1, sp @ a1 -> register save block ++ ANDS v2, sp, #7 ++ SUBNE sp, sp, #4 @ align stack to 8 bytes + #else + @ Create an APCS-32 compilant signal stack frame + ADR a4, __h_cback + 4*3 @ point at handler name for backtrace +@@ -796,11 +795,12 @@ + STR a1, [a3, #GBL_EXECUTING_SIGNALHANDLER] + + #ifdef __ARM_EABI__ +- ADD a1, sp, #8 @ Skip signal frame (fp, lr) ++ TEQ v2, #0 ++ ADDNE a1, sp, #4 @ Undo stack alignment + #else + ADD a1, sp, #16 @ Skip signal frame (fp, sp, lr, name ptr) + #endif +- ADD sp, sp, #16+17*4 ++ ADD sp, sp, #17*4 + SWI XOS_EnterOS @ We need to be in SVC mode so reenbling IRQs + @ is atomic with returning to USR mode, + @ otherwise USR sp could be overwitten by +Index: libunixlib/signal/post.c +=================================================================== +--- libunixlib/signal/post.c (revision 7698) ++++ libunixlib/signal/post.c (working copy) +@@ -255,19 +255,230 @@ + fprintf (stderr, "\nTermination signal received: %s\n", sys_siglist[signo]); + } + ++static void ++__write_abort_block (const unsigned int *blk, int is32bit) ++{ ++ const unsigned int pcmask = is32bit ? 0xfffffffcu : 0x03fffffcu; ++ ++ fprintf (stderr, "\n Register dump at %08x:\n", (unsigned int) blk); ++ ++ if (!__valid_address (blk, blk + 17)) ++ fputs ("\n [bad register dump address]\n", stderr); ++ else ++ { ++ const char rnames[] = "a1a2a3a4v1v2v3v4v5v6slfpipsplrpc"; ++ for (int reg = 0; reg < 16; reg++) ++ { ++ if ((reg & 0x3) == 0) ++ fputs ("\n ", stderr); ++ ++ fprintf (stderr, " %c%c: %8x", ++ rnames[2*reg + 0], rnames[2*reg + 1], blk[reg + 1]); ++ } ++ ++ if (is32bit) ++ fprintf (stderr, "\n cpsr: %8x\n", blk[0]); ++ else ++ { ++ const char * const pmode[4] = { "USR", "FIQ", "IRQ", "SVC" }; ++ fprintf (stderr, "\n Mode %s, flags set: %c%c%c%c%c%c\n", ++ pmode[blk[15 + 1] & 3], ++ (blk[15 + 1] & (1<<31)) ? 'N' : 'n', ++ (blk[15 + 1] & (1<<30)) ? 'Z' : 'z', ++ (blk[15 + 1] & (1<<29)) ? 'C' : 'c', ++ (blk[15 + 1] & (1<<28)) ? 'V' : 'v', ++ (blk[15 + 1] & (1<<27)) ? 'I' : 'i', ++ (blk[15 + 1] & (1<<26)) ? 'F' : 'f'); ++ } ++ ++ unsigned int *pc = (unsigned int *) (blk[15 + 1] & pcmask); ++ ++ /* Try LR if PC invalid (e.g. with a prefetch abort). */ ++ if (pc < (unsigned int *)0x8000 || !__valid_address (pc - 5, pc + 4)) ++ pc = (unsigned int *) (blk[14 + 1] & pcmask); ++ ++ if (pc >= (unsigned int *)0x8000 && __valid_address (pc - 5, pc + 4)) ++ { ++ for (unsigned int *diss = pc - 5; diss < pc + 4; diss++) ++ { ++ const char *ins; ++ int length; ++ _swix (Debugger_Disassemble, _INR(0,1) | _OUTR(1,2), ++ *diss, diss, &ins, &length); ++ ++ const unsigned char c[4] = ++ { ++ (*diss >> 0) & 0xFF, ++ (*diss >> 8) & 0xFF, ++ (*diss >> 16) & 0xFF, ++ (*diss >> 24) ++ }; ++ fprintf (stderr, "\n %08x : %c%c%c%c : %08x : ", ++ (unsigned int) diss, ++ (c[0] >= ' ' && c[0] != 127) ? c[0] : '.', ++ (c[1] >= ' ' && c[1] != 127) ? c[1] : '.', ++ (c[2] >= ' ' && c[2] != 127) ? c[2] : '.', ++ (c[3] >= ' ' && c[3] != 127) ? c[3] : '.', ++ *diss); ++ fwrite (ins, length, 1, stderr); ++ } ++ } ++ else ++ fputs ("\n [Disassembly not available]", stderr); ++ } ++ ++ fputs ("\n\n", stderr); ++} ++ + /* Clang and GCC do not have compatible frame pointers. */ + #ifdef __clang__ + #define FP_OFFSET (0) + #define LR_OFFSET (1) +-#elif defined (__ARM_EABI__) +-#define FP_OFFSET (-1) +-#define LR_OFFSET (0) + #else + #define LR_OFFSET (-1) + #define FP_OFFSET (-3) + #endif + ++#ifdef __ARM_EABI__ ++/** ++ * AAPCS does not require the compiler to construct a backtrace structure ++ * in the stack (unlike APCS, which does). This results in FP rarely pointing ++ * at any form of valid stack frame (and, to complicate matters, at the time ++ * of writing, some frames end up with APCS-format frame records, anyway) ++ * which makes it nigh-on impossible to reliably unwind the stack without ++ * additional information). FP is thus often treated as an additional ++ * callee-saved register (i.e. v8) in AAPCS-conformant code. ++ * ++ * Additionally, where frame records are generated, AAPCS has them contain ++ * two entries: previous-FP and LR on entry. There is therefore (unlike APCS) ++ * no way of finding the function entry point from the frame record at all, ++ * even if it did exist. ++ * ++ * So, we cannot trust that FP ever points at a valid stack frame record and ++ * we cannot find function entry points to extract poked function names from. ++ * We can, however, make stack unwinding work if we have some means of ++ * identifying the function in which an arbitrary instruction lies. ++ * ++ * -funwind-tables will result in clang/GCC generating such a data structure, ++ * (an array between __exidx_start and __exidx_end) which will be consulted ++ * by _Unwind_Backtrace() when unwinding the stack. ++ */ ++ ++#include <unwind.h> ++ ++typedef struct { ++ const unsigned int *regs; ++ const unsigned int *last_fn; ++} ul_unwind_ctx; ++ ++static void __attribute__((naked)) ++__do_unwind (_Unwind_Trace_Fn fn, const void *pw) ++{ ++ __asm volatile( ++ "stmfd sp!, {fp, lr};" ++ "add fp, sp, #4;" ++ /* Registers at this point in time will be the initial state. ++ * The trace function must unwind the stack frame we just created ++ * because the personality function will be told there is nothing ++ * to do as we are declared naked. ++ */ ++ "bl _Unwind_Backtrace;" ++ "ldmfd sp!, {fp, pc};" ++ ); ++} ++ ++static _Unwind_Reason_Code ++__write_backtrace_cb (_Unwind_Context *ctx, void *pw) ++{ ++ ul_unwind_ctx *uctx = pw; ++ _Unwind_Control_Block *ucbp = NULL; ++ const unsigned int *fn; ++ ++ ucbp = (_Unwind_Control_Block *) _Unwind_GetGR(ctx, UNWIND_POINTER_REG); ++ fn = (const unsigned int *) ucbp->pr_cache.fnstart; ++ ++ uctx->last_fn = fn; ++ ++ if (fn == (const unsigned int *) __do_unwind) ++ { ++ /* First call */ ++ if (uctx->regs == NULL) ++ { ++ /* Running thread: unwind on behalf of __do_unwind */ ++ _Unwind_VRS_Pop (ctx, _UVRSC_CORE, (1<<11)|(1<<14), _UVRSD_UINT32); ++ } ++ else ++ { ++ /* Thread backtrace: replace entire VRS */ ++ int idx; ++ for (idx = 16; idx > 0; idx--) ++ _Unwind_SetGR (ctx, idx - 1, uctx->regs[idx - 1]); ++ } ++ ++ return _URC_NO_REASON; ++ } ++ ++ fprintf (stderr, " (%8x) fn: %8x pc: %8x sp: %8x ", ++ _Unwind_GetGR (ctx, 11), (unsigned int)fn, _Unwind_GetIP (ctx), ++ _Unwind_GetGR (ctx, 13)); ++ ++#if PIC ++ /* FIXME: extend this with source location when available. */ ++ const char *lib = NULL; ++ unsigned offset; ++ _swix(SOM_Location, ++ _IN(0) | _OUTR(0,1), _Unwind_GetIP (ctx), &lib, &offset); ++ if (lib) ++ fprintf(stderr, " : %8X : %s\n", offset, lib); ++ else ++#endif ++ { ++ int cplusplus_name; ++ const char *name = extract_name (fn, &cplusplus_name); ++ fprintf (stderr, (cplusplus_name) ? " %s\n" : " %s()\n", name); ++ } ++ ++ return _URC_NO_REASON; ++} ++ + static void ++__write_backtrace_thread (const unsigned int *regs) ++{ ++ ul_unwind_ctx ctx; ++ ++ /* First pass: dump trace for stack as provided */ ++ ctx.regs = regs; ++ ctx.last_fn = NULL; ++ __do_unwind (__write_backtrace_cb, &ctx); ++ ++ /* If we got here via an environment handler, there may be a saved abort ++ * block to look at. We only want to look if the first pass terminated with ++ * __unixlib_raise_signal (being the entry point to all this unwind logic ++ * from the environment handlers) -- if the first pass terminated somewhere ++ * else, then it is likely that we have been invoked directly via raise(), ++ * and so the presence or otherwise of an abort block is irrelevant. ++ * ++ * If an abort block is available, it will be pointed at by the ++ * (misnamed for EABI) __ul_callbackfp; if not __ul_callbackfp will be NULL. ++ * Additionally, we only want to consider the abort block if we're dumping ++ * the running thread, so check for regs being NULL to identify that. ++ */ ++ if (__ul_callbackfp != NULL && regs == NULL ++ && ctx.last_fn == (unsigned int *) __unixlib_raise_signal) ++ { ++ /* Abort block: cpsr, r0-r15. */ ++ __write_abort_block (__ul_callbackfp, /* is32bit= */ 1); ++ ++ /* Dump remaining trace from block (skipping over saved CPSR) */ ++ ctx.regs = __ul_callbackfp + 1; ++ ctx.last_fn = NULL; ++ __do_unwind (__write_backtrace_cb, &ctx); ++ } ++ ++ fputc ('\n', stderr); ++} ++#else ++static void + __write_backtrace_thread (const unsigned int *fp) + { + /* Running as USR26 or USR32 ? */ +@@ -306,22 +517,6 @@ + break; + } + +-#ifdef __ARM_EABI__ +- const unsigned int * const lr = (unsigned int *)fp[LR_OFFSET]; +- fprintf (stderr, " (%8x) lr: %8x", +- (unsigned int)fp, (unsigned int)lr); +-#if PIC +- /* FIXME: extend this with source location when available. */ +- const char *lib = NULL; +- unsigned offset; +- _swix(SOM_Location, +- _IN(0) | _OUTR(0,1), lr, &lib, &offset); +- if (lib) +- fprintf(stderr, " : %8X : %s\n", offset, lib); +- else +-#endif +- fputc('\n', stderr); +-#else + /* Retrieve PC counter. + PC counter has been saved using STMxx ..., { ..., PC } so it can be + 8 or 12 bytes away from the STMxx instruction depending on the ARM +@@ -347,96 +542,24 @@ + int cplusplus_name; + const char *name = extract_name (pc, &cplusplus_name); + fprintf (stderr, (cplusplus_name) ? " %s\n" : " %s()\n", name); +-#endif ++ + oldfp = fp; + fp = (const unsigned int *)fp[FP_OFFSET]; +-#ifndef __ARM_EABI__ + if (__ul_callbackfp != NULL && fp == __ul_callbackfp) + { + /* At &oldfp[1] = cpsr, a1-a4, v1-v6, sl, fp, ip, sp, lr, pc */ +- fprintf (stderr, "\n Register dump at %08x:\n", +- (unsigned int) &oldfp[1]); +- +- if (!__valid_address (oldfp + 1, oldfp + 18)) +- fputs ("\n [bad register dump address]\n", stderr); +- else +- { +- const char rnames[] = "a1a2a3a4v1v2v3v4v5v6slfpipsplrpc"; +- for (int reg = 0; reg < 16; reg++) +- { +- if ((reg & 0x3) == 0) +- fputs ("\n ", stderr); +- +- fprintf (stderr, " %c%c: %8x", +- rnames[2*reg + 0], rnames[2*reg + 1], oldfp[reg + 2]); +- } +- +- if (is32bit) +- fprintf (stderr, "\n cpsr: %8x\n", oldfp[1]); +- else +- { +- const char * const pmode[4] = { "USR", "FIQ", "IRQ", "SVC" }; +- fprintf (stderr, "\n Mode %s, flags set: %c%c%c%c%c%c\n", +- pmode[oldfp[15 + 2] & 3], +- (oldfp[15 + 2] & (1<<31)) ? 'N' : 'n', +- (oldfp[15 + 2] & (1<<30)) ? 'Z' : 'z', +- (oldfp[15 + 2] & (1<<29)) ? 'C' : 'c', +- (oldfp[15 + 2] & (1<<28)) ? 'V' : 'v', +- (oldfp[15 + 2] & (1<<27)) ? 'I' : 'i', +- (oldfp[15 + 2] & (1<<26)) ? 'F' : 'f'); +- } +- +- pc = (unsigned int *) (oldfp[17] & pcmask); +- +- /* Try LR if PC invalid (e.g. with a prefetch abort). */ +- if (pc < (unsigned int *)0x8000 || !__valid_address (pc - 5, pc + 4)) +- pc = (unsigned int *) (oldfp[16] & pcmask); +- +- if (pc >= (unsigned int *)0x8000 && __valid_address (pc - 5, pc + 4)) +- { +- for (unsigned int *diss = pc - 5; diss < pc + 4; diss++) +- { +- const char *ins; +- int length; +- _swix (Debugger_Disassemble, _INR(0,1) | _OUTR(1,2), +- *diss, diss, &ins, &length); +- +- const unsigned char c[4] = +- { +- (*diss >> 0) & 0xFF, +- (*diss >> 8) & 0xFF, +- (*diss >> 16) & 0xFF, +- (*diss >> 24) +- }; +- fprintf (stderr, "\n %08x : %c%c%c%c : %08x : ", +- (unsigned int) diss, +- (c[0] >= ' ' && c[0] != 127) ? c[0] : '.', +- (c[1] >= ' ' && c[1] != 127) ? c[1] : '.', +- (c[2] >= ' ' && c[2] != 127) ? c[2] : '.', +- (c[3] >= ' ' && c[3] != 127) ? c[3] : '.', +- *diss); +- fwrite (ins, length, 1, stderr); +- } +- } +- else +- fputs ("\n [Disassembly not available]", stderr); +- } +- +- fputs ("\n\n", stderr); ++ __write_abort_block (&oldfp[1], is32bit); + } +-#endif + } + + fputc ('\n', stderr); + } ++#endif + +- + void + __write_backtrace (int signo) + { +-#ifdef __ARM_EABI__ +- register const unsigned int *fp = __builtin_frame_address(0); +-#else ++#ifndef __ARM_EABI__ + register const unsigned int *fp __asm ("fp"); + #endif + +@@ -485,7 +608,11 @@ + /* Dump first the details of the current thread. */ + fprintf (stderr, "Stack backtrace:\n\nRunning thread %p (%s)\n", + __pthread_running_thread, __pthread_running_thread->name); ++#ifdef __ARM_EABI__ ++ __write_backtrace_thread (NULL); ++#else + __write_backtrace_thread (fp); ++#endif + + /* And then the other suspended threads if any. */ + for (pthread_t th = __pthread_thread_list; th != NULL; th = th->next) +@@ -494,7 +621,10 @@ + continue; + + fprintf (stderr, "\nThread %p (%s)\n", th, th->name); +-#ifdef __clang__ ++#ifdef __ARM_EABI__ ++ __write_backtrace_thread (&th->saved_context->r[0]); ++#else ++# ifdef __clang__ + const unsigned int fakestackframe[] = + { + (unsigned int)th->saved_context->r[11], +@@ -501,22 +631,16 @@ + (unsigned int)th->saved_context->r[14] + }; + __write_backtrace_thread (&fakestackframe[0]); +-#elif defined (__ARM_EABI__) ++# else + const unsigned int fakestackframe[] = + { + (unsigned int)th->saved_context->r[11], +- (unsigned int)th->saved_context->r[14] +- }; +- __write_backtrace_thread (&fakestackframe[1]); +-#else +- const unsigned int fakestackframe[] = +- { +- (unsigned int)th->saved_context->r[11], + (unsigned int)th->saved_context->r[13], + (unsigned int)th->saved_context->r[14], + (unsigned int)th->saved_context->r[15] + }; + __write_backtrace_thread (&fakestackframe[3]); ++# endif + #endif + } + } diff --git a/arm-riscos-gnueabi/recipes/patches/infozip/globals.p b/arm-riscos-gnueabi/recipes/patches/infozip/globals.p new file mode 100644 index 0000000..c10adfa --- /dev/null +++ b/arm-riscos-gnueabi/recipes/patches/infozip/globals.p @@ -0,0 +1,13 @@ +--- globals.c.orig 2005-03-20 12:32:02.000000000 -0800 ++++ globals.c 2008-01-12 22:45:07.000000000 -0800 +@@ -30,6 +30,10 @@ + int pathput = 1; /* 1=store path with name */ + #ifdef RISCOS + int scanimage = 1; /* 1=scan through image files */ ++#else ++#ifdef FORRISCOS ++int decomma = 0; ++#endif + #endif + int method = BEST; /* one of BEST, DEFLATE (only), or STORE (only) */ + int dosify = 0; /* 1=make new entries look like MSDOS */ diff --git a/arm-riscos-gnueabi/recipes/patches/infozip/zip.p b/arm-riscos-gnueabi/recipes/patches/infozip/zip.p new file mode 100644 index 0000000..aee2b24 --- /dev/null +++ b/arm-riscos-gnueabi/recipes/patches/infozip/zip.p @@ -0,0 +1,58 @@ +--- zip.c.orig 2009-05-07 11:54:09.000000000 +0100 ++++ zip.c 2009-05-07 11:53:08.000000000 +0100 +@@ -668,6 +668,9 @@ + ," -h2 show more help -I don't scan thru Image files" + #else + ," -h2 show more help" ++#ifdef FORRISCOS ++," -, strip ,xxx from filename and convert to RISCOS filetype encoding" ++#endif + #endif + #endif /* ?MACOS */ + #ifdef VMS +@@ -1144,6 +1147,9 @@ + #if CRYPT && defined(PASSWD_FROM_STDIN) + "PASSWD_FROM_STDIN", + #endif /* CRYPT & PASSWD_FROM_STDIN */ ++#ifdef FORRISCOS ++ "FORRISCOS", ++#endif + NULL + }; + +@@ -2109,6 +2115,9 @@ + #ifdef RISCOS + {"/", "exts-to-swap", o_REQUIRED_VALUE, o_NOT_NEGATABLE, '/', "override Zip$Exts"}, + #endif ++#ifdef FORRISCOS ++ {",", "strip-type", o_NO_VALUE, o_NOT_NEGATABLE, ',', "strip ,xxx extension"}, ++#endif + /* the end of the list */ + {NULL, NULL, o_NO_VALUE, o_NOT_NEGATABLE, 0, NULL} /* end has option_ID = 0 */ + }; +@@ -2847,6 +2856,12 @@ + case 'I': /* Don't scan through Image files */ + scanimage = 0; + break; ++#else ++#ifdef FORRISCOS ++ case ',': /* Convert ,xxx to RISC OS extended filetype info */ ++ decomma = 1; ++ break; ++#endif + #endif + #ifdef MACOS + case o_jj: /* store absolute path including volname */ +--- zip.h.org 2008-01-12 22:56:51.000000000 -0800 ++++ zip.h 2008-01-12 23:00:05.000000000 -0800 +@@ -323,6 +323,10 @@ + + #ifdef RISCOS + extern int scanimage; /* Scan through image files */ ++#else ++#ifdef FORRISCOS ++extern int decomma; /* Convert ,xxx filename to RISC OS filetype info */ ++#endif + #endif + + #define BEST -1 /* Use best method (deflation or store) */ diff --git a/arm-riscos-gnueabi/recipes/patches/infozip/zipup.p b/arm-riscos-gnueabi/recipes/patches/infozip/zipup.p new file mode 100644 index 0000000..f4d43d0 --- /dev/null +++ b/arm-riscos-gnueabi/recipes/patches/infozip/zipup.p @@ -0,0 +1,162 @@ +--- zipup.c.orig 2008-01-12 22:29:14.000000000 -0800 ++++ zipup.c 2008-01-12 22:36:00.000000000 -0800 +@@ -139,6 +139,9 @@ + #else + local int filetypes OF((char *, char *)); + #endif ++#ifdef FORRISCOS ++ local int set_extra_field_forriscos OF((struct zlist far *z, iztimes *z_utim)); ++#endif + local unsigned file_read OF((char *buf, unsigned size)); + #ifdef USE_ZLIB + local int zl_deflate_init OF((int pack_level)); +@@ -379,7 +382,133 @@ + } + #endif /* ?RISCOS */ + ++#ifdef FORRISCOS ++ ++int set_extra_field_forriscos(z, z_utim) ++ struct zlist far *z; ++ iztimes *z_utim; ++{ ++#ifdef USE_EF_UT_TIME ++ char *eb_ptr; ++#endif /* USE_EF_UT_TIME */ ++ char *cptr; ++ char *extra_block; ++ unsigned int addr; ++ unsigned int ftype = 0xfff; /* Untyped files default to 'text' */ ++ unsigned timlo; /* 3 lower bytes of acorn file-time plus carry byte */ ++ unsigned timhi; /* 2 high bytes of acorn file-time */ ++ ++#define EB_SPARK_LEN 20 ++#define EB_SPARK_SIZE (EB_HEADSIZE+EB_SPARK_LEN) ++#ifdef USE_EF_UT_TIME ++# ifdef IZ_CHECK_TZ ++# define EB_UTTIME_SIZE (zp_tz_is_valid ? EB_HEADSIZE+EB_UT_LEN(1) : 0) ++# else ++# define EB_UTTIME_SIZE (EB_HEADSIZE+EB_UT_LEN(1)) ++# endif ++#else ++# define EB_UTTIME_SIZE 0 ++#endif ++#define EF_SPARK_TOTALSIZE (EB_SPARK_SIZE + EB_UTTIME_SIZE) ++ ++ cptr=strrchr(z->iname, (int) ','); ++ if (cptr) ++ if ((cptr - z->iname) != (int)(strlen(z->iname)-4)) ++ cptr = NULL; /* There was a comma, but it wasn't a ,xxx at the end! */ ++ ++ if (cptr) ++ { ++ *cptr='\0'; /* Chop the filename at the comma */ ++ ++ ftype = strtol(cptr+1, NULL, 16); /* read the ,xxx as hex filetype */ ++ } ++ else ++ { ++ /* When there is no given filetype, but there is a full stop in the name, ++ then it is better to let the unzip utility in RISC OS do a MimeMap lookup ++ instead, and therefore do nothing here */ ++ if (strchr(z->iname, '.')) ++ return ZE_OK; ++ } ++ ++ z->extra=(char *)malloc(EF_SPARK_TOTALSIZE); ++ if (z->extra==NULL) { ++ fprintf(stderr," set_extra_field_forriscos: not enough memory\n"); ++ return ZE_MEM; ++ } ++ z->cextra = z->extra; ++ z->cext = z->ext = EF_SPARK_TOTALSIZE; ++ ++ timlo = ((unsigned)z_utim->mtime & 0x00ffffffU) * 100 + 0x00996a00U; ++ timhi = ((unsigned)z_utim->mtime >> 24); ++ timhi = timhi * 100 + 0x0000336eU + (timlo >> 24); ++ ++ extra_block=z->extra; ++ /* ID */ ++ extra_block[0]='A'; ++ extra_block[1]='C'; ++ ++ /* size */ ++ extra_block[2]=(char)(EB_SPARK_LEN); ++ extra_block[3]=(char)(EB_SPARK_LEN)>>8; ++ ++ /* ID_2 */ ++ extra_block[4]='A'; ++ extra_block[5]='R'; ++ extra_block[6]='C'; ++ extra_block[7]='0'; ++ ++ /* Load address */ ++ addr=0xfff00000 | (ftype << 8); /* This file is typed, and has filetype 'ftype' */ ++ addr|= ((timhi >> 8) & 0xffU); ++ extra_block[8]=(char)(addr); ++ extra_block[9]=(char)(addr>>8); ++ extra_block[10]=(char)(addr>>16); ++ extra_block[11]=(char)(addr>>24); ++ ++ /* Exec address */ ++ addr=(timlo & 0x00ffffffU) | ((timhi & 0x000000ffU) << 24); ++ extra_block[12]=(char)(addr); ++ extra_block[13]=(char)(addr>>8); ++ extra_block[14]=(char)(addr>>16); ++ extra_block[15]=(char)(addr>>24); ++ ++ /* Attributes */ ++ extra_block[16]=0x13; /* Private read/write, no public access, unlocked */ ++ extra_block[17]=0; ++ extra_block[18]=0; ++ extra_block[19]=0; ++ ++ /* Zero */ ++ extra_block[20]=0; ++ extra_block[21]=0; ++ extra_block[22]=0; ++ extra_block[23]=0; ++ ++#ifdef USE_EF_UT_TIME ++# ifdef IZ_CHECK_TZ ++ if (zp_tz_is_valid) { ++# endif ++ eb_ptr = z->extra + EB_SPARK_SIZE; ++ ++ eb_ptr[0] = 'U'; ++ eb_ptr[1] = 'T'; ++ eb_ptr[2] = EB_UT_LEN(1); /* length of data part of e.f. */ ++ eb_ptr[3] = 0; ++ eb_ptr[4] = EB_UT_FL_MTIME; ++ eb_ptr[5] = (char)(z_utim->mtime); ++ eb_ptr[6] = (char)(z_utim->mtime >> 8); ++ eb_ptr[7] = (char)(z_utim->mtime >> 16); ++ eb_ptr[8] = (char)(z_utim->mtime >> 24); ++# ifdef IZ_CHECK_TZ ++ } ++# endif ++#endif /* USE_EF_UT_TIME */ ++ ++ return ZE_OK; ++} + ++#endif /* FORRISCOS */ + + /* Note: a zip "entry" includes a local header (which includes the file + name), an encryption header if encrypting, the compressed data +@@ -552,6 +681,15 @@ + #if !(defined(VMS) && defined(VMS_PK_EXTRA)) + if (extra_fields) { + /* create extra field and change z->att and z->atx if desired */ ++#ifdef FORRISCOS ++ if (decomma) ++ { ++ /* If we're making a zip for RISC OS, we don't bother with any other */ ++ /* OS-Specific info (although we could - but there's no point!) */ ++ set_extra_field_forriscos(z, &f_utim); ++ } ++ else ++#endif + set_extra_field(z, &f_utim); + # ifdef QLZIP + if(qlflag) diff --git a/arm-riscos-gnueabi/recipes/patches/oslib/buildsystem-elfeabi.p b/arm-riscos-gnueabi/recipes/patches/oslib/buildsystem-elfeabi.p new file mode 100644 index 0000000..83bd862 --- /dev/null +++ b/arm-riscos-gnueabi/recipes/patches/oslib/buildsystem-elfeabi.p @@ -0,0 +1,144 @@ +Index: Source/Makefile +=================================================================== +--- Source/Makefile (revision 477) ++++ Source/Makefile (working copy) +@@ -3,8 +3,8 @@ + # already be built upfront. + # Written by OSLib Development Team. + +-# Build type: CROSSGCC_AOF, CROSSGCC_ELF (default), [NORCROFT_AOF: not +-# supported yet] ++# Build type: CROSSGCC_AOF, CROSSGCC_ELF (default), CROSSGCC_ELFEABI, ++# [NORCROFT_AOF: not supported yet] + export BUILDTYPE ?= CROSSGCC_ELF + # Possible values: "SOFTFPU" (e.g. for UnixLib usage), "HARDFPU" (e.g. for + # SharedCLibrary usage) and "MODULE" (latter also meaning HARDFPU but the +@@ -12,9 +12,10 @@ + export ELFOBJECTTYPE ?= SOFTFPU + + ifeq ($(BUILDTYPE),CROSSGCC_ELF) ++else ifeq ($(BUILDTYPE),CROSSGCC_ELFEABI) + else ifeq ($(BUILDTYPE),CROSSGCC_AOF) + else +-$(error Unknown BUILDTYPE value, possible values are CROSSGCC_AOF and CROSSGCC_ELF) ++$(error Unknown BUILDTYPE value, possible values are CROSSGCC_AOF, CROSSGCC_ELF, and CROSSGCC_ELFEABI) + endif + include Makefile.setup.$(BUILDTYPE) + +Index: Source/Makefile.inc +=================================================================== +--- Source/Makefile.inc (revision 477) ++++ Source/Makefile.inc (working copy) +@@ -65,6 +65,9 @@ + ifeq ($(BUILDTYPE),CROSSGCC_ELF) + .ELFHdr.Hdr: + if [ -s "$<" ]; then $(CP) $< $@; fi ++else ifeq ($(BUILDTYPE),CROSSGCC_ELFEABI) ++.ELFHdr.Hdr: ++ if [ -s "$<" ]; then $(CP) $< $@; fi + else + .AOFHdr.Hdr: + if [ -s "$<" ]; then $(CP) $< $@; fi +@@ -98,6 +101,9 @@ + ifeq ($(BUILDTYPE),CROSSGCC_ELF) + .gas.o: + $(AS) -o $@ $< ++else ifeq ($(BUILDTYPE),CROSSGCC_ELFEABI) ++.gas.o: ++ $(AS) -o $@ $< + else + .asm.o: + $(AS) -o $@ $< +Index: Source/Makefile.setup.CROSSGCC_ELFEABI +=================================================================== +--- Source/Makefile.setup.CROSSGCC_ELFEABI (nonexistent) ++++ Source/Makefile.setup.CROSSGCC_ELFEABI (working copy) +@@ -0,0 +1,62 @@ ++# Settings for ELF building ++ ++ifndef GCCSDK_INSTALL_CROSSBIN ++$(error Environment variable GCCSDK_INSTALL_CROSSBIN is not defined) ++endif ++ifndef GCCSDK_INSTALL_ENV ++$(error Environment variable GCCSDK_INSTALL_ENV is not defined) ++endif ++ ++ifeq ($(ELFOBJECTTYPE),SOFTFPU) ++CCFLAGS = -mfloat-abi=soft ++DEFMODFLAGS = -float-abi soft ++else ifeq ($(ELFOBJECTTYPE),HARDFPU) ++CCFLAGS = -mlibscl ++DEFMODFLAGS = -float-abi hard ++else ifeq ($(ELFOBJECTTYPE),MODULE) ++CCFLAGS = -mmodule ++DEFMODFLAGS = -float-abi hard ++else ++$(error Unknown ELFOBJECTTYPE value, possible values are SOFTFPU, HARDFPU and MODULE) ++endif ++ ++export SOURCEDIR := $(abspath .) ++export BINDIR := $(SOURCEDIR)/../Bin ++export BUILDDIR := $(SOURCEDIR)/../Build ++export RELEASEDIR := $(SOURCEDIR)/../Release ++export RELEASEBINDIR := $(SOURCEDIR)/../Release/$(BUILDTYPE)/$(ELFOBJECTTYPE) ++export EXAMPLESDIR := $(SOURCEDIR)/../examples ++export DOCSDIR := $(SOURCEDIR)/../docs ++ ++export TOPHEADERDIR := $(BUILDDIR)/Header ++export HEADERDIR := $(TOPHEADERDIR)/oslib ++export CSTRONGDIR := $(BUILDDIR)/CStrong ++export VAPIDIR := $(BUILDDIR)/\!Vala/vapi ++export VAPIHDIR := $(BUILDDIR)/vapih ++export OBJDIR := $(BUILDDIR)/Objs ++export OBJEXCEPTDIR := $(BUILDDIR)/Objs/Exceptions ++export OSLIBSUPPORTDIR := $(BUILDDIR)/OSLibSupport ++ ++export BYTEWIDE := $(SOURCEDIR)/ByteWide ++export DEFMOD := $(BINDIR)/defmod -asmtype gccelfeabi $(DEFMODFLAGS) ++export REDUCEAOF := @echo Not needed for ELF build: reduceaof ++export BINDHELP := $(BINDIR)/bindhelp ++ ++export PATH := $(GCCSDK_INSTALL_CROSSBIN):$(PATH) ++ ++export CC := arm-riscos-gnueabi-gcc $(CCFLAGS) ++export CXX := arm-riscos-gnueabi-g++ $(CCFLAGS) ++export AS := arm-riscos-gnueabi-gcc -c -xassembler-with-cpp $(CCFLAGS) -I.. -I$(SOURCEDIR)/Types ++export LIBFILE := arm-riscos-gnueabi-ar rs ++export MKDIR := mkdir -p ++export RM := rm -rf ++export CP := cp -r ++export INSTALL := $(GCCSDK_INSTALL_ENV)/ro-install ++ ++export ASMEXT := .gas ++export EXEEXT := ,e1f ++export LIBSUFFIX := a ++ ++export OSLIBLIB := $(BUILDDIR)/libOSLib32.$(LIBSUFFIX) ++export OSLIBSUPPORTLIB := $(OSLIBSUPPORTDIR)/libOSLibSupport32.$(LIBSUFFIX) ++export OSLIBCSTRONG := $(BUILDDIR)/OSLib,3d6 +Index: Makefile +=================================================================== +--- Makefile (revision 477) ++++ Makefile (working copy) +@@ -29,6 +29,10 @@ + install-elf: oslib-elf + $(MAKE) -C Source install BUILDTYPE=CROSSGCC_ELF + ++# Installs the ELF headers & library in GCCSDK environment. ++install-elfeabi: oslib-elfeabi ++ $(MAKE) -C Source install BUILDTYPE=CROSSGCC_ELFEABI ++ + # Installs the AOF headers & library in GCCSDK environment. + install-aof: oslib-aof + $(MAKE) -C Source install BUILDTYPE=CROSSGCC_AOF +@@ -49,6 +53,10 @@ + $(MAKE) -C Source oslib BUILDTYPE=CROSSGCC_ELF + $(MAKE) -C Source oslibsupport BUILDTYPE=CROSSGCC_ELF + ++oslib-elfeabi: tools ++ $(MAKE) -C Source oslib BUILDTYPE=CROSSGCC_ELFEABI ++ $(MAKE) -C Source oslibsupport BUILDTYPE=CROSSGCC_ELFEABI ++ + vapis: tools + $(MAKE) -C Source vapis BUILDTYPE=CROSSGCC_ELF + diff --git a/arm-riscos-gnueabi/recipes/patches/oslib/defmod-elfeabi.p b/arm-riscos-gnueabi/recipes/patches/oslib/defmod-elfeabi.p new file mode 100644 index 0000000..eadeb6d --- /dev/null +++ b/arm-riscos-gnueabi/recipes/patches/oslib/defmod-elfeabi.p @@ -0,0 +1,84 @@ +Index: Tools/DefMod2/assembler.c +=================================================================== +--- Tools/DefMod2/assembler.c (revision 477) ++++ Tools/DefMod2/assembler.c (working copy) +@@ -1242,6 +1242,21 @@ + goto finish; + break; + } ++ case AsmType_eGCCELFEABI: ++ { ++ const char *floatABI = (FloatABI == FloatABI_eSoft) ? "soft" : "hard"; ++ if (!apcs32) ++ { ++ fprintf(stderr, "EABI does not support APCS-26."); ++ goto finish; ++ } ++ if ((rc = sprintf (cmd, ++ "arm-riscos-gnueabi-gcc -c -xassembler -mfloat-abi=%s -o %s %s", ++ floatABI, ++ name2, name1)) < 0) ++ goto finish; ++ break; ++ } + default: + fprintf (stderr, "Unknown assembler type\n"); + goto finish; +Index: Tools/DefMod2/assembler.h +=================================================================== +--- Tools/DefMod2/assembler.h (revision 477) ++++ Tools/DefMod2/assembler.h (working copy) +@@ -22,8 +22,9 @@ + AsmType_eGCCAOF, /* Assembler used in GCCSDK 3.4 (AOF) release, called + 'as' (predecessor of AsAsm). */ + AsmType_eARMASM, /* ARM's assembler. */ +- AsmType_eGCCELF /* Assembler used in GCCSDK 4 (ELF) release, called ++ AsmType_eGCCELF, /* Assembler used in GCCSDK 4 (ELF) release, called + 'gas' (GNU binutils assembler). */ ++ AsmType_eGCCELFEABI /* Assembler used in EABI-capable GCCSDK */ + } AsmType_e; + + typedef enum +@@ -37,7 +38,7 @@ + extern AsmType_e AsmType; + extern FloatABI_e FloatABI; + +-#define GASSyntax (AsmType == AsmType_eGCCELF) ++#define GASSyntax (AsmType == AsmType_eGCCELF || AsmType == AsmType_eGCCELFEABI) + + /*if |separate|, output is to the directory |output|; otherwise, to the file |file|.*/ + extern os_error *assembler_output (FILE *file, const char *title, const char *author, lookup_t types, lookup_t swis, osbool separate, osbool apcs32, char *output); +Index: Tools/DefMod2/defmod.y +=================================================================== +--- Tools/DefMod2/defmod.y (revision 477) ++++ Tools/DefMod2/defmod.y (working copy) +@@ -1179,7 +1179,7 @@ + "[-o <output-dir> | > <output-file>] " + "[-byte_wide <byte-wide-file>] " + "[-26bit | -32bit] " +- "[-asmtype [objasm | asasmaof | asasmelf | gccaof | armasm | gccelf]] " ++ "[-asmtype [objasm | asasmaof | asasmelf | gccaof | armasm | gccelf | gccelfeabi]] " + "[-float-abi [soft | hard]] " + "< <module-interface-file>\r" + "Purpose: generate output from a module interface file\r" +@@ -1203,6 +1203,7 @@ + "\tgccaof\t\t" "...use GCC AOF toolkit (GCCSDK 3.4 only)\r" + "\tarmasm\t\t" "...use ARM ASM\r" + "\tgccelf\t\t" "...use GCC ELF toolkit (GCCSDK 4 only)\r" ++ "\tgccelfeabi\t\t" "...use GCC EABI ELF toolkit (GCCSDK 8+ only)\r" + "-float-abi\t\t" "marks object files which float-abi is in use\r" + "\tsoft\t\t" "...soft-float, no FP instructions used\r" + "\thard\t\t" "...hard-float, FP instructions can be used\r" +@@ -1345,9 +1346,11 @@ + AsmType = AsmType_eARMASM; + else if (strcmp (argv[i], "gccelf") == 0) + AsmType = AsmType_eGCCELF; ++ else if (strcmp (argv[i], "gccelfeabi") == 0) ++ AsmType = AsmType_eGCCELFEABI; + else + { +- fprintf (stderr, "Unknown option value %s for -asmtype (only \"objasm\", \"asasmaof\", \"asasmelf\", \"armarm\", \"gccaof\" and \"gccelf\" are known)\n", argv[i]); ++ fprintf (stderr, "Unknown option value %s for -asmtype (only \"objasm\", \"asasmaof\", \"asasmelf\", \"armarm\", \"gccaof\", \"gccelf\" and \"gccelfeabi\" are known)\n", argv[i]); + Parse_Error = TRUE; + goto finish; + } diff --git a/arm-riscos-gnueabi/recipes/patches/oslib/vapi.p b/arm-riscos-gnueabi/recipes/patches/oslib/vapi.p new file mode 100644 index 0000000..a3daf40 --- /dev/null +++ b/arm-riscos-gnueabi/recipes/patches/oslib/vapi.p @@ -0,0 +1,10 @@ +--- Tools/DefMod2/vapi.c.orig 2017-09-19 11:57:15.559547484 +0100 ++++ Tools/DefMod2/vapi.c 2017-09-19 11:57:31.067750029 +0100 +@@ -23,6 +23,7 @@ + #include <stdio.h> + #include <string.h> + #include <ctype.h> ++#include <stdbool.h> + + #include "oslib/os.h" + diff --git a/arm-unknown-riscos/Makefile b/arm-unknown-riscos/Makefile index 052a414..60b08a7 100644 --- a/arm-unknown-riscos/Makefile +++ b/arm-unknown-riscos/Makefile @@ -1,32 +1,32 @@ # Use a tested trunk version of GCCSDK -UPSTREAM_GCCSDK_TARBALL := gcc4 -UPSTREAM_GCCSDK_VERSION := release_4_7_4_v2 +UPSTREAM_GCCSDK_VERSION := release_4_7_4_v6 +UPSTREAM_GCCSDK_TARBALL := gcc4$(UPSTREAM_GCCSDK_VERSION).tar.gz UPSTREAM_GCCSDK_URI := svn://svn.riscos.info/gccsdk/tags/$(UPSTREAM_GCCSDK_VERSION) # OSLib 7.00 -UPSTREAM_OSLIB_VERSION := oslib-700 -UPSTREAM_OSLIB_TARBALL := oslib -UPSTREAM_OSLIB_URI := https://svn.code.sf.net/p/ro-oslib/code/tags/$(UPSTREAM_OSLIB_VERSION)/!OSLib +UPSTREAM_OSLIB_VERSION := 700 +UPSTREAM_OSLIB_TARBALL := oslib$(UPSTREAM_OSLIB_VERSION).tar.gz +UPSTREAM_OSLIB_URI := https://svn.code.sf.net/p/ro-oslib/code/tags/oslib-$(UPSTREAM_OSLIB_VERSION)/!OSLib # Known tested version of trunk for CCRes UPSTREAM_CCRES_VERSION := 96 -UPSTREAM_CCRES_TARBALL := ccres +UPSTREAM_CCRES_TARBALL := ccres$(UPSTREAM_CCRES_VERSION).tar.gz UPSTREAM_CCRES_URI := svn://svn.riscos.info/ccres/trunk@$(UPSTREAM_CCRES_VERSION) # Makerun -UPSTREAM_MAKERUN_VERSION := unused -UPSTREAM_MAKERUN_TARBALL := makerun +UPSTREAM_MAKERUN_VERSION := fe55b6bf +UPSTREAM_MAKERUN_TARBALL := makerun$(UPSTREAM_MAKERUN_VERSION).tar.gz UPSTREAM_MAKERUN_URI := git://git.netsurf-browser.org/makerun.git # Squeeze -UPSTREAM_SQUEEZE_VERSION := unused -UPSTREAM_SQUEEZE_TARBALL := squeeze +UPSTREAM_SQUEEZE_VERSION := f26ccd6 +UPSTREAM_SQUEEZE_TARBALL := squeeze$(UPSTREAM_SQUEEZE_VERSION).tar.gz UPSTREAM_SQUEEZE_URI := git://git.netsurf-browser.org/squeeze.git # Infozip UPSTREAM_INFOZIP_VERSION := 30 UPSTREAM_INFOZIP_TARBALL := zip$(UPSTREAM_INFOZIP_VERSION).tar.gz -UPSTREAM_INFOZIP_URI := http://downloads.sourceforge.net/project/infozip/Zip%203.x%20%28latest%29/3.0/$(UPSTREAM_INFOZIP_TARBALL) +UPSTREAM_INFOZIP_URI := https://downloads.sourceforge.net/project/infozip/Zip%203.x%20%28latest%29/3.0/$(UPSTREAM_INFOZIP_TARBALL) TOP := $(CURDIR) RECIPES := $(TOP)/recipes @@ -38,6 +38,9 @@ TARGET_NAME := arm-unknown-riscos PREFIX ?= /opt/netsurf/$(TARGET_NAME) +# tools +FETCHSRC:=$(CURDIR)/fetchsrc + .PHONY: all clean distclean all: $(BUILDSTEPS)/toolchain.d @@ -59,7 +62,7 @@ $(BUILDSTEPS)/toolchain.d: $(BUILDSTEPS)/ccres.d $(BUILDSTEPS)/makerun.d $(BUILD ### $(BUILDSTEPS)/infozip.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_INFOZIP_TARBALL) - tar -C $(BUILDDIR) -xzf $(SOURCESDIR)/$(UPSTREAM_INFOZIP_TARBALL) + tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_INFOZIP_TARBALL) for p in `ls $(RECIPES)/patches/infozip/*.p` ; do patch -d $(BUILDDIR)/zip$(UPSTREAM_INFOZIP_VERSION) -p0 <$$p ; done cd $(BUILDDIR)/zip$(UPSTREAM_INFOZIP_VERSION) && make -f unix/Makefile generic LOCAL_ZIP=-DFORRISCOS cp $(BUILDDIR)/zip$(UPSTREAM_INFOZIP_VERSION)/zip $(PREFIX)/cross/bin/zip @@ -73,7 +76,7 @@ $(BUILDSTEPS)/infozip.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_INFOZIP_TA ### $(BUILDSTEPS)/makerun.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TARBALL) - cp -r $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TARBALL) $(BUILDDIR)/makerun + tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TARBALL) cd $(BUILDDIR)/makerun && GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install touch $@ @@ -82,7 +85,7 @@ $(BUILDSTEPS)/makerun.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TA ### $(BUILDSTEPS)/squeeze.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TARBALL) - cp -r $(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TARBALL) $(BUILDDIR)/squeeze + tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TARBALL) cd $(BUILDDIR)/squeeze && GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install touch $@ @@ -91,7 +94,7 @@ $(BUILDSTEPS)/squeeze.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TA ### $(BUILDSTEPS)/ccres.d: $(BUILDSTEPS)/oslib.d $(SOURCESDIR)/$(UPSTREAM_CCRES_TARBALL) - cp -r $(SOURCESDIR)/$(UPSTREAM_CCRES_TARBALL) $(BUILDDIR)/ccres + tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_CCRES_TARBALL) cd $(BUILDDIR)/ccres && GCCSDK_INSTALL_ENV=$(PREFIX)/env GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make cd $(BUILDDIR)/ccres && GCCSDK_INSTALL_ENV=$(PREFIX)/env GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install touch $@ @@ -101,7 +104,7 @@ $(BUILDSTEPS)/ccres.d: $(BUILDSTEPS)/oslib.d $(SOURCESDIR)/$(UPSTREAM_CCRES_TARB ### $(BUILDSTEPS)/oslib.d: $(BUILDSTEPS)/gcc.d $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL) - cp -r $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL) $(BUILDDIR)/oslib + tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL) for p in `ls $(RECIPES)/patches/oslib/*.p` ; do patch -d $(BUILDDIR)/oslib -p0 <$$p ; done cd $(BUILDDIR)/oslib && GCCSDK_INSTALL_ENV=$(PREFIX)/env GCCSDK_INSTALL_CROSSBIN=$(PREFIX)/cross/bin make install touch $@ @@ -119,8 +122,9 @@ $(BUILDSTEPS)/gcc.d: $(BUILDSTEPS)/gccsdk-srcdir.d touch $@ $(BUILDSTEPS)/gccsdk-srcdir.d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL) - cp -r $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL) $(BUILDDIR)/gcc4 + tar -C $(BUILDDIR) -xaf $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL) cp -p $(RECIPES)/files/gcc4/gccsdk-params $(BUILDDIR)/gcc4/gcc4/gccsdk-params + cp -p $(RECIPES)/files/gcc4/*.p $(BUILDDIR)/gcc4/gcc4/recipe/patches/gcc/ sed -i 's#{PREFIX}#$(PREFIX)#' $(BUILDDIR)/gcc4/gcc4/gccsdk-params for p in `ls $(RECIPES)/patches/gcc4/*.p` ; do patch -d $(BUILDDIR)/gcc4 -p0 <$$p ; done touch $@ @@ -130,22 +134,29 @@ $(BUILDSTEPS)/gccsdk-srcdir.d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR)/$(UPSTRE ### $(SOURCESDIR)/$(UPSTREAM_GCCSDK_TARBALL): - svn co $(UPSTREAM_GCCSDK_URI) $@ + svn co $(UPSTREAM_GCCSDK_URI) $(SOURCESDIR)/gcc4 + tar -C $(SOURCESDIR) -caf $@ gcc4 $(SOURCESDIR)/$(UPSTREAM_OSLIB_TARBALL): - svn co $(UPSTREAM_OSLIB_URI) $@ + svn co $(UPSTREAM_OSLIB_URI) $(SOURCESDIR)/oslib + tar -C $(SOURCESDIR) -caf $@ oslib $(SOURCESDIR)/$(UPSTREAM_CCRES_TARBALL): - svn co $(UPSTREAM_CCRES_URI) $@ + svn co $(UPSTREAM_CCRES_URI) $(SOURCESDIR)/ccres + tar -C $(SOURCESDIR) -caf $@ ccres $(SOURCESDIR)/$(UPSTREAM_MAKERUN_TARBALL): - git clone $(UPSTREAM_MAKERUN_URI) $@ + $(RM) -rf $(SOURCESDIR)/makerun + git clone $(UPSTREAM_MAKERUN_URI) $(SOURCESDIR)/makerun + tar -C $(SOURCESDIR) -caf $@ makerun $(SOURCESDIR)/$(UPSTREAM_SQUEEZE_TARBALL): - git clone $(UPSTREAM_SQUEEZE_URI) $@ + $(RM) -rf $(SOURCESDIR)/squeeze + git clone $(UPSTREAM_SQUEEZE_URI) $(SOURCESDIR)/squeeze + tar -C $(SOURCESDIR) -caf $@ squeeze $(SOURCESDIR)/$(UPSTREAM_INFOZIP_TARBALL): - wget -q -O $@ $(UPSTREAM_INFOZIP_URI) + $(FETCHSRC) arm-unknown-riscos $(subst $(SOURCESDIR)/,,$@) $(UPSTREAM_INFOZIP_URI) $@ ### # Rule to create buildsteps dir diff --git a/arm-unknown-riscos/fetchsrc b/arm-unknown-riscos/fetchsrc new file mode 100755 index 0000000..92ae5bf --- /dev/null +++ b/arm-unknown-riscos/fetchsrc @@ -0,0 +1,16 @@ +#!/bin/bash + +# script to fetch toolchain source tar using ci.netsurf-browser.org as a cache + +# Usage fetchsrc <target> <source> <upstream> <output> + +NSSRV="https://ci.netsurf-browser.org/toolchain/" + +wget -q -O ${4} ${NSSRV}/${1}/${2} +if [ $? -ne 0 ];then + wget -q -O ${4} ${3} + if [ $? -ne 0 ];then + rm ${4} + exit 1 + fi +fi diff --git a/arm-unknown-riscos/recipes/files/gcc4/cp_cfns_gperf.p b/arm-unknown-riscos/recipes/files/gcc4/cp_cfns_gperf.p new file mode 100644 index 0000000..f0598e5 --- /dev/null +++ b/arm-unknown-riscos/recipes/files/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/arm-unknown-riscos/recipes/files/gcc4/cp_cfns_h.p b/arm-unknown-riscos/recipes/files/gcc4/cp_cfns_h.p new file mode 100644 index 0000000..8f89f8a --- /dev/null +++ b/arm-unknown-riscos/recipes/files/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/arm-unknown-riscos/recipes/files/gcc4/gcc_texi.p b/arm-unknown-riscos/recipes/files/gcc4/gcc_texi.p new file mode 100644 index 0000000..056edfa --- /dev/null +++ b/arm-unknown-riscos/recipes/files/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/arm-unknown-riscos/recipes/patches/gcc4/binutils-download.p b/arm-unknown-riscos/recipes/patches/gcc4/binutils-download.p new file mode 100644 index 0000000..3f2f110 --- /dev/null +++ b/arm-unknown-riscos/recipes/patches/gcc4/binutils-download.p @@ -0,0 +1,12 @@ +--- gcc4/Makefile.orig 2018-01-26 10:37:32.006594122 +0000 ++++ gcc4/Makefile 2018-01-26 10:38:42.316723336 +0000 +@@ -677,8 +677,7 @@ + # Download binutils source: + $(SRCORIGDIR)/binutils-$(BINUTILS_VERSION).tar.bz2: + -mkdir -p $(SRCORIGDIR) +- cd $(SRCORIGDIR) && wget -c https://ftpmirror.gnu.org/binutils/binutils-$(BINUTILS_VERSION).tar.bz2 +- touch $@ ++ wget -O $@ -c https://ci.netsurf-browser.org/toolchain/arm-unknown-riscos/binutils-$(BINUTILS_VERSION).tar.bz2 + + ifeq "$(GCC_USE_SCM)" "yes" + # Checkout gcc source: diff --git a/arm-unknown-riscos/recipes/patches/gcc4/cloog-ppl-download.p b/arm-unknown-riscos/recipes/patches/gcc4/cloog-ppl-download.p new file mode 100644 index 0000000..6f91911 --- /dev/null +++ b/arm-unknown-riscos/recipes/patches/gcc4/cloog-ppl-download.p @@ -0,0 +1,12 @@ +--- gcc4/Makefile.orig 2018-01-26 10:40:26.623881778 +0000 ++++ gcc4/Makefile 2018-01-26 10:41:24.141623273 +0000 +@@ -719,8 +719,7 @@ + # Download CLooG source: + $(SRCORIGDIR)/cloog-ppl-$(CLOOG_VERSION).tar.gz: + -mkdir -p $(SRCORIGDIR) +- cd $(SRCORIGDIR) && wget -c ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-$(CLOOG_VERSION).tar.gz +- touch $@ ++ wget -O $@ -c https://ci.netsurf-browser.org/toolchain/arm-unknown-riscos/cloog-ppl-$(CLOOG_VERSION).tar.gz + + # Download newlib source: + $(SRCORIGDIR)/newlib-$(NEWLIB_VERSION).tar.gz: diff --git a/arm-unknown-riscos/recipes/patches/gcc4/gmp-download.p b/arm-unknown-riscos/recipes/patches/gcc4/gmp-download.p new file mode 100644 index 0000000..4f99d57 --- /dev/null +++ b/arm-unknown-riscos/recipes/patches/gcc4/gmp-download.p @@ -0,0 +1,11 @@ +--- gcc4/Makefile.orig 2018-01-25 22:42:43.937180762 +0000 ++++ gcc4/Makefile 2018-01-25 22:44:46.680863288 +0000 +@@ -703,7 +703,7 @@ + # Download mpc source: + $(SRCORIGDIR)/mpc-$(MPC_VERSION).tar.gz: + -mkdir -p $(SRCORIGDIR) +- cd $(SRCORIGDIR) && wget -c https://ftpmirror.gnu.org/mpc/mpc-$(MPC_VERSION).tar.gz ++ cd $(SRCORIGDIR) && wget -c https://ci.netsurf-browser.org/toolchain/arm-unknown-riscos/mpc-$(MPC_VERSION).tar.gz + touch $@ + + # Download mpfr source: diff --git a/arm-unknown-riscos/recipes/patches/gcc4/no-scm.p b/arm-unknown-riscos/recipes/patches/gcc4/no-scm.p new file mode 100644 index 0000000..5e12120 --- /dev/null +++ b/arm-unknown-riscos/recipes/patches/gcc4/no-scm.p @@ -0,0 +1,11 @@ +--- gcc4/Makefile (old) ++++ gcc4/Makefile (new) +@@ -36,7 +36,7 @@ + AUTOMAKE_FOR_GCC_VERSION=1.11.1 + LIBTOOL_FOR_GCC_VERSION=2.4.2 + GCC_VERSION=$(GCCSDK_SUPPORTED_GCC_RELEASE) +-GCC_USE_SCM=yes ++GCC_USE_SCM=no + GCC_SCM_PATH=branches/gcc-4_7-branch + NEWLIB_VERSION=1.19.0 + NEWLIB_USE_SCM=no diff --git a/arm-unknown-riscos/recipes/patches/gcc4/posix-extended-locale.p b/arm-unknown-riscos/recipes/patches/gcc4/posix-extended-locale.p new file mode 100644 index 0000000..f5726b8 --- /dev/null +++ b/arm-unknown-riscos/recipes/patches/gcc4/posix-extended-locale.p @@ -0,0 +1,1920 @@ +Index: gcc4/recipe/files/gcc/libunixlib/Makefile.am +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/Makefile.am (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/Makefile.am (working copy) +@@ -583,11 +583,11 @@ + else + locale_src = \ + locale/localeconv.c \ ++ locale/newlocale.c \ + locale/nl_langinfo.c \ + locale/setlocale.c \ + locale/strcoll.c \ +- locale/strxfrm.c \ +- locale/territory.c ++ locale/strxfrm.c + endif + locale_src += \ + locale/iconv.c +@@ -1312,6 +1312,7 @@ + bits/in.h \ + bits/libc-lock.h \ + bits/locale.h \ ++ bits/locale_t.h \ + bits/mathcalls.h \ + bits/mathdef.h \ + bits/mathinline.h \ +Index: gcc4/recipe/files/gcc/libunixlib/ctype/ctypetable.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/ctype/ctypetable.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/ctype/ctypetable.c (working copy) +@@ -10,36 +10,35 @@ + #include <internal/os.h> + #include <internal/unix.h> + +-/* Note the offset 1 and depth 257 instead of 0 and 256: ISO C says we must +- support EOF. */ +-static unsigned char ctype[257]; +-const unsigned char * const __ctype = &ctype[1]; ++/* Global containing current locale settings. */ ++struct _locale __locale_global; ++/* Offset 1 as the first entry is reserved for EOF. */ ++const unsigned char * const __ctype = &__locale_global.ctype[1]; ++const short * const __ctype_upper = &__locale_global.ctype_upper[1]; ++const short * const __ctype_lower = &__locale_global.ctype_lower[1]; + +-static short ctype_upper[257]; +-const short * const __ctype_upper = &ctype_upper[1]; +- +-static short ctype_lower[257]; +-const short * const __ctype_lower = &ctype_lower[1]; +- + void +-__build_ctype_tables (int territory) ++__build_ctype_tables (locale_t locobj, int territory) + { + PTHREAD_UNSAFE + + if (territory == -2) + { +- /* Initialise the array. This is only done by __unixinit(). */ ++ /* Initialise the array. This is only done by __unixinit()/newlocale(). */ + territory = -1; +- for (int x = 0; x <= LC_ALL; x++) +- __locale_territory[x] = -1; ++ for (int x = 0; x < LC_ALL; x++) ++ locobj->locale_territory[x] = -1; ++ __localeconv_lconv_init(&locobj->lc); ++ locobj->lc_needs_refresh = 1; + } + + /* Initialise ctype_upper/ctype_lower tables. */ + for (int x = 0; x < 257; x++) + { +- /* In the C/POSIX locate, tolower(top bit set char) ++ /* In the C/POSIX locale, tolower(top bit set char) + should return the character unchanged. */ +- ctype_lower[x] = ctype_upper[x] = x - 1; ++ locobj->ctype_lower[x] = locobj->ctype_upper[x] = x - 1; ++ locobj->ctype[x] = 0; + } + + int regs[10]; +@@ -61,7 +60,7 @@ + for (int offset = 1; bits; bits = bits >> 1, offset += 1) + { + if (bits & 1) +- ctype[pos + offset] |= 1 << code; ++ locobj->ctype[pos + offset] |= 1 << code; + } + pos += 32; + } +@@ -80,7 +79,7 @@ + int y = (territory == -1) ? 128 : 256; + for (int x = 1; x <= y; x++) + { +- ctype_lower[x] = (short)*p++; +- ctype_upper[x] = (short)*q++; ++ locobj->ctype_lower[x] = (short)*p++; ++ locobj->ctype_upper[x] = (short)*q++; + } + } +Index: gcc4/recipe/files/gcc/libunixlib/ctype/isalnum.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/ctype/isalnum.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/ctype/isalnum.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (isalnum) (int c) +@@ -10,3 +11,8 @@ + return isalnum (c); + } + ++int ++isalnum_l (int c, locale_t locobj) ++{ ++ return ((&locobj->ctype[1])[c] & (___ctype_alpha | ___ctype_digit)); ++} +Index: gcc4/recipe/files/gcc/libunixlib/ctype/isalpha.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/ctype/isalpha.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/ctype/isalpha.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (isalpha) (int c) +@@ -10,3 +11,8 @@ + return isalpha (c); + } + ++int ++isalpha_l (int c, locale_t locobj) ++{ ++ return ((&locobj->ctype[1])[c] & ___ctype_alpha); ++} +Index: gcc4/recipe/files/gcc/libunixlib/ctype/isascii.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/ctype/isascii.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/ctype/isascii.c (working copy) +@@ -10,3 +10,9 @@ + return isascii (c); + } + ++int ++isascii_l (int c, locale_t locobj) ++{ ++ (void) locobj; ++ return isascii (c); ++} +Index: gcc4/recipe/files/gcc/libunixlib/ctype/isblank.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/ctype/isblank.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/ctype/isblank.c (working copy) +@@ -9,3 +9,10 @@ + { + return isblank (c); + } ++ ++int ++isblank_l (int c, locale_t locobj) ++{ ++ (void) locobj; ++ return isblank (c); ++} +Index: gcc4/recipe/files/gcc/libunixlib/ctype/iscntrl.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/ctype/iscntrl.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/ctype/iscntrl.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (iscntrl) (int c) +@@ -10,3 +11,8 @@ + return iscntrl (c); + } + ++int ++iscntrl_l (int c, locale_t locobj) ++{ ++ return ((&locobj->ctype[1])[c] & ___ctype_ctrl); ++} +Index: gcc4/recipe/files/gcc/libunixlib/ctype/isdigit.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/ctype/isdigit.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/ctype/isdigit.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (isdigit) (int c) +@@ -10,3 +11,8 @@ + return isdigit (c); + } + ++int ++isdigit_l (int c, locale_t locobj) ++{ ++ return ((&locobj->ctype[1])[c] & ___ctype_digit); ++} +Index: gcc4/recipe/files/gcc/libunixlib/ctype/isgraph.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/ctype/isgraph.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/ctype/isgraph.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (isgraph) (int c) +@@ -10,3 +11,8 @@ + return isgraph (c); + } + ++int ++isgraph_l (int c, locale_t locobj) ++{ ++ return ((&locobj->ctype[1])[c] & ~(___ctype_white | ___ctype_ctrl)); ++} +Index: gcc4/recipe/files/gcc/libunixlib/ctype/islower.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/ctype/islower.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/ctype/islower.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (islower) (int c) +@@ -10,3 +11,8 @@ + return islower (c); + } + ++int ++islower_l (int c, locale_t locobj) ++{ ++ return ((&locobj->ctype[1])[c] & ___ctype_lower); ++} +Index: gcc4/recipe/files/gcc/libunixlib/ctype/isprint.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/ctype/isprint.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/ctype/isprint.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (isprint) (int c) +@@ -10,3 +11,10 @@ + return isprint (c); + } + ++int ++isprint_l (int c, locale_t locobj) ++{ ++ return ((&locobj->ctype[1])[c] & ++ (___ctype_upper | ___ctype_lower | ___ctype_digit | ___ctype_punc | ++ ___ctype_white)) && !((&locobj->ctype[1])[c] & ___ctype_ctrl); ++} +Index: gcc4/recipe/files/gcc/libunixlib/ctype/ispunct.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/ctype/ispunct.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/ctype/ispunct.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (ispunct) (int c) +@@ -10,3 +11,8 @@ + return ispunct (c); + } + ++int ++ispunct_l (int c, locale_t locobj) ++{ ++ return ((&locobj->ctype[1])[c] & ___ctype_punc); ++} +Index: gcc4/recipe/files/gcc/libunixlib/ctype/isspace.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/ctype/isspace.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/ctype/isspace.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (isspace) (int c) +@@ -10,3 +11,8 @@ + return isspace (c); + } + ++int ++isspace_l (int c, locale_t locobj) ++{ ++ return ((&locobj->ctype[1])[c] & ___ctype_white); ++} +Index: gcc4/recipe/files/gcc/libunixlib/ctype/isupper.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/ctype/isupper.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/ctype/isupper.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (isupper) (int c) +@@ -10,3 +11,8 @@ + return isupper (c); + } + ++int ++isupper_l (int c, locale_t locobj) ++{ ++ return ((&locobj->ctype[1])[c] & ___ctype_upper); ++} +Index: gcc4/recipe/files/gcc/libunixlib/ctype/isxdigit.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/ctype/isxdigit.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/ctype/isxdigit.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (isxdigit) (int c) +@@ -10,3 +11,8 @@ + return isxdigit (c); + } + ++int ++isxdigit_l (int c, locale_t locobj) ++{ ++ return ((&locobj->ctype[1])[c] & ___ctype_xdigit); ++} +Index: gcc4/recipe/files/gcc/libunixlib/ctype/toascii.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/ctype/toascii.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/ctype/toascii.c (working copy) +@@ -10,3 +10,9 @@ + return toascii (c); + } + ++int ++toascii_l (int c, locale_t locobj) ++{ ++ (void) locobj; ++ return toascii (c); ++} +Index: gcc4/recipe/files/gcc/libunixlib/ctype/tolower.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/ctype/tolower.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/ctype/tolower.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (tolower) (int c) +@@ -10,3 +11,8 @@ + return tolower (c); + } + ++int ++tolower_l (int c, locale_t locobj) ++{ ++ return (&locobj->ctype_lower[1])[c]; ++} +Index: gcc4/recipe/files/gcc/libunixlib/ctype/toupper.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/ctype/toupper.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/ctype/toupper.c (working copy) +@@ -3,6 +3,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + + int + (toupper) (int c) +@@ -10,3 +11,8 @@ + return toupper (c); + } + ++int ++toupper_l (int c, locale_t locobj) ++{ ++ return (&locobj->ctype_upper[1])[c]; ++} +Index: gcc4/recipe/files/gcc/libunixlib/incl-local/locale.h +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/incl-local/locale.h (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/incl-local/locale.h (working copy) +@@ -13,15 +13,36 @@ + + #ifndef __TARGET_SCL__ + +-/* Territory number for each locale. C locale is -1. */ +-extern int __locale_territory[LC_ALL + 1]; ++struct _locale { ++ /* Map from locale category to territory number. C locale is -1. */ ++ int locale_territory[LC_ALL]; + +-/* Set to 1 is setlocale has been called since the last call to +- localeconv. localeconv uses this flag to cache the lconv structure. */ +-extern int __setlocale_called; ++ /* Character type LUTs: EOF + one entry per character ++ * ++ * EOF is defined as -1, so character entries start at offset 1. ++ */ ++ short ctype_upper[257]; ++ short ctype_lower[257]; ++ unsigned char ctype[257]; + +-extern void __build_ctype_tables (int __territory) __THROW; ++ /* Set to 1 if the locale information has changed since the last time ++ * the lconv structure was updated. */ ++ int lc_needs_refresh; ++ /* Numeric formatting information for locale */ ++ struct lconv lc; ++}; + ++extern struct _locale __locale_global; ++ ++extern void __build_ctype_tables (locale_t locobj, int __territory) __THROW; ++ ++extern char *__setlocale_l (locale_t locobj, int __category, ++ const char *__locale) __THROW; ++ ++void __localeconv_lconv_init (struct lconv *lc); ++void __localeconv_lconv_fini (struct lconv *lc); ++void __localeconv_l (locale_t locobj); ++ + #endif + + __END_DECLS +Index: gcc4/recipe/files/gcc/libunixlib/include/bits/locale_t.h +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/include/bits/locale_t.h (nonexistent) ++++ gcc4/recipe/files/gcc/libunixlib/include/bits/locale_t.h (working copy) +@@ -0,0 +1,10 @@ ++/* ++ * Copyright (c) 2022 UnixLib Developers ++ */ ++ ++#ifndef _BITS_LOCALE_T_H_ ++#define _BITS_LOCALE_T_H_ ++ ++typedef struct _locale *locale_t; ++ ++#endif +Index: gcc4/recipe/files/gcc/libunixlib/include/ctype.h +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/include/ctype.h (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/include/ctype.h (working copy) +@@ -51,6 +51,48 @@ + extern int isblank (int __c) __THROW; + + #ifndef __TARGET_SCL__ ++# ifdef __USE_XOPEN2K8 ++# include <bits/locale_t.h> ++ ++/* c is alphabetic or numeric. */ ++extern int isalnum_l (int __c, locale_t locobj) __THROW; ++ ++/* c is alphabetic. */ ++extern int isalpha_l (int __c, locale_t locobj) __THROW; ++ ++/* c is a control character. */ ++extern int iscntrl_l (int __c, locale_t locobj) __THROW; ++ ++/* c is a decimal digit. */ ++extern int isdigit_l (int __c, locale_t locobj) __THROW; ++ ++/* c is any printable character other than a space. */ ++extern int isgraph_l (int __c, locale_t locobj) __THROW; ++ ++/* c is a lower-case letter. */ ++extern int islower_l (int __c, locale_t locobj) __THROW; ++ ++/* c is an upper-case letter. */ ++extern int isupper_l (int __c, locale_t locobj) __THROW; ++ ++/* c is a printable character. */ ++extern int isprint_l (int __c, locale_t locobj) __THROW; ++ ++/* c is a printable character other than a space or a ++ alphanumeric character. */ ++extern int ispunct_l (int __c, locale_t locobj) __THROW; ++ ++/* c is a white space character e.g. space, newline, tab, linefeed, ++ return, vertical tab. */ ++extern int isspace_l (int __c, locale_t locobj) __THROW; ++ ++/* c is a hex digit. */ ++extern int isxdigit_l (int __c, locale_t locobj) __THROW; ++ ++/* c is tab or space. */ ++extern int isblank_l (int __c, locale_t locobj) __THROW; ++# endif ++ + /* Characteristics. */ + extern const unsigned char * const __ctype; + /* Lower case table. */ +@@ -108,6 +150,10 @@ + extern int toupper (int __c) __THROW; + #ifndef __TARGET_SCL__ + # define toupper(c) ((int) __ctype_upper[(int) (c)]) ++ ++# ifdef __USE_XOPEN2K8 ++extern int toupper_l (int __c, locale_t locobj) __THROW; ++# endif + #endif + + /* Convert c to lower case. */ +@@ -114,6 +160,10 @@ + extern int tolower (int __c) __THROW; + #ifndef __TARGET_SCL__ + # define tolower(c) ((int) __ctype_lower[(int) (c)]) ++ ++# ifdef __USE_XOPEN2K8 ++extern int tolower_l (int __c, locale_t locobj) __THROW; ++# endif + #endif + + #ifndef __TARGET_SCL__ +@@ -135,6 +185,11 @@ + /* Is c an ASCII character. */ + extern int isascii (int __c) __THROW; + # define isascii(c) ((unsigned)(c) <= 0x7f) ++ ++# ifdef __USE_XOPEN2K8 ++extern int toascii_l (int __c, locale_t locobj) __THROW; ++extern int isascii_l (int __c, locale_t locobj) __THROW; ++# endif + # endif + #endif + +Index: gcc4/recipe/files/gcc/libunixlib/include/langinfo.h +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/include/langinfo.h (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/include/langinfo.h (working copy) +@@ -580,18 +580,12 @@ + extern char *nl_langinfo (nl_item __item) __THROW; + + +-#if 0 +-#ifdef __USE_GNU +-/* This interface is for the extended locale model. See <locale.h> for +- more information. */ ++#ifdef __USE_XOPEN2K8 ++# include <bits/locale_t.h> + +-/* Get locale datatype definition. */ +-# include <xlocale.h> +- + /* Just like nl_langinfo but get the information from the locale object L. */ +-extern char *nl_langinfo_l (nl_item __item, __locale_t l); ++extern char *nl_langinfo_l (nl_item __item, locale_t __l); + #endif +-#endif + + __END_DECLS + +Index: gcc4/recipe/files/gcc/libunixlib/include/locale.h +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/include/locale.h (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/include/locale.h (working copy) +@@ -33,16 +33,16 @@ + /* Entire locale. */ + # define LC_ALL 6 + +-#define LC_COLLATE_MASK (1L << 1) +-#define LC_CTYPE_MASK (1L << 2) +-#define LC_MESSAGES_MASK (1L << 3) +-#define LC_MONETARY_MASK (1L << 4) +-#define LC_NUMERIC_MASK (1L << 5) +-#define LC_TIME_MASK (1L << 6) +-#define LC_ALL_MASK (LC_COLLATE_MASK | LC_CTYPE_MASK | LC_MESSAGES_MASK | LC_MONETARY_MASK | LC_NUMERIC_MASK | LC_TIME_MASK) ++# ifdef __USE_XOPEN2K8 ++# define LC_COLLATE_MASK (1L << 0) ++# define LC_CTYPE_MASK (1L << 1) ++# define LC_MESSAGES_MASK (1L << 2) ++# define LC_MONETARY_MASK (1L << 3) ++# define LC_NUMERIC_MASK (1L << 4) ++# define LC_TIME_MASK (1L << 5) ++# define LC_ALL_MASK (LC_COLLATE_MASK | LC_CTYPE_MASK | LC_MESSAGES_MASK | LC_MONETARY_MASK | LC_NUMERIC_MASK | LC_TIME_MASK) ++# endif + +-typedef struct _locale *locale_t; +- + #else + /* String collation (functions 'strcoll' and 'strxfrm'). */ + # define LC_COLLATE 1 +@@ -121,6 +121,9 @@ + extern struct lconv *localeconv (void) __THROW; + + #ifndef __TARGET_SCL__ ++# ifdef __USE_XOPEN2K8 ++# include <bits/locale_t.h> ++ + extern locale_t uselocale(locale_t newloc); + + extern void freelocale(locale_t locobj); +@@ -127,7 +130,11 @@ + + extern locale_t newlocale(int category_mask, const char *locale, + locale_t base); +-# define LC_GLOBAL_LOCALE ((locale_t) -1L) ++ ++extern locale_t duplocale(locale_t locobj); ++ ++# define LC_GLOBAL_LOCALE ((locale_t) -1L) ++# endif + #endif + + __END_NAMESPACE_STD +Index: gcc4/recipe/files/gcc/libunixlib/include/string.h +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/include/string.h (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/include/string.h (working copy) +@@ -93,6 +93,16 @@ + const char *__restrict __src, size_t __n) + __THROW __nonnull ((2)); + ++#ifdef __USE_XOPEN2K8 ++#include <bits/locale_t.h> ++ ++extern int strcoll_l (const char *__s1, const char *__s2, locale_t __l) ++ __THROW __attribute_pure__ __nonnull ((1, 2, 3)); ++ ++extern size_t strxfrm_l (char *__dest, const char *__src, size_t __n, ++ locale_t __l) __THROW __nonnull ((2, 4)); ++#endif ++ + /* Find the first occurrence of c in s. */ + extern char *strchr (const char *__s, int __c) + __THROW __attribute_pure__ __nonnull ((1)) __wur; +@@ -281,6 +291,17 @@ + /* Compare no more than N chars of S1 and S2, ignoring case. */ + extern int strncasecmp (const char *__s1, const char *__s2, size_t __n) + __THROW __attribute_pure__ __nonnull ((1, 2)) __wur; ++ ++# ifdef __USE_XOPEN2K8 ++# include <bits/locale_t.h> ++ ++extern int strcasecmp_l (const char *__s1, const char *__s2, locale_t __loc) ++ __THROW __attribute_pure__ __nonnull ((1, 2, 3)); ++ ++extern int strncasecmp_l (const char *__s1, const char *__s2, ++ size_t __n, locale_t __loc) ++ __THROW __attribute_pure__ __nonnull ((1, 2, 4)); ++# endif + #endif /* Use BSD. */ + + #if defined __USE_XOPEN2K || defined __USE_MISC +@@ -289,6 +310,11 @@ + __THROW __nonnull ((2)); + #endif + ++#ifdef __USE_XOPEN2K8 ++/* Translate error number to string according to the locale L. */ ++extern char *strerror_l (int __errnum, locale_t __l) __THROW; ++#endif ++ + #ifndef __TARGET_SCL__ + # ifndef basename + /* Return the file name within directory of FILENAME. We don't +Index: gcc4/recipe/files/gcc/libunixlib/include/strings.h +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/include/strings.h (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/include/strings.h (working copy) +@@ -37,7 +37,17 @@ + /* Compare n chars of S1 and S2, ignoring case. */ + extern int strncasecmp (const char *__s1, const char *__s2, size_t __n); + ++# ifdef __USE_XOPEN2K8 ++# include <bits/locale_t.h> + ++extern int strcasecmp_l (const char *__s1, const char *__s2, locale_t __loc) ++ __THROW __attribute_pure__ __nonnull ((1, 2, 3)); ++ ++extern int strncasecmp_l (const char *__s1, const char *__s2, ++ size_t __n, locale_t __loc) ++ __THROW __attribute_pure__ __nonnull ((1, 2, 4)); ++# endif ++ + /* Return the position of the first bit set in I, or 0 if none are set. + The least-significant bit is position 1, the most-significant 32. */ + extern int ffs (int __i); +Index: gcc4/recipe/files/gcc/libunixlib/include/wchar.h +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/include/wchar.h (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/include/wchar.h (working copy) +@@ -1,7 +1,7 @@ + /* + * File taken from glibc 2.11. + * Following changes were made: +- * - Disabled non-standard reentrant locale prototypes. ++ * - None + */ + + /* Copyright (C) 1995-2008, 2009 Free Software Foundation, Inc. +@@ -172,7 +172,6 @@ + __END_NAMESPACE_STD + #endif + +-#if 0 + #ifdef __USE_XOPEN2K8 + /* Compare S1 and S2, ignoring case. */ + extern int wcscasecmp (__const wchar_t *__s1, __const wchar_t *__s2) __THROW; +@@ -183,15 +182,14 @@ + + /* Similar to the two functions above but take the information from + the provided locale and not the global locale. */ +-# include <xlocale.h> ++# include <bits/locale_t.h> + + extern int wcscasecmp_l (__const wchar_t *__s1, __const wchar_t *__s2, +- __locale_t __loc) __THROW; ++ locale_t __loc) __THROW; + + extern int wcsncasecmp_l (__const wchar_t *__s1, __const wchar_t *__s2, +- size_t __n, __locale_t __loc) __THROW; ++ size_t __n, locale_t __loc) __THROW; + #endif +-#endif + + __BEGIN_NAMESPACE_STD + /* Compare S1 and S2, both interpreted as appropriate to the +@@ -205,7 +203,6 @@ + __END_NAMESPACE_STD + + #ifdef __USE_XOPEN2K8 +-#if 0 + /* Similar to the two functions above but take the information from + the provided locale and not the global locale. */ + +@@ -212,14 +209,13 @@ + /* Compare S1 and S2, both interpreted as appropriate to the + LC_COLLATE category of the given locale. */ + extern int wcscoll_l (__const wchar_t *__s1, __const wchar_t *__s2, +- __locale_t __loc) __THROW; ++ locale_t __loc) __THROW; + + /* Transform S2 into array pointed to by S1 such that if wcscmp is + applied to two transformed strings the result is the as applying + `wcscoll' to the original strings. */ + extern size_t wcsxfrm_l (wchar_t *__s1, __const wchar_t *__s2, +- size_t __n, __locale_t __loc) __THROW; +-#endif ++ size_t __n, locale_t __loc) __THROW; + + #ifndef __TARGET_SCL__ + /* Duplicate S, returning an identical malloc'd string. */ +Index: gcc4/recipe/files/gcc/libunixlib/include/wctype.h +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/include/wctype.h (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/include/wctype.h (working copy) +@@ -3,7 +3,6 @@ + * Following changes were made: + * - Replaced "#include <bits/types.h>" into "#include <unixlib/types.h>" + * - Add wint_t typedef when it hasn't been defined in stddef.h. +- * - Disabled non-standard reentrant locale prototypes. + */ + + /* Copyright (C) 1996-2002,2005,2007,2008,2009 Free Software Foundation, Inc. +@@ -191,7 +190,6 @@ + /* Determine whether the wide-character WC has the property described by + DESC. */ + extern int iswctype (wint_t __wc, wctype_t __desc) __THROW; +-#define iswctype_l(c, d, l) iswctype(c, d) + + __END_NAMESPACE_C99 + +@@ -241,73 +239,71 @@ + extern wint_t towctrans (wint_t __wc, wctrans_t __desc) __THROW; + __END_NAMESPACE_C99 + +-#if 0 + # ifdef __USE_XOPEN2K8 +-/* Declare the interface to extended locale model. */ +-# include <xlocale.h> ++# include <bits/locale_t.h> + + /* Test for any wide character for which `iswalpha' or `iswdigit' is + true. */ +-extern int iswalnum_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswalnum_l (wint_t __wc, locale_t __locale) __THROW; + + /* Test for any wide character for which `iswupper' or 'iswlower' is + true, or any wide character that is one of a locale-specific set of + wide-characters for which none of `iswcntrl', `iswdigit', + `iswpunct', or `iswspace' is true. */ +-extern int iswalpha_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswalpha_l (wint_t __wc, locale_t __locale) __THROW; + + /* Test for any control wide character. */ +-extern int iswcntrl_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswcntrl_l (wint_t __wc, locale_t __locale) __THROW; + + /* Test for any wide character that corresponds to a decimal-digit + character. */ +-extern int iswdigit_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswdigit_l (wint_t __wc, locale_t __locale) __THROW; + + /* Test for any wide character for which `iswprint' is true and + `iswspace' is false. */ +-extern int iswgraph_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswgraph_l (wint_t __wc, locale_t __locale) __THROW; + + /* Test for any wide character that corresponds to a lowercase letter + or is one of a locale-specific set of wide characters for which + none of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */ +-extern int iswlower_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswlower_l (wint_t __wc, locale_t __locale) __THROW; + + /* Test for any printing wide character. */ +-extern int iswprint_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswprint_l (wint_t __wc, locale_t __locale) __THROW; + + /* Test for any printing wide character that is one of a + locale-specific et of wide characters for which neither `iswspace' + nor `iswalnum' is true. */ +-extern int iswpunct_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswpunct_l (wint_t __wc, locale_t __locale) __THROW; + + /* Test for any wide character that corresponds to a locale-specific + set of wide characters for which none of `iswalnum', `iswgraph', or + `iswpunct' is true. */ +-extern int iswspace_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswspace_l (wint_t __wc, locale_t __locale) __THROW; + + /* Test for any wide character that corresponds to an uppercase letter + or is one of a locale-specific set of wide character for which none + of `iswcntrl', `iswdigit', `iswpunct', or `iswspace' is true. */ +-extern int iswupper_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswupper_l (wint_t __wc, locale_t __locale) __THROW; + + /* Test for any wide character that corresponds to a hexadecimal-digit + character equivalent to that performed be the functions described + in the previous subclause. */ +-extern int iswxdigit_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswxdigit_l (wint_t __wc, locale_t __locale) __THROW; + + /* Test for any wide character that corresponds to a standard blank + wide character or a locale-specific set of wide characters for + which `iswalnum' is false. */ +-extern int iswblank_l (wint_t __wc, __locale_t __locale) __THROW; ++extern int iswblank_l (wint_t __wc, locale_t __locale) __THROW; + + /* Construct value that describes a class of wide characters identified + by the string argument PROPERTY. */ +-extern wctype_t wctype_l (__const char *__property, __locale_t __locale) ++extern wctype_t wctype_l (__const char *__property, locale_t __locale) + __THROW; + + /* Determine whether the wide-character WC has the property described by + DESC. */ +-extern int iswctype_l (wint_t __wc, wctype_t __desc, __locale_t __locale) ++extern int iswctype_l (wint_t __wc, wctype_t __desc, locale_t __locale) + __THROW; + + +@@ -316,22 +312,21 @@ + */ + + /* Converts an uppercase letter to the corresponding lowercase letter. */ +-extern wint_t towlower_l (wint_t __wc, __locale_t __locale) __THROW; ++extern wint_t towlower_l (wint_t __wc, locale_t __locale) __THROW; + + /* Converts an lowercase letter to the corresponding uppercase letter. */ +-extern wint_t towupper_l (wint_t __wc, __locale_t __locale) __THROW; ++extern wint_t towupper_l (wint_t __wc, locale_t __locale) __THROW; + + /* Construct value that describes a mapping between wide characters + identified by the string argument PROPERTY. */ +-extern wctrans_t wctrans_l (__const char *__property, __locale_t __locale) ++extern wctrans_t wctrans_l (__const char *__property, locale_t __locale) + __THROW; + + /* Map the wide character WC using the mapping described by DESC. */ + extern wint_t towctrans_l (wint_t __wc, wctrans_t __desc, +- __locale_t __locale) __THROW; ++ locale_t __locale) __THROW; + + # endif /* Use POSIX 2008. */ +-#endif + + __END_DECLS + +Index: gcc4/recipe/files/gcc/libunixlib/locale/localeconv.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/locale/localeconv.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/locale/localeconv.c (working copy) +@@ -14,8 +14,6 @@ + + /* #define DEBUG */ + +-int __setlocale_called = 1; +- + static int + read_symbol (int reason_code, int territory) + { +@@ -71,26 +69,44 @@ + *grouping = new_grouping; + } + +-static struct lconv lc = { NULL, NULL, NULL, NULL, NULL, +- NULL, NULL, NULL, NULL, NULL, +- CHAR_MAX, CHAR_MAX, CHAR_MAX, CHAR_MAX, +- CHAR_MAX, CHAR_MAX, CHAR_MAX, CHAR_MAX }; ++void ++__localeconv_lconv_init (struct lconv *lc) ++{ ++ memset(lc, 0, sizeof(*lc)); ++ lc->int_frac_digits = lc->frac_digits = lc->p_cs_precedes = ++ lc->p_sep_by_space = lc->n_cs_precedes = lc->n_sep_by_space = ++ lc->p_sign_posn = lc->n_sign_posn = CHAR_MAX; ++} + +-/* Defined by POSIX as not threadsafe */ +-struct lconv * +-localeconv (void) ++void ++__localeconv_lconv_fini (struct lconv *lc) + { ++ free(lc->decimal_point); ++ free(lc->thousands_sep); ++ free(lc->grouping); ++ free(lc->int_curr_symbol); ++ free(lc->currency_symbol); ++ free(lc->mon_decimal_point); ++ free(lc->mon_thousands_sep); ++ free(lc->mon_grouping); ++ free(lc->positive_sign); ++ free(lc->negative_sign); ++} ++ ++void ++__localeconv_l (locale_t locobj) ++{ + int numeric, monetary; + + /* If setlocale has not been called since the last call to + localeconv, then the lconv structure will be the same. */ +- if (!__setlocale_called) +- return &lc; ++ if (!locobj->lc_needs_refresh) ++ return; + +- __setlocale_called = 0; ++ locobj->lc_needs_refresh = 0; + +- numeric = __locale_territory[LC_NUMERIC]; +- monetary = __locale_territory[LC_MONETARY]; ++ numeric = locobj->locale_territory[LC_NUMERIC]; ++ monetary = locobj->locale_territory[LC_MONETARY]; + + /* See the PRMs regarding SWI Territory_ReadSymbols for the + meanings of the following numbers. */ +@@ -97,71 +113,80 @@ + if (numeric == -1) + { + /* We're using the 'C' locale. */ +- free (lc.decimal_point); +- lc.decimal_point = strdup ("."); +- free (lc.thousands_sep); +- lc.thousands_sep = strdup (""); +- free (lc.grouping); +- lc.grouping = strdup (""); ++ free (locobj->lc.decimal_point); ++ locobj->lc.decimal_point = strdup ("."); ++ free (locobj->lc.thousands_sep); ++ locobj->lc.thousands_sep = strdup (""); ++ free (locobj->lc.grouping); ++ locobj->lc.grouping = strdup (""); + } + else + { +- free (lc.decimal_point); +- lc.decimal_point = strdup ((char *) read_symbol (0, numeric)); +- free (lc.thousands_sep); +- lc.thousands_sep = strdup ((char *) read_symbol (1, numeric)); +- read_byte_list (2, &lc.grouping, numeric); ++ free (locobj->lc.decimal_point); ++ locobj->lc.decimal_point = strdup ((char *) read_symbol (0, numeric)); ++ free (locobj->lc.thousands_sep); ++ locobj->lc.thousands_sep = strdup ((char *) read_symbol (1, numeric)); ++ read_byte_list (2, &locobj->lc.grouping, numeric); + } + if (monetary == -1) + { + /* We using the 'C' locale. Empty strings and CHAR_MAX means + that these fields are unspecified. */ +- free (lc.mon_decimal_point); +- lc.mon_decimal_point = strdup (""); +- free (lc.mon_thousands_sep); +- lc.mon_thousands_sep = strdup (""); +- free (lc.mon_grouping); +- lc.mon_grouping = strdup (""); +- lc.int_frac_digits = CHAR_MAX; +- lc.frac_digits = CHAR_MAX; +- free (lc.currency_symbol); +- lc.currency_symbol = strdup (""); +- free (lc.int_curr_symbol); +- lc.int_curr_symbol = strdup (""); +- lc.p_cs_precedes = CHAR_MAX; +- lc.n_cs_precedes = CHAR_MAX; +- lc.p_sep_by_space = CHAR_MAX; +- lc.n_sep_by_space = CHAR_MAX; +- free (lc.positive_sign); +- lc.positive_sign = strdup (""); +- free (lc.negative_sign); +- lc.negative_sign = strdup (""); +- lc.p_sign_posn = CHAR_MAX; +- lc.n_sign_posn = CHAR_MAX; ++ free (locobj->lc.mon_decimal_point); ++ locobj->lc.mon_decimal_point = strdup (""); ++ free (locobj->lc.mon_thousands_sep); ++ locobj->lc.mon_thousands_sep = strdup (""); ++ free (locobj->lc.mon_grouping); ++ locobj->lc.mon_grouping = strdup (""); ++ locobj->lc.int_frac_digits = CHAR_MAX; ++ locobj->lc.frac_digits = CHAR_MAX; ++ free (locobj->lc.currency_symbol); ++ locobj->lc.currency_symbol = strdup (""); ++ free (locobj->lc.int_curr_symbol); ++ locobj->lc.int_curr_symbol = strdup (""); ++ locobj->lc.p_cs_precedes = CHAR_MAX; ++ locobj->lc.n_cs_precedes = CHAR_MAX; ++ locobj->lc.p_sep_by_space = CHAR_MAX; ++ locobj->lc.n_sep_by_space = CHAR_MAX; ++ free (locobj->lc.positive_sign); ++ locobj->lc.positive_sign = strdup (""); ++ free (locobj->lc.negative_sign); ++ locobj->lc.negative_sign = strdup (""); ++ locobj->lc.p_sign_posn = CHAR_MAX; ++ locobj->lc.n_sign_posn = CHAR_MAX; + } + else + { +- free (lc.int_curr_symbol); +- lc.int_curr_symbol = strdup ((char *)read_symbol (3, monetary)); +- free (lc.currency_symbol); +- lc.currency_symbol = strdup ((char *)read_symbol (4, monetary)); +- free (lc.mon_decimal_point); +- lc.mon_decimal_point = strdup ((char *)read_symbol (5, monetary)); +- free (lc.mon_thousands_sep); +- lc.mon_thousands_sep = strdup ((char *)read_symbol (6, monetary)); +- read_byte_list (7, &lc.mon_grouping, monetary); +- free (lc.positive_sign); +- lc.positive_sign = strdup ((char *)read_symbol (8, monetary)); +- free (lc.negative_sign); +- lc.negative_sign = strdup ((char *)read_symbol (9, monetary)); +- lc.int_frac_digits = (char)read_symbol (10, monetary); +- lc.frac_digits = (char)read_symbol (11, monetary); +- lc.p_cs_precedes = (char)read_symbol (12, monetary); +- lc.p_sep_by_space = (char)read_symbol (13, monetary); +- lc.n_cs_precedes = (char)read_symbol (14, monetary); +- lc.n_sep_by_space = (char)read_symbol (15, monetary); +- lc.p_sign_posn = (char)read_symbol (16, monetary); +- lc.n_sign_posn = (char)read_symbol (17, monetary); ++ free (locobj->lc.int_curr_symbol); ++ locobj->lc.int_curr_symbol = strdup ((char *)read_symbol (3, monetary)); ++ free (locobj->lc.currency_symbol); ++ locobj->lc.currency_symbol = strdup ((char *)read_symbol (4, monetary)); ++ free (locobj->lc.mon_decimal_point); ++ locobj->lc.mon_decimal_point = strdup ((char *)read_symbol (5, monetary)); ++ free (locobj->lc.mon_thousands_sep); ++ locobj->lc.mon_thousands_sep = strdup ((char *)read_symbol (6, monetary)); ++ read_byte_list (7, &locobj->lc.mon_grouping, monetary); ++ free (locobj->lc.positive_sign); ++ locobj->lc.positive_sign = strdup ((char *)read_symbol (8, monetary)); ++ free (locobj->lc.negative_sign); ++ locobj->lc.negative_sign = strdup ((char *)read_symbol (9, monetary)); ++ locobj->lc.int_frac_digits = (char)read_symbol (10, monetary); ++ locobj->lc.frac_digits = (char)read_symbol (11, monetary); ++ locobj->lc.p_cs_precedes = (char)read_symbol (12, monetary); ++ locobj->lc.p_sep_by_space = (char)read_symbol (13, monetary); ++ locobj->lc.n_cs_precedes = (char)read_symbol (14, monetary); ++ locobj->lc.n_sep_by_space = (char)read_symbol (15, monetary); ++ locobj->lc.p_sign_posn = (char)read_symbol (16, monetary); ++ locobj->lc.n_sign_posn = (char)read_symbol (17, monetary); + } +- return &lc; ++ return; + } ++ ++/* Defined by POSIX as not threadsafe */ ++struct lconv * ++localeconv (void) ++{ ++ __localeconv_l (&__locale_global); ++ ++ return &__locale_global.lc; ++} +Index: gcc4/recipe/files/gcc/libunixlib/locale/newlocale.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/locale/newlocale.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/locale/newlocale.c (working copy) +@@ -1,17 +1,17 @@ + /* Copyright (c) 2019 UnixLib Developers + */ + ++#include <ctype.h> ++#include <errno.h> ++#include <locale.h> + #include <stdlib.h> +-#include <locale.h> + #include <stdio.h> +-#include <errno.h> ++#include <string.h> + +-struct _locale { +- struct lconv lc; +-}; ++#include <internal/unix.h> + + /* This is supposed to be per-thread. */ +-static locale_t current_locale; ++static locale_t current_locale = LC_GLOBAL_LOCALE; + + locale_t uselocale(locale_t newloc) + { +@@ -27,20 +27,94 @@ + + void freelocale(locale_t locobj) + { +- if (locobj) ++ if (locobj) { ++ __localeconv_lconv_fini(&locobj->lc); + free(locobj); ++ } + } + + locale_t newlocale(int category_mask, const char *locale, + locale_t base) + { +- locale_t loc = (locale_t)malloc(sizeof(*loc)); +- if (!loc) { ++ struct _locale tmp; ++ ++ PTHREAD_UNSAFE ++ ++ if ((category_mask & ~LC_ALL_MASK) || locale == NULL) { ++ __set_errno (EINVAL); ++ return 0; ++ } ++ ++ /* The locale provided will be verified by __setlocale_l() */ ++ ++ /* Prepare the temporary locale we will modify */ ++ if (base != 0 && base != LC_GLOBAL_LOCALE) { ++ memcpy(&tmp, base, sizeof(tmp)); ++ } else { ++ if (base == LC_GLOBAL_LOCALE) { ++ /* Undefined: be helpful to client */ ++ memcpy(&tmp, &__locale_global, sizeof(tmp)); ++ } else { ++ /* Initialise to C locale */ ++ __build_ctype_tables(&tmp, -2); ++ } ++ } ++ ++ /* Now, apply the requested locale to each of the categories in the mask */ ++ if (category_mask == LC_ALL_MASK) { ++ /* Special-case LC_ALL to handle the encoded locale string */ ++ if (__setlocale_l(&tmp, LC_ALL, locale) == NULL) { ++ return 0; ++ } ++ } else { ++ int category = 0, mask = category_mask; ++ while (mask != 0) { ++ if (mask & 1) { ++ if (__setlocale_l(&tmp, category, locale) == NULL) { ++ return 0; ++ } ++ } ++ category++; ++ mask >>= 1; ++ } ++ } ++ ++ /* Allocate the result, if necessary */ ++ if (base == 0 || base == LC_GLOBAL_LOCALE) { ++ base = (locale_t)malloc(sizeof(*base)); ++ if (!base) { ++ __set_errno (ENOMEM); ++ return 0; ++ } ++ } ++ /* Fill it in */ ++ memcpy(base, &tmp, sizeof(tmp)); ++ ++ /* Mark the lconv data stale */ ++ base->lc_needs_refresh = 1; ++ ++ return base; ++} ++ ++locale_t duplocale(locale_t locobj) ++{ ++ locale_t loc; ++ ++ loc = (locale_t) malloc(sizeof(*loc)); ++ if (loc == NULL) { + __set_errno (ENOMEM); + return 0; + } + +- loc->lc = *localeconv(); ++ if (locobj == LC_GLOBAL_LOCALE) { ++ memcpy(loc, &__locale_global, sizeof(*loc)); ++ } else { ++ memcpy(loc, locobj, sizeof(*loc)); ++ } + ++ /* Invalidate lconv in the copy */ ++ __localeconv_lconv_init(&loc->lc); ++ loc->lc_needs_refresh = 1; ++ + return loc; + } +Index: gcc4/recipe/files/gcc/libunixlib/locale/nl_langinfo.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/locale/nl_langinfo.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/locale/nl_langinfo.c (working copy) +@@ -24,3 +24,10 @@ + + return (char *)value; + } ++ ++char * ++nl_langinfo_l (nl_item item, locale_t l) ++{ ++ (void) l; ++ return nl_langinfo(item); ++} +Index: gcc4/recipe/files/gcc/libunixlib/locale/setlocale.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/locale/setlocale.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/locale/setlocale.c (working copy) +@@ -195,7 +195,7 @@ + } + + static void +-do_lc_all (char *buffer, int size) ++do_lc_all (locale_t locobj, char *buffer, int size) + { + char temp[64]; + int category, same = 1; +@@ -204,13 +204,13 @@ + setlocale to set all locales. If all locales are + the same, then we can produce a very short string. */ + for (category = 1; category < LC_ALL; ++category) +- if (__locale_territory[0] != __locale_territory[category]) ++ if (locobj->locale_territory[0] != locobj->locale_territory[category]) + same = 0; + + if (same) + { + /* All locales are set to the same territory. */ +- territory_name (__locale_territory[0], buffer, size); ++ territory_name (locobj->locale_territory[0], buffer, size); + } + else + { +@@ -218,7 +218,7 @@ + LC_CATEGORY=country;LC_CATEGORY=country; ... */ + for (category = 0; category < LC_ALL; ++category) + { +- territory_name (__locale_territory[category], temp, sizeof (temp)); ++ territory_name (locobj->locale_territory[category], temp, sizeof (temp)); + buffer = stpcpy (buffer, locale_names[category]); + *buffer++ = '='; + buffer = stpcpy (buffer, temp); +@@ -230,15 +230,13 @@ + } + + char * +-setlocale (int category, const char *locale) ++__setlocale_l (locale_t locobj, int category, const char *locale) + { + int new_territory, changed; + static char old_locale[256]; + +- PTHREAD_UNSAFE +- + /* This tells localeconv to re-read data for the lconv structure. */ +- __setlocale_called = 1; ++ locobj->lc_needs_refresh = 1; + + if (locale == NULL) + { +@@ -247,11 +245,11 @@ + { + /* The locale string is specially encoded for LC_ALL so we + could restore all locales at any time. */ +- do_lc_all (old_locale, sizeof (old_locale)); ++ do_lc_all (locobj, old_locale, sizeof (old_locale)); + return old_locale; + } + +- territory_name (__locale_territory[category], old_locale, sizeof (old_locale)); ++ territory_name (locobj->locale_territory[category], old_locale, sizeof (old_locale)); + return old_locale; + } + +@@ -270,7 +268,7 @@ + /* Encode the locale string, as we will be returning this + later. Remember, setlocale returns the locale settings + that are about to be changed. */ +- do_lc_all (old_locale, sizeof (old_locale)); ++ do_lc_all (locobj, old_locale, sizeof (old_locale)); + + /* Check for an encoded (composite) name. Simply looking for + a semi-colon will verify this. */ +@@ -332,11 +330,11 @@ + + /* We now know all locales exist, so set them. */ + for (category = 0; category < LC_ALL; ++category) +- __locale_territory[category] = territory_number (newnames[category]); ++ locobj->locale_territory[category] = territory_number (newnames[category]); + + /* Re-build the character type tables according to the new + locale settings. */ +- __build_ctype_tables (__locale_territory[LC_CTYPE]); ++ __build_ctype_tables (locobj, locobj->locale_territory[LC_CTYPE]); + return old_locale; + } + } +@@ -359,9 +357,9 @@ + /* Change the locale for all categories. old_locale was created + when we previously checked for a composite string. */ + for (category = 0; category < LC_ALL; ++category) +- if (__locale_territory[category] != new_territory) ++ if (locobj->locale_territory[category] != new_territory) + { +- __locale_territory[category] = new_territory; ++ locobj->locale_territory[category] = new_territory; + changed = 1; + } + } +@@ -368,12 +366,12 @@ + else + { + /* Change the locale for just one category. */ +- territory_name (__locale_territory[category], ++ territory_name (locobj->locale_territory[category], + old_locale, sizeof (old_locale)); + +- if (__locale_territory[category] != new_territory) ++ if (locobj->locale_territory[category] != new_territory) + { +- __locale_territory[category] = new_territory; ++ locobj->locale_territory[category] = new_territory; + changed = 1; + } + } +@@ -384,7 +382,16 @@ + is changing. The GNU Java compiler is known to repeatedly call + setlocale. */ + if (changed && (category == LC_ALL || category == LC_CTYPE)) +- __build_ctype_tables (new_territory); ++ __build_ctype_tables (locobj, new_territory); + + return old_locale; + } ++ ++char * ++setlocale (int category, const char *locale) ++{ ++ ++ PTHREAD_UNSAFE ++ ++ return __setlocale_l(&__locale_global, category, locale); ++} +Index: gcc4/recipe/files/gcc/libunixlib/locale/strcoll.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/locale/strcoll.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/locale/strcoll.c (working copy) +@@ -11,9 +11,15 @@ + int + strcoll (const char *s1, const char *s2) + { ++ return strcoll_l (s1, s2, &__locale_global); ++} ++ ++int ++strcoll_l (const char *s1, const char *s2, locale_t l) ++{ + int regs[10]; + +- regs[0] = __locale_territory[LC_COLLATE]; ++ regs[0] = l->locale_territory[LC_COLLATE]; + regs[1] = (int)s1; + regs[2] = (int)s2; + regs[3] = 0; +@@ -21,3 +27,4 @@ + __os_swi (Territory_Collate, regs); + return regs[0]; + } ++ +Index: gcc4/recipe/files/gcc/libunixlib/locale/strxfrm.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/locale/strxfrm.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/locale/strxfrm.c (working copy) +@@ -11,9 +11,15 @@ + size_t + strxfrm (char *to, const char *from, size_t size) + { ++ return strxfrm_l (to, from, size, &__locale_global); ++} ++ ++size_t ++strxfrm_l (char *to, const char *from, size_t size, locale_t l) ++{ + int regs[10]; + +- regs[0] = __locale_territory[LC_COLLATE]; ++ regs[0] = l->locale_territory[LC_COLLATE]; + regs[1] = (int)to; + regs[2] = (int)from; + regs[3] = size; +Index: gcc4/recipe/files/gcc/libunixlib/locale/territory.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/locale/territory.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/locale/territory.c (nonexistent) +@@ -1,10 +0,0 @@ +-/* __locale_territory +- * Copyright (c) 2000-2006 UnixLib Developers +- */ +- +-#include <locale.h> +- +-/* Global used for all calls to the Territory module. These variable +- contain the territory number as set by setlocale. A value of +- -1 means use the C locale. */ +-int __locale_territory[LC_ALL + 1]; +Index: gcc4/recipe/files/gcc/libunixlib/string/stricmp.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/string/stricmp.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/string/stricmp.c (working copy) +@@ -4,6 +4,7 @@ + #include <string.h> + #include <strings.h> + #include <ctype.h> ++#include <locale.h> + + int + stricmp (const char *s1, const char *s2) +@@ -26,3 +27,24 @@ + return result; + } + strong_alias (stricmp, strcasecmp) ++ ++int ++strcasecmp_l (const char *s1, const char *s2, locale_t locobj) ++{ ++ const unsigned char *p1 = (const unsigned char *) s1; ++ const unsigned char *p2 = (const unsigned char *) s2; ++ int result = 0; ++ ++ if (p1 == p2) ++ return result; ++ ++ while (! result) ++ { ++ result = tolower_l (*p1, locobj) - tolower_l (*p2, locobj); ++ if (*p1++ == '\0') ++ break; ++ p2 ++; ++ } ++ ++ return result; ++} +Index: gcc4/recipe/files/gcc/libunixlib/string/strnicmp.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/string/strnicmp.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/string/strnicmp.c (working copy) +@@ -5,6 +5,7 @@ + #include <string.h> + #include <strings.h> + #include <ctype.h> ++#include <locale.h> + + int + strnicmp (const char *s1, const char *s2, size_t n) +@@ -26,3 +27,22 @@ + } + strong_alias (strnicmp, strncasecmp) + ++int ++strncasecmp_l (const char *s1, const char *s2, size_t n, locale_t locobj) ++{ ++ int i, j; ++ ++ if (!n) ++ return 0; ++ ++ do ++ { ++ i = *s1++, j = *s2++; ++ i = tolower_l (i, locobj); ++ j = tolower_l (j, locobj); ++ } ++ while (i && i == j && --n); ++ ++ return i - j; ++} ++ +Index: gcc4/recipe/files/gcc/libunixlib/sys/errlist.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/sys/errlist.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/sys/errlist.c (working copy) +@@ -211,3 +211,10 @@ + + return 0; + } ++ ++char * ++strerror_l (int errnum, locale_t l) ++{ ++ (void) l; ++ return strerror (errnum); ++} +Index: gcc4/recipe/files/gcc/libunixlib/time/broken.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/time/broken.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/time/broken.c (working copy) +@@ -49,7 +49,7 @@ + #ifdef __TARGET_SCL__ + -1, + #else +- __locale_territory[LC_TIME], ++ __locale_global.locale_territory[LC_TIME], + #endif + riscos_time, ordinals); + } +Index: gcc4/recipe/files/gcc/libunixlib/time/gmtime_r.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/time/gmtime_r.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/time/gmtime_r.c (working copy) +@@ -46,7 +46,7 @@ + #ifdef __TARGET_SCL__ + -1, + #else +- __locale_territory[LC_TIME], ++ __locale_global.locale_territory[LC_TIME], + #endif + riscos_time, ordinals)) != NULL) + { +Index: gcc4/recipe/files/gcc/libunixlib/time/localtime_r.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/time/localtime_r.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/time/localtime_r.c (working copy) +@@ -28,7 +28,7 @@ + #ifdef __TARGET_SCL__ + -1, + #else +- __locale_territory[LC_TIME], ++ __locale_global.locale_territory[LC_TIME], + #endif + riscos_time, ordinals)) != NULL) + { +Index: gcc4/recipe/files/gcc/libunixlib/time/mktime.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/time/mktime.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/time/mktime.c (working copy) +@@ -23,7 +23,7 @@ + #ifdef __TARGET_SCL__ + -1, + #else +- __locale_territory[LC_TIME], ++ __locale_global.locale_territory[LC_TIME], + #endif + riscos_time, + ordinals)) != NULL) +Index: gcc4/recipe/files/gcc/libunixlib/time/stdtime.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/time/stdtime.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/time/stdtime.c (working copy) +@@ -48,7 +48,7 @@ + #ifdef __TARGET_SCL__ + -1, + #else +- __locale_territory[LC_TIME], ++ __locale_global.locale_territory[LC_TIME], + #endif + riscos_time, + result, +Index: gcc4/recipe/files/gcc/libunixlib/time/strftime.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/time/strftime.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/time/strftime.c (working copy) +@@ -353,7 +353,7 @@ + int regs[10]; + char buffer[64]; + +- regs[0] = __locale_territory[LC_TIME]; ++ regs[0] = __locale_global.locale_territory[LC_TIME]; + regs[1] = (int)timep; + regs[2] = (int)buffer; + regs[3] = sizeof (buffer) - 1; +@@ -368,7 +368,7 @@ + int regs[10]; + char buffer[64]; + +- regs[0] = __locale_territory[LC_TIME]; ++ regs[0] = __locale_global.locale_territory[LC_TIME]; + regs[1] = (int)timep; + regs[2] = (int)buffer; + regs[3] = sizeof (buffer) - 1; +Index: gcc4/recipe/files/gcc/libunixlib/time/tzset.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/time/tzset.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/time/tzset.c (working copy) +@@ -36,7 +36,7 @@ + /* Get timezone information for current territory. */ + _kernel_swi_regs regs; + #ifndef __TARGET_SCL__ +- regs.r[0] = __locale_territory[LC_TIME]; ++ regs.r[0] = __locale_global.locale_territory[LC_TIME]; + #else + regs.r[0] = -1; /* Current territory. */ + #endif +Index: gcc4/recipe/files/gcc/libunixlib/unix/unix.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/unix/unix.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/unix/unix.c (working copy) +@@ -191,7 +191,7 @@ + __pthread_prog_init (); + __unixlib_signal_initialise (__u); + /* Initialise ctype tables to the C locale. */ +- __build_ctype_tables (-2); ++ __build_ctype_tables (&__locale_global, -2); + /* Define and initialise the Unix I/O. */ + initialise_unix_io (); + __stdioinit (); +Index: gcc4/recipe/files/gcc/libunixlib/vscript +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/vscript (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/vscript (working copy) +@@ -58,6 +58,9 @@ + __init_des_r; + __init_des; + __invalidate; ++ __locale_global; ++ __localeconv_lconv_init; ++ __localeconv_lconv_fini; + malloc_trim; + malloc_trim_unlocked; + malloc_unlocked; +@@ -80,6 +83,7 @@ + __res_vinit; + __runtime_features; + __setup_signalhandler_stack; ++ __setlocale_l; + __sdirinit; + __sfixinit; + __sfixfind; +Index: gcc4/recipe/files/gcc/libunixlib/wchar/wctype.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/wchar/wctype.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/wchar/wctype.c (working copy) +@@ -4,6 +4,7 @@ + */ + + #include <ctype.h> ++#include <locale.h> + #include <wctype.h> + + int +@@ -71,3 +72,69 @@ + { + return isxdigit (wc); + } ++ ++int ++iswalnum_l (wint_t wc, locale_t locale) ++{ ++ return isalnum_l (wc, locale); ++} ++ ++int ++iswalpha_l (wint_t wc, locale_t locale) ++{ ++ return isalpha_l (wc, locale); ++} ++ ++int ++iswcntrl_l (wint_t wc, locale_t locale) ++{ ++ return iscntrl_l (wc, locale); ++} ++ ++int ++iswdigit_l (wint_t wc, locale_t locale) ++{ ++ return isdigit_l (wc, locale); ++} ++ ++int ++iswgraph_l (wint_t wc, locale_t locale) ++{ ++ return isgraph_l (wc, locale); ++} ++ ++int ++iswprint_l (wint_t wc, locale_t locale) ++{ ++ return isprint_l (wc, locale); ++} ++ ++int ++iswpunct_l (wint_t wc, locale_t locale) ++{ ++ return ispunct_l (wc, locale); ++} ++ ++int ++iswspace_l (wint_t wc, locale_t locale) ++{ ++ return isspace_l (wc, locale); ++} ++ ++int ++iswxdigit_l (wint_t wc, locale_t locale) ++{ ++ return isxdigit_l (wc, locale); ++} ++ ++wint_t ++towlower_l (wint_t wc, locale_t locale) ++{ ++ return tolower_l (wc, locale); ++} ++ ++wint_t ++towupper_l (wint_t wc, locale_t locale) ++{ ++ return toupper_l (wc, locale); ++} +Index: gcc4/recipe/files/gcc/libunixlib/wchar/wmissing.c +=================================================================== +--- gcc4/recipe/files/gcc/libunixlib/wchar/wmissing.c (revision 7698) ++++ gcc4/recipe/files/gcc/libunixlib/wchar/wmissing.c (working copy) +@@ -1,7 +1,7 @@ ++#include <locale.h> ++#include <stdio.h> + #include <stdlib.h> + #include <wctype.h> +-#include <wctype.h> +-#include <stdio.h> + + int iswupper (wint_t __wc) + { +@@ -9,13 +9,26 @@ + abort(); + } + +-unsigned long int wcstoul (__const wchar_t *__restrict __nptr, +- wchar_t **__restrict __endptr, int __base) ++int ++iswupper_l (wint_t wc, locale_t locale) + { + printf("%s: Not implemented\n", __func__); + abort(); + } + ++int iswlower (wint_t __wc) ++{ ++ printf("%s: Not implemented\n", __func__); ++ abort(); ++} ++ ++int ++iswlower_l (wint_t wc, locale_t locale) ++{ ++ printf("%s: Not implemented\n", __func__); ++ abort(); ++} ++ + int wcscoll (__const wchar_t *__s1, __const wchar_t *__s2) + { + printf("%s: Not implemented\n", __func__); +@@ -22,12 +35,47 @@ + abort(); + } + +-int iswlower (wint_t __wc) ++int wcscoll_l (__const wchar_t *__s1, __const wchar_t *__s2, ++ locale_t loc) + { + printf("%s: Not implemented\n", __func__); + abort(); + } + ++int wcscasecmp (__const wchar_t *__s1, __const wchar_t *__s2) ++{ ++ printf("%s: Not implemented\n", __func__); ++ abort(); ++} ++ ++int wcsncasecmp (__const wchar_t *__s1, __const wchar_t *__s2, ++ size_t __n) ++{ ++ printf("%s: Not implemented\n", __func__); ++ abort(); ++} ++ ++int wcscasecmp_l (__const wchar_t *__s1, __const wchar_t *__s2, ++ locale_t __loc) ++{ ++ printf("%s: Not implemented\n", __func__); ++ abort(); ++} ++ ++int wcsncasecmp_l (__const wchar_t *__s1, __const wchar_t *__s2, ++ size_t __n, locale_t __loc) ++{ ++ printf("%s: Not implemented\n", __func__); ++ abort(); ++} ++ ++unsigned long int wcstoul (__const wchar_t *__restrict __nptr, ++ wchar_t **__restrict __endptr, int __base) ++{ ++ printf("%s: Not implemented\n", __func__); ++ abort(); ++} ++ + long long int wcstoll (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, int __base) + { +@@ -63,6 +111,13 @@ + abort(); + } + ++size_t wcsxfrm_l (wchar_t *__s1, __const wchar_t *__s2, ++ size_t __n, locale_t __loc) ++{ ++ printf("%s: Not implemented\n", __func__); ++ abort(); ++} ++ + float wcstof (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr) + { +@@ -83,6 +138,13 @@ + abort(); + } + ++int ++iswblank_l (wint_t __wc, locale_t __locale) ++{ ++ printf("%s: Not implemented\n", __func__); ++ abort(); ++} ++ + int iswctype (wint_t __wc, wctype_t __desc) + { + printf("%s: Not implemented\n", __func__); +@@ -89,6 +151,12 @@ + abort(); + } + ++int iswctype_l (wint_t __wc, wctype_t __desc, locale_t __locale) ++{ ++ printf("%s: Not implemented\n", __func__); ++ abort(); ++} ++ + unsigned long long int wcstoull (__const wchar_t *__restrict __nptr, + wchar_t **__restrict __endptr, + int __base) +@@ -116,6 +184,12 @@ + abort(); + } + ++wctype_t wctype_l (__const char *__property, locale_t __locale) ++{ ++ printf("%s: Not implemented\n", __func__); ++ abort(); ++} ++ + wint_t ungetwc(wint_t wc, FILE *stream) + { + printf("%s: Not implemented\n", __func__); diff --git a/arm-unknown-riscos/recipes/patches/gcc4/ppl-download.p b/arm-unknown-riscos/recipes/patches/gcc4/ppl-download.p new file mode 100644 index 0000000..128e9eb --- /dev/null +++ b/arm-unknown-riscos/recipes/patches/gcc4/ppl-download.p @@ -0,0 +1,27 @@ +--- gcc4/Makefile.orig 2018-01-26 08:03:49.745541843 +0000 ++++ gcc4/Makefile 2018-01-26 08:05:15.256056177 +0000 +@@ -586,9 +586,9 @@ + touch $(BUILDSTEPSDIR)/$@ + + # Unpack & copy ppl source: +-src-ppl-copied: $(SRCORIGDIR)/ppl-$(PPL_VERSION).tar.gz ++src-ppl-copied: $(SRCORIGDIR)/ppl-$(PPL_VERSION).tar.xz + -rm -rf $(SRCORIGDIR)/ppl-$(PPL_VERSION) $(SRCDIR)/ppl +- cd $(SRCORIGDIR) && tar xf $< ++ cd $(SRCORIGDIR) && tar axf $< + -mkdir -p $(SRCDIR)/ppl + cp -T -p -r $(SRCORIGDIR)/ppl-$(PPL_VERSION) $(SRCDIR)/ppl + cd $(SRCDIR)/ppl && PATH="$(PREFIX_BUILDTOOL_GCC)/bin:$(PATH)" && $(SCRIPTSDIR)/do-patch-and-copy $(RECIPEDIR) +@@ -713,10 +713,9 @@ + touch $@ + + # Download ppl source: +-$(SRCORIGDIR)/ppl-$(PPL_VERSION).tar.gz: ++$(SRCORIGDIR)/ppl-$(PPL_VERSION).tar.xz: + -mkdir -p $(SRCORIGDIR) +- cd $(SRCORIGDIR) && wget -c https://www.bugseng.com/external/ppl/download/ftp/releases/$(PPL_VERSION)/ppl-$(PPL_VERSION).tar.gz +- touch $@ ++ wget -O $@ -c https://ci.netsurf-browser.org/toolchain/arm-unknown-riscos/ppl-$(PPL_VERSION).tar.xz + + # Download CLooG source: + $(SRCORIGDIR)/cloog-ppl-$(CLOOG_VERSION).tar.gz: diff --git a/arm-unknown-riscos/recipes/patches/gcc4/unixlib-ldrex-strex.p b/arm-unknown-riscos/recipes/patches/gcc4/unixlib-ldrex-strex.p deleted file mode 100644 index 045a0b8..0000000 --- a/arm-unknown-riscos/recipes/patches/gcc4/unixlib-ldrex-strex.p +++ /dev/null @@ -1,304 +0,0 @@ -Backport r7043 from upstream: partially replaces use of SWP with LDREX/STREX -on systems where SWP is no longer available. This fix is incomplete, -but sufficient for our purposes. - -Fri Mar 11 14:51:54 GMT 2016 Lee Noar <leenoar@sky.com> - - * sys/_cpucaps.s: New file. Provide functions to probe the - OS for details of the CPU (currently SWP, LDREX/STREX - availability). - * Makefile.am: Add above file. - * include/unixlib/local.h: Add declarations for user facing - functions provided above. - * incl-local/internal/asm_dec.s(__ul_global): Add entry to - record CPU flags. - * incl-local/internal/unix.h: Likewise. - * pthread/_ints.s(__pthread_disable_ints,__pthread_protect_unsafe): - Use CPU flags to determine whether to use the SWP instruction or - LRDEX/STREX. - * sys/_syslib.s(__main): Add call to __probe_cpu_caps. - (__unixlib_fatal): Use CPU flags to determine whether to use the - SWP instruction or LRDEX/STREX. - - -Index: gcc4/recipe/files/gcc/libunixlib/pthread/_ints.s -=================================================================== ---- gcc4/recipe/files/gcc/libunixlib/pthread/_ints.s (revision 7042) -+++ gcc4/recipe/files/gcc/libunixlib/pthread/_ints.s (revision 7043) -@@ -2,7 +2,7 @@ - @ disable_ints can be called multiple times, provided enable_ints is - @ subsequently called an equal number of times - @ Written by Martin Piper and Alex Waugh --@ Copyright (c) 2002-2008 UnixLib Developers -+@ Copyright (c) 2002-2016 UnixLib Developers - - #include "internal/asm_dec.s" - -@@ -20,15 +20,26 @@ - PICEQ "LDR a2, [a2, #0]" - PICEQ "LDR a2, [a2, #__GOTT_INDEX__]" @ a2 = GOT ptr - -- LDR a1, .L0 @=__ul_global -+ LDR a1, .L0 @ =__ul_global - PICEQ "LDR a1, [a2, a1]" -+ LDR a4, [a1, #GBL_CPU_FLAGS] - ADD a1, a1, #GBL_PTH_WORKSEMAPHORE -+ TST a4, #__CPUCAP_HAVE_SWP -+ @ From this point onwards we will not be interrupted by the callback -+ BEQ 0f -+ - MOV a3, #1 - SWP a2, a3, [a1] -- @ From this point onwards we will not be interrupted by the callback - ADD a2, a2, #1 - STR a2, [a1] - MOV pc, lr -+0: -+ LDREX a2, [a1] -+ ADD a2, a2, #1 -+ STREX a3, a2, [a1] -+ TEQ a3, #1 -+ BEQ 0b -+ MOV pc, lr - .L0: - WORD __ul_global - DECLARE_FUNCTION __pthread_disable_ints -@@ -78,18 +89,32 @@ - PICEQ "LDR a1, [a1, #0]" - PICEQ "LDR a1, [a1, #__GOTT_INDEX__]" @ a1 = GOT ptr - -- LDR a4, .L2 @=__ul_global -+ LDR a4, .L2 @ =__ul_global - PICEQ "LDR a4, [a1, a4]" -+ LDR a2, [a4, #GBL_CPU_FLAGS] - ADD a1, a4, #GBL_PTH_WORKSEMAPHORE -+ TST a2, #__CPUCAP_HAVE_SWP -+ @ From this point onwards we cannot be interrupted by the callback -+ BEQ 0f -+ - MOV a2, #1 - SWP a3, a2, [a1] -- @ From this point onwards we cannot be interrupted by the callback - CMP a3, #0 -- STRNE a3, [a1, #0] @ Restore original value -+ BEQ 1f -+ STR a3, [a1, #0] @ Restore original value - @ Return, as if ints are disabled on entry to the - @ calling function then they should not be reenabled - @ until the calling function has returned -+ MOV pc, lr -+0: -+ LDREX a3, [a1] -+ MOV ip, #1 -+ STREX a2, ip, [a1] -+ TEQ a2, #1 -+ BEQ 0b -+ TEQ a3, #0 - MOVNE pc, lr -+1: - - #if __UNIXLIB_PARANOID - LDR a3, [a4, #GBL_PTH_RETURN_ADDRESS] -Index: gcc4/recipe/files/gcc/libunixlib/include/unixlib/local.h -=================================================================== ---- gcc4/recipe/files/gcc/libunixlib/include/unixlib/local.h (revision 7042) -+++ gcc4/recipe/files/gcc/libunixlib/include/unixlib/local.h (revision 7043) -@@ -133,6 +133,16 @@ - socket. Is -1 when socket handle is not valid. */ - extern int __get_ro_socket (int __sockfd); - -+/* Return 1 if the SWP instruction is available, otherwise 0. */ -+extern unsigned int __cpucap_have_swp (void); -+ -+/* Return 1 if the LDREX/STREX instructions are available, otherwise 0. */ -+extern unsigned int __cpucap_have_rex (void); -+ -+/* Return 1 if the LDREX/STREX instructions that operate on bytes, half-words -+ and double words are available, otherwise 0. */ -+extern unsigned int __cpucap_have_rexbhd (void); -+ - __END_DECLS - - #endif - * incl-local/internal/asm_dec.s(XSOM_DeregisterClient): Add -Index: gcc4/recipe/files/gcc/libunixlib/Makefile.am -=================================================================== ---- gcc4/recipe/files/gcc/libunixlib/Makefile.am (revision 7042) -+++ gcc4/recipe/files/gcc/libunixlib/Makefile.am (revision 7043) -@@ -1027,6 +1027,7 @@ - sys/sigsetjmp.c \ - sys/stackalloc.c \ - sys/vfork.c \ -+ sys/_cpucaps.s \ - sys/_getcpuarch.s \ - sys/_jmp.s \ - sys/_mman.s \ -Index: gcc4/recipe/files/gcc/libunixlib/incl-local/internal/asm_dec.s -=================================================================== ---- gcc4/recipe/files/gcc/libunixlib/incl-local/internal/asm_dec.s (revision 7042) -+++ gcc4/recipe/files/gcc/libunixlib/incl-local/internal/asm_dec.s (revision 7043) -@@ -269,8 +269,10 @@ - .set GBL_FLS_LBSTM_ON_RD, 108 @ = __ul_global.fls_lbstm_on_rd - .set GBL_PTH_CALLEVERY_RMA, 112 @ = __ul_global.pthread_callevery_rma - -+.set GBL_CPU_FLAGS, 116 @ = __ul_global.cpu_flags -+ - #if !defined(__SOFTFP__) && defined(__VFP_FP__) --.set GBL_VFP_REGCOUNT, 116 @ = __ul_global.vfp_regcount -+.set GBL_VFP_REGCOUNT, 120 @ = __ul_global.vfp_regcount - #endif - - @ Entries in the __ul_memory table. Must be kept in sync with -@@ -322,3 +324,7 @@ - .set CRT1_LIB_FINI, 32 @ Ptr to function to finalise shared libraries - @ at program exit - can be NULL. - #endif -+ -+#define __CPUCAP_HAVE_SWP 0x1 -+#define __CPUCAP_HAVE_REX 0x2 -+#define __CPUCAP_HAVE_REXBHD 0x4 -Index: gcc4/recipe/files/gcc/libunixlib/incl-local/internal/unix.h -=================================================================== ---- gcc4/recipe/files/gcc/libunixlib/incl-local/internal/unix.h (revision 7042) -+++ gcc4/recipe/files/gcc/libunixlib/incl-local/internal/unix.h (revision 7043) -@@ -197,6 +197,8 @@ - the life of the program. This block is passed to the call_every handler in - r12. */ - -+ unsigned int cpu_flags; /* Flags indicating the capabilities of the CPU. */ -+ - #if !defined(__SOFTFP__) && defined(__VFP_FP__) - int vfp_regcount; /* Number of doubleword registers we should request for - VFP contexts */ -Index: gcc4/recipe/files/gcc/libunixlib/sys/_cpucaps.s -=================================================================== ---- gcc4/recipe/files/gcc/libunixlib/sys/_cpucaps.s (revision 0) -+++ gcc4/recipe/files/gcc/libunixlib/sys/_cpucaps.s (revision 7043) -@@ -0,0 +1,91 @@ -+@ Determine the capabilities of the CPU and allow callers to enquire -+@ what they are. -+@ Copyright (c) 2016 UnixLib Developers. -+@ Written by Lee Noar. -+ -+#include "internal/asm_dec.s" -+ -+ .text -+ -+@ Determine what the CPU capabilities are, and record them. -+@ Called early on during program initialisation in _syslib.s. -+ .global __probe_cpu_caps -+ NAME __probe_cpu_caps -+__probe_cpu_caps: -+ MOV r0, #0 -+ SWI XOS_PlatformFeatures -+ MOVVS r0, #0 -+ -+ MOV r2, #0 -+ @ The OS flag is set to 1 to indicate _no_ SWP instruction available (for -+ @ backwards compatibility). We reverse it here and set our flag to 1 to -+ @ indicate that SWP _is_ available. -+ TST r0, #1<<11 @ SWP{B} not available -+ ORREQ r2, r2, #__CPUCAP_HAVE_SWP -+ TST r0, #1<<12 @ LDREX/STREX available -+ ORRNE r2, r2, #__CPUCAP_HAVE_REX -+ TST r0, #1<<13 @ LDREX/STREX{B/H/D} available -+ ORRNE r2, r2, #__CPUCAP_HAVE_REXBHD -+ -+ PICEQ "LDR r0, =__GOTT_BASE__" -+ PICEQ "LDR r0, [r0, #0]" -+ PICEQ "LDR r0, [r0, #__GOTT_INDEX__]" @ r0 = GOT ptr -+ LDR r1, .L0 @ =__ul_global -+ PICEQ "LDR r1, [r0, r1]" -+ STR r2, [r1, #GBL_CPU_FLAGS] -+ -+ MOV pc, lr -+.L0: -+ WORD __ul_global -+ DECLARE_FUNCTION __probe_cpu_caps -+ -+ .global __cpucap_have_swp -+ NAME __cpucap_have_swp -+__cpucap_have_swp: -+ PICEQ "LDR r0, =__GOTT_BASE__" -+ PICEQ "LDR r0, [r0, #0]" -+ PICEQ "LDR r0, [r0, #__GOTT_INDEX__]" @ r0 = GOT ptr -+ LDR r1, .L0 @ =__ul_global -+ PICEQ "LDR r1, [r0, r1]" -+ LDR r0, [r1, #GBL_CPU_FLAGS] -+ TST r0, #__CPUCAP_HAVE_SWP -+ MOVEQ r0, #0 -+ MOVNE r0, #1 -+ -+ MOV pc, lr -+ DECLARE_FUNCTION __cpucap_have_swp -+ -+@ Return 1 if LDREX/STREX instructions are available on the CPU, otherwise 0. -+ .global __cpucap_have_rex -+ NAME __cpucap_have_rex -+__cpucap_have_rex: -+ PICEQ "LDR r0, =__GOTT_BASE__" -+ PICEQ "LDR r0, [r0, #0]" -+ PICEQ "LDR r0, [r0, #__GOTT_INDEX__]" @ r0 = GOT ptr -+ LDR r1, .L0 @ =__ul_global -+ PICEQ "LDR r1, [r0, r1]" -+ LDR r0, [r1, #GBL_CPU_FLAGS] -+ TST r0, #__CPUCAP_HAVE_REX -+ MOVEQ r0, #0 -+ MOVNE r0, #1 -+ -+ MOV pc, lr -+ DECLARE_FUNCTION __cpucap_have_rex -+ -+@ Return 1 if LDREX/STREX instructions that work on non-32 bit data sizes -+@ are available on the CPU, otherwise 0. -+ .global __cpucap_have_rexbhd -+ NAME __cpucap_have_rexbhd -+__cpucap_have_rexbhd: -+ PICEQ "LDR r0, =__GOTT_BASE__" -+ PICEQ "LDR r0, [r0, #0]" -+ PICEQ "LDR r0, [r0, #__GOTT_INDEX__]" @ r0 = GOT ptr -+ LDR r1, .L0 @ =__ul_global -+ PICEQ "LDR r1, [r0, r1]" -+ LDR r0, [r1, #GBL_CPU_FLAGS] -+ TST r0, #__CPUCAP_HAVE_REXBHD -+ MOVEQ r0, #0 -+ MOVNE r0, #1 -+ -+ MOV pc, lr -+ DECLARE_FUNCTION __cpucap_have_rexbhd -Index: gcc4/recipe/files/gcc/libunixlib/sys/_syslib.s -=================================================================== ---- gcc4/recipe/files/gcc/libunixlib/sys/_syslib.s (revision 7042) -+++ gcc4/recipe/files/gcc/libunixlib/sys/_syslib.s (revision 7043) -@@ -255,6 +255,8 @@ - BCC __exit_with_error_num - unknown_cpu_arch: - -+ BL __probe_cpu_caps -+ - @ Use of DAs explicitly overridden if __dynamic_no_da is declared - MOV lr, #-1 - STR lr, [ip, #GBL_DYNAMIC_NUM] -@@ -1286,9 +1288,21 @@ - @ error handling. As last resort to avoid an infinite loop - @ we go for a straight OS_Exit scenario. Anything better we - @ can do ? -+ ADD a3, a4, #GBL_PANIC_MODE -+ LDR a2, [a4, #GBL_CPU_FLAGS] -+ TST a2, #__CPUCAP_HAVE_SWP -+ BEQ 0f -+ - MOV a2, #1 -- ADD a3, a4, #GBL_PANIC_MODE - SWP a2, a2, [a3] -+ B 1f -+0: -+ LDREX a2, [a3] -+ MOV ip, #1 -+ STREX lr, ip, [a3] -+ TEQ lr, #1 -+ BEQ 0b -+1: - TEQ a2, #0 - BEQ __unixlib_fatal_cont1 - diff --git a/arm-unknown-riscos/recipes/patches/oslib/vapi.p b/arm-unknown-riscos/recipes/patches/oslib/vapi.p new file mode 100644 index 0000000..a3daf40 --- /dev/null +++ b/arm-unknown-riscos/recipes/patches/oslib/vapi.p @@ -0,0 +1,10 @@ +--- Tools/DefMod2/vapi.c.orig 2017-09-19 11:57:15.559547484 +0100 ++++ Tools/DefMod2/vapi.c 2017-09-19 11:57:31.067750029 +0100 +@@ -23,6 +23,7 @@ + #include <stdio.h> + #include <string.h> + #include <ctype.h> ++#include <stdbool.h> + + #include "oslib/os.h" + diff --git a/i686-w64-mingw32/Makefile b/i686-w64-mingw32/Makefile index 4a5a7e7..5d35249 100644 --- a/i686-w64-mingw32/Makefile +++ b/i686-w64-mingw32/Makefile @@ -1,29 +1,28 @@ -#!/usr/bin/make +#!/bin/make # Build cross toolchain for i686 processor with a win32 (mingw) ABI -UPSTREAM_GCC_VERSION := 4.8.4 -UPSTREAM_GCC_TARBALL := gcc-$(UPSTREAM_GCC_VERSION).tar.bz2 +UPSTREAM_GCC_VERSION := 12.2.0 +UPSTREAM_GCC_TARBALL := gcc-$(UPSTREAM_GCC_VERSION).tar.xz UPSTREAM_GCC_URI := http://ftpmirror.gnu.org/gcc/gcc-$(UPSTREAM_GCC_VERSION)/$(UPSTREAM_GCC_TARBALL) -UPSTREAM_BINUTILS_VERSION := 2.25 +UPSTREAM_BINUTILS_VERSION := 2.39 UPSTREAM_BINUTILS_TARBALL := binutils-$(UPSTREAM_BINUTILS_VERSION).tar.bz2 UPSTREAM_BINUTILS_URI := http://ftpmirror.gnu.org/binutils/$(UPSTREAM_BINUTILS_TARBALL) -UPSTREAM_GMP_VERSION := 5.0.5 +UPSTREAM_GMP_VERSION := 6.2.1 UPSTREAM_GMP_TARBALL := gmp-$(UPSTREAM_GMP_VERSION).tar.bz2 UPSTREAM_GMP_URI := http://ftp.gnu.org/gnu/gmp/$(UPSTREAM_GMP_TARBALL) -# Would use 3.0.0, but that dislikes in-tree gmp sources -UPSTREAM_MPFR_VERSION := 2.4.2 -UPSTREAM_MPFR_TARBALL := mpfr-$(UPSTREAM_MPFR_VERSION).tar.bz2 +UPSTREAM_MPFR_VERSION := 4.2.0 +UPSTREAM_MPFR_TARBALL := mpfr-$(UPSTREAM_MPFR_VERSION).tar.xz UPSTREAM_MPFR_URI := http://www.mpfr.org/mpfr-$(UPSTREAM_MPFR_VERSION)/$(UPSTREAM_MPFR_TARBALL) -UPSTREAM_MPC_VERSION := 0.8.2 +UPSTREAM_MPC_VERSION := 1.3.0 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_MINGW_VERSION := 3.3.0 +UPSTREAM_MINGW_VERSION := 10.0.0 UPSTREAM_MINGW_TARBALL := mingw-w64-v$(UPSTREAM_MINGW_VERSION).tar.bz2 UPSTREAM_MINGW_URI := "http://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/$(UPSTREAM_MINGW_TARBALL)?r=http%3A%2F%2Fmingw-w64.sourceforge.net%2Fdownload.php&ts=1426088797&use_mirror=cznic" @@ -62,7 +61,7 @@ $(BUILDSTEPS)/gcc-core.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/binutils.d --prefix=$(PREFIX) --target=$(TARGET_NAME) \ --enable-languages=c,c++ --with-system-zlib --disable-multilib \ --enable-shared --enable-fully-dynamic-string - cd $(BUILDDIR)/gcc && PATH="$(PREFIX)/bin:$(PATH)" make all-gcc + cd $(BUILDDIR)/gcc && PATH="$(PREFIX)/bin:$(PATH)" make all-gcc -j 8 cd $(BUILDDIR)/gcc && PATH="$(PREFIX)/bin:$(PATH)" make install-gcc touch $@ @@ -143,28 +142,22 @@ $(BUILDSTEPS)/binutils-srcdir.d: $(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL) ### $(SOURCESDIR)/$(UPSTREAM_GCC_TARBALL): - wget -q -O $@ $(UPSTREAM_GCC_URI) - touch $@ + wget -q -O $@ $(UPSTREAM_GCC_URI) $(SOURCESDIR)/$(UPSTREAM_GMP_TARBALL): wget -q -O $@ $(UPSTREAM_GMP_URI) - touch $@ $(SOURCESDIR)/$(UPSTREAM_MPFR_TARBALL): wget -q -O $@ $(UPSTREAM_MPFR_URI) - touch $@ $(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL): wget -q -O $@ $(UPSTREAM_MPC_URI) - touch $@ $(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL): wget -q -O $@ $(UPSTREAM_BINUTILS_URI) - touch $@ $(SOURCESDIR)/$(UPSTREAM_MINGW_TARBALL): wget -q -O $@ $(UPSTREAM_MINGW_URI) - touch $@ ### # Rule to create buildsteps dir @@ -175,7 +168,7 @@ $(BUILDSTEPS)/buildsteps.d: $(SOURCESDIR) $(SRCDIR) touch $@ $(SOURCESDIR): - mkdir -p $@ + mkdir -p $(SOURCESDIR) $(SRCDIR): - mkdir -p $@ + mkdir -p $(SRCDIR) 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/m5475-atari-mint/Makefile b/m5475-atari-mint/Makefile index 43e6c56..6ed3b4c 100644 --- a/m5475-atari-mint/Makefile +++ b/m5475-atari-mint/Makefile @@ -5,13 +5,13 @@ UPSTREAM_GCC_VERSION := 4.6.4 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) -UPSTREAM_GCC_PATCH := gcc-4.6.4-mint-20130415.patch.bz2 +UPSTREAM_GCC_PATCH := gcc-4.6.4-mint-20200504.patch.bz2 UPSTREAM_GCC_PATCH_URI := http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_GCC_PATCH) -UPSTREAM_BINUTILS_VERSION := 2.24 +UPSTREAM_BINUTILS_VERSION := 2.30 UPSTREAM_BINUTILS_TARBALL := binutils-$(UPSTREAM_BINUTILS_VERSION).tar.bz2 UPSTREAM_BINUTILS_URI := ftp://ftp.gnu.org/gnu/binutils/$(UPSTREAM_BINUTILS_TARBALL) -UPSTREAM_BINUTILS_PATCH := binutils-2.24-mint-20131217.patch.bz2 +UPSTREAM_BINUTILS_PATCH := binutils-2.30-mint-20180703.patch.bz2 UPSTREAM_BINUTILS_PATCH_URI := http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_BINUTILS_PATCH) UPSTREAM_GMP_VERSION := 4.3.2 @@ -27,21 +27,21 @@ 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_MINTBIN_VERSION := CVS-20110527 +UPSTREAM_MINTBIN_VERSION := Git-20201129 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-20131219 +UPSTREAM_MINTLIB_VERSION := Git-20220821 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) UPSTREAM_PML_VERSION := 2.03 UPSTREAM_PML_TARBALL := pml-$(UPSTREAM_PML_VERSION).tar.bz2 UPSTREAM_PML_URI := http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_PML_TARBALL) -UPSTREAM_PML_PATCH := pml-2.03-mint-20110207.patch.bz2 +UPSTREAM_PML_PATCH := pml-2.03-mint-20191013.patch.bz2 UPSTREAM_PML_PATCH_URI := http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_PML_PATCH) -UPSTREAM_GEMLIB_VERSION := CVS-20130415 +UPSTREAM_GEMLIB_VERSION := Git-20230112 UPSTREAM_GEMLIB_TARBALL := gemlib-$(UPSTREAM_GEMLIB_VERSION).tar.bz2 UPSTREAM_GEMLIB_URI := http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_GEMLIB_TARBALL) @@ -49,6 +49,9 @@ GCC_AUTOCONF := autoconf2.64 GCC_AUTOHEADER := autoheader2.64 GCC_AUTORECONF := autoreconf2.64 GCC_AUTOM4TE := autom4te2.64 +GCC_AUTOMAKE := automake-1.11 +GCC_ACLOCAL := aclocal-1.11 +GCC_MAKEINFO := : TOP := $(CURDIR) RECIPES := $(TOP)/recipes @@ -59,6 +62,8 @@ SRCDIR := $(BUILDDIR)/srcdir GCC_SRCDIR := $(SRCDIR)/gcc BINUTILS_SRCDIR := $(SRCDIR)/binutils MINTBIN_SRCDIR := $(SRCDIR)/mintbin +# optionally pass -jN here +BUILD_SMP := TARGET_NAME := m5475-atari-mint @@ -81,8 +86,8 @@ $(BUILDSTEPS)/gemlib.d: $(BUILDSTEPS)/stage2.d $(SOURCESDIR)/$(UPSTREAM_GEMLIB_T tar xjf $(SOURCESDIR)/$(UPSTREAM_GEMLIB_TARBALL) mv gemlib-$(UPSTREAM_GEMLIB_VERSION) $(BUILDDIR)/gemlib for p in `ls $(RECIPES)/patches/gemlib/*.p` ; do patch -d $(BUILDDIR)/gemlib -p0 <$$p ; done - cd $(BUILDDIR)/gemlib/gemlib && PATH="$(PREFIX)/bin:$(PATH)" make - cd $(BUILDDIR)/gemlib/gemlib && PATH="$(PREFIX)/bin:$(PATH)" make install + cd $(BUILDDIR)/gemlib && PATH="$(PREFIX)/bin:$(PATH)" make + cd $(BUILDDIR)/gemlib && PATH="$(PREFIX)/bin:$(PATH)" make install touch $@ ### @@ -131,7 +136,7 @@ $(BUILDSTEPS)/mintlib.d: $(BUILDSTEPS)/bootstrap-compiler.d $(SOURCESDIR)/$(UPST # Rules to build and install the bootstrap compiler ### -GCC_ENV_PARAMS := AUTOCONF=$(GCC_AUTOCONF) AUTOHEADER=$(GCC_AUTOHEADER) AUTOM4TE=$(GCC_AUTOM4TE) PATH="$(PREFIX)/bin:$(PATH)" +GCC_ENV_PARAMS := AUTOCONF=$(GCC_AUTOCONF) AUTOHEADER=$(GCC_AUTOHEADER) AUTOM4TE=$(GCC_AUTOM4TE) ACLOCAL=$(GCC_ACLOCAL) AUTOMAKE=$(GCC_AUTOMAKE) MAKEINFO=$(GCC_MAKEINFO) PATH="$(PREFIX)/bin:$(PATH)" $(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/binutils.d $(BUILDSTEPS)/mintbin.d cd $(BUILDDIR) && $(GCC_ENV_PARAMS) $(GCC_SRCDIR)/configure \ @@ -140,9 +145,9 @@ $(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/b --enable-checking=no --enable-c99 \ --enable-maintainer-mode --without-headers \ --with-arch=cf - cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make all-gcc + cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make $(BUILD_SMP) all-gcc cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make install-gcc - cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make all-target-libgcc + cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make $(BUILD_SMP) all-target-libgcc cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make install-target-libgcc touch $@ @@ -154,9 +159,9 @@ $(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/b $(BUILDSTEPS)/srcdir-step3.d: $(BUILDSTEPS)/srcdir-step2.d $(SOURCESDIR)/$(UPSTREAM_GCC_PATCH) bzcat $(SOURCESDIR)/$(UPSTREAM_GCC_PATCH) | patch -d $(GCC_SRCDIR) -p1 cd $(GCC_SRCDIR) && ./contrib/gcc_update --touch - $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libmudflap - $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libssp - $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libquadmath + $(GCC_ENV_PARAMS) $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libmudflap + $(GCC_ENV_PARAMS) $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libssp + $(GCC_ENV_PARAMS) $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libquadmath for p in `ls $(RECIPES)/patches/gcc/*.p` ; do patch -d $(GCC_SRCDIR) -p0 <$$p ; done touch $@ @@ -183,7 +188,7 @@ $(BUILDSTEPS)/$(UPSTREAM_GCC_TARBALL).d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR $(BUILDSTEPS)/mintbin.d: $(BUILDSTEPS)/mintbin-srcdir.d mkdir -p $(BUILDDIR)/mintbin - cd $(BUILDDIR)/mintbin && $(BINUTILS_SRCDIR)/configure --prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls + cd $(BUILDDIR)/mintbin && $(MINTBIN_SRCDIR)/configure --prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls cd $(BUILDDIR)/mintbin && make cd $(BUILDDIR)/mintbin && make install touch $@ @@ -200,7 +205,7 @@ $(BUILDSTEPS)/mintbin-srcdir.d: $(SOURCESDIR)/$(UPSTREAM_MINTBIN_TARBALL) $(BUILDSTEPS)/binutils.d: $(BUILDSTEPS)/binutils-srcdir.d mkdir -p $(BUILDDIR)/binutils cd $(BUILDDIR)/binutils && $(BINUTILS_SRCDIR)/configure --prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls - cd $(BUILDDIR)/binutils && make + cd $(BUILDDIR)/binutils && make $(BUILD_SMP) cd $(BUILDDIR)/binutils && make install touch $@ diff --git a/m5475-atari-mint/fetchsrc b/m5475-atari-mint/fetchsrc index bbe8f6b..9396a4e 100755 --- a/m5475-atari-mint/fetchsrc +++ b/m5475-atari-mint/fetchsrc @@ -4,7 +4,7 @@ # Usage fetchsrc <target> <source> <upstream> <output> -NSSRV="http://ci.netsurf-browser.org/toolchain/" +NSSRV="https://ci.netsurf-browser.org/toolchain/" wget -q -O ${4} ${NSSRV}/${1}/${2} if [ $? -ne 0 ];then diff --git a/m5475-atari-mint/recipes/patches/gemlib/CONFIGVARS.p b/m5475-atari-mint/recipes/patches/gemlib/CONFIGVARS.p index 5692a21..f65dc89 100644 --- a/m5475-atari-mint/recipes/patches/gemlib/CONFIGVARS.p +++ b/m5475-atari-mint/recipes/patches/gemlib/CONFIGVARS.p @@ -1,29 +1,28 @@ ---- CONFIGVARS.orig 2012-10-11 17:55:52.000000000 +0100 -+++ CONFIGVARS 2012-10-11 17:56:37.000000000 +0100 -@@ -1,8 +1,8 @@ - # - # +--- CONFIGVARS 2011-05-13 23:38:45.000000000 +0100 ++++ CONFIGVARS 2011-05-13 23:40:11.000000000 +0100 +@@ -3,6 +3,7 @@ # cross compiling --#CROSS = yes --CROSS = no + #CROSS = yes + #CROSS = no +CROSS = yes -+#CROSS = no - # - # build alternate libraries for processor variants -@@ -15,13 +15,13 @@ # + # cross compiling +@@ -33,7 +34,7 @@ + CROSS := yes + else ifeq ($(CROSS),yes) - --CROSSPREFIX=m68k-atari-mint- -+CROSSPREFIX=m5475-atari-mint- - - NATIVECC = gcc +- CROSS_TOOL=m68k-atari-mint ++ CROSS_TOOL=m5475-atari-mint + CROSSPREFIX=$(CROSS_TOOL)- + else + CROSSPREFIX= +@@ -46,7 +47,7 @@ NATIVECFLAGS = -O CRLF = echo crlf -s --PREFIX=/usr/m68k-atari-mint +-PREFIX=$(shell $(CROSSPREFIX)gcc -print-sysroot)/usr +PREFIX=/opt/netsurf/m5475-atari-mint/cross/m5475-atari-mint - - else - + ifeq ($(PREFIX),) + PREFIX=/usr/$(CROSS_TOOL) + endif diff --git a/m5475-atari-mint/recipes/patches/mintlib/configvars.p b/m5475-atari-mint/recipes/patches/mintlib/configvars.p index f72d6f4..803272a 100644 --- a/m5475-atari-mint/recipes/patches/mintlib/configvars.p +++ b/m5475-atari-mint/recipes/patches/mintlib/configvars.p @@ -1,6 +1,6 @@ --- ./configvars.orig 2012-05-03 19:26:10.000000000 +0200 -+++ ./configvars 2012-11-05 23:03:52.000000000 +0100 -@@ -12,14 +12,14 @@ ++++ ./configvars 2012-11-05 22:34:07.000000000 +0100 +@@ -12,7 +12,7 @@ # get installed. You have to take car yourself that the libraries # and include files and so on will get installed in the right place # The easiest way to do this is to change "prefix", see below. @@ -9,29 +9,30 @@ # Silent build or verbose AM_DEFAULT_VERBOSITY = 1 - - # Define this to "m68k-atari-mint-" if you cross compile. +@@ -35,7 +35,7 @@ + CROSS := yes + else ifeq ($(CROSS),yes) -- toolprefix=m68k-atari-mint- -+ toolprefix=m5475-atari-mint- +- CROSS_TOOL=m68k-atari-mint ++ CROSS_TOOL=m5475-atari-mint + toolprefix=$(CROSS_TOOL)- else toolprefix= - endif -@@ -47,7 +47,7 @@ +@@ -64,7 +64,7 @@ + # This variable is used for various others. Change its value if # need be. When cross-compiling you will usually want to set this # to "/usr/m68k-atari-mint". - ifeq ($(CROSS),yes) -- prefix=/usr/m68k-atari-mint -+ prefix=/opt/netsurf/m5475-atari-mint/cross/m5475-atari-mint - else - prefix=/usr - endif -@@ -124,7 +124,7 @@ - CFLAGS=-O2 -fomit-frame-pointer +-prefix=/usr ++prefix=/opt/netsurf/m5475-atari-mint/cross/m5475-atari-mint + + # This is where include files get installed. + includedir=${prefix}/include +@@ -141,7 +141,7 @@ + LDFLAGS= # Additional defines. -DEFS= +DEFS=-DREGEX_MALLOC # Define this to the warning level you want. - WARN=-Wall + WARN=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -Wold-style-declaration -Wold-style-definition diff --git a/m5475-atari-mint/recipes/patches/mintlib/posix_regex.p b/m5475-atari-mint/recipes/patches/mintlib/posix_regex.p new file mode 100644 index 0000000..6a42a40 --- /dev/null +++ b/m5475-atari-mint/recipes/patches/mintlib/posix_regex.p @@ -0,0 +1,11 @@ +--- ./posix/regex.c.orig 2012-05-03 19:26:10.000000000 +0200 ++++ ./posix/regex.c 2012-11-05 22:34:07.000000000 +0100 +@@ -1364,6 +1364,7 @@ + \ + DEBUG_PRINT2 (" Pushing failure id: %u\n", failure_id); \ + DEBUG_PUSH (failure_id); \ ++ (void) destination; \ + } while (0) + + /* This is the number of items that are pushed and popped on the stack + diff --git a/m68k-atari-mint/Makefile b/m68k-atari-mint/Makefile index 27abd82..f05fb8e 100644 --- a/m68k-atari-mint/Makefile +++ b/m68k-atari-mint/Makefile @@ -5,13 +5,13 @@ UPSTREAM_GCC_VERSION := 4.6.4 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) -UPSTREAM_GCC_PATCH := gcc-4.6.4-mint-20130415.patch.bz2 +UPSTREAM_GCC_PATCH := gcc-4.6.4-mint-20200504.patch.bz2 UPSTREAM_GCC_PATCH_URI := http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_GCC_PATCH) -UPSTREAM_BINUTILS_VERSION := 2.24 +UPSTREAM_BINUTILS_VERSION := 2.30 UPSTREAM_BINUTILS_TARBALL := binutils-$(UPSTREAM_BINUTILS_VERSION).tar.bz2 UPSTREAM_BINUTILS_URI := ftp://ftp.gnu.org/gnu/binutils/$(UPSTREAM_BINUTILS_TARBALL) -UPSTREAM_BINUTILS_PATCH := binutils-2.24-mint-20131217.patch.bz2 +UPSTREAM_BINUTILS_PATCH := binutils-2.30-mint-20180703.patch.bz2 UPSTREAM_BINUTILS_PATCH_URI := http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_BINUTILS_PATCH) UPSTREAM_GMP_VERSION := 4.3.2 @@ -27,21 +27,21 @@ 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_MINTBIN_VERSION := CVS-20110527 +UPSTREAM_MINTBIN_VERSION := Git-20201129 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-20220821 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) UPSTREAM_PML_VERSION := 2.03 UPSTREAM_PML_TARBALL := pml-$(UPSTREAM_PML_VERSION).tar.bz2 UPSTREAM_PML_URI := http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_PML_TARBALL) -UPSTREAM_PML_PATCH := pml-2.03-mint-20110207.patch.bz2 +UPSTREAM_PML_PATCH := pml-2.03-mint-20191013.patch.bz2 UPSTREAM_PML_PATCH_URI := http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_PML_PATCH) -UPSTREAM_GEMLIB_VERSION := CVS-20130415 +UPSTREAM_GEMLIB_VERSION := Git-20230112 UPSTREAM_GEMLIB_TARBALL := gemlib-$(UPSTREAM_GEMLIB_VERSION).tar.bz2 UPSTREAM_GEMLIB_URI := http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/$(UPSTREAM_GEMLIB_TARBALL) @@ -49,6 +49,9 @@ GCC_AUTOCONF := autoconf2.64 GCC_AUTOHEADER := autoheader2.64 GCC_AUTORECONF := autoreconf2.64 GCC_AUTOM4TE := autom4te2.64 +GCC_AUTOMAKE := automake-1.11 +GCC_ACLOCAL := aclocal-1.11 +GCC_MAKEINFO := : TOP := $(CURDIR) RECIPES := $(TOP)/recipes @@ -59,6 +62,8 @@ SRCDIR := $(BUILDDIR)/srcdir GCC_SRCDIR := $(SRCDIR)/gcc BINUTILS_SRCDIR := $(SRCDIR)/binutils MINTBIN_SRCDIR := $(SRCDIR)/mintbin +# optionally pass -jN here +BUILD_SMP := TARGET_NAME := m68k-atari-mint @@ -81,8 +86,8 @@ $(BUILDSTEPS)/gemlib.d: $(BUILDSTEPS)/stage2.d $(SOURCESDIR)/$(UPSTREAM_GEMLIB_T tar xjf $(SOURCESDIR)/$(UPSTREAM_GEMLIB_TARBALL) mv gemlib-$(UPSTREAM_GEMLIB_VERSION) $(BUILDDIR)/gemlib for p in `ls $(RECIPES)/patches/gemlib/*.p` ; do patch -d $(BUILDDIR)/gemlib -p0 <$$p ; done - cd $(BUILDDIR)/gemlib/gemlib && PATH="$(PREFIX)/bin:$(PATH)" make - cd $(BUILDDIR)/gemlib/gemlib && PATH="$(PREFIX)/bin:$(PATH)" make install + cd $(BUILDDIR)/gemlib && PATH="$(PREFIX)/bin:$(PATH)" make + cd $(BUILDDIR)/gemlib && PATH="$(PREFIX)/bin:$(PATH)" make install touch $@ ### @@ -131,7 +136,7 @@ $(BUILDSTEPS)/mintlib.d: $(BUILDSTEPS)/bootstrap-compiler.d $(SOURCESDIR)/$(UPST # Rules to build and install the bootstrap compiler ### -GCC_ENV_PARAMS := AUTOCONF=$(GCC_AUTOCONF) AUTOHEADER=$(GCC_AUTOHEADER) AUTOM4TE=$(GCC_AUTOM4TE) PATH="$(PREFIX)/bin:$(PATH)" +GCC_ENV_PARAMS := AUTOCONF=$(GCC_AUTOCONF) AUTOHEADER=$(GCC_AUTOHEADER) AUTOM4TE=$(GCC_AUTOM4TE) ACLOCAL=$(GCC_ACLOCAL) AUTOMAKE=$(GCC_AUTOMAKE) MAKEINFO=$(GCC_MAKEINFO) PATH="$(PREFIX)/bin:$(PATH)" $(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/binutils.d $(BUILDSTEPS)/mintbin.d cd $(BUILDDIR) && $(GCC_ENV_PARAMS) $(GCC_SRCDIR)/configure \ @@ -139,9 +144,9 @@ $(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/b --disable-nls --enable-languages=c \ --enable-checking=no --enable-c99 \ --enable-maintainer-mode --without-headers - cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make all-gcc + cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make $(BUILD_SMP) all-gcc cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make install-gcc - cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make all-target-libgcc + cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make $(BUILD_SMP) all-target-libgcc cd $(BUILDDIR) && $(GCC_ENV_PARAMS) make install-target-libgcc touch $@ @@ -153,9 +158,9 @@ $(BUILDSTEPS)/bootstrap-compiler.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/b $(BUILDSTEPS)/srcdir-step3.d: $(BUILDSTEPS)/srcdir-step2.d $(SOURCESDIR)/$(UPSTREAM_GCC_PATCH) bzcat $(SOURCESDIR)/$(UPSTREAM_GCC_PATCH) | patch -d $(GCC_SRCDIR) -p1 cd $(GCC_SRCDIR) && ./contrib/gcc_update --touch - $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libmudflap - $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libssp - $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libquadmath + $(GCC_ENV_PARAMS) $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libmudflap + $(GCC_ENV_PARAMS) $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libssp + $(GCC_ENV_PARAMS) $(GCC_AUTORECONF) -f $(GCC_SRCDIR)/libquadmath for p in `ls $(RECIPES)/patches/gcc/*.p` ; do patch -d $(GCC_SRCDIR) -p0 <$$p ; done touch $@ @@ -182,7 +187,7 @@ $(BUILDSTEPS)/$(UPSTREAM_GCC_TARBALL).d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR $(BUILDSTEPS)/mintbin.d: $(BUILDSTEPS)/mintbin-srcdir.d mkdir -p $(BUILDDIR)/mintbin - cd $(BUILDDIR)/mintbin && $(BINUTILS_SRCDIR)/configure --prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls + cd $(BUILDDIR)/mintbin && $(MINTBIN_SRCDIR)/configure --prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls cd $(BUILDDIR)/mintbin && make cd $(BUILDDIR)/mintbin && make install touch $@ @@ -199,7 +204,7 @@ $(BUILDSTEPS)/mintbin-srcdir.d: $(SOURCESDIR)/$(UPSTREAM_MINTBIN_TARBALL) $(BUILDSTEPS)/binutils.d: $(BUILDSTEPS)/binutils-srcdir.d mkdir -p $(BUILDDIR)/binutils cd $(BUILDDIR)/binutils && $(BINUTILS_SRCDIR)/configure --prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls - cd $(BUILDDIR)/binutils && make + cd $(BUILDDIR)/binutils && make $(BUILD_SMP) cd $(BUILDDIR)/binutils && make install touch $@ diff --git a/m68k-atari-mint/fetchsrc b/m68k-atari-mint/fetchsrc index e71d85f..92ae5bf 100755 --- a/m68k-atari-mint/fetchsrc +++ b/m68k-atari-mint/fetchsrc @@ -4,7 +4,7 @@ # Usage fetchsrc <target> <source> <upstream> <output> -NSSRV="http://ci.netsurf-browser.org/toolchain/" +NSSRV="https://ci.netsurf-browser.org/toolchain/" wget -q -O ${4} ${NSSRV}/${1}/${2} if [ $? -ne 0 ];then diff --git a/m68k-atari-mint/recipes/patches/gemlib/CONFIGVARS.p b/m68k-atari-mint/recipes/patches/gemlib/CONFIGVARS.p index 6f774db..c865542 100644 --- a/m68k-atari-mint/recipes/patches/gemlib/CONFIGVARS.p +++ b/m68k-atari-mint/recipes/patches/gemlib/CONFIGVARS.p @@ -1,20 +1,19 @@ --- CONFIGVARS 2011-05-13 23:38:45.000000000 +0100 +++ CONFIGVARS 2011-05-13 23:40:11.000000000 +0100 -@@ -2,7 +2,7 @@ - # +@@ -3,6 +3,7 @@ # cross compiling #CROSS = yes --CROSS = no + #CROSS = no +CROSS = yes - # - # build alternate libraries for processor variants -@@ -21,7 +21,7 @@ + # + # cross compiling +@@ -46,7 +47,7 @@ NATIVECFLAGS = -O CRLF = echo crlf -s --PREFIX=/usr/m68k-atari-mint +-PREFIX=$(shell $(CROSSPREFIX)gcc -print-sysroot)/usr +PREFIX=/opt/netsurf/m68k-atari-mint/cross/m68k-atari-mint - - else - + ifeq ($(PREFIX),) + PREFIX=/usr/$(CROSS_TOOL) + endif diff --git a/m68k-atari-mint/recipes/patches/mintlib/configvars.p b/m68k-atari-mint/recipes/patches/mintlib/configvars.p index 1df9fae..a3acd90 100644 --- a/m68k-atari-mint/recipes/patches/mintlib/configvars.p +++ b/m68k-atari-mint/recipes/patches/mintlib/configvars.p @@ -9,21 +9,21 @@ # Silent build or verbose AM_DEFAULT_VERBOSITY = 1 -@@ -47,7 +47,7 @@ +@@ -64,7 +64,7 @@ + # This variable is used for various others. Change its value if # need be. When cross-compiling you will usually want to set this # to "/usr/m68k-atari-mint". - ifeq ($(CROSS),yes) -- prefix=/usr/m68k-atari-mint -+ prefix=/opt/netsurf/m68k-atari-mint/cross/m68k-atari-mint - else - prefix=/usr - endif -@@ -124,7 +124,7 @@ - CFLAGS=-O2 -fomit-frame-pointer +-prefix=/usr ++prefix=/opt/netsurf/m68k-atari-mint/cross/m68k-atari-mint + + # This is where include files get installed. + includedir=${prefix}/include +@@ -141,7 +141,7 @@ + LDFLAGS= # Additional defines. -DEFS= +DEFS=-DREGEX_MALLOC # Define this to the warning level you want. - WARN=-Wall + WARN=-Wall -Werror -Wstrict-prototypes -Wmissing-prototypes -Wold-style-declaration -Wold-style-definition diff --git a/m68k-atari-mint/recipes/patches/mintlib/posix_regex.p b/m68k-atari-mint/recipes/patches/mintlib/posix_regex.p new file mode 100644 index 0000000..6a42a40 --- /dev/null +++ b/m68k-atari-mint/recipes/patches/mintlib/posix_regex.p @@ -0,0 +1,11 @@ +--- ./posix/regex.c.orig 2012-05-03 19:26:10.000000000 +0200 ++++ ./posix/regex.c 2012-11-05 22:34:07.000000000 +0100 +@@ -1364,6 +1364,7 @@ + \ + DEBUG_PRINT2 (" Pushing failure id: %u\n", failure_id); \ + DEBUG_PUSH (failure_id); \ ++ (void) destination; \ + } while (0) + + /* This is the number of items that are pushed and popped on the stack + diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile index 489b408..d3b3d52 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) @@ -18,9 +23,9 @@ 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_213 +UPSTREAM_CLIB2_VERSION := 1_214 UPSTREAM_CLIB2_TARBALL := V$(UPSTREAM_CLIB2_VERSION).tar.gz UPSTREAM_CLIB2_URI := https://github.com/adtools/clib2/archive/$(UPSTREAM_CLIB2_TARBALL) @@ -31,12 +36,25 @@ UPSTREAM_OPENURL_VERSION := 7.16 UPSTREAM_OPENURL_TARBALL := openurl-$(UPSTREAM_OPENURL_VERSION) UPSTREAM_OPENURL_URI := https://github.com/jens-maus/libopenurl/archive/$(UPSTREAM_OPENURL_VERSION).tar.gz +UPSTREAM_AMISSL_VERSION := 5.13 +UPSTREAM_AMISSL_TARBALL := AmiSSL-$(UPSTREAM_AMISSL_VERSION)-SDK.lha +UPSTREAM_AMISSL_URI := https://github.com/jens-maus/amissl/releases/download/$(UPSTREAM_AMISSL_VERSION)/$(UPSTREAM_AMISSL_TARBALL) + UPSTREAM_GUIGFX_TARBALL := guigfxlib.lha UPSTREAM_GUIGFX_URI := http://neoscientists.org/~bifat/binarydistillery/$(UPSTREAM_GUIGFX_TARBALL) UPSTREAM_RENDER_TARBALL := renderlib.lha UPSTREAM_RENDER_URI := http://neoscientists.org/~bifat/binarydistillery/$(UPSTREAM_RENDER_TARBALL) +UPSTREAM_CODESETS_VERSION := 6.20 +UPSTREAM_CODESETS_TARBALL := codesets-$(UPSTREAM_CODESETS_VERSION).lha +UPSTREAM_CODESETS_URI := https://github.com/jens-maus/libcodesets/releases/download/$(UPSTREAM_CODESETS_VERSION)/$(UPSTREAM_CODESETS_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 +67,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 @@ -80,23 +100,31 @@ $(BUILDSTEPS)/stage2.d: $(BUILDSTEPS)/clib2.d # Rules to build and install Clib2 ### -$(BUILDSTEPS)/clib2.d: $(BUILDSTEPS)/bootstrap-compiler.d $(BUILDSTEPS)/ndk.d $(SOURCESDIR)/$(UPSTREAM_CLIB2_TARBALL) - tar xaf $(SOURCESDIR)/$(UPSTREAM_CLIB2_TARBALL) - mv clib2-$(UPSTREAM_CLIB2_VERSION)/library $(BUILDDIR)/clib2 - for p in `ls $(RECIPES)/patches/clib2/*.p` ; do patch -d $(BUILDDIR)/clib2 -p0 <$$p ; done - for dir in `find $(RECIPES)/files/clib2/ -type d | grep -v '\.svn' | sed 's#$(RECIPES)/files/clib2##'` ; do mkdir -p $(BUILDDIR)/clib2$$dir ; done - for file in `find $(RECIPES)/files/clib2/ -type f | grep -v '\.svn' | sed 's#$(RECIPES)/files/clib2##'` ; do cp -p $(RECIPES)/files/clib2$$file $(BUILDDIR)/clib2$$file ; done +$(BUILDSTEPS)/clib2.d: $(BUILDSTEPS)/bootstrap-compiler.d $(BUILDSTEPS)/ndk.d $(BUILDSTEPS)/clib2-src.d cd $(BUILDDIR)/clib2 && PATH="$(PREFIX)/bin:$(PATH)" make -f GNUmakefile.68k cp -r $(BUILDDIR)/clib2/include $(PREFIX)/$(TARGET_NAME) cp -r $(BUILDDIR)/clib2/lib $(PREFIX)/$(TARGET_NAME) ln -sf $(PREFIX)/$(TARGET_NAME)/lib/ncrt0.o $(PREFIX)/$(TARGET_NAME)/lib/crt0.o touch $@ + +$(BUILDSTEPS)/clib2-src.d: $(SOURCESDIR)/$(UPSTREAM_CLIB2_TARBALL) + $(RM) -rf $(SOURCESDIR)/clib2-$(UPSTREAM_CLIB2_VERSION) + $(RM) -rf $(BUILDDIR)/clib2 + cd $(SOURCESDIR) && tar xaf $(SOURCESDIR)/$(UPSTREAM_CLIB2_TARBALL) + mv $(SOURCESDIR)/clib2-$(UPSTREAM_CLIB2_VERSION)/library $(BUILDDIR)/clib2 + $(RM) -rf $(SOURCESDIR)/clib2-$(UPSTREAM_CLIB2_VERSION) + for p in `ls $(RECIPES)/patches/clib2/*.p` ; do patch -d $(BUILDDIR)/clib2 -p0 <$$p || exit $0 ; done + for dir in `find $(RECIPES)/files/clib2/ -type d | grep -v '\.svn' | sed 's#$(RECIPES)/files/clib2##'` ; do mkdir -p $(BUILDDIR)/clib2$$dir ; done + for file in `find $(RECIPES)/files/clib2/ -type f | grep -v '\.svn' | sed 's#$(RECIPES)/files/clib2##'` ; do cp -p $(RECIPES)/files/clib2$$file $(BUILDDIR)/clib2$$file ; done + touch $@ + + ### # Rules to install the NDK ### -$(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL) $(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL) $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL) +$(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL) $(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL) $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL) $(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL) $(SOURCESDIR)/$(UPSTREAM_AMISSL_TARBALL) mkdir -p $(PREFIX)/$(TARGET_NAME) tar -C $(PREFIX)/$(TARGET_NAME) --strip-components=2 -xjf $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) for p in `ls $(RECIPES)/patches/ndk/*.p` ; do patch -d $(PREFIX)/$(TARGET_NAME) -p0 <$$p ; done @@ -111,13 +139,20 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTR mkdir -p $(BUILDDIR)/renderlib lha xw=$(BUILDDIR)/renderlib $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL) cp -r $(BUILDDIR)/renderlib/renderlib/include/* $(PREFIX)/$(TARGET_NAME)/sys-include/ + mkdir -p $(BUILDDIR)/codesets + lha xw=$(BUILDDIR)/codesets $(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL) + cp -r $(BUILDDIR)/codesets/codesets/Developer/include/* $(PREFIX)/$(TARGET_NAME)/sys-include/ + mkdir -p $(BUILDDIR)/AmiSSL + lha xw=$(BUILDDIR)/AmiSSL $(SOURCESDIR)/$(UPSTREAM_AMISSL_TARBALL) + cp -r $(BUILDDIR)/AmiSSL/AmiSSL/Developer/include/* $(PREFIX)/$(TARGET_NAME)/sys-include/ + cp -r $(BUILDDIR)/AmiSSL/AmiSSL/Developer/lib/AmigaOS3/* $(PREFIX)/$(TARGET_NAME)/lib/ touch $@ ### # 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 +195,26 @@ $(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) + for p in `ls $(RECIPES)/patches/bison/*.p` ; do patch -d $(BISON_SRCDIR) -p0 <$$p ; done + touch $@ + +$(BUILDSTEPS)/$(UPSTREAM_BISON_TARBALL).d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR)/$(UPSTREAM_BISON_TARBALL) + touch $@ + +### # Rules to build and install binutils ### @@ -167,7 +222,7 @@ $(BUILDSTEPS)/$(UPSTREAM_GCC_TARBALL).d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR # Build a 32bit binary until this gets fixed $(BUILDSTEPS)/binutils.d: $(BUILDSTEPS)/binutils-srcdir.d mkdir -p $(BUILDDIR)/binutils - cd $(BUILDDIR)/binutils && CFLAGS="-m32" LDFLAGS="-m32" $(BINUTILS_SRCDIR)/configure --prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls + cd $(BUILDDIR)/binutils && CFLAGS="-m32" LDFLAGS="-m32" $(BINUTILS_SRCDIR)/configure --prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls --disable-werror cd $(BUILDDIR)/binutils && make cd $(BUILDDIR)/binutils && make install touch $@ @@ -211,6 +266,14 @@ $(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL): $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL): wget -q -O $@ $(UPSTREAM_RENDER_URI) +$(SOURCESDIR)/$(UPSTREAM_BISON_TARBALL): + wget -q -O $@ $(UPSTREAM_BISON_URI) + +$(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL): + wget -q -O $@ $(UPSTREAM_CODESETS_URI) + +$(SOURCESDIR)/$(UPSTREAM_AMISSL_TARBALL): + wget -q -O $@ $(UPSTREAM_AMISSL_URI) ### # Rule to create buildsteps dir diff --git a/m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/macros.h b/m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/macros.h new file mode 100644 index 0000000..2a07ae6 --- /dev/null +++ b/m68k-unknown-amigaos/recipes/files/ndk/sys-include/inline/macros.h @@ -0,0 +1,1749 @@ +#ifndef __INLINE_MACROS_H +#define __INLINE_MACROS_H + +/* + General macros for Amiga function calls. Not all the possibilities have + been created - only the ones which exist in OS 3.1. Third party libraries + and future versions of AmigaOS will maybe need some new ones... + + LPX - functions that take X arguments. + + Modifiers (variations are possible): + NR - no return (void), + A4, A5 - "a4" or "a5" is used as one of the arguments, + UB - base will be given explicitly by user (see cia.resource). + FP - one of the parameters has type "pointer to function". + FR - the return type is a "pointer to function". + + "bt" arguments are not used - they are provided for backward compatibility + only. +*/ + +#ifndef __INLINE_STUB_H +#include <inline/stubs.h> +#endif + +#define LP0(offs, rt, name, bt, bn) \ +({ \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP0FR(offs, rt, name, bt, bn, fpr) \ +({ \ + typedef fpr; \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP0NR(offs, name, bt, bn) \ +({ \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn) \ + : "fp0", "fp1", "cc", "memory"); \ + } \ +}) + +#define LP1(offs, rt, name, t1, v1, r1, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP1FP(offs, rt, name, t1, v1, r1, bt, bn, fpt) \ +({ \ + typedef fpt; \ + t1 _##name##_v1 = (v1); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP1FR(offs, rt, name, t1, v1, r1, bt, bn, fpr) \ +({ \ + typedef fpr; \ + t1 _##name##_v1 = (v1); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP1FPFR(offs, rt, name, t1, v1, r1, bt, bn, fpt, fpr) \ +({ \ + typedef fpr; \ + typedef fpt; \ + t1 _##name##_v1 = (v1); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP1NR(offs, name, t1, v1, r1, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1) \ + : "fp0", "fp1", "cc", "memory"); \ + } \ +}) + +/* Only graphics.library/AttemptLockLayerRom() */ +#define LP1A5(offs, rt, name, t1, v1, r1, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + __asm volatile ("exg d7,a5\n\tjsr a6@(-"#offs":W)\n\texg d7,a5" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +/* Only graphics.library/LockLayerRom() and graphics.library/UnlockLayerRom() */ +#define LP1NRA5(offs, name, t1, v1, r1, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + __asm volatile ("exg d7,a5\n\tjsr a6@(-"#offs":W)\n\texg d7,a5" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1) \ + : "fp0", "fp1", "cc", "memory"); \ + } \ +}) + +/* Only exec.library/Supervisor() */ +#define LP1A5FP(offs, rt, name, t1, v1, r1, bt, bn, fpt) \ +({ \ + typedef fpt; \ + t1 _##name##_v1 = (v1); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + __asm volatile ("exg d7,a5\n\tjsr a6@(-"#offs":W)\n\texg d7,a5" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP1NRFP(offs, name, t1, v1, r1, bt, bn, fpt) \ +({ \ + typedef fpt; \ + t1 _##name##_v1 = (v1); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1) \ + : "fp0", "fp1", "cc", "memory"); \ + } \ +}) + +#define LP2(offs, rt, name, t1, v1, r1, t2, v2, r2, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP2NR(offs, name, t1, v1, r1, t2, v2, r2, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2) \ + : "fp0", "fp1", "cc", "memory"); \ + } \ +}) + +/* Only cia.resource/AbleICR() and cia.resource/SetICR() */ +#define LP2UB(offs, rt, name, t1, v1, r1, t2, v2, r2) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r"(_n1), "rf"(_n2) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +/* Only dos.library/InternalUnLoadSeg() */ +#define LP2FP(offs, rt, name, t1, v1, r1, t2, v2, r2, bt, bn, fpt) \ +({ \ + typedef fpt; \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP2FPFR(offs, rt, name, t1, v1, r1, t2, v2, r2, bt, bn, fpt, fpr) \ +({ \ + typedef fpr; \ + typedef fpt; \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP2NRFP(offs, name, t1, v1, r1, t2, v2, r2, bt, bn, fpt) \ +({ \ + typedef fpt; \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2) \ + : "fp0", "fp1", "cc", "memory"); \ + } \ +}) + +#define LP3(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP3NR(offs, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3) \ + : "fp0", "fp1", "cc", "memory"); \ + } \ +}) + +/* Only cia.resource/AddICRVector() */ +#define LP3UB(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r"(_n1), "rf"(_n2), "rf"(_n3) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +/* Only cia.resource/RemICRVector() */ +#define LP3NRUB(offs, name, t1, v1, r1, t2, v2, r2, t3, v3, r3) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r"(_n1), "rf"(_n2), "rf"(_n3) \ + : "fp0", "fp1", "cc", "memory"); \ + } \ +}) + +/* Only exec.library/SetFunction() */ +#define LP3FP(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, bt, bn, fpt) \ +({ \ + typedef fpt; \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP3FP2(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, bt, bn, fpt1, fpt2) \ +({ \ + typedef fpt1; \ + typedef fpt2; \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP3FP3(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, bt, bn, fpt1, fpt2, fpt3) \ +({ \ + typedef fpt1; \ + typedef fpt2; \ + typedef fpt3; \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +/* Only graphics.library/SetCollision() */ +#define LP3NRFP(offs, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, bt, bn, fpt) \ +({ \ + typedef fpt; \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3) \ + : "fp0", "fp1", "cc", "memory"); \ + } \ +}) + +#define LP3NRFP2(offs, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, bt, bn, fpt1, fpt2) \ +({ \ + typedef fpt1; \ + typedef fpt2; \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3) \ + : "fp0", "fp1", "cc", "memory"); \ + } \ +}) + +#define LP3NRFP3(offs, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, bt, bn, fpt1, fpt2, fpt3) \ +({ \ + typedef fpt1; \ + typedef fpt2; \ + typedef fpt3; \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3) \ + : "fp0", "fp1", "cc", "memory"); \ + } \ +}) + +#define LP4(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP4NR(offs, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4) \ + : "fp0", "fp1", "cc", "memory"); \ + } \ +}) + +#define LP4NRFP3(offs, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, bt, bn, fpt1, fpt2, fpt3) \ +({ \ + typedef fpt1; \ + typedef fpt2; \ + typedef fpt3; \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4) \ + : "fp0", "fp1", "cc", "memory"); \ + } \ +}) + +/* Only exec.library/RawDoFmt() */ +#define LP4FP(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, bt, bn, fpt) \ +({ \ + typedef fpt; \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP4FP4(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, bt, bn, fpt1, fpt2, fpt3, fpt4) \ +({ \ + typedef fpt1; \ + typedef fpt2; \ + typedef fpt3; \ + typedef fpt4; \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP5(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP5NR(offs, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5) \ + : "fp0", "fp1", "cc", "memory"); \ + } \ +}) + +#define LP5NRA4(offs, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + __asm volatile ("exg d7,a4\n\tjsr a6@(-"#offs":W)\n\texg d7,a4" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5) \ + : "fp0", "fp1", "cc", "memory"); \ + }; \ +}) + +#define LP5NRA5(offs, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + __asm volatile ("exg d7,a5\n\tjsr a6@(-"#offs":W)\n\texg d7,a5" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5) \ + : "fp0", "fp1", "cc", "memory"); \ + } \ +}) + +/* Only exec.library/MakeLibrary() */ +#define LP5FP(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, bt, bn, fpt) \ +({ \ + typedef fpt; \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +/* Only reqtools.library/XXX() */ +#define LP5A4(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + __asm volatile ("exg d7,a4\n\tjsr a6@(-"#offs":W)\n\texg d7,a4" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP5A4FP(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, bt, bn, fpt) \ +({ \ + typedef fpt; \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + __asm volatile ("exg d7,a4\n\tjsr a6@(-"#offs":W)\n\texg d7,a4" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP6(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP6NR(offs, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6) \ + : "fp0", "fp1", "cc", "memory"); \ + } \ +}) + +#define LP6A4(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + __asm volatile ("exg d7,a4\n\tjsr a6@(-"#offs":W)\n\texg d7,a4" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP6NRA4(offs, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + __asm volatile ("exg d7,a4\n\tjsr a6@(-"#offs":W)\n\texg d7,a4" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6) \ + : "fp0", "fp1", "cc", "memory"); \ + }; \ +}) + +#define LP6FP(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, bt, bn, fpt) \ +({ \ + typedef fpt; \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP6A4FP(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, bt, bn, fpt) \ +({ \ + typedef fpt; \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + __asm volatile ("exg d7,a4\n\tjsr a6@(-"#offs":W)\n\texg d7,a4" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP7(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, t7, v7, r7, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + t7 _##name##_v7 = (v7); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + register t7 _n7 __asm(#r7) = _##name##_v7; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6), "rf"(_n7) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP7NR(offs, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, t7, v7, r7, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + t7 _##name##_v7 = (v7); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + register t7 _n7 __asm(#r7) = _##name##_v7; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6), "rf"(_n7) \ + : "fp0", "fp1", "cc", "memory"); \ + } \ +}) + +#define LP7NRFP6(offs, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, t7, v7, r7, bt, bn, fpt1, fpt2, fpt3, fpt4, fpt5, fpt6) \ +({ \ + typedef fpt1; \ + typedef fpt2; \ + typedef fpt3; \ + typedef fpt4; \ + typedef fpt5; \ + typedef fpt6; \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + t7 _##name##_v7 = (v7); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + register t7 _n7 __asm(#r7) = _##name##_v7; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6), "rf"(_n7) \ + : "fp0", "fp1", "cc", "memory"); \ + } \ +}) + +/* Only workbench.library/AddAppIconA() */ +#define LP7A4(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, t7, v7, r7, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + t7 _##name##_v7 = (v7); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + register t7 _n7 __asm(#r7) = _##name##_v7; \ + __asm volatile ("exg d7,a4\n\tjsr a6@(-"#offs":W)\n\texg d7,a4" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6), "rf"(_n7) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP7A4FP(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, t7, v7, r7, bt, bn, fpt) \ +({ \ + typedef fpt; \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + t7 _##name##_v7 = (v7); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + register t7 _n7 __asm(#r7) = _##name##_v7; \ + __asm volatile ("exg d7,a4\n\tjsr a6@(-"#offs":W)\n\texg d7,a4" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6), "rf"(_n7) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP7NRA4(offs, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, t7, v7, r7, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + t7 _##name##_v7 = (v7); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + register t7 _n7 __asm(#r7) = _##name##_v7; \ + __asm volatile ("exg d7,a4\n\tjsr a6@(-"#offs":W)\n\texg d7,a4" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6), "rf"(_n7) \ + : "fp0", "fp1", "cc", "memory"); \ + }; \ +}) + +/* Would you believe that there really are beasts that need more than 7 + arguments? :-) */ + +/* For example intuition.library/AutoRequest() */ +#define LP8(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, t7, v7, r7, t8, v8, r8, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + t7 _##name##_v7 = (v7); \ + t8 _##name##_v8 = (v8); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + register t7 _n7 __asm(#r7) = _##name##_v7; \ + register t8 _n8 __asm(#r8) = _##name##_v8; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6), "rf"(_n7), "rf"(_n8) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +/* For example intuition.library/ModifyProp() */ +#define LP8NR(offs, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, t7, v7, r7, t8, v8, r8, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + t7 _##name##_v7 = (v7); \ + t8 _##name##_v8 = (v8); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + register t7 _n7 __asm(#r7) = _##name##_v7; \ + register t8 _n8 __asm(#r8) = _##name##_v8; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6), "rf"(_n7), "rf"(_n8) \ + : "fp0", "fp1", "cc", "memory"); \ + } \ +}) + +#define LP8A4(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, t7, v7, r7, t8, v8, r8, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + t7 _##name##_v7 = (v7); \ + t8 _##name##_v8 = (v8); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + register t7 _n7 __asm(#r7) = _##name##_v7; \ + register t8 _n8 __asm(#r8) = _##name##_v8; \ + __asm volatile ("exg d7,a4\n\tjsr a6@(-"#offs":W)\n\texg d7,a4" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6), "rf"(_n7), "rf"(_n8) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP8NRA4(offs, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, t7, v7, r7, t8, v8, r8, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + t7 _##name##_v7 = (v7); \ + t8 _##name##_v8 = (v8); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + register t7 _n7 __asm(#r7) = _##name##_v7; \ + register t8 _n8 __asm(#r8) = _##name##_v8; \ + __asm volatile ("exg d7,a4\n\tjsr a6@(-"#offs":W)\n\texg d7,a4" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6), "rf"(_n7), "rf"(_n8) \ + : "fp0", "fp1", "cc", "memory"); \ + }; \ +}) + +/* For example layers.library/CreateUpfrontHookLayer() */ +#define LP9(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, t7, v7, r7, t8, v8, r8, t9, v9, r9, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + t7 _##name##_v7 = (v7); \ + t8 _##name##_v8 = (v8); \ + t9 _##name##_v9 = (v9); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + register t7 _n7 __asm(#r7) = _##name##_v7; \ + register t8 _n8 __asm(#r8) = _##name##_v8; \ + register t9 _n9 __asm(#r9) = _##name##_v9; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6), "rf"(_n7), "rf"(_n8), "rf"(_n9) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +/* For example intuition.library/NewModifyProp() */ +#define LP9NR(offs, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, t7, v7, r7, t8, v8, r8, t9, v9, r9, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + t7 _##name##_v7 = (v7); \ + t8 _##name##_v8 = (v8); \ + t9 _##name##_v9 = (v9); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + register t7 _n7 __asm(#r7) = _##name##_v7; \ + register t8 _n8 __asm(#r8) = _##name##_v8; \ + register t9 _n9 __asm(#r9) = _##name##_v9; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6), "rf"(_n7), "rf"(_n8), "rf"(_n9) \ + : "fp0", "fp1", "cc", "memory"); \ + } \ +}) + +#define LP9A4(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, t7, v7, r7, t8, v8, r8, t9, v9, r9, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + t7 _##name##_v7 = (v7); \ + t8 _##name##_v8 = (v8); \ + t9 _##name##_v9 = (v9); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + register t7 _n7 __asm(#r7) = _##name##_v7; \ + register t8 _n8 __asm(#r8) = _##name##_v8; \ + register t9 _n9 __asm(#r9) = _##name##_v9; \ + __asm volatile ("exg d7,a4\n\tjsr a6@(-"#offs":W)\n\texg d7,a4" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6), "rf"(_n7), "rf"(_n8), "rf"(_n9) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#define LP9NRA4(offs, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, t7, v7, r7, t8, v8, r8, t9, v9, r9, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + t7 _##name##_v7 = (v7); \ + t8 _##name##_v8 = (v8); \ + t9 _##name##_v9 = (v9); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + register t7 _n7 __asm(#r7) = _##name##_v7; \ + register t8 _n8 __asm(#r8) = _##name##_v8; \ + register t9 _n9 __asm(#r9) = _##name##_v9; \ + __asm volatile ("exg d7,a4\n\tjsr a6@(-"#offs":W)\n\texg d7,a4" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6), "rf"(_n7), "rf"(_n8), "rf"(_n9) \ + : "fp0", "fp1", "cc", "memory"); \ + }; \ +}) + +/* Kriton Kyrimis <kyrimis@cti.gr> says CyberGraphics needs the following */ +#define LP10(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, t7, v7, r7, t8, v8, r8, t9, v9, r9, t10, v10, r10, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + t7 _##name##_v7 = (v7); \ + t8 _##name##_v8 = (v8); \ + t9 _##name##_v9 = (v9); \ + t10 _##name##_v10 = (v10); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + register t7 _n7 __asm(#r7) = _##name##_v7; \ + register t8 _n8 __asm(#r8) = _##name##_v8; \ + register t9 _n9 __asm(#r9) = _##name##_v9; \ + register t10 _n10 __asm(#r10) = _##name##_v10; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6), "rf"(_n7), "rf"(_n8), "rf"(_n9), "rf"(_n10) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +/* Only graphics.library/BltMaskBitMapRastPort() */ +#define LP10NR(offs, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, t7, v7, r7, t8, v8, r8, t9, v9, r9, t10, v10, r10, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + t7 _##name##_v7 = (v7); \ + t8 _##name##_v8 = (v8); \ + t9 _##name##_v9 = (v9); \ + t10 _##name##_v10 = (v10); \ + { \ + register int _d0 __asm("d0"); \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + register t7 _n7 __asm(#r7) = _##name##_v7; \ + register t8 _n8 __asm(#r8) = _##name##_v8; \ + register t9 _n9 __asm(#r9) = _##name##_v9; \ + register t10 _n10 __asm(#r10) = _##name##_v10; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_d0), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6), "rf"(_n7), "rf"(_n8), "rf"(_n9), "rf"(_n10) \ + : "fp0", "fp1", "cc", "memory"); \ + } \ +}) + +#define LP10A4(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, t7, v7, r7, t8, v8, r8, t9, v9, r9, t10, v10, r10, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + t7 _##name##_v7 = (v7); \ + t8 _##name##_v8 = (v8); \ + t9 _##name##_v9 = (v9); \ + t10 _##name##_v10 = (v10); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + register t7 _n7 __asm(#r7) = _##name##_v7; \ + register t8 _n8 __asm(#r8) = _##name##_v8; \ + register t9 _n9 __asm(#r9) = _##name##_v9; \ + register t10 _n10 __asm(#r10) = _##name##_v10; \ + __asm volatile ("exg d7,a4\n\tjsr a6@(-"#offs":W)\n\texg d7,a4" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6), "rf"(_n7), "rf"(_n8), "rf"(_n9), "rf"(_n10) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +/* Only graphics.library/BltBitMap() */ +#define LP11(offs, rt, name, t1, v1, r1, t2, v2, r2, t3, v3, r3, t4, v4, r4, t5, v5, r5, t6, v6, r6, t7, v7, r7, t8, v8, r8, t9, v9, r9, t10, v10, r10, t11, v11, r11, bt, bn) \ +({ \ + t1 _##name##_v1 = (v1); \ + t2 _##name##_v2 = (v2); \ + t3 _##name##_v3 = (v3); \ + t4 _##name##_v4 = (v4); \ + t5 _##name##_v5 = (v5); \ + t6 _##name##_v6 = (v6); \ + t7 _##name##_v7 = (v7); \ + t8 _##name##_v8 = (v8); \ + t9 _##name##_v9 = (v9); \ + t10 _##name##_v10 = (v10); \ + t11 _##name##_v11 = (v11); \ + rt _##name##_re2 = \ + ({ \ + register int _d1 __asm("d1"); \ + register int _a0 __asm("a0"); \ + register int _a1 __asm("a1"); \ + register rt _##name##_re __asm("d0"); \ + register void *const _##name##_bn __asm("a6") = (bn); \ + register t1 _n1 __asm(#r1) = _##name##_v1; \ + register t2 _n2 __asm(#r2) = _##name##_v2; \ + register t3 _n3 __asm(#r3) = _##name##_v3; \ + register t4 _n4 __asm(#r4) = _##name##_v4; \ + register t5 _n5 __asm(#r5) = _##name##_v5; \ + register t6 _n6 __asm(#r6) = _##name##_v6; \ + register t7 _n7 __asm(#r7) = _##name##_v7; \ + register t8 _n8 __asm(#r8) = _##name##_v8; \ + register t9 _n9 __asm(#r9) = _##name##_v9; \ + register t10 _n10 __asm(#r10) = _##name##_v10; \ + register t11 _n11 __asm(#r11) = _##name##_v11; \ + __asm volatile ("jsr a6@(-"#offs":W)" \ + : "=r" (_##name##_re), "=r" (_d1), "=r" (_a0), "=r" (_a1) \ + : "r" (_##name##_bn), "rf"(_n1), "rf"(_n2), "rf"(_n3), "rf"(_n4), "rf"(_n5), "rf"(_n6), "rf"(_n7), "rf"(_n8), "rf"(_n9), "rf"(_n10), "rf"(_n11) \ + : "fp0", "fp1", "cc", "memory"); \ + _##name##_re; \ + }); \ + _##name##_re2; \ +}) + +#endif /* __INLINE_MACROS_H */ + diff --git a/m68k-unknown-amigaos/recipes/patches/bison/fseterr.c.p b/m68k-unknown-amigaos/recipes/patches/bison/fseterr.c.p new file mode 100644 index 0000000..a47a2f9 --- /dev/null +++ b/m68k-unknown-amigaos/recipes/patches/bison/fseterr.c.p @@ -0,0 +1,11 @@ +--- lib/fseterr.c.old 2020-03-11 10:08:25.275228721 +0000 ++++ lib/fseterr.c 2020-03-11 10:08:35.199250194 +0000 +@@ -29,7 +29,7 @@ + /* Most systems provide FILE as a struct and the necessary bitmask in + <stdio.h>, because they need it for implementing getc() and putc() as + fast macros. */ +-#if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ ++#if defined _IO_EOF_SEEN || defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */ + fp->_flags |= _IO_ERR_SEEN; + #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, Mac OS X, Cygwin */ + fp_->_flags |= __SERR; diff --git a/ppc-amigaos/Makefile b/ppc-amigaos/Makefile index efcc485..47260b1 100644 --- a/ppc-amigaos/Makefile +++ b/ppc-amigaos/Makefile @@ -1,4 +1,4 @@ -UPSTREAM_GCC_VERSION := 5.3.0 +UPSTREAM_GCC_VERSION := 6.1.0 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) @@ -6,20 +6,27 @@ UPSTREAM_BINUTILS_VERSION := 2.23.2 UPSTREAM_BINUTILS_TARBALL := binutils-$(UPSTREAM_BINUTILS_VERSION).tar.bz2 UPSTREAM_BINUTILS_URI := ftp://ftp.gnu.org/gnu/binutils/$(UPSTREAM_BINUTILS_TARBALL) -UPSTREAM_GMP_VERSION := 5.0.5 +UPSTREAM_GMP_VERSION := 6.1.2 UPSTREAM_GMP_TARBALL := gmp-$(UPSTREAM_GMP_VERSION).tar.bz2 UPSTREAM_GMP_URI := http://ftp.gnu.org/gnu/gmp/$(UPSTREAM_GMP_TARBALL) -UPSTREAM_MPFR_VERSION := 3.1.2 +UPSTREAM_MPFR_VERSION := 3.1.6 UPSTREAM_MPFR_TARBALL := mpfr-$(UPSTREAM_MPFR_VERSION).tar.bz2 UPSTREAM_MPFR_URI := http://www.mpfr.org/mpfr-$(UPSTREAM_MPFR_VERSION)/$(UPSTREAM_MPFR_TARBALL) -UPSTREAM_MPC_VERSION := 0.9 +UPSTREAM_MPC_VERSION := 1.0.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://ftp.gnu.org/gnu/mpc/$(UPSTREAM_MPC_TARBALL) -UPSTREAM_NDK_TARBALL := SDK_53.29.lha -UPSTREAM_NDK_URI := "http://hyperion-entertainment.biz/index.php/downloads?view=download&format=raw&file=82" +UPSTREAM_LHASA_VERSION := 887d68ebca0cbad392af3709203745d202a2020b +UPSTREAM_LHASA_TARBALL := lhasa-$(UPSTREAM_LHASA_VERSION).zip +UPSTREAM_LHASA_URI := https://github.com/fragglet/lhasa/archive/$(UPSTREAM_LHASA_VERSION).zip + +UPSTREAM_NDK_TARBALL := SDK_54.16.lha +UPSTREAM_NDK_URI := "http://hyperion-entertainment.biz/index.php/downloads?view=download&format=raw&file=127" + +UPSTREAM_NDK_UPDATE_TARBALL := SDK_addon_final_edition_update2.zip +UPSTREAM_NDK_UPDATE_URI := http://kas1e.mikendezign.com/aos4/SDK_addon_final_edition_update2.zip UPSTREAM_OPENURL_VERSION := 7.16 UPSTREAM_OPENURL_TARBALL := openurl-$(UPSTREAM_OPENURL_VERSION).tar.gz @@ -35,6 +42,10 @@ 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) +UPSTREAM_CODESETS_VERSION := 6.20 +UPSTREAM_CODESETS_TARBALL := codesets-$(UPSTREAM_CODESETS_VERSION).lha +UPSTREAM_CODESETS_URI := https://github.com/jens-maus/libcodesets/releases/download/$(UPSTREAM_CODESETS_VERSION)/$(UPSTREAM_CODESETS_TARBALL) + # need to force the auto* version in use GCC_AUTOCONF := autoconf2.64 GCC_AUTOHEADER := autoheader2.64 @@ -67,7 +78,7 @@ distclean: clean # Rules to build the full compiler ### -GCC_ENV_PARAMS := AUTOCONF=$(GCC_AUTOCONF) AUTOHEADER=$(GCC_AUTOHEADER) AUTOM4TE=$(GCC_AUTOM4TE) PATH="$(PREFIX)/bin:$(PATH)" +GCC_ENV_PARAMS := AUTOCONF=$(GCC_AUTOCONF) AUTOHEADER=$(GCC_AUTOHEADER) AUTOM4TE=$(GCC_AUTOM4TE) PATH="$(PREFIX)/bin:$(PATH)" CXXFLAGS="-fpermissive" $(BUILDSTEPS)/stage2.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/binutils.d $(BUILDSTEPS)/ndk.d cd $(BUILDDIR) && $(GCC_ENV_PARAMS) $(GCC_SRCDIR)/configure \ @@ -85,30 +96,57 @@ $(BUILDSTEPS)/stage2.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/binutils.d $( # Rules to install the NDK ### -$(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL) $(SOURCESDIR)/$(UPSTREAM_ONCHIPMEM_TARBALL) $(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL) $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL) +$(BUILDSTEPS)/ndk.d: $(BUILDSTEPS)/lhasa.d $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTREAM_NDK_UPDATE_TARBALL) $(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL) $(SOURCESDIR)/$(UPSTREAM_ONCHIPMEM_TARBALL) $(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL) $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL) $(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL) mkdir -p $(BUILDDIR)/ndk/tmp/ - lha xw=$(BUILDDIR)/ndk $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) - lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/base.lha - lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/newlib-53.30.lha - lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/clib2-1.206.lha - lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/pthreads-53.11.lha - lha xw=$(BUILDDIR)/ndk/tmp $(SOURCESDIR)/$(UPSTREAM_ONCHIPMEM_TARBALL) + $(BUILDDIR)/prefix/bin/lha xw=$(BUILDDIR)/ndk $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) + $(BUILDDIR)/prefix/bin/lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/base.lha + $(BUILDDIR)/prefix/bin/lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/execsg_sdk-54.31.lha + $(BUILDDIR)/prefix/bin/lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/newlib-53.80.lha + $(BUILDDIR)/prefix/bin/lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/clib2.lha + $(BUILDDIR)/prefix/bin/lha xw=$(BUILDDIR)/ndk/tmp $(BUILDDIR)/ndk/SDK_Install/pthreads-53.12.lha + $(BUILDDIR)/prefix/bin/lha xw=$(BUILDDIR)/ndk/tmp $(SOURCESDIR)/$(UPSTREAM_ONCHIPMEM_TARBALL) mkdir -p $(PREFIX)/$(TARGET_NAME)/SDK + unzip -o $(SOURCESDIR)/$(UPSTREAM_NDK_UPDATE_TARBALL) -d $(BUILDDIR)/ndk/tmp cp -r $(BUILDDIR)/ndk/tmp/Include $(PREFIX)/$(TARGET_NAME)/SDK/include cp -r $(BUILDDIR)/ndk/tmp/newlib $(PREFIX)/$(TARGET_NAME)/SDK/newlib cp -r $(BUILDDIR)/ndk/tmp/clib2 $(PREFIX)/$(TARGET_NAME)/SDK/clib2 cp -r $(BUILDDIR)/ndk/tmp/Local/common/include/* $(PREFIX)/$(TARGET_NAME)/SDK/newlib/include/ cp -r $(BUILDDIR)/ndk/tmp/Local/newlib/lib/* $(PREFIX)/$(TARGET_NAME)/SDK/newlib/lib/ cp -r $(BUILDDIR)/ndk/tmp/SDK/Include/* $(PREFIX)/$(TARGET_NAME)/SDK/include + cp -r $(BUILDDIR)/ndk/tmp/SDK/newlib $(PREFIX)/$(TARGET_NAME)/SDK/newlib + cp -r $(BUILDDIR)/ndk/tmp/SDK/local/newlib/lib/* $(PREFIX)/$(TARGET_NAME)/SDK/newlib/lib/ + cp -r $(BUILDDIR)/ndk/tmp/SDK/local/common/include/* $(PREFIX)/$(TARGET_NAME)/SDK/newlib/include/ + unzip -o $(SOURCESDIR)/$(UPSTREAM_NDK_UPDATE_TARBALL) -d $(BUILDDIR)/ndk/tmp mkdir -p $(BUILDDIR)/openurl cd $(BUILDDIR)/openurl && tar xaf $(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL) cp -r $(BUILDDIR)/openurl/libopenurl-$(UPSTREAM_OPENURL_VERSION)/include/* $(PREFIX)/$(TARGET_NAME)/SDK/include/include_h/ mkdir -p $(BUILDDIR)/guigfxlib - lha xw=$(BUILDDIR)/guigfxlib $(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL) + $(BUILDDIR)/prefix/bin/lha xw=$(BUILDDIR)/guigfxlib $(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL) cp -r $(BUILDDIR)/guigfxlib/include_os4/* $(PREFIX)/$(TARGET_NAME)/SDK/include/include_h/ mkdir -p $(BUILDDIR)/renderlib - lha xw=$(BUILDDIR)/renderlib $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL) + $(BUILDDIR)/prefix/bin/lha xw=$(BUILDDIR)/renderlib $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL) cp -r $(BUILDDIR)/renderlib/renderlib/include_os4/* $(PREFIX)/$(TARGET_NAME)/SDK/include/include_h/ + mkdir -p $(BUILDDIR)/codesets + $(BUILDDIR)/prefix/bin/lha xw=$(BUILDDIR)/codesets $(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL) + cp -r $(BUILDDIR)/codesets/codesets/Developer/include/* $(PREFIX)/$(TARGET_NAME)/SDK/include/include_h/ + touch $@ + +### +# Rules to build and install lhasa +### + +$(BUILDSTEPS)/lhasa.d: $(BUILDSTEPS)/lhasa-srcdir.d + mkdir -p $(BUILDDIR)/lhasa + mkdir -p $(BUILDDIR)/prefix + cd $(BUILDDIR)/lhasa && $(SRCDIR)/lhasa/configure --prefix=$(BUILDDIR)/prefix + cd $(BUILDDIR)/lhasa && make + cd $(BUILDDIR)/lhasa && make install + touch $@ + +$(BUILDSTEPS)/lhasa-srcdir.d: $(SOURCESDIR)/$(UPSTREAM_LHASA_TARBALL) + unzip $(SOURCESDIR)/$(UPSTREAM_LHASA_TARBALL) + mv lhasa-$(UPSTREAM_LHASA_VERSION) $(SRCDIR)/lhasa + cd $(SRCDIR)/lhasa && autoreconf -i touch $@ ### @@ -117,6 +155,11 @@ $(BUILDSTEPS)/ndk.d: $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL) $(SOURCESDIR)/$(UPSTR $(BUILDSTEPS)/srcdir-step3.d: $(BUILDSTEPS)/srcdir-step2.d for p in `ls $(RECIPES)/patches/gcc/*.p` ; do patch -d $(GCC_SRCDIR) -p0 <$$p ; done + touch $(GCC_SRCDIR)/lto-plugin/aclocal.m4 $(GCC_SRCDIR)/lto-plugin/Makefile.in + touch $(GCC_SRCDIR)/zlib/aclocal.m4 $(GCC_SRCDIR)/zlib/Makefile.in + touch $(GCC_SRCDIR)/libbacktrace/aclocal.m4 $(GCC_SRCDIR)/libbacktrace/Makefile.in + touch $(GCC_SRCDIR)/libcc1/aclocal.m4 $(GCC_SRCDIR)/libcc1/Makefile.in + touch $(GCC_SRCDIR)/libquadmath/aclocal.m4 $(GCC_SRCDIR)/libquadmath/Makefile.in touch $@ $(BUILDSTEPS)/srcdir-step2.d: $(BUILDSTEPS)/srcdir-step1.d $(SOURCESDIR)/$(UPSTREAM_GMP_TARBALL) $(SOURCESDIR)/$(UPSTREAM_MPFR_TARBALL) $(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL) @@ -142,7 +185,7 @@ $(BUILDSTEPS)/$(UPSTREAM_GCC_TARBALL).d: $(BUILDSTEPS)/buildsteps.d $(SOURCESDIR $(BUILDSTEPS)/binutils.d: $(BUILDSTEPS)/binutils-srcdir.d mkdir -p $(BUILDDIR)/binutils - cd $(BUILDDIR)/binutils && $(BINUTILS_SRCDIR)/configure --prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls --enable-plugins + cd $(BUILDDIR)/binutils && $(BINUTILS_SRCDIR)/configure --prefix=$(PREFIX) --target=$(TARGET_NAME) --disable-nls --enable-plugins --disable-werror cd $(BUILDDIR)/binutils && make cd $(BUILDDIR)/binutils && make install touch $@ @@ -172,9 +215,15 @@ $(SOURCESDIR)/$(UPSTREAM_MPC_TARBALL): $(SOURCESDIR)/$(UPSTREAM_BINUTILS_TARBALL): wget -q -O $@ $(UPSTREAM_BINUTILS_URI) +$(SOURCESDIR)/$(UPSTREAM_LHASA_TARBALL): + wget -q -O $@ $(UPSTREAM_LHASA_URI) + $(SOURCESDIR)/$(UPSTREAM_NDK_TARBALL): wget -q -O $@ $(UPSTREAM_NDK_URI) +$(SOURCESDIR)/$(UPSTREAM_NDK_UPDATE_TARBALL): + wget -q -O $@ $(UPSTREAM_NDK_UPDATE_URI) + $(SOURCESDIR)/$(UPSTREAM_OPENURL_TARBALL): wget -q -O $@ $(UPSTREAM_OPENURL_URI) @@ -187,6 +236,9 @@ $(SOURCESDIR)/$(UPSTREAM_GUIGFX_TARBALL): $(SOURCESDIR)/$(UPSTREAM_RENDER_TARBALL): wget -q -O $@ $(UPSTREAM_RENDER_URI) +$(SOURCESDIR)/$(UPSTREAM_CODESETS_TARBALL): + wget -q -O $@ $(UPSTREAM_CODESETS_URI) + ### # Rule to create buildsteps dir ### diff --git a/ppc-amigaos/recipes/patches/binutils/0001-Changes-for-various-Amiga-targets.p b/ppc-amigaos/recipes/patches/binutils/0001-Changes-for-various-Amiga-targets.p index ccc8a07..a38891a 100644 --- a/ppc-amigaos/recipes/patches/binutils/0001-Changes-for-various-Amiga-targets.p +++ b/ppc-amigaos/recipes/patches/binutils/0001-Changes-for-various-Amiga-targets.p @@ -1,7 +1,7 @@ From 1678a95339b8893195b307a953a0053ceeca0133 Mon Sep 17 00:00:00 2001 From: Sebastian Bauer <mail@sebastianbauer.info> Date: Sat, 14 Feb 2015 14:54:44 +0100 -Subject: [PATCH 1/7] Changes for various Amiga targets. +Subject: [PATCH 1/8] Changes for various Amiga targets. --- bfd/ChangeLog-9697 | 64 + @@ -9509,6 +9509,785 @@ index 0000000000000000000000000000000000000000..cf6c6cb9efdd15c786932adedd2476ec +#define elf_backend_reloc_type_class ppc_elf_reloc_type_class + +#include "elf32-target.h" +diff --git a/bfd/elf32-ppc.c b/bfd/elf32-amigaos.c +similarity index 97% +copy from bfd/elf32-ppc.c +copy to bfd/elf32-amigaos.c +index 6454a8350da35adf6ed1e2209d9e4774ab7c50e3..9bf9535888f2345d60a8f802680ae03f41f67a5f 100644 +--- bfd/elf32-ppc.c ++++ bfd/elf32-amigaos.c +@@ -31,32 +31,50 @@ + #include <stdarg.h> + #include "bfd.h" + #include "bfdlink.h" + #include "libbfd.h" + #include "elf-bfd.h" + #include "elf/ppc.h" ++#include "elf/amigaos.h" + #include "elf32-ppc.h" + #include "elf-vxworks.h" + #include "dwarf2.h" + ++#undef DEBUG ++ + typedef enum split16_format_type + { + split16a_type = 0, + split16d_type + } + split16_format_type; + + /* RELA relocations are used here. */ ++#define USE_RELA ++#define USE_REL 0 + + static bfd_reloc_status_type ppc_elf_addr16_ha_reloc + (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); + static bfd_reloc_status_type ppc_elf_unhandled_reloc + (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); + static void ppc_elf_vle_split16 + (bfd *, bfd_byte *, bfd_vma, bfd_vma, split16_format_type); + ++int ppc_elf_amigaos_select_plt_layout (bfd *, struct bfd_link_info *, ++ enum ppc_elf_plt_type, int); ++ ++bfd_boolean ppc_elf_amigaos_section_processing (bfd *abfd, Elf_Internal_Shdr *shdr); ++bfd_boolean ppc_elf_amigaos_modify_segment_map (bfd *abfd, ++ struct bfd_link_info *info ATTRIBUTE_UNUSED); ++asection *ppc_elf_amigaos_tls_setup (bfd *obfd, struct bfd_link_info *info, ++ int no_tls_get_addr_opt); ++bfd_boolean ppc_elf_amigaos_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED, ++ struct bfd_link_info *info); ++unsigned int _bfd_elf_amigaos_ppc_at_tls_transform (unsigned int insn, unsigned int reg); ++unsigned int _bfd_elf_amigaos_ppc_at_tprel_transform (unsigned int insn, unsigned int reg); ++ + /* Branch prediction bit for branch taken relocs. */ + #define BRANCH_PREDICT_BIT 0x200000 + /* Mask to set RA in memory instructions. */ + #define RA_REGISTER_MASK 0x001f0000 + /* Value to shift register by to insert RA. */ + #define RA_REGISTER_SHIFT 16 +@@ -1381,12 +1399,74 @@ static reloc_howto_type ppc_elf_howto_raw[] = { + /* Relocation not handled: R_PPC_EMB_RELSEC16 */ + /* Relocation not handled: R_PPC_EMB_RELST_LO */ + /* Relocation not handled: R_PPC_EMB_RELST_HI */ + /* Relocation not handled: R_PPC_EMB_RELST_HA */ + /* Relocation not handled: R_PPC_EMB_BIT_FLD */ + ++ ++ /* A standard 32 bit base relative relocation. */ ++ HOWTO (R_PPC_AMIGAOS_BREL, /* type */ ++ 0, /* rightshift */ ++ 2, /* size (0 = byte, 1 = short, 2 = long) */ ++ 32, /* bitsize */ ++ FALSE, /* pc_relative */ ++ 0, /* bitpos */ ++ complain_overflow_bitfield, /* complain_on_overflow */ ++ bfd_elf_generic_reloc, /* special_function */ ++ "R_PPC_AMIGAOS_BREL", /* name */ ++ FALSE, /* partial_inplace */ ++ 0, /* src_mask */ ++ 0xffffffff, /* dst_mask */ ++ FALSE), /* pcrel_offset */ ++ ++ /* A 16 bit base relative relocation without overflow. */ ++ HOWTO (R_PPC_AMIGAOS_BREL_LO, /* type */ ++ 0, /* rightshift */ ++ 1, /* size (0 = byte, 1 = short, 2 = long) */ ++ 16, /* bitsize */ ++ FALSE, /* pc_relative */ ++ 0, /* bitpos */ ++ complain_overflow_dont,/* complain_on_overflow */ ++ bfd_elf_generic_reloc, /* special_function */ ++ "R_PPC_AMIGAOS_BREL_LO",/* name */ ++ FALSE, /* partial_inplace */ ++ 0, /* src_mask */ ++ 0xffff, /* dst_mask */ ++ FALSE), /* pcrel_offset */ ++ ++ /* The high order 16 bits of a base relative address. */ ++ HOWTO (R_PPC_AMIGAOS_BREL_HI, /* type */ ++ 16, /* rightshift */ ++ 1, /* size (0 = byte, 1 = short, 2 = long) */ ++ 16, /* bitsize */ ++ FALSE, /* pc_relative */ ++ 0, /* bitpos */ ++ complain_overflow_dont, /* complain_on_overflow */ ++ bfd_elf_generic_reloc, /* special_function */ ++ "R_PPC_AMIGAOS_BREL_HI",/* name */ ++ FALSE, /* partial_inplace */ ++ 0, /* src_mask */ ++ 0xffff, /* dst_mask */ ++ FALSE), /* pcrel_offset */ ++ ++ /* The high order 16 bits of a base relative address, plus 1 if the contents ++ of the low 16 bits, treated as a signed number, is negative. */ ++ HOWTO (R_PPC_AMIGAOS_BREL_HA, /* type */ ++ 16, /* rightshift */ ++ 1, /* size (0 = byte, 1 = short, 2 = long) */ ++ 16, /* bitsize */ ++ FALSE, /* pc_relative */ ++ 0, /* bitpos */ ++ complain_overflow_dont, /* complain_on_overflow */ ++ ppc_elf_addr16_ha_reloc, /* special_function */ ++ "R_PPC_AMIGAOS_BREL_HA",/* name */ ++ FALSE, /* partial_inplace */ ++ 0, /* src_mask */ ++ 0xffff, /* dst_mask */ ++ FALSE), /* pcrel_offset */ ++ + /* PC relative relocation against either _SDA_BASE_ or _SDA2_BASE_, filling + in the 16 bit signed offset from the appropriate base, and filling in the + register field with the appropriate register (0, 2, or 13). */ + HOWTO (R_PPC_EMB_RELSDA, /* type */ + 0, /* rightshift */ + 1, /* size (0 = byte, 1 = short, 2 = long) */ +@@ -1935,12 +2015,16 @@ ppc_elf_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, + r = R_PPC_VLE_SDAREL_HA16D; + break; + case BFD_RELOC_16_PCREL: r = R_PPC_REL16; break; + case BFD_RELOC_LO16_PCREL: r = R_PPC_REL16_LO; break; + case BFD_RELOC_HI16_PCREL: r = R_PPC_REL16_HI; break; + case BFD_RELOC_HI16_S_PCREL: r = R_PPC_REL16_HA; break; ++ case BFD_RELOC_PPC_AMIGAOS_BREL: r = R_PPC_AMIGAOS_BREL; break; ++ case BFD_RELOC_PPC_AMIGAOS_BREL_LO: r = R_PPC_AMIGAOS_BREL_LO; break; ++ case BFD_RELOC_PPC_AMIGAOS_BREL_HI: r = R_PPC_AMIGAOS_BREL_HI; break; ++ case BFD_RELOC_PPC_AMIGAOS_BREL_HA: r = R_PPC_AMIGAOS_BREL_HA; break; + case BFD_RELOC_VTABLE_INHERIT: r = R_PPC_GNU_VTINHERIT; break; + case BFD_RELOC_VTABLE_ENTRY: r = R_PPC_GNU_VTENTRY; break; + } + + return ppc_elf_howto_table[r]; + }; +@@ -2268,13 +2352,13 @@ ppc_elf_lookup_section_flags (char *flag_name) + return 0; + } + + /* Add the VLE flag if required. */ + + bfd_boolean +-ppc_elf_section_processing (bfd *abfd, Elf_Internal_Shdr *shdr) ++ppc_elf_amigaos_section_processing (bfd *abfd, Elf_Internal_Shdr *shdr) + { + if (bfd_get_mach (abfd) == bfd_mach_ppc_vle + && (shdr->sh_flags & SHF_EXECINSTR) != 0) + shdr->sh_flags |= SHF_PPC_VLE; + + return TRUE; +@@ -2285,12 +2369,15 @@ ppc_elf_section_processing (bfd *abfd, Elf_Internal_Shdr *shdr) + + static bfd_vma + ppc_elf_plt_sym_val (bfd_vma i ATTRIBUTE_UNUSED, + const asection *plt ATTRIBUTE_UNUSED, + const arelent *rel) + { ++#ifdef DEBUG ++ fprintf (stderr, "ppc_elf_plt_sym_cal (0x%08x)\n", (unsigned int)rel->address); ++#endif + return rel->address; + } + + /* Handle a PowerPC specific section when reading an object file. This + is called when bfd_section_from_shdr finds a section with an unknown + type. */ +@@ -2337,13 +2424,14 @@ ppc_elf_fake_sections (bfd *abfd ATTRIBUTE_UNUSED, + + static int + ppc_elf_additional_program_headers (bfd *abfd, + struct bfd_link_info *info ATTRIBUTE_UNUSED) + { + asection *s; +- int ret = 0; ++// int ret = 0; ++ int ret = 1; + + s = bfd_get_section_by_name (abfd, ".sbss2"); + if (s != NULL && (s->flags & SEC_ALLOC) != 0) + ++ret; + + s = bfd_get_section_by_name (abfd, ".PPC.EMB.sbss0"); +@@ -2353,13 +2441,13 @@ ppc_elf_additional_program_headers (bfd *abfd, + return ret; + } + + /* Modify the segment map for VLE executables. */ + + bfd_boolean +-ppc_elf_modify_segment_map (bfd *abfd, ++ppc_elf_amigaos_modify_segment_map (bfd *abfd, + struct bfd_link_info *info ATTRIBUTE_UNUSED) + { + struct elf_segment_map *m, *n; + bfd_size_type amt; + unsigned int j, k; + bfd_boolean sect0_vle, sectj_vle; +@@ -2546,13 +2634,13 @@ apuinfo_list_finish (void) + #define APUINFO_LABEL "APUinfo" + + /* Scan the input BFDs and create a linked list of + the APUinfo values that will need to be emitted. */ + + static void +-ppc_elf_begin_write_processing (bfd *abfd, struct bfd_link_info *link_info) ++ppc_elf_amigaos_begin_write_processing (bfd *abfd, struct bfd_link_info *link_info) + { + bfd *ibfd; + asection *asec; + char *buffer = NULL; + bfd_size_type largest_input_size = 0; + unsigned i; +@@ -2646,24 +2734,24 @@ ppc_elf_begin_write_processing (bfd *abfd, struct bfd_link_info *link_info) + } + + /* Prevent the output section from accumulating the input sections' + contents. We have already stored this in our linked list structure. */ + + static bfd_boolean +-ppc_elf_write_section (bfd *abfd ATTRIBUTE_UNUSED, ++ppc_elf_amigaos_write_section (bfd *abfd ATTRIBUTE_UNUSED, + struct bfd_link_info *link_info ATTRIBUTE_UNUSED, + asection *asec, + bfd_byte *contents ATTRIBUTE_UNUSED) + { + return apuinfo_set && strcmp (asec->name, APUINFO_SECTION_NAME) == 0; + } + + /* Finally we can generate the output section. */ + + static void +-ppc_elf_final_write_processing (bfd *abfd, bfd_boolean linker ATTRIBUTE_UNUSED) ++ppc_elf_amigaos_final_write_processing (bfd *abfd, bfd_boolean linker ATTRIBUTE_UNUSED) + { + bfd_byte *buffer; + asection *asec; + unsigned i; + unsigned num_entries; + bfd_size_type length; +@@ -3232,13 +3320,13 @@ ppc_elf_create_got (bfd *abfd, struct bfd_link_info *info) + abort (); + } + else + { + /* The powerpc .got has a blrl instruction in it. Mark it + executable. */ +- flags = (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_HAS_CONTENTS ++ flags = (SEC_ALLOC | SEC_LOAD | /*SEC_CODE |*/ SEC_HAS_CONTENTS + | SEC_IN_MEMORY | SEC_LINKER_CREATED); + if (!bfd_set_section_flags (abfd, s, flags)) + return FALSE; + } + + htab->relgot = bfd_get_linker_section (abfd, ".rela.got"); +@@ -3340,13 +3428,13 @@ ppc_elf_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info) + + htab->relplt = bfd_get_linker_section (abfd, ".rela.plt"); + htab->plt = s = bfd_get_linker_section (abfd, ".plt"); + if (s == NULL) + abort (); + +- flags = SEC_ALLOC | SEC_CODE | SEC_LINKER_CREATED; ++ flags = SEC_ALLOC | SEC_CODE | SEC_LINKER_CREATED | SEC_READONLY; + if (htab->plt_type == PLT_VXWORKS) + /* The VxWorks PLT is a loaded section with contents. */ + flags |= SEC_HAS_CONTENTS | SEC_LOAD | SEC_READONLY; + return bfd_set_section_flags (abfd, s, flags); + } + +@@ -3410,13 +3498,13 @@ ppc_elf_copy_indirect_symbol (struct bfd_link_info *info, + eind->dyn_relocs = NULL; + } + + /* If we were called to copy over info for a weak sym, that's all. + You might think dyn_relocs need not be copied over; After all, + both syms will be dynamic or both non-dynamic so we're just +- moving reloc accounting around. However, ELIMINATE_COPY_RELOCS ++ moving reloc accounting around. However, ELIMINATE_COPY_RELOCS + code in ppc_elf_adjust_dynamic_symbol needs to check for + dyn_relocs in read-only sections, and it does so on what is the + DIR sym here. */ + if (eind->elf.root.type != bfd_link_hash_indirect) + return; + +@@ -4186,12 +4274,19 @@ ppc_elf_check_relocs (bfd *abfd, + case R_PPC_EMB_RELST_LO: + case R_PPC_EMB_RELST_HI: + case R_PPC_EMB_RELST_HA: + case R_PPC_EMB_BIT_FLD: + break; + ++ /* These don't work with a GOT */ ++ case R_PPC_AMIGAOS_BREL: ++ case R_PPC_AMIGAOS_BREL_HI: ++ case R_PPC_AMIGAOS_BREL_LO: ++ case R_PPC_AMIGAOS_BREL_HA: ++ break; ++ + /* This refers only to functions defined in the shared library. */ + case R_PPC_LOCAL24PC: + if (h != NULL && h == htab->elf.hgot && htab->plt_type == PLT_UNSET) + { + htab->plt_type = PLT_OLD; + htab->old_bfd = abfd; +@@ -4679,13 +4774,13 @@ ppc_elf_vle_split16 (bfd *output_bfd, bfd_byte *contents, + } + + + /* Choose which PLT scheme to use, and set .plt flags appropriately. + Returns -1 on error, 0 for old PLT, 1 for new PLT. */ + int +-ppc_elf_select_plt_layout (bfd *output_bfd ATTRIBUTE_UNUSED, ++ppc_elf_amigaos_select_plt_layout (bfd *output_bfd ATTRIBUTE_UNUSED, + struct bfd_link_info *info, + enum ppc_elf_plt_type plt_style, + int emit_stub_syms) + { + struct ppc_elf_link_hash_table *htab; + flagword flags; +@@ -4976,13 +5071,13 @@ ppc_elf_gc_sweep_hook (bfd *abfd, + } + + /* Set plt output section type, htab->tls_get_addr, and call the + generic ELF tls_setup function. */ + + asection * +-ppc_elf_tls_setup (bfd *obfd, ++ppc_elf_amigaos_tls_setup (bfd *obfd, + struct bfd_link_info *info, + int no_tls_get_addr_opt) + { + struct ppc_elf_link_hash_table *htab; + + htab = ppc_elf_hash_table (info); +@@ -5075,13 +5170,13 @@ branch_reloc_hash_match (const bfd *ibfd, + } + + /* Run through all the TLS relocs looking for optimization + opportunities. */ + + bfd_boolean +-ppc_elf_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED, ++ppc_elf_amigaos_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED, + struct bfd_link_info *info) + { + bfd *ibfd; + asection *sec; + struct ppc_elf_link_hash_table *htab; + int pass; +@@ -6008,12 +6103,16 @@ ppc_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, + fprintf (stderr, "ppc_elf_size_dynamic_sections called\n"); + #endif + + htab = ppc_elf_hash_table (info); + BFD_ASSERT (htab->elf.dynobj != NULL); + ++#ifdef DEBUG ++ fprintf (stderr, "ppc_elf_size_dynamic_sections: dynamic_sections_created = %d\n", elf_hash_table (info)->dynamic_sections_created); ++#endif ++ + if (elf_hash_table (info)->dynamic_sections_created) + { + /* Set the contents of the .interp section to the interpreter. */ + if (info->executable) + { + s = bfd_get_linker_section (htab->elf.dynobj, ".interp"); +@@ -6037,12 +6136,16 @@ ppc_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, + struct plt_entry **local_plt; + struct plt_entry **end_local_plt; + char *lgot_masks; + bfd_size_type locsymcount; + Elf_Internal_Shdr *symtab_hdr; + ++#ifdef DEBUG ++ fprintf (stderr, "ppc_elf_size_dynamic_sections: is_ppc_elf() = %d (flavour = %d)\n", is_ppc_elf (ibfd), bfd_get_flavour (ibfd)); ++#endif ++ + if (!is_ppc_elf (ibfd)) + continue; + + for (s = ibfd->sections; s != NULL; s = s->next) + { + struct elf_dyn_relocs *p; +@@ -6400,12 +6503,16 @@ ppc_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, + if (!add_dynamic_entry (DT_TEXTREL, 0)) + return FALSE; + } + if (htab->is_vxworks + && !elf_vxworks_add_dynamic_entries (output_bfd, info)) + return FALSE; ++ ++ /* Flag it as a version 2 dynamic binary */ ++ if (!add_dynamic_entry(DT_AMIGAOS_DYNVERSION, 2)) ++ return FALSE; + } + #undef add_dynamic_entry + + if (htab->glink_eh_frame != NULL + && htab->glink_eh_frame->contents != NULL) + { +@@ -7172,13 +7279,13 @@ is_static_defined (struct elf_link_hash_entry *h) + + /* If INSN is an opcode that may be used with an @tls operand, return + the transformed insn for TLS optimisation, otherwise return 0. If + REG is non-zero only match an insn with RB or RA equal to REG. */ + + unsigned int +-_bfd_elf_ppc_at_tls_transform (unsigned int insn, unsigned int reg) ++_bfd_elf_amigaos_ppc_at_tls_transform (unsigned int insn, unsigned int reg) + { + unsigned int rtra; + + if ((insn & (0x3f << 26)) != 31 << 26) + return 0; + +@@ -7212,13 +7319,13 @@ _bfd_elf_ppc_at_tls_transform (unsigned int insn, unsigned int reg) + + /* If INSN is an opcode that may be used with an @tprel operand, return + the transformed insn for an undefined weak symbol, ie. with the + thread pointer REG operand removed. Otherwise return 0. */ + + unsigned int +-_bfd_elf_ppc_at_tprel_transform (unsigned int insn, unsigned int reg) ++_bfd_elf_amigaos_ppc_at_tprel_transform (unsigned int insn, unsigned int reg) + { + if ((insn & (0x1f << 16)) == reg << 16 + && ((insn & (0x3f << 26)) == 14u << 26 /* addi */ + || (insn & (0x3f << 26)) == 15u << 26 /* addis */ + || (insn & (0x3f << 26)) == 32u << 26 /* lwz */ + || (insn & (0x3f << 26)) == 34u << 26 /* lbz */ +@@ -8076,13 +8183,13 @@ ppc_elf_relocate_section (bfd *output_bfd, + /* Make this relocation against an undefined weak symbol + resolve to zero. This is really just a tweak, since + code using weak externs ought to check that they are + defined before using them. */ + bfd_byte *p = contents + rel->r_offset - d_offset; + unsigned int insn = bfd_get_32 (output_bfd, p); +- insn = _bfd_elf_ppc_at_tprel_transform (insn, 2); ++ insn = _bfd_elf_amigaos_ppc_at_tprel_transform (insn, 2); + if (insn != 0) + bfd_put_32 (output_bfd, insn, p); + break; + } + addend -= htab->elf.tls_sec->vma + TP_OFFSET; + /* The TPREL16 relocs shouldn't really be used in shared +@@ -8502,13 +8609,47 @@ ppc_elf_relocate_section (bfd *output_bfd, + sym_name, + howto->name, + name); + } + } + break; ++#if 0 ++ case R_PPC_AMIGAOS_BREL: ++ case R_PPC_AMIGAOS_BREL_HI: ++ case R_PPC_AMIGAOS_BREL_LO: ++ case R_PPC_AMIGAOS_BREL_HA: ++ { ++ if (data_section == NULL) ++ data_section = bfd_get_section_by_name (output_bfd, ".data"); ++ ++ if (sec) ++ { ++ const char *name = bfd_get_section_name (abfd, sec->output_section); ++ if (strcmp (name, ".sdata") != 0 ++ && strcmp (name, ".sbss") != 0 ++ && strcmp (name, ".data") != 0 ++ && strcmp (name, ".bss") != 0 ++ && strncmp (name, ".ctors", 6) != 0 ++ && strncmp (name, ".dtors", 6) != 0) ++ { ++ (*_bfd_error_handler) (_("%s: The target (%s) of a %s relocation is in the wrong output section (%s)"), ++ input_bfd, ++ sym_name, ++ howto->name, ++ name); ++ } ++ } ++ ++ addend = addend - data_section->vma; ++ ++ if (r_type == R_PPC_AMIGAOS_BREL_HA) ++ addend += ((relocation + addend) & 0x8000) << 1; + ++ } ++ break; ++#endif + case R_PPC_VLE_LO16A: + relocation = (relocation + addend) & 0xffff; + ppc_elf_vle_split16 (output_bfd, contents, rel->r_offset, + relocation, split16a_type); + continue; + +@@ -8899,12 +9040,15 @@ ppc_elf_relocate_section (bfd *output_bfd, + input_section, + contents, + rel->r_offset, + relocation, + addend); + ++#ifdef DEBUG ++ fprintf (stderr, "%p %p %p\n", (void *)rel->r_offset, (void *)relocation, (void *)addend); ++#endif + if (r != bfd_reloc_ok) + { + if (r == bfd_reloc_overflow) + { + if (warned) + continue; +@@ -9124,18 +9268,24 @@ ppc_elf_finish_dynamic_symbol (bfd *output_bfd, + || h->dynindx == -1) + splt = htab->iplt; + + rela.r_offset = (splt->output_section->vma + + splt->output_offset + + ent->plt.offset); ++#ifdef DEBUG ++ fprintf (stderr, " r_offset = %p ", (void *)rela.r_offset); ++#endif + if (htab->plt_type == PLT_OLD + || !htab->elf.dynamic_sections_created + || h->dynindx == -1) + { + /* We don't need to fill in the .plt. The ppc dynamic + linker will fill it in. */ ++#ifdef DEBUG ++ fprintf (stderr, " not filling in .plt "); ++#endif + } + else + { + bfd_vma val = (htab->glink_pltresolve + ent->plt.offset + + htab->glink->output_section->vma + + htab->glink->output_offset); +@@ -9166,24 +9316,34 @@ ppc_elf_finish_dynamic_symbol (bfd *output_bfd, + * sizeof (Elf32_External_Rela))); + else + loc = (htab->relplt->contents + + reloc_index * sizeof (Elf32_External_Rela)); + bfd_elf32_swap_reloca_out (output_bfd, &rela, loc); + ++#ifdef DEBUG ++ fprintf (stderr, " r_offset = %p r_addednd = %p, r_info = 0x%08x, h->def_regular = %d", (void *)rela.r_offset, (void *)rela.r_addend, (unsigned int)rela.r_info, (int)h->def_regular); ++#endif + if (!h->def_regular) + { + /* Mark the symbol as undefined, rather than as + defined in the .plt section. Leave the value if + there were any relocations where pointer equality + matters (this is a clue for the dynamic linker, to + make function pointer comparisons work between an + application and shared library), otherwise set it + to zero. */ + sym->st_shndx = SHN_UNDEF; + if (!h->pointer_equality_needed) +- sym->st_value = 0; ++ { ++ /* THF: This is peculiar. The compiler generates a R_PPC_REL24 for externally referenced ++ * symbols impoted from libc.so. Relocation in elf.library requires the symbol to have it's .plt ++ * stub value, but the linker specifically clears the value to 0, resulting in run-time ++ * errors when the binary tries to call libc functions. ++ */ ++ // sym->st_value = 0; ++ } + else if (!h->ref_regular_nonweak) + { + /* This breaks function pointer comparisons, but + that is better than breaking tests for a NULL + function pointer. */ + sym->st_value = 0; +@@ -9275,12 +9435,15 @@ ppc_elf_finish_dynamic_symbol (bfd *output_bfd, + rela.r_addend = 0; + loc = s->contents + s->reloc_count++ * sizeof (Elf32_External_Rela); + bfd_elf32_swap_reloca_out (output_bfd, &rela, loc); + } + + #ifdef DEBUG ++ fprintf (stderr, " SYM_VAL(%p) ", (void *)SYM_VAL(h)); ++#endif ++#ifdef DEBUG + fprintf (stderr, "\n"); + #endif + + return TRUE; + } + +@@ -9735,16 +9898,14 @@ ppc_elf_finish_dynamic_sections (bfd *output_bfd, + return FALSE; + } + + return ret; + } + +-#define TARGET_LITTLE_SYM bfd_elf32_powerpcle_vec +-#define TARGET_LITTLE_NAME "elf32-powerpcle" +-#define TARGET_BIG_SYM bfd_elf32_powerpc_vec +-#define TARGET_BIG_NAME "elf32-powerpc" ++#define TARGET_BIG_SYM bfd_elf32_amigaos_vec ++#define TARGET_BIG_NAME "elf32-amigaos" + #define ELF_ARCH bfd_arch_powerpc + #define ELF_TARGET_ID PPC32_ELF_DATA + #define ELF_MACHINE_CODE EM_PPC + #ifdef __QNXTARGET__ + #define ELF_MAXPAGESIZE 0x1000 + #else +@@ -9789,153 +9950,23 @@ ppc_elf_finish_dynamic_sections (bfd *output_bfd, + #define elf_backend_size_dynamic_sections ppc_elf_size_dynamic_sections + #define elf_backend_hash_symbol ppc_elf_hash_symbol + #define elf_backend_finish_dynamic_symbol ppc_elf_finish_dynamic_symbol + #define elf_backend_finish_dynamic_sections ppc_elf_finish_dynamic_sections + #define elf_backend_fake_sections ppc_elf_fake_sections + #define elf_backend_additional_program_headers ppc_elf_additional_program_headers +-#define elf_backend_modify_segment_map ppc_elf_modify_segment_map ++#define elf_backend_modify_segment_map ppc_elf_amigaos_modify_segment_map + #define elf_backend_grok_prstatus ppc_elf_grok_prstatus + #define elf_backend_grok_psinfo ppc_elf_grok_psinfo + #define elf_backend_write_core_note ppc_elf_write_core_note + #define elf_backend_reloc_type_class ppc_elf_reloc_type_class +-#define elf_backend_begin_write_processing ppc_elf_begin_write_processing +-#define elf_backend_final_write_processing ppc_elf_final_write_processing +-#define elf_backend_write_section ppc_elf_write_section ++#define elf_backend_begin_write_processing ppc_elf_amigaos_begin_write_processing ++#define elf_backend_final_write_processing ppc_elf_amigaos_final_write_processing ++#define elf_backend_write_section ppc_elf_amigaos_write_section + #define elf_backend_get_sec_type_attr ppc_elf_get_sec_type_attr + #define elf_backend_plt_sym_val ppc_elf_plt_sym_val + #define elf_backend_action_discarded ppc_elf_action_discarded + #define elf_backend_init_index_section _bfd_elf_init_1_index_section + #define elf_backend_post_process_headers _bfd_elf_set_osabi + #define elf_backend_lookup_section_flags_hook ppc_elf_lookup_section_flags +-#define elf_backend_section_processing ppc_elf_section_processing +- +-#include "elf32-target.h" +- +-/* FreeBSD Target */ +- +-#undef TARGET_LITTLE_SYM +-#undef TARGET_LITTLE_NAME +- +-#undef TARGET_BIG_SYM +-#define TARGET_BIG_SYM bfd_elf32_powerpc_freebsd_vec +-#undef TARGET_BIG_NAME +-#define TARGET_BIG_NAME "elf32-powerpc-freebsd" +- +-#undef ELF_OSABI +-#define ELF_OSABI ELFOSABI_FREEBSD +- +-#undef elf32_bed +-#define elf32_bed elf32_powerpc_fbsd_bed +- +-#include "elf32-target.h" +- +-/* VxWorks Target */ +- +-#undef TARGET_LITTLE_SYM +-#undef TARGET_LITTLE_NAME +- +-#undef TARGET_BIG_SYM +-#define TARGET_BIG_SYM bfd_elf32_powerpc_vxworks_vec +-#undef TARGET_BIG_NAME +-#define TARGET_BIG_NAME "elf32-powerpc-vxworks" +- +-#undef ELF_OSABI +- +-/* VxWorks uses the elf default section flags for .plt. */ +-static const struct bfd_elf_special_section * +-ppc_elf_vxworks_get_sec_type_attr (bfd *abfd ATTRIBUTE_UNUSED, asection *sec) +-{ +- if (sec->name == NULL) +- return NULL; +- +- if (strcmp (sec->name, ".plt") == 0) +- return _bfd_elf_get_sec_type_attr (abfd, sec); +- +- return ppc_elf_get_sec_type_attr (abfd, sec); +-} +- +-/* Like ppc_elf_link_hash_table_create, but overrides +- appropriately for VxWorks. */ +-static struct bfd_link_hash_table * +-ppc_elf_vxworks_link_hash_table_create (bfd *abfd) +-{ +- struct bfd_link_hash_table *ret; +- +- ret = ppc_elf_link_hash_table_create (abfd); +- if (ret) +- { +- struct ppc_elf_link_hash_table *htab +- = (struct ppc_elf_link_hash_table *)ret; +- htab->is_vxworks = 1; +- htab->plt_type = PLT_VXWORKS; +- htab->plt_entry_size = VXWORKS_PLT_ENTRY_SIZE; +- htab->plt_slot_size = VXWORKS_PLT_ENTRY_SIZE; +- htab->plt_initial_entry_size = VXWORKS_PLT_INITIAL_ENTRY_SIZE; +- } +- return ret; +-} +- +-/* Tweak magic VxWorks symbols as they are loaded. */ +-static bfd_boolean +-ppc_elf_vxworks_add_symbol_hook (bfd *abfd, +- struct bfd_link_info *info, +- Elf_Internal_Sym *sym, +- const char **namep ATTRIBUTE_UNUSED, +- flagword *flagsp ATTRIBUTE_UNUSED, +- asection **secp, +- bfd_vma *valp) +-{ +- if (!elf_vxworks_add_symbol_hook(abfd, info, sym,namep, flagsp, secp, +- valp)) +- return FALSE; +- +- return ppc_elf_add_symbol_hook(abfd, info, sym,namep, flagsp, secp, valp); +-} +- +-static void +-ppc_elf_vxworks_final_write_processing (bfd *abfd, bfd_boolean linker) +-{ +- ppc_elf_final_write_processing(abfd, linker); +- elf_vxworks_final_write_processing(abfd, linker); +-} +- +-/* On VxWorks, we emit relocations against _PROCEDURE_LINKAGE_TABLE_, so +- define it. */ +-#undef elf_backend_want_plt_sym +-#define elf_backend_want_plt_sym 1 +-#undef elf_backend_want_got_plt +-#define elf_backend_want_got_plt 1 +-#undef elf_backend_got_symbol_offset +-#define elf_backend_got_symbol_offset 0 +-#undef elf_backend_plt_not_loaded +-#define elf_backend_plt_not_loaded 0 +-#undef elf_backend_plt_readonly +-#define elf_backend_plt_readonly 1 +-#undef elf_backend_got_header_size +-#define elf_backend_got_header_size 12 +- +-#undef bfd_elf32_get_synthetic_symtab +- +-#undef bfd_elf32_bfd_link_hash_table_create +-#define bfd_elf32_bfd_link_hash_table_create \ +- ppc_elf_vxworks_link_hash_table_create +-#undef elf_backend_add_symbol_hook +-#define elf_backend_add_symbol_hook \ +- ppc_elf_vxworks_add_symbol_hook +-#undef elf_backend_link_output_symbol_hook +-#define elf_backend_link_output_symbol_hook \ +- elf_vxworks_link_output_symbol_hook +-#undef elf_backend_final_write_processing +-#define elf_backend_final_write_processing \ +- ppc_elf_vxworks_final_write_processing +-#undef elf_backend_get_sec_type_attr +-#define elf_backend_get_sec_type_attr \ +- ppc_elf_vxworks_get_sec_type_attr +-#undef elf_backend_emit_relocs +-#define elf_backend_emit_relocs \ +- elf_vxworks_emit_relocs +- +-#undef elf32_bed +-#define elf32_bed ppc_elf_vxworks_bed +-#undef elf_backend_post_process_headers ++#define elf_backend_section_processing ppc_elf_amigaos_section_processing + + #include "elf32-target.h" diff --git a/bfd/elf32-i386-amithlon.c b/bfd/elf32-i386-amithlon.c new file mode 100644 index 0000000000000000000000000000000000000000..4e029a5e90187a96013ed97e078fba920d95db28 @@ -20701,13 +21480,19 @@ diff --git a/include/elf/ppc.h b/include/elf/ppc.h index f80a1e8a3e9c5852902beaafbb6a2a9e36d815c3..9893a88d96a77d730d91ef2bfe89a18d75029dd1 100644 --- include/elf/ppc.h +++ include/elf/ppc.h -@@ -128,12 +128,18 @@ START_RELOC_NUMBERS (elf_ppc_reloc_type) +@@ -128,12 +128,24 @@ START_RELOC_NUMBERS (elf_ppc_reloc_type) RELOC_NUMBER (R_PPC_EMB_RELST_LO, 112) RELOC_NUMBER (R_PPC_EMB_RELST_HI, 113) RELOC_NUMBER (R_PPC_EMB_RELST_HA, 114) RELOC_NUMBER (R_PPC_EMB_BIT_FLD, 115) RELOC_NUMBER (R_PPC_EMB_RELSDA, 116) ++/* Special MorphOS relocs. */ ++ RELOC_NUMBER (R_PPC_MORPHOS_DREL, 200) ++ RELOC_NUMBER (R_PPC_MORPHOS_DREL_LO, 201) ++ RELOC_NUMBER (R_PPC_MORPHOS_DREL_HI, 202) ++ RELOC_NUMBER (R_PPC_MORPHOS_DREL_HA, 203) ++ +/* AmigaOS4 relocs */ + RELOC_NUMBER (R_PPC_AMIGAOS_BREL, 210) + RELOC_NUMBER (R_PPC_AMIGAOS_BREL_LO, 211) @@ -26110,6 +26895,460 @@ index 3fc1352e19184c0319302e809cccf7cc861ec8d7..b8248cd4966e34e95c8b262e515ace18 + .libnix___LIB_LIST__ ${RELOCATING-0} : { *(.libnix___LIB_LIST__) } } EOF +diff --git a/ld/scripttempl/elfi370.sc b/ld/scripttempl/morphos.sc +similarity index 88% +copy from ld/scripttempl/elfi370.sc +copy to ld/scripttempl/morphos.sc +index a845b2980105fa8504b5bf8a83aeb6fc086caa6e..469a8f5f2cad237c9317faf5d23db7f2b7a63eee 100644 +--- ld/scripttempl/elfi370.sc ++++ ld/scripttempl/morphos.sc +@@ -1,17 +1,14 @@ + # +-# This is just a raw copy of elfppc.sc and has not been otherwise modified +-# + # Unusual variables checked by this code: +-# NOP - four byte opcode for no-op (defaults to 0) ++# NOP - two byte opcode for no-op (defaults to 0) + # DATA_ADDR - if end-of-text-plus-one-page isn't right for data start + # OTHER_READONLY_SECTIONS - other than .text .init .rodata ... + # (e.g., .PARISC.milli) + # OTHER_READWRITE_SECTIONS - other than .data .bss .ctors .sdata ... + # (e.g., .PARISC.global) +-# 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_SYMBOLS - symbols that appear at the start of the + # .text section. + # DATA_START_SYMBOLS - symbols that appear at the start of the +@@ -19,37 +16,35 @@ + # OTHER_BSS_SYMBOLS - symbols that appear at the start of the + # .bss section besides __bss_start. + # + # When adding sections, do note that the names of some sections are used + # when specifying the start address of the next. + # +-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} +-test -z "$ATTRS_SECTIONS" && ATTRS_SECTIONS=".gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }" + test "$LD_FLAG" = "N" && DATA_ADDR=. + SBSS2=".sbss2 ${RELOCATING-0} : { *(.sbss2) }" + SDATA2=".sdata2 ${RELOCATING-0} : { *(.sdata2) }" + INTERP=".interp ${RELOCATING-0} : { *(.interp) }" + PLT=".plt ${RELOCATING-0} : { *(.plt) }" + cat <<EOF + OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}", + "${LITTLE_OUTPUT_FORMAT}") + OUTPUT_ARCH(${ARCH}) +-${RELOCATING+ENTRY(${ENTRY})} + + ${RELOCATING+${LIB_SEARCH_DIRS}} + ${RELOCATING+/* Do we need any of these for elf? + __DYNAMIC = 0; ${STACKZERO+${STACKZERO}} ${SHLIB_PATH+${SHLIB_PATH}} */} + ${RELOCATING+${EXECUTABLE_SYMBOLS}} + ${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. */} + + ${RELOCATING+PROVIDE (__stack = 0);} ++PROVIDE (__machtype = 0x1); + SECTIONS + { + /* Read-only sections, merged into text segment: */ + ${CREATE_SHLIB-${RELOCATING+. = ${TEXT_START_ADDR} + SIZEOF_HEADERS;}} + ${CREATE_SHLIB+${RELOCATING+. = SIZEOF_HEADERS;}} + ${CREATE_SHLIB-${INTERP}} +@@ -77,27 +72,30 @@ SECTIONS + .rela.sdata ${RELOCATING-0} : { *(.rela.sdata) } + .rela.sbss ${RELOCATING-0} : { *(.rela.sbss) } + .rela.sdata2 ${RELOCATING-0} : { *(.rela.sdata2) } + .rela.sbss2 ${RELOCATING-0} : { *(.rela.sbss2) } + .text ${RELOCATING-0} : + { ++ PROVIDE (__text_start = .); + ${RELOCATING+${TEXT_START_SYMBOLS}} + *(.text) + /* .gnu.warning sections are handled specially by elf32.em. */ + *(.gnu.warning) + *(.gnu.linkonce.t*) ++ PROVIDE (__text_end = .); + } =${NOP-0} ++ PROVIDE (__text_size = SIZEOF(.text)); + .init ${RELOCATING-0} : { *(.init) } =${NOP-0} + .fini ${RELOCATING-0} : { *(.fini) } =${NOP-0} + .rodata ${RELOCATING-0} : { *(.rodata) *(.gnu.linkonce.r*) } + .rodata1 ${RELOCATING-0} : { *(.rodata1) } + ${RELOCATING+_etext = .;} + ${RELOCATING+PROVIDE (etext = .);} + ${CREATE_SHLIB-${SDATA2}} + ${CREATE_SHLIB-${SBSS2}} +- ${OTHER_READONLY_SECTIONS} ++ ${RELOCATING+${OTHER_READONLY_SECTIONS}} + + /* Adjust the address for the data segment. We want to adjust up to + the same address within the page on the next page up. It would + be more correct to do this: + ${RELOCATING+. = ${DATA_ADDR-ALIGN(${MAXPAGESIZE}) + (ALIGN(8) & (${MAXPAGESIZE} - 1))};} + The current expression does not correctly handle the case of a +@@ -111,19 +109,22 @@ SECTIONS + that no actual memory is lost; the page which is skipped can not + be referenced). */ + ${RELOCATING+. = ${DATA_ADDR- ALIGN(8) + ${MAXPAGESIZE}};} + + .data ${RELOCATING-0} : + { ++ PROVIDE (__data_start = .); + ${RELOCATING+${DATA_START_SYMBOLS}} + *(.data) + *(.gnu.linkonce.d*) + ${CONSTRUCTING+CONSTRUCTORS} ++ PROVIDE (__data_end = .); + } ++ PROVIDE (__data_size = SIZEOF(.data)); + .data1 ${RELOCATING-0} : { *(.data1) } +- ${OTHER_READWRITE_SECTIONS} ++ ${RELOCATING+${OTHER_READWRITE_SECTIONS}} + + .got1 ${RELOCATING-0} : { *(.got1) } + .dynamic ${RELOCATING-0} : { *(.dynamic) } + + /* Put .ctors and .dtors next to the .got2 section, so that the pointers + get relocated with -mrelocatable. Also put in the .fixup pointers. +@@ -152,32 +153,43 @@ SECTIONS + ${CREATE_SHLIB+${SBSS2}} + ${RELOCATING+PROVIDE (_GOT_END_ = .);} + + /* 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} : { *(.sdata) } ++ .sdata ${RELOCATING-0} : ++ { ++ PROVIDE (__sdata_start = .); ++ *(.sdata) ++ PROVIDE (__r13_init = 0x8000); ++ PROVIDE (__sdata_end = .); ++ } ++ PROVIDE (__sdata_size = SIZEOF(.sdata)); + ${RELOCATING+_edata = .;} + ${RELOCATING+PROVIDE (edata = .);} + .sbss ${RELOCATING-0} : + { +- ${RELOCATING+PROVIDE (__sbss_start = .);} ++ PROVIDE (__sbss_start = .); + *(.sbss) + *(.scommon) + *(.dynsbss) +- ${RELOCATING+PROVIDE (__sbss_end = .);} ++ PROVIDE (__sbss_end = .); + } ++ PROVIDE (__sbss_size = SIZEOF(.sbss)); + ${PLT} + .bss ${RELOCATING-0} : + { +- ${RELOCATING+${OTHER_BSS_SYMBOLS}} +- ${RELOCATING+PROVIDE (__bss_start = .);} +- *(.dynbss) +- *(.bss) +- *(COMMON) ++ PROVIDE (__bss_start = .); ++ ${RELOCATING+${OTHER_BSS_SYMBOLS}} ++ ${RELOCATING+PROVIDE (__bss_start = .);} ++ *(.dynbss) ++ *(.bss) ++ *(COMMON) ++ PROVIDE (__bss_end = .); + } ++ PROVIDE (__bss_size = SIZEOF(.bss)); + ${RELOCATING+_end = . ;} + ${RELOCATING+PROVIDE (end = .);} + + /* These are needed for ELF backends which have not yet been + converted to the new style linker. */ + .stab 0 : { *(.stab) } +@@ -197,13 +209,13 @@ SECTIONS + + /* DWARF 1.1 and DWARF 2 */ + .debug_aranges 0 : { *(.debug_aranges) } + .debug_pubnames 0 : { *(.debug_pubnames) } + + /* DWARF 2 */ +- .debug_info 0 : { *(.debug_info) *(.gnu.linkonce.wi.*) } ++ .debug_info 0 : { *(.debug_info) } + .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) } +@@ -211,17 +223,10 @@ SECTIONS + /* 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) } +- +- /* DWARF Extension. */ +- .debug_macro 0 : { *(.debug_macro) } +- +- ${ATTRS_SECTIONS} ++ /* These must appear regardless of ${RELOCATING}. */ + ${OTHER_SECTIONS} + } + EOF +diff --git a/ld/scripttempl/elfi370.sc b/ld/scripttempl/morphos_baserel.sc +similarity index 69% +copy from ld/scripttempl/elfi370.sc +copy to ld/scripttempl/morphos_baserel.sc +index a845b2980105fa8504b5bf8a83aeb6fc086caa6e..4f0f4aba86bddb4e76a9405c0da04df4c0091d9e 100644 +--- ld/scripttempl/elfi370.sc ++++ ld/scripttempl/morphos_baserel.sc +@@ -1,17 +1,14 @@ + # +-# This is just a raw copy of elfppc.sc and has not been otherwise modified +-# + # Unusual variables checked by this code: +-# NOP - four byte opcode for no-op (defaults to 0) ++# NOP - two byte opcode for no-op (defaults to 0) + # DATA_ADDR - if end-of-text-plus-one-page isn't right for data start + # OTHER_READONLY_SECTIONS - other than .text .init .rodata ... + # (e.g., .PARISC.milli) + # OTHER_READWRITE_SECTIONS - other than .data .bss .ctors .sdata ... + # (e.g., .PARISC.global) +-# 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_SYMBOLS - symbols that appear at the start of the + # .text section. + # DATA_START_SYMBOLS - symbols that appear at the start of the +@@ -19,37 +16,35 @@ + # OTHER_BSS_SYMBOLS - symbols that appear at the start of the + # .bss section besides __bss_start. + # + # When adding sections, do note that the names of some sections are used + # when specifying the start address of the next. + # +-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} +-test -z "$ATTRS_SECTIONS" && ATTRS_SECTIONS=".gnu.attributes 0 : { KEEP (*(.gnu.attributes)) }" + test "$LD_FLAG" = "N" && DATA_ADDR=. + SBSS2=".sbss2 ${RELOCATING-0} : { *(.sbss2) }" + SDATA2=".sdata2 ${RELOCATING-0} : { *(.sdata2) }" + INTERP=".interp ${RELOCATING-0} : { *(.interp) }" + PLT=".plt ${RELOCATING-0} : { *(.plt) }" + cat <<EOF + OUTPUT_FORMAT("${OUTPUT_FORMAT}", "${BIG_OUTPUT_FORMAT}", + "${LITTLE_OUTPUT_FORMAT}") + OUTPUT_ARCH(${ARCH}) +-${RELOCATING+ENTRY(${ENTRY})} + + ${RELOCATING+${LIB_SEARCH_DIRS}} + ${RELOCATING+/* Do we need any of these for elf? + __DYNAMIC = 0; ${STACKZERO+${STACKZERO}} ${SHLIB_PATH+${SHLIB_PATH}} */} + ${RELOCATING+${EXECUTABLE_SYMBOLS}} + ${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. */} + + ${RELOCATING+PROVIDE (__stack = 0);} ++PROVIDE (__machtype = 0x1); + SECTIONS + { + /* Read-only sections, merged into text segment: */ + ${CREATE_SHLIB-${RELOCATING+. = ${TEXT_START_ADDR} + SIZEOF_HEADERS;}} + ${CREATE_SHLIB+${RELOCATING+. = SIZEOF_HEADERS;}} + ${CREATE_SHLIB-${INTERP}} +@@ -58,72 +53,53 @@ SECTIONS + .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) } + .rela.text ${RELOCATING-0} : + { *(.rela.text) *(.rela.gnu.linkonce.t*) } +- .rela.data ${RELOCATING-0} : +- { *(.rela.data) *(.rela.gnu.linkonce.d*) } +- .rela.rodata ${RELOCATING-0} : +- { *(.rela.rodata) *(.rela.gnu.linkonce.r*) } + .rela.got ${RELOCATING-0} : { *(.rela.got) } + .rela.got1 ${RELOCATING-0} : { *(.rela.got1) } + .rela.got2 ${RELOCATING-0} : { *(.rela.got2) } + .rela.ctors ${RELOCATING-0} : { *(.rela.ctors) } + .rela.dtors ${RELOCATING-0} : { *(.rela.dtors) } + .rela.init ${RELOCATING-0} : { *(.rela.init) } + .rela.fini ${RELOCATING-0} : { *(.rela.fini) } +- .rela.bss ${RELOCATING-0} : { *(.rela.bss) } + .rela.plt ${RELOCATING-0} : { *(.rela.plt) } +- .rela.sdata ${RELOCATING-0} : { *(.rela.sdata) } +- .rela.sbss ${RELOCATING-0} : { *(.rela.sbss) } ++ .rela.rodata ${RELOCATING-0} : ++ { *(.rela.rodata) *(.rela.gnu.linkonce.r*) } ++ .rela.sdata ${RELOCATING-0} : ++ { ++ *(.rela.data) ++ *(.rela.gnu.linkonce.d*) ++ *(.rela.sdata) ++ } ++ .rela.sbss ${RELOCATING-0} : ++ { ++ *(.rela.sbss) ++ *(.rela.bss) ++ } + .rela.sdata2 ${RELOCATING-0} : { *(.rela.sdata2) } + .rela.sbss2 ${RELOCATING-0} : { *(.rela.sbss2) } + .text ${RELOCATING-0} : + { ++ PROVIDE (__text_start = .); + ${RELOCATING+${TEXT_START_SYMBOLS}} + *(.text) + /* .gnu.warning sections are handled specially by elf32.em. */ + *(.gnu.warning) + *(.gnu.linkonce.t*) ++ PROVIDE (__text_end = .); + } =${NOP-0} ++ PROVIDE (__text_size = SIZEOF(.text)); + .init ${RELOCATING-0} : { *(.init) } =${NOP-0} + .fini ${RELOCATING-0} : { *(.fini) } =${NOP-0} +- .rodata ${RELOCATING-0} : { *(.rodata) *(.gnu.linkonce.r*) } +- .rodata1 ${RELOCATING-0} : { *(.rodata1) } + ${RELOCATING+_etext = .;} + ${RELOCATING+PROVIDE (etext = .);} + ${CREATE_SHLIB-${SDATA2}} + ${CREATE_SHLIB-${SBSS2}} +- ${OTHER_READONLY_SECTIONS} +- +- /* Adjust the address for the data segment. We want to adjust up to +- the same address within the page on the next page up. It would +- be more correct to do this: +- ${RELOCATING+. = ${DATA_ADDR-ALIGN(${MAXPAGESIZE}) + (ALIGN(8) & (${MAXPAGESIZE} - 1))};} +- The current expression does not correctly handle the case of a +- text segment ending precisely at the end of a page; it causes the +- data segment to skip a page. The above expression does not have +- this problem, but it will currently (2/95) cause BFD to allocate +- a single segment, combining both text and data, for this case. +- This will prevent the text segment from being shared among +- multiple executions of the program; I think that is more +- important than losing a page of the virtual address space (note +- that no actual memory is lost; the page which is skipped can not +- be referenced). */ +- ${RELOCATING+. = ${DATA_ADDR- ALIGN(8) + ${MAXPAGESIZE}};} +- +- .data ${RELOCATING-0} : +- { +- ${RELOCATING+${DATA_START_SYMBOLS}} +- *(.data) +- *(.gnu.linkonce.d*) +- ${CONSTRUCTING+CONSTRUCTORS} +- } +- .data1 ${RELOCATING-0} : { *(.data1) } +- ${OTHER_READWRITE_SECTIONS} ++ ${RELOCATING+${OTHER_READONLY_SECTIONS}} + + .got1 ${RELOCATING-0} : { *(.got1) } + .dynamic ${RELOCATING-0} : { *(.dynamic) } + + /* Put .ctors and .dtors next to the .got2 section, so that the pointers + get relocated with -mrelocatable. Also put in the .fixup pointers. +@@ -148,38 +124,41 @@ SECTIONS + ${RELOCATING+PROVIDE (_GOT_START_ = .);} + .got ${RELOCATING-0} : { *(.got) } + .got.plt ${RELOCATING-0} : { *(.got.plt) } + ${CREATE_SHLIB+${SDATA2}} + ${CREATE_SHLIB+${SBSS2}} + ${RELOCATING+PROVIDE (_GOT_END_ = .);} +- +- /* We want the small data sections together, so single-instruction offsets ++ .rodata ${RELOCATING-0} : { *(.rodata) } ++ /* 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} : { *(.sdata) } ++ .sdata ${RELOCATING-0} : ++ { ++ /*PROVIDE (__sdata_start = .);*/ ++ __sdata_start = .; ++ *(.data) ++ *(.data1) ++ __small_start = .; ++ *(.sdata) ++ PROVIDE (__r13_init = /*__small_start*/ __sdata_start + 0x8000); ++ PROVIDE (__sdata_end = .); ++ } ++ PROVIDE (__sdata_size = SIZEOF(.sdata)); + ${RELOCATING+_edata = .;} + ${RELOCATING+PROVIDE (edata = .);} + .sbss ${RELOCATING-0} : + { +- ${RELOCATING+PROVIDE (__sbss_start = .);} ++ PROVIDE (__sbss_start = .); + *(.sbss) + *(.scommon) + *(.dynsbss) +- ${RELOCATING+PROVIDE (__sbss_end = .);} +- } +- ${PLT} +- .bss ${RELOCATING-0} : +- { +- ${RELOCATING+${OTHER_BSS_SYMBOLS}} +- ${RELOCATING+PROVIDE (__bss_start = .);} +- *(.dynbss) +- *(.bss) +- *(COMMON) ++ *(.bss) ++ *(COMMON) ++ PROVIDE (__sbss_end = .); + } +- ${RELOCATING+_end = . ;} +- ${RELOCATING+PROVIDE (end = .);} ++ PROVIDE (__sbss_size = SIZEOF(.sbss)); + + /* These are needed for ELF backends which have not yet been + converted to the new style linker. */ + .stab 0 : { *(.stab) } + .stabstr 0 : { *(.stabstr) } + +@@ -197,13 +176,13 @@ SECTIONS + + /* DWARF 1.1 and DWARF 2 */ + .debug_aranges 0 : { *(.debug_aranges) } + .debug_pubnames 0 : { *(.debug_pubnames) } + + /* DWARF 2 */ +- .debug_info 0 : { *(.debug_info) *(.gnu.linkonce.wi.*) } ++ .debug_info 0 : { *(.debug_info) } + .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) } +@@ -211,17 +190,10 @@ SECTIONS + /* 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) } +- +- /* DWARF Extension. */ +- .debug_macro 0 : { *(.debug_macro) } +- +- ${ATTRS_SECTIONS} ++ /* These must appear regardless of ${RELOCATING}. */ + ${OTHER_SECTIONS} + } + EOF diff --git a/libiberty/config/mh-amigaos b/libiberty/config/mh-amigaos new file mode 100644 index 0000000000000000000000000000000000000000..495fa7e35897000efe600c9f1dd844b086731fcd @@ -26189,5 +27428,5 @@ index bc2dd491592e56fb664cdf96fc32491c08e1e075..bc40541b7c5aecc30a7a74fd61f29225 Seperate from reg_names since 'spu', 'fpl' look weird. */ static char *const reg_half_names[] = -- -2.1.4 +2.11.0 diff --git a/ppc-amigaos/recipes/patches/binutils/0002-Fixed-errors-occuring-with-more-recent-versions-of-t.p b/ppc-amigaos/recipes/patches/binutils/0002-Fixed-errors-occuring-with-more-recent-versions-of-t.p index eb82ebf..caf90cf 100644 --- a/ppc-amigaos/recipes/patches/binutils/0002-Fixed-errors-occuring-with-more-recent-versions-of-t.p +++ b/ppc-amigaos/recipes/patches/binutils/0002-Fixed-errors-occuring-with-more-recent-versions-of-t.p @@ -1,7 +1,7 @@ From e5811195ee1007420de6150b593fd6b3654c4921 Mon Sep 17 00:00:00 2001 From: Sebastian Bauer <mail@sebastianbauer.info> Date: Sat, 29 Nov 2014 11:32:22 +0100 -Subject: [PATCH 2/7] Fixed errors occuring with more recent versions of +Subject: [PATCH 2/8] Fixed errors occuring with more recent versions of texinfo. --- @@ -432,5 +432,5 @@ index 71e909e4b61606d4ca8d1f855d9cd10a3ae1947b..81d538bad91eee08ae24dc88f589b6d0 @bye -- -2.1.4 +2.11.0 diff --git a/ppc-amigaos/recipes/patches/binutils/0003-Disabled-some-stuff-such-that-68k-vtarget-builds-aga.p b/ppc-amigaos/recipes/patches/binutils/0003-Disabled-some-stuff-such-that-68k-vtarget-builds-aga.p index f3b89fd..92cec94 100644 --- a/ppc-amigaos/recipes/patches/binutils/0003-Disabled-some-stuff-such-that-68k-vtarget-builds-aga.p +++ b/ppc-amigaos/recipes/patches/binutils/0003-Disabled-some-stuff-such-that-68k-vtarget-builds-aga.p @@ -1,7 +1,7 @@ From be1c62376ea16552979036768972be85ca66c9ed Mon Sep 17 00:00:00 2001 From: Sebastian Bauer <mail@sebastianbauer.info> Date: Tue, 17 Mar 2015 19:30:24 +0100 -Subject: [PATCH 3/7] Disabled some stuff such that 68k vtarget builds again. +Subject: [PATCH 3/8] Disabled some stuff such that 68k vtarget builds again. This doesn't imply that it is working. --- @@ -106,5 +106,5 @@ index 8b5f6c60f2141ee91d6e9d1d639815abdf4e5042..9070a862b9c1266e84a8cea8da697f33 } while (*input_line_pointer++ == ','); -- -2.1.4 +2.11.0 diff --git a/ppc-amigaos/recipes/patches/binutils/0004-Print-symbol-name-when-an-unexpected-type-was-encoun.p b/ppc-amigaos/recipes/patches/binutils/0004-Print-symbol-name-when-an-unexpected-type-was-encoun.p index 7c4f7a6..55b7f20 100644 --- a/ppc-amigaos/recipes/patches/binutils/0004-Print-symbol-name-when-an-unexpected-type-was-encoun.p +++ b/ppc-amigaos/recipes/patches/binutils/0004-Print-symbol-name-when-an-unexpected-type-was-encoun.p @@ -1,7 +1,7 @@ From 5e5e0a5505d8e5fc67697f3ab397fa5a39e085cc Mon Sep 17 00:00:00 2001 From: Sebastian Bauer <mail@sebastianbauer.info> Date: Sat, 12 Sep 2015 11:29:01 +0200 -Subject: [PATCH 4/7] Print symbol name when an unexpected type was +Subject: [PATCH 4/8] Print symbol name when an unexpected type was encountered. --- @@ -27,5 +27,5 @@ index bcd3add478ab13addffee21b54919afd5cdcd7d6..f10801b99e366ad956faf039401cfcbf case bfd_link_hash_undefweak: input_sec = bfd_und_section_ptr; -- -2.1.4 +2.11.0 diff --git a/ppc-amigaos/recipes/patches/binutils/0005-Bind-in-the-ld-unwind-options.p b/ppc-amigaos/recipes/patches/binutils/0005-Bind-in-the-ld-unwind-options.p index f82d880..f1aee2f 100644 --- a/ppc-amigaos/recipes/patches/binutils/0005-Bind-in-the-ld-unwind-options.p +++ b/ppc-amigaos/recipes/patches/binutils/0005-Bind-in-the-ld-unwind-options.p @@ -1,7 +1,7 @@ From ce074fe73deeb899bf1cd863092c174034f56e67 Mon Sep 17 00:00:00 2001 From: Sebastian Bauer <mail@sebastianbauer.info> Date: Thu, 22 Oct 2015 09:48:26 +0200 -Subject: [PATCH 5/7] Bind in the ld unwind options. +Subject: [PATCH 5/8] Bind in the ld unwind options. --- ld/emulparams/amigaos.sh | 4 +++- @@ -23,5 +23,5 @@ index 605b81e76bcbbd2322561d7d9502190dc7c00674..2661d4ddcd1c5ecab9adea84af7f7d0b COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)" ALIGNMENT=16 -- -2.1.4 +2.11.0 diff --git a/ppc-amigaos/recipes/patches/binutils/0006-Introduced-strip-unneeded-rel-relocs.p b/ppc-amigaos/recipes/patches/binutils/0006-Introduced-strip-unneeded-rel-relocs.p index db15c54..70a5e4b 100644 --- a/ppc-amigaos/recipes/patches/binutils/0006-Introduced-strip-unneeded-rel-relocs.p +++ b/ppc-amigaos/recipes/patches/binutils/0006-Introduced-strip-unneeded-rel-relocs.p @@ -1,7 +1,7 @@ From 6b64c328f239a146c1ce5a85c27b0ff1636f3987 Mon Sep 17 00:00:00 2001 From: Sebastian Bauer <mail@sebastianbauer.info> Date: Tue, 1 Dec 2015 13:51:20 +0100 -Subject: [PATCH 6/7] Introduced strip-unneeded-rel-relocs. +Subject: [PATCH 6/8] Introduced strip-unneeded-rel-relocs. Normally, on AmigaOS we keep all relocs for executables as we don't have an isolated address space. However, not all relative relocs are necessary @@ -124,5 +124,5 @@ index 88bd071eefa8b5426eaadfd6431e9de5d4a4591b..4beee77179b85479d5b43507d9eb2a6e add_specific_symbol (optarg, strip_specific_htab); break; -- -2.1.4 +2.11.0 diff --git a/ppc-amigaos/recipes/patches/binutils/0007-Keep-symbols-for-stripped-sections.-This-is-importan.p b/ppc-amigaos/recipes/patches/binutils/0007-Keep-symbols-for-stripped-sections.-This-is-importan.p index 7681051..5b695f4 100644 --- a/ppc-amigaos/recipes/patches/binutils/0007-Keep-symbols-for-stripped-sections.-This-is-importan.p +++ b/ppc-amigaos/recipes/patches/binutils/0007-Keep-symbols-for-stripped-sections.-This-is-importan.p @@ -1,7 +1,7 @@ From 035f3afce47e01ee70c7972a71a9dccea2b61e6f Mon Sep 17 00:00:00 2001 From: Sebastian Bauer <mail@sebastianbauer.info> Date: Thu, 3 Dec 2015 23:48:21 +0100 -Subject: [PATCH 7/7] Keep symbols for stripped sections. This is important for +Subject: [PATCH 7/8] Keep symbols for stripped sections. This is important for _SDA_BASE_, --- @@ -38,5 +38,5 @@ index 4beee77179b85479d5b43507d9eb2a6e0caf384e..8750db51279ec56080aba114cd61780d && (weaken || is_specified_symbol (name, weaken_specific_htab))) { -- -2.1.4 +2.11.0 diff --git a/ppc-amigaos/recipes/patches/binutils/0008-Fix-undefined-behaviour.p b/ppc-amigaos/recipes/patches/binutils/0008-Fix-undefined-behaviour.p new file mode 100644 index 0000000..102bcad --- /dev/null +++ b/ppc-amigaos/recipes/patches/binutils/0008-Fix-undefined-behaviour.p @@ -0,0 +1,113 @@ +From 9592197f4e9723b6a435318b9c39521beab07c7b Mon Sep 17 00:00:00 2001 +From: Sebastian Bauer <mail@sebastianbauer.info> +Date: Wed, 15 Feb 2017 22:12:54 +0100 +Subject: [PATCH 8/8] Fix undefined behaviour. + +This should ensure that the code compiles with more recent version of GCC. +Changes have been backported from more recent version of binutils. +--- + binutils/dwarf.c | 2 +- + gas/config/tc-ppc.c | 2 +- + gas/read.c | 2 +- + gas/write.c | 2 +- + include/opcode/ppc.h | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/binutils/dwarf.c b/binutils/dwarf.c +index 6e93906af385ff3dd0f8785792a1e8cc3d04a774..9fc4a594cfe83693f44f686fc752987b3e2a5653 100644 +--- binutils/dwarf.c ++++ binutils/dwarf.c +@@ -214,13 +214,13 @@ read_leb128 (unsigned char *data, unsigned int *length_return, int sign) + while (byte & 0x80); + + if (length_return != NULL) + *length_return = num_read; + + if (sign && (shift < 8 * sizeof (result)) && (byte & 0x40)) +- result |= -1L << shift; ++ result |= -((dwarf_vma) 1 << shift); + + return result; + } + + /* Create a signed version to avoid painful typecasts. */ + static dwarf_signed_vma +diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c +index 11949323d80802138ec23fb8174727c0a7c4fd45..14346e30661d408d5dba4d456cc274f2f4dc3820 100644 +--- gas/config/tc-ppc.c ++++ gas/config/tc-ppc.c +@@ -1466,13 +1466,13 @@ insn_validate (const struct powerpc_opcode *op) + as_bad (_("operand index error for %s"), op->name); + return TRUE; + } + else + { + const struct powerpc_operand *operand = &powerpc_operands[*o]; +- if (operand->shift != PPC_OPSHIFT_INV) ++ if (operand->shift != (int) PPC_OPSHIFT_INV) + { + unsigned long mask; + + if (operand->shift >= 0) + mask = operand->bitm << operand->shift; + else +diff --git a/gas/read.c b/gas/read.c +index 9de62b9c512025212d52a19833ffe28004944dd1..dfd466be7934cfd379b2a0c99f08c7ea877fdbe0 100644 +--- gas/read.c ++++ gas/read.c +@@ -5172,13 +5172,13 @@ output_big_sleb128 (char *p, LITTLENUM_TYPE *bignum, int size) + + /* Mop up any left-over bits (of which there will be less than 7). */ + if ((byte & 0x80) != 0) + { + /* Sign-extend VAL. */ + if (val & (1 << (loaded - 1))) +- val |= ~0 << loaded; ++ val |= ~0U << loaded; + if (orig) + *p = val & 0x7f; + p++; + } + + return p - orig; +diff --git a/gas/write.c b/gas/write.c +index 8a9746c927a3e8b7007cdec9c7f16e47509b5f45..be6969865f7373cdeb396df44506ef537206fbd8 100644 +--- gas/write.c ++++ gas/write.c +@@ -2310,13 +2310,13 @@ static relax_addressT + relax_align (register relax_addressT address, /* Address now. */ + register int alignment /* Alignment (binary). */) + { + relax_addressT mask; + relax_addressT new_address; + +- mask = ~((~0) << alignment); ++ mask = ~((relax_addressT) ~0 << alignment); + new_address = (address + mask) & (~mask); + #ifdef LINKER_RELAXING_SHRINKS_ONLY + if (linkrelax) + /* We must provide lots of padding, so the linker can discard it + when needed. The linker will not add extra space, ever. */ + new_address += (1 << alignment); +diff --git a/include/opcode/ppc.h b/include/opcode/ppc.h +index e57b118b02e5a2faba62f5dbd524f03827f719c0..40a1262ecd17944de229f6b192f8c6e078f70728 100644 +--- include/opcode/ppc.h ++++ include/opcode/ppc.h +@@ -267,13 +267,13 @@ struct powerpc_operand + extern const struct powerpc_operand powerpc_operands[]; + extern const unsigned int num_powerpc_operands; + + /* Use with the shift field of a struct powerpc_operand to indicate + that BITM and SHIFT cannot be used to determine where the operand + goes in the insn. */ +-#define PPC_OPSHIFT_INV (-1 << 31) ++#define PPC_OPSHIFT_INV (-1U << 31) + + /* Values defined for the flags field of a struct powerpc_operand. */ + + /* This operand takes signed values. */ + #define PPC_OPERAND_SIGNED (0x1) + +-- +2.11.0 + diff --git a/ppc-amigaos/recipes/patches/binutils/missing-files.p b/ppc-amigaos/recipes/patches/binutils/missing-files.p index be93e0f..a0650ca 100644 --- a/ppc-amigaos/recipes/patches/binutils/missing-files.p +++ b/ppc-amigaos/recipes/patches/binutils/missing-files.p @@ -1,9979 +1,4 @@ --- /dev/null 2015-09-06 08:42:34.091999986 +0100 -+++ bfd/elf32-amigaos.c 2016-01-03 01:46:50.503001072 +0000 -@@ -0,0 +1,9972 @@ -+/* PowerPC-specific support for 32-bit ELF -+ Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, -+ 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 -+ Free Software Foundation, Inc. -+ Written by Ian Lance Taylor, Cygnus Support. -+ -+ This file is part of BFD, the Binary File Descriptor library. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 3 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the -+ Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, -+ Boston, MA 02110-1301, USA. */ -+ -+ -+/* This file is based on a preliminary PowerPC ELF ABI. The -+ information may not match the final PowerPC ELF ABI. It includes -+ suggestions from the in-progress Embedded PowerPC ABI, and that -+ information may also not match. */ -+ -+#include "sysdep.h" -+#include <stdarg.h> -+#include "bfd.h" -+#include "bfdlink.h" -+#include "libbfd.h" -+#include "elf-bfd.h" -+#include "elf/ppc.h" -+#include "elf/amigaos.h" -+#include "elf32-ppc.h" -+#include "elf-vxworks.h" -+#include "dwarf2.h" -+ -+#undef DEBUG -+ -+typedef enum split16_format_type -+{ -+ split16a_type = 0, -+ split16d_type -+} -+split16_format_type; -+ -+/* RELA relocations are used here. */ -+#define USE_RELA -+#define USE_REL 0 -+ -+static bfd_reloc_status_type ppc_elf_addr16_ha_reloc -+ (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); -+static bfd_reloc_status_type ppc_elf_unhandled_reloc -+ (bfd *, arelent *, asymbol *, void *, asection *, bfd *, char **); -+static void ppc_elf_vle_split16 -+ (bfd *, bfd_byte *, bfd_vma, bfd_vma, split16_format_type); -+ -+int ppc_elf_amigaos_select_plt_layout (bfd *, struct bfd_link_info *, -+ enum ppc_elf_plt_type, int); -+ -+bfd_boolean ppc_elf_amigaos_section_processing (bfd *abfd, Elf_Internal_Shdr *shdr); -+bfd_boolean ppc_elf_amigaos_modify_segment_map (bfd *abfd, -+ struct bfd_link_info *info ATTRIBUTE_UNUSED); -+asection *ppc_elf_amigaos_tls_setup (bfd *obfd, struct bfd_link_info *info, -+ int no_tls_get_addr_opt); -+bfd_boolean ppc_elf_amigaos_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED, -+ struct bfd_link_info *info); -+unsigned int _bfd_elf_amigaos_ppc_at_tls_transform (unsigned int insn, unsigned int reg); -+unsigned int _bfd_elf_amigaos_ppc_at_tprel_transform (unsigned int insn, unsigned int reg); -+ -+/* Branch prediction bit for branch taken relocs. */ -+#define BRANCH_PREDICT_BIT 0x200000 -+/* Mask to set RA in memory instructions. */ -+#define RA_REGISTER_MASK 0x001f0000 -+/* Value to shift register by to insert RA. */ -+#define RA_REGISTER_SHIFT 16 -+ -+/* The name of the dynamic interpreter. This is put in the .interp -+ section. */ -+#define ELF_DYNAMIC_INTERPRETER "/usr/lib/ld.so.1" -+ -+/* For old-style PLT. */ -+/* The number of single-slot PLT entries (the rest use two slots). */ -+#define PLT_NUM_SINGLE_ENTRIES 8192 -+ -+/* For new-style .glink and .plt. */ -+#define GLINK_PLTRESOLVE 16*4 -+#define GLINK_ENTRY_SIZE 4*4 -+#define TLS_GET_ADDR_GLINK_SIZE 12*4 -+ -+/* VxWorks uses its own plt layout, filled in by the static linker. */ -+ -+/* The standard VxWorks PLT entry. */ -+#define VXWORKS_PLT_ENTRY_SIZE 32 -+static const bfd_vma ppc_elf_vxworks_plt_entry -+ [VXWORKS_PLT_ENTRY_SIZE / 4] = -+ { -+ 0x3d800000, /* lis r12,0 */ -+ 0x818c0000, /* lwz r12,0(r12) */ -+ 0x7d8903a6, /* mtctr r12 */ -+ 0x4e800420, /* bctr */ -+ 0x39600000, /* li r11,0 */ -+ 0x48000000, /* b 14 <.PLT0resolve+0x4> */ -+ 0x60000000, /* nop */ -+ 0x60000000, /* nop */ -+ }; -+static const bfd_vma ppc_elf_vxworks_pic_plt_entry -+ [VXWORKS_PLT_ENTRY_SIZE / 4] = -+ { -+ 0x3d9e0000, /* addis r12,r30,0 */ -+ 0x818c0000, /* lwz r12,0(r12) */ -+ 0x7d8903a6, /* mtctr r12 */ -+ 0x4e800420, /* bctr */ -+ 0x39600000, /* li r11,0 */ -+ 0x48000000, /* b 14 <.PLT0resolve+0x4> 14: R_PPC_REL24 .PLTresolve */ -+ 0x60000000, /* nop */ -+ 0x60000000, /* nop */ -+ }; -+ -+/* The initial VxWorks PLT entry. */ -+#define VXWORKS_PLT_INITIAL_ENTRY_SIZE 32 -+static const bfd_vma ppc_elf_vxworks_plt0_entry -+ [VXWORKS_PLT_INITIAL_ENTRY_SIZE / 4] = -+ { -+ 0x3d800000, /* lis r12,0 */ -+ 0x398c0000, /* addi r12,r12,0 */ -+ 0x800c0008, /* lwz r0,8(r12) */ -+ 0x7c0903a6, /* mtctr r0 */ -+ 0x818c0004, /* lwz r12,4(r12) */ -+ 0x4e800420, /* bctr */ -+ 0x60000000, /* nop */ -+ 0x60000000, /* nop */ -+ }; -+static const bfd_vma ppc_elf_vxworks_pic_plt0_entry -+ [VXWORKS_PLT_INITIAL_ENTRY_SIZE / 4] = -+ { -+ 0x819e0008, /* lwz r12,8(r30) */ -+ 0x7d8903a6, /* mtctr r12 */ -+ 0x819e0004, /* lwz r12,4(r30) */ -+ 0x4e800420, /* bctr */ -+ 0x60000000, /* nop */ -+ 0x60000000, /* nop */ -+ 0x60000000, /* nop */ -+ 0x60000000, /* nop */ -+ }; -+ -+/* For executables, we have some additional relocations in -+ .rela.plt.unloaded, for the kernel loader. */ -+ -+/* The number of non-JMP_SLOT relocations per PLT0 slot. */ -+#define VXWORKS_PLT_NON_JMP_SLOT_RELOCS 3 -+/* The number of relocations in the PLTResolve slot. */ -+#define VXWORKS_PLTRESOLVE_RELOCS 2 -+/* The number of relocations in the PLTResolve slot when when creating -+ a shared library. */ -+#define VXWORKS_PLTRESOLVE_RELOCS_SHLIB 0 -+ -+/* Some instructions. */ -+#define ADDIS_11_11 0x3d6b0000 -+#define ADDIS_11_30 0x3d7e0000 -+#define ADDIS_12_12 0x3d8c0000 -+#define ADDI_11_11 0x396b0000 -+#define ADD_0_11_11 0x7c0b5a14 -+#define ADD_3_12_2 0x7c6c1214 -+#define ADD_11_0_11 0x7d605a14 -+#define B 0x48000000 -+#define BCL_20_31 0x429f0005 -+#define BCTR 0x4e800420 -+#define BEQLR 0x4d820020 -+#define CMPWI_11_0 0x2c0b0000 -+#define LIS_11 0x3d600000 -+#define LIS_12 0x3d800000 -+#define LWZU_0_12 0x840c0000 -+#define LWZ_0_12 0x800c0000 -+#define LWZ_11_3 0x81630000 -+#define LWZ_11_11 0x816b0000 -+#define LWZ_11_30 0x817e0000 -+#define LWZ_12_3 0x81830000 -+#define LWZ_12_12 0x818c0000 -+#define MR_0_3 0x7c601b78 -+#define MR_3_0 0x7c030378 -+#define MFLR_0 0x7c0802a6 -+#define MFLR_12 0x7d8802a6 -+#define MTCTR_0 0x7c0903a6 -+#define MTCTR_11 0x7d6903a6 -+#define MTLR_0 0x7c0803a6 -+#define NOP 0x60000000 -+#define SUB_11_11_12 0x7d6c5850 -+ -+/* Offset of tp and dtp pointers from start of TLS block. */ -+#define TP_OFFSET 0x7000 -+#define DTP_OFFSET 0x8000 -+ -+/* The value of a defined global symbol. */ -+#define SYM_VAL(SYM) \ -+ ((SYM)->root.u.def.section->output_section->vma \ -+ + (SYM)->root.u.def.section->output_offset \ -+ + (SYM)->root.u.def.value) -+ -+static reloc_howto_type *ppc_elf_howto_table[R_PPC_max]; -+ -+static reloc_howto_type ppc_elf_howto_raw[] = { -+ /* This reloc does nothing. */ -+ HOWTO (R_PPC_NONE, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_NONE", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* A standard 32 bit relocation. */ -+ HOWTO (R_PPC_ADDR32, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_ADDR32", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffffffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* An absolute 26 bit branch; the lower two bits must be zero. -+ FIXME: we don't check that, we just clear them. */ -+ HOWTO (R_PPC_ADDR24, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 26, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_ADDR24", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0x3fffffc, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* A standard 16 bit relocation. */ -+ HOWTO (R_PPC_ADDR16, /* type */ -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_ADDR16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* A 16 bit relocation without overflow. */ -+ HOWTO (R_PPC_ADDR16_LO, /* type */ -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont,/* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_ADDR16_LO", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* The high order 16 bits of an address. */ -+ HOWTO (R_PPC_ADDR16_HI, /* type */ -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_ADDR16_HI", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* The high order 16 bits of an address, plus 1 if the contents of -+ the low 16 bits, treated as a signed number, is negative. */ -+ HOWTO (R_PPC_ADDR16_HA, /* type */ -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_addr16_ha_reloc, /* special_function */ -+ "R_PPC_ADDR16_HA", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* An absolute 16 bit branch; the lower two bits must be zero. -+ FIXME: we don't check that, we just clear them. */ -+ HOWTO (R_PPC_ADDR14, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_ADDR14", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xfffc, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* An absolute 16 bit branch, for which bit 10 should be set to -+ indicate that the branch is expected to be taken. The lower two -+ bits must be zero. */ -+ HOWTO (R_PPC_ADDR14_BRTAKEN, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_ADDR14_BRTAKEN",/* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xfffc, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* An absolute 16 bit branch, for which bit 10 should be set to -+ indicate that the branch is not expected to be taken. The lower -+ two bits must be zero. */ -+ HOWTO (R_PPC_ADDR14_BRNTAKEN, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_ADDR14_BRNTAKEN",/* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xfffc, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* A relative 26 bit branch; the lower two bits must be zero. */ -+ HOWTO (R_PPC_REL24, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 26, /* bitsize */ -+ TRUE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_REL24", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0x3fffffc, /* dst_mask */ -+ TRUE), /* pcrel_offset */ -+ -+ /* A relative 16 bit branch; the lower two bits must be zero. */ -+ HOWTO (R_PPC_REL14, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ TRUE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_REL14", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xfffc, /* dst_mask */ -+ TRUE), /* pcrel_offset */ -+ -+ /* A relative 16 bit branch. Bit 10 should be set to indicate that -+ the branch is expected to be taken. The lower two bits must be -+ zero. */ -+ HOWTO (R_PPC_REL14_BRTAKEN, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ TRUE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_REL14_BRTAKEN", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xfffc, /* dst_mask */ -+ TRUE), /* pcrel_offset */ -+ -+ /* A relative 16 bit branch. Bit 10 should be set to indicate that -+ the branch is not expected to be taken. The lower two bits must -+ be zero. */ -+ HOWTO (R_PPC_REL14_BRNTAKEN, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ TRUE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_REL14_BRNTAKEN",/* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xfffc, /* dst_mask */ -+ TRUE), /* pcrel_offset */ -+ -+ /* Like R_PPC_ADDR16, but referring to the GOT table entry for the -+ symbol. */ -+ HOWTO (R_PPC_GOT16, /* type */ -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_GOT16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like R_PPC_ADDR16_LO, but referring to the GOT table entry for -+ the symbol. */ -+ HOWTO (R_PPC_GOT16_LO, /* type */ -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_GOT16_LO", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like R_PPC_ADDR16_HI, but referring to the GOT table entry for -+ the symbol. */ -+ HOWTO (R_PPC_GOT16_HI, /* type */ -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_GOT16_HI", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like R_PPC_ADDR16_HA, but referring to the GOT table entry for -+ the symbol. */ -+ HOWTO (R_PPC_GOT16_HA, /* type */ -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ ppc_elf_addr16_ha_reloc, /* special_function */ -+ "R_PPC_GOT16_HA", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like R_PPC_REL24, but referring to the procedure linkage table -+ entry for the symbol. */ -+ HOWTO (R_PPC_PLTREL24, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 26, /* bitsize */ -+ TRUE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_PLTREL24", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0x3fffffc, /* dst_mask */ -+ TRUE), /* pcrel_offset */ -+ -+ /* This is used only by the dynamic linker. The symbol should exist -+ both in the object being run and in some shared library. The -+ dynamic linker copies the data addressed by the symbol from the -+ shared library into the object, because the object being -+ run has to have the data at some particular address. */ -+ HOWTO (R_PPC_COPY, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_COPY", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like R_PPC_ADDR32, but used when setting global offset table -+ entries. */ -+ HOWTO (R_PPC_GLOB_DAT, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_GLOB_DAT", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffffffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Marks a procedure linkage table entry for a symbol. */ -+ HOWTO (R_PPC_JMP_SLOT, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_JMP_SLOT", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Used only by the dynamic linker. When the object is run, this -+ longword is set to the load address of the object, plus the -+ addend. */ -+ HOWTO (R_PPC_RELATIVE, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_RELATIVE", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffffffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like R_PPC_REL24, but uses the value of the symbol within the -+ object rather than the final value. Normally used for -+ _GLOBAL_OFFSET_TABLE_. */ -+ HOWTO (R_PPC_LOCAL24PC, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 26, /* bitsize */ -+ TRUE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_LOCAL24PC", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0x3fffffc, /* dst_mask */ -+ TRUE), /* pcrel_offset */ -+ -+ /* Like R_PPC_ADDR32, but may be unaligned. */ -+ HOWTO (R_PPC_UADDR32, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_UADDR32", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffffffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like R_PPC_ADDR16, but may be unaligned. */ -+ HOWTO (R_PPC_UADDR16, /* type */ -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_UADDR16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* 32-bit PC relative */ -+ HOWTO (R_PPC_REL32, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ TRUE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_REL32", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffffffff, /* dst_mask */ -+ TRUE), /* pcrel_offset */ -+ -+ /* 32-bit relocation to the symbol's procedure linkage table. -+ FIXME: not supported. */ -+ HOWTO (R_PPC_PLT32, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_PLT32", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* 32-bit PC relative relocation to the symbol's procedure linkage table. -+ FIXME: not supported. */ -+ HOWTO (R_PPC_PLTREL32, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ TRUE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_PLTREL32", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0, /* dst_mask */ -+ TRUE), /* pcrel_offset */ -+ -+ /* Like R_PPC_ADDR16_LO, but referring to the PLT table entry for -+ the symbol. */ -+ HOWTO (R_PPC_PLT16_LO, /* type */ -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_PLT16_LO", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like R_PPC_ADDR16_HI, but referring to the PLT table entry for -+ the symbol. */ -+ HOWTO (R_PPC_PLT16_HI, /* type */ -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_PLT16_HI", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like R_PPC_ADDR16_HA, but referring to the PLT table entry for -+ the symbol. */ -+ HOWTO (R_PPC_PLT16_HA, /* type */ -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ ppc_elf_addr16_ha_reloc, /* special_function */ -+ "R_PPC_PLT16_HA", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* A sign-extended 16 bit value relative to _SDA_BASE_, for use with -+ small data items. */ -+ HOWTO (R_PPC_SDAREL16, /* type */ -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_SDAREL16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* 16-bit section relative relocation. */ -+ HOWTO (R_PPC_SECTOFF, /* type */ -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_SECTOFF", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* 16-bit lower half section relative relocation. */ -+ HOWTO (R_PPC_SECTOFF_LO, /* type */ -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_SECTOFF_LO", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* 16-bit upper half section relative relocation. */ -+ HOWTO (R_PPC_SECTOFF_HI, /* type */ -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_SECTOFF_HI", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* 16-bit upper half adjusted section relative relocation. */ -+ HOWTO (R_PPC_SECTOFF_HA, /* type */ -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ ppc_elf_addr16_ha_reloc, /* special_function */ -+ "R_PPC_SECTOFF_HA", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Marker relocs for TLS. */ -+ HOWTO (R_PPC_TLS, -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_TLS", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ HOWTO (R_PPC_TLSGD, -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_TLSGD", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ HOWTO (R_PPC_TLSLD, -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_TLSLD", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Computes the load module index of the load module that contains the -+ definition of its TLS sym. */ -+ HOWTO (R_PPC_DTPMOD32, -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_DTPMOD32", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffffffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Computes a dtv-relative displacement, the difference between the value -+ of sym+add and the base address of the thread-local storage block that -+ contains the definition of sym, minus 0x8000. */ -+ HOWTO (R_PPC_DTPREL32, -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_DTPREL32", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffffffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* A 16 bit dtprel reloc. */ -+ HOWTO (R_PPC_DTPREL16, -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_DTPREL16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like DTPREL16, but no overflow. */ -+ HOWTO (R_PPC_DTPREL16_LO, -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_DTPREL16_LO", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like DTPREL16_LO, but next higher group of 16 bits. */ -+ HOWTO (R_PPC_DTPREL16_HI, -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_DTPREL16_HI", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like DTPREL16_HI, but adjust for low 16 bits. */ -+ HOWTO (R_PPC_DTPREL16_HA, -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_DTPREL16_HA", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Computes a tp-relative displacement, the difference between the value of -+ sym+add and the value of the thread pointer (r13). */ -+ HOWTO (R_PPC_TPREL32, -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_TPREL32", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffffffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* A 16 bit tprel reloc. */ -+ HOWTO (R_PPC_TPREL16, -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_TPREL16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like TPREL16, but no overflow. */ -+ HOWTO (R_PPC_TPREL16_LO, -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_TPREL16_LO", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like TPREL16_LO, but next higher group of 16 bits. */ -+ HOWTO (R_PPC_TPREL16_HI, -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_TPREL16_HI", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like TPREL16_HI, but adjust for low 16 bits. */ -+ HOWTO (R_PPC_TPREL16_HA, -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_TPREL16_HA", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Allocates two contiguous entries in the GOT to hold a tls_index structure, -+ with values (sym+add)@dtpmod and (sym+add)@dtprel, and computes the offset -+ to the first entry. */ -+ HOWTO (R_PPC_GOT_TLSGD16, -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_GOT_TLSGD16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like GOT_TLSGD16, but no overflow. */ -+ HOWTO (R_PPC_GOT_TLSGD16_LO, -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_GOT_TLSGD16_LO", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like GOT_TLSGD16_LO, but next higher group of 16 bits. */ -+ HOWTO (R_PPC_GOT_TLSGD16_HI, -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_GOT_TLSGD16_HI", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like GOT_TLSGD16_HI, but adjust for low 16 bits. */ -+ HOWTO (R_PPC_GOT_TLSGD16_HA, -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_GOT_TLSGD16_HA", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Allocates two contiguous entries in the GOT to hold a tls_index structure, -+ with values (sym+add)@dtpmod and zero, and computes the offset to the -+ first entry. */ -+ HOWTO (R_PPC_GOT_TLSLD16, -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_GOT_TLSLD16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like GOT_TLSLD16, but no overflow. */ -+ HOWTO (R_PPC_GOT_TLSLD16_LO, -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_GOT_TLSLD16_LO", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like GOT_TLSLD16_LO, but next higher group of 16 bits. */ -+ HOWTO (R_PPC_GOT_TLSLD16_HI, -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_GOT_TLSLD16_HI", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like GOT_TLSLD16_HI, but adjust for low 16 bits. */ -+ HOWTO (R_PPC_GOT_TLSLD16_HA, -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_GOT_TLSLD16_HA", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Allocates an entry in the GOT with value (sym+add)@dtprel, and computes -+ the offset to the entry. */ -+ HOWTO (R_PPC_GOT_DTPREL16, -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_GOT_DTPREL16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like GOT_DTPREL16, but no overflow. */ -+ HOWTO (R_PPC_GOT_DTPREL16_LO, -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_GOT_DTPREL16_LO", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like GOT_DTPREL16_LO, but next higher group of 16 bits. */ -+ HOWTO (R_PPC_GOT_DTPREL16_HI, -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_GOT_DTPREL16_HI", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like GOT_DTPREL16_HI, but adjust for low 16 bits. */ -+ HOWTO (R_PPC_GOT_DTPREL16_HA, -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_GOT_DTPREL16_HA", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Allocates an entry in the GOT with value (sym+add)@tprel, and computes the -+ offset to the entry. */ -+ HOWTO (R_PPC_GOT_TPREL16, -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_GOT_TPREL16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like GOT_TPREL16, but no overflow. */ -+ HOWTO (R_PPC_GOT_TPREL16_LO, -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_GOT_TPREL16_LO", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like GOT_TPREL16_LO, but next higher group of 16 bits. */ -+ HOWTO (R_PPC_GOT_TPREL16_HI, -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_GOT_TPREL16_HI", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Like GOT_TPREL16_HI, but adjust for low 16 bits. */ -+ HOWTO (R_PPC_GOT_TPREL16_HA, -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_unhandled_reloc, /* special_function */ -+ "R_PPC_GOT_TPREL16_HA", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* The remaining relocs are from the Embedded ELF ABI, and are not -+ in the SVR4 ELF ABI. */ -+ -+ /* 32 bit value resulting from the addend minus the symbol. */ -+ HOWTO (R_PPC_EMB_NADDR32, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_EMB_NADDR32", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffffffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* 16 bit value resulting from the addend minus the symbol. */ -+ HOWTO (R_PPC_EMB_NADDR16, /* type */ -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_EMB_NADDR16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* 16 bit value resulting from the addend minus the symbol. */ -+ HOWTO (R_PPC_EMB_NADDR16_LO, /* type */ -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont,/* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_EMB_ADDR16_LO", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* The high order 16 bits of the addend minus the symbol. */ -+ HOWTO (R_PPC_EMB_NADDR16_HI, /* type */ -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_EMB_NADDR16_HI", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* The high order 16 bits of the result of the addend minus the address, -+ plus 1 if the contents of the low 16 bits, treated as a signed number, -+ is negative. */ -+ HOWTO (R_PPC_EMB_NADDR16_HA, /* type */ -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_addr16_ha_reloc, /* special_function */ -+ "R_PPC_EMB_NADDR16_HA", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* 16 bit value resulting from allocating a 4 byte word to hold an -+ address in the .sdata section, and returning the offset from -+ _SDA_BASE_ for that relocation. */ -+ HOWTO (R_PPC_EMB_SDAI16, /* type */ -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_EMB_SDAI16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* 16 bit value resulting from allocating a 4 byte word to hold an -+ address in the .sdata2 section, and returning the offset from -+ _SDA2_BASE_ for that relocation. */ -+ HOWTO (R_PPC_EMB_SDA2I16, /* type */ -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_EMB_SDA2I16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* A sign-extended 16 bit value relative to _SDA2_BASE_, for use with -+ small data items. */ -+ HOWTO (R_PPC_EMB_SDA2REL, /* type */ -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_EMB_SDA2REL", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Relocate against either _SDA_BASE_ or _SDA2_BASE_, filling in the 16 bit -+ signed offset from the appropriate base, and filling in the register -+ field with the appropriate register (0, 2, or 13). */ -+ HOWTO (R_PPC_EMB_SDA21, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_EMB_SDA21", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Relocation not handled: R_PPC_EMB_MRKREF */ -+ /* Relocation not handled: R_PPC_EMB_RELSEC16 */ -+ /* Relocation not handled: R_PPC_EMB_RELST_LO */ -+ /* Relocation not handled: R_PPC_EMB_RELST_HI */ -+ /* Relocation not handled: R_PPC_EMB_RELST_HA */ -+ /* Relocation not handled: R_PPC_EMB_BIT_FLD */ -+ -+ -+ /* A standard 32 bit base relative relocation. */ -+ HOWTO (R_PPC_AMIGAOS_BREL, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_AMIGAOS_BREL", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffffffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* A 16 bit base relative relocation without overflow. */ -+ HOWTO (R_PPC_AMIGAOS_BREL_LO, /* type */ -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont,/* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_AMIGAOS_BREL_LO",/* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* The high order 16 bits of a base relative address. */ -+ HOWTO (R_PPC_AMIGAOS_BREL_HI, /* type */ -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_AMIGAOS_BREL_HI",/* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* The high order 16 bits of a base relative address, plus 1 if the contents -+ of the low 16 bits, treated as a signed number, is negative. */ -+ HOWTO (R_PPC_AMIGAOS_BREL_HA, /* type */ -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_addr16_ha_reloc, /* special_function */ -+ "R_PPC_AMIGAOS_BREL_HA",/* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* PC relative relocation against either _SDA_BASE_ or _SDA2_BASE_, filling -+ in the 16 bit signed offset from the appropriate base, and filling in the -+ register field with the appropriate register (0, 2, or 13). */ -+ HOWTO (R_PPC_EMB_RELSDA, /* type */ -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_EMB_RELSDA", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* A relative 8 bit branch. */ -+ HOWTO (R_PPC_VLE_REL8, /* type */ -+ 1, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 8, /* bitsize */ -+ TRUE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_VLE_REL8", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xff, /* dst_mask */ -+ TRUE), /* pcrel_offset */ -+ -+ /* A relative 15 bit branch. */ -+ HOWTO (R_PPC_VLE_REL15, /* type */ -+ 1, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 15, /* bitsize */ -+ TRUE, /* pc_relative */ -+ 1, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_VLE_REL15", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xfe, /* dst_mask */ -+ TRUE), /* pcrel_offset */ -+ -+ /* A relative 24 bit branch. */ -+ HOWTO (R_PPC_VLE_REL24, /* type */ -+ 1, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 24, /* bitsize */ -+ TRUE, /* pc_relative */ -+ 1, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_VLE_REL24", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0x1fffffe, /* dst_mask */ -+ TRUE), /* pcrel_offset */ -+ -+ /* The 16 LSBS in split16a format. */ -+ HOWTO (R_PPC_VLE_LO16A, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_VLE_LO16A", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0x1f007ff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* The 16 LSBS in split16d format. */ -+ HOWTO (R_PPC_VLE_LO16D, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_VLE_LO16D", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0x1f07ff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Bits 16-31 split16a format. */ -+ HOWTO (R_PPC_VLE_HI16A, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_VLE_HI16A", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0x1f007ff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Bits 16-31 split16d format. */ -+ HOWTO (R_PPC_VLE_HI16D, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_VLE_HI16D", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0x1f07ff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Bits 16-31 (High Adjusted) in split16a format. */ -+ HOWTO (R_PPC_VLE_HA16A, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_VLE_HA16A", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0x1f007ff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Bits 16-31 (High Adjusted) in split16d format. */ -+ HOWTO (R_PPC_VLE_HA16D, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_VLE_HA16D", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0x1f07ff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* This reloc does nothing. */ -+ HOWTO (R_PPC_VLE_SDA21, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_VLE_SDA21", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* This reloc does nothing. */ -+ HOWTO (R_PPC_VLE_SDA21_LO, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_VLE_SDA21_LO", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* The 16 LSBS relative to _SDA_BASE_ in split16a format. */ -+ HOWTO (R_PPC_VLE_SDAREL_LO16A,/* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_VLE_SDAREL_LO16A", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0x1f007ff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* The 16 LSBS relative to _SDA_BASE_ in split16d format. */ -+ /* This reloc does nothing. */ -+ HOWTO (R_PPC_VLE_SDAREL_LO16D, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_VLE_SDAREL_LO16D", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0x1f07ff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Bits 16-31 relative to _SDA_BASE_ in split16a format. */ -+ HOWTO (R_PPC_VLE_SDAREL_HI16A, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_VLE_SDAREL_HI16A", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0x1f007ff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Bits 16-31 relative to _SDA_BASE_ in split16d format. */ -+ HOWTO (R_PPC_VLE_SDAREL_HI16D, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_VLE_SDAREL_HI16D", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0x1f07ff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Bits 16-31 (HA) relative to _SDA_BASE split16a format. */ -+ HOWTO (R_PPC_VLE_SDAREL_HA16A, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_VLE_SDAREL_HA16A", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0x1f007ff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Bits 16-31 (HA) relative to _SDA_BASE split16d format. */ -+ HOWTO (R_PPC_VLE_SDAREL_HA16D, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_VLE_SDAREL_HA16D", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0x1f07ff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ HOWTO (R_PPC_IRELATIVE, /* type */ -+ 0, /* rightshift */ -+ 2, /* size (0 = byte, 1 = short, 2 = long) */ -+ 32, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_IRELATIVE", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffffffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* A 16 bit relative relocation. */ -+ HOWTO (R_PPC_REL16, /* type */ -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ TRUE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_bitfield, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_REL16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ TRUE), /* pcrel_offset */ -+ -+ /* A 16 bit relative relocation without overflow. */ -+ HOWTO (R_PPC_REL16_LO, /* type */ -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ TRUE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont,/* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_REL16_LO", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ TRUE), /* pcrel_offset */ -+ -+ /* The high order 16 bits of a relative address. */ -+ HOWTO (R_PPC_REL16_HI, /* type */ -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ TRUE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_REL16_HI", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ TRUE), /* pcrel_offset */ -+ -+ /* The high order 16 bits of a relative address, plus 1 if the contents of -+ the low 16 bits, treated as a signed number, is negative. */ -+ HOWTO (R_PPC_REL16_HA, /* type */ -+ 16, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ TRUE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ ppc_elf_addr16_ha_reloc, /* special_function */ -+ "R_PPC_REL16_HA", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ TRUE), /* pcrel_offset */ -+ -+ /* GNU extension to record C++ vtable hierarchy. */ -+ HOWTO (R_PPC_GNU_VTINHERIT, /* type */ -+ 0, /* rightshift */ -+ 0, /* size (0 = byte, 1 = short, 2 = long) */ -+ 0, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ NULL, /* special_function */ -+ "R_PPC_GNU_VTINHERIT", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* GNU extension to record C++ vtable member usage. */ -+ HOWTO (R_PPC_GNU_VTENTRY, /* type */ -+ 0, /* rightshift */ -+ 0, /* size (0 = byte, 1 = short, 2 = long) */ -+ 0, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_dont, /* complain_on_overflow */ -+ NULL, /* special_function */ -+ "R_PPC_GNU_VTENTRY", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+ -+ /* Phony reloc to handle AIX style TOC entries. */ -+ HOWTO (R_PPC_TOC16, /* type */ -+ 0, /* rightshift */ -+ 1, /* size (0 = byte, 1 = short, 2 = long) */ -+ 16, /* bitsize */ -+ FALSE, /* pc_relative */ -+ 0, /* bitpos */ -+ complain_overflow_signed, /* complain_on_overflow */ -+ bfd_elf_generic_reloc, /* special_function */ -+ "R_PPC_TOC16", /* name */ -+ FALSE, /* partial_inplace */ -+ 0, /* src_mask */ -+ 0xffff, /* dst_mask */ -+ FALSE), /* pcrel_offset */ -+}; -+ -+/* Initialize the ppc_elf_howto_table, so that linear accesses can be done. */ -+ -+static void -+ppc_elf_howto_init (void) -+{ -+ unsigned int i, type; -+ -+ for (i = 0; -+ i < sizeof (ppc_elf_howto_raw) / sizeof (ppc_elf_howto_raw[0]); -+ i++) -+ { -+ type = ppc_elf_howto_raw[i].type; -+ if (type >= (sizeof (ppc_elf_howto_table) -+ / sizeof (ppc_elf_howto_table[0]))) -+ abort (); -+ ppc_elf_howto_table[type] = &ppc_elf_howto_raw[i]; -+ } -+} -+ -+static reloc_howto_type * -+ppc_elf_reloc_type_lookup (bfd *abfd ATTRIBUTE_UNUSED, -+ bfd_reloc_code_real_type code) -+{ -+ enum elf_ppc_reloc_type r; -+ -+ /* Initialize howto table if not already done. */ -+ if (!ppc_elf_howto_table[R_PPC_ADDR32]) -+ ppc_elf_howto_init (); -+ -+ switch (code) -+ { -+ default: -+ return NULL; -+ -+ case BFD_RELOC_NONE: r = R_PPC_NONE; break; -+ case BFD_RELOC_32: r = R_PPC_ADDR32; break; -+ case BFD_RELOC_PPC_BA26: r = R_PPC_ADDR24; break; -+ case BFD_RELOC_PPC64_ADDR16_DS: -+ case BFD_RELOC_16: r = R_PPC_ADDR16; break; -+ case BFD_RELOC_PPC64_ADDR16_LO_DS: -+ case BFD_RELOC_LO16: r = R_PPC_ADDR16_LO; break; -+ case BFD_RELOC_HI16: r = R_PPC_ADDR16_HI; break; -+ case BFD_RELOC_HI16_S: r = R_PPC_ADDR16_HA; break; -+ case BFD_RELOC_PPC_BA16: r = R_PPC_ADDR14; break; -+ case BFD_RELOC_PPC_BA16_BRTAKEN: r = R_PPC_ADDR14_BRTAKEN; break; -+ case BFD_RELOC_PPC_BA16_BRNTAKEN: r = R_PPC_ADDR14_BRNTAKEN; break; -+ case BFD_RELOC_PPC_B26: r = R_PPC_REL24; break; -+ case BFD_RELOC_PPC_B16: r = R_PPC_REL14; break; -+ case BFD_RELOC_PPC_B16_BRTAKEN: r = R_PPC_REL14_BRTAKEN; break; -+ case BFD_RELOC_PPC_B16_BRNTAKEN: r = R_PPC_REL14_BRNTAKEN; break; -+ case BFD_RELOC_PPC64_GOT16_DS: -+ case BFD_RELOC_16_GOTOFF: r = R_PPC_GOT16; break; -+ case BFD_RELOC_PPC64_GOT16_LO_DS: -+ case BFD_RELOC_LO16_GOTOFF: r = R_PPC_GOT16_LO; break; -+ case BFD_RELOC_HI16_GOTOFF: r = R_PPC_GOT16_HI; break; -+ case BFD_RELOC_HI16_S_GOTOFF: r = R_PPC_GOT16_HA; break; -+ case BFD_RELOC_24_PLT_PCREL: r = R_PPC_PLTREL24; break; -+ case BFD_RELOC_PPC_COPY: r = R_PPC_COPY; break; -+ case BFD_RELOC_PPC_GLOB_DAT: r = R_PPC_GLOB_DAT; break; -+ case BFD_RELOC_PPC_LOCAL24PC: r = R_PPC_LOCAL24PC; break; -+ case BFD_RELOC_32_PCREL: r = R_PPC_REL32; break; -+ case BFD_RELOC_32_PLTOFF: r = R_PPC_PLT32; break; -+ case BFD_RELOC_32_PLT_PCREL: r = R_PPC_PLTREL32; break; -+ case BFD_RELOC_PPC64_PLT16_LO_DS: -+ case BFD_RELOC_LO16_PLTOFF: r = R_PPC_PLT16_LO; break; -+ case BFD_RELOC_HI16_PLTOFF: r = R_PPC_PLT16_HI; break; -+ case BFD_RELOC_HI16_S_PLTOFF: r = R_PPC_PLT16_HA; break; -+ case BFD_RELOC_GPREL16: r = R_PPC_SDAREL16; break; -+ case BFD_RELOC_PPC64_SECTOFF_DS: -+ case BFD_RELOC_16_BASEREL: r = R_PPC_SECTOFF; break; -+ case BFD_RELOC_PPC64_SECTOFF_LO_DS: -+ case BFD_RELOC_LO16_BASEREL: r = R_PPC_SECTOFF_LO; break; -+ case BFD_RELOC_HI16_BASEREL: r = R_PPC_SECTOFF_HI; break; -+ case BFD_RELOC_HI16_S_BASEREL: r = R_PPC_SECTOFF_HA; break; -+ case BFD_RELOC_CTOR: r = R_PPC_ADDR32; break; -+ case BFD_RELOC_PPC64_TOC16_DS: -+ case BFD_RELOC_PPC_TOC16: r = R_PPC_TOC16; break; -+ case BFD_RELOC_PPC_TLS: r = R_PPC_TLS; break; -+ case BFD_RELOC_PPC_TLSGD: r = R_PPC_TLSGD; break; -+ case BFD_RELOC_PPC_TLSLD: r = R_PPC_TLSLD; break; -+ case BFD_RELOC_PPC_DTPMOD: r = R_PPC_DTPMOD32; break; -+ case BFD_RELOC_PPC64_TPREL16_DS: -+ case BFD_RELOC_PPC_TPREL16: r = R_PPC_TPREL16; break; -+ case BFD_RELOC_PPC64_TPREL16_LO_DS: -+ case BFD_RELOC_PPC_TPREL16_LO: r = R_PPC_TPREL16_LO; break; -+ case BFD_RELOC_PPC_TPREL16_HI: r = R_PPC_TPREL16_HI; break; -+ case BFD_RELOC_PPC_TPREL16_HA: r = R_PPC_TPREL16_HA; break; -+ case BFD_RELOC_PPC_TPREL: r = R_PPC_TPREL32; break; -+ case BFD_RELOC_PPC64_DTPREL16_DS: -+ case BFD_RELOC_PPC_DTPREL16: r = R_PPC_DTPREL16; break; -+ case BFD_RELOC_PPC64_DTPREL16_LO_DS: -+ case BFD_RELOC_PPC_DTPREL16_LO: r = R_PPC_DTPREL16_LO; break; -+ case BFD_RELOC_PPC_DTPREL16_HI: r = R_PPC_DTPREL16_HI; break; -+ case BFD_RELOC_PPC_DTPREL16_HA: r = R_PPC_DTPREL16_HA; break; -+ case BFD_RELOC_PPC_DTPREL: r = R_PPC_DTPREL32; break; -+ case BFD_RELOC_PPC_GOT_TLSGD16: r = R_PPC_GOT_TLSGD16; break; -+ case BFD_RELOC_PPC_GOT_TLSGD16_LO: r = R_PPC_GOT_TLSGD16_LO; break; -+ case BFD_RELOC_PPC_GOT_TLSGD16_HI: r = R_PPC_GOT_TLSGD16_HI; break; -+ case BFD_RELOC_PPC_GOT_TLSGD16_HA: r = R_PPC_GOT_TLSGD16_HA; break; -+ case BFD_RELOC_PPC_GOT_TLSLD16: r = R_PPC_GOT_TLSLD16; break; -+ case BFD_RELOC_PPC_GOT_TLSLD16_LO: r = R_PPC_GOT_TLSLD16_LO; break; -+ case BFD_RELOC_PPC_GOT_TLSLD16_HI: r = R_PPC_GOT_TLSLD16_HI; break; -+ case BFD_RELOC_PPC_GOT_TLSLD16_HA: r = R_PPC_GOT_TLSLD16_HA; break; -+ case BFD_RELOC_PPC_GOT_TPREL16: r = R_PPC_GOT_TPREL16; break; -+ case BFD_RELOC_PPC_GOT_TPREL16_LO: r = R_PPC_GOT_TPREL16_LO; break; -+ case BFD_RELOC_PPC_GOT_TPREL16_HI: r = R_PPC_GOT_TPREL16_HI; break; -+ case BFD_RELOC_PPC_GOT_TPREL16_HA: r = R_PPC_GOT_TPREL16_HA; break; -+ case BFD_RELOC_PPC_GOT_DTPREL16: r = R_PPC_GOT_DTPREL16; break; -+ case BFD_RELOC_PPC_GOT_DTPREL16_LO: r = R_PPC_GOT_DTPREL16_LO; break; -+ case BFD_RELOC_PPC_GOT_DTPREL16_HI: r = R_PPC_GOT_DTPREL16_HI; break; -+ case BFD_RELOC_PPC_GOT_DTPREL16_HA: r = R_PPC_GOT_DTPREL16_HA; break; -+ case BFD_RELOC_PPC_EMB_NADDR32: r = R_PPC_EMB_NADDR32; break; -+ case BFD_RELOC_PPC_EMB_NADDR16: r = R_PPC_EMB_NADDR16; break; -+ case BFD_RELOC_PPC_EMB_NADDR16_LO: r = R_PPC_EMB_NADDR16_LO; break; -+ case BFD_RELOC_PPC_EMB_NADDR16_HI: r = R_PPC_EMB_NADDR16_HI; break; -+ case BFD_RELOC_PPC_EMB_NADDR16_HA: r = R_PPC_EMB_NADDR16_HA; break; -+ case BFD_RELOC_PPC_EMB_SDAI16: r = R_PPC_EMB_SDAI16; break; -+ case BFD_RELOC_PPC_EMB_SDA2I16: r = R_PPC_EMB_SDA2I16; break; -+ case BFD_RELOC_PPC_EMB_SDA2REL: r = R_PPC_EMB_SDA2REL; break; -+ case BFD_RELOC_PPC_EMB_SDA21: r = R_PPC_EMB_SDA21; break; -+ case BFD_RELOC_PPC_EMB_MRKREF: r = R_PPC_EMB_MRKREF; break; -+ case BFD_RELOC_PPC_EMB_RELSEC16: r = R_PPC_EMB_RELSEC16; break; -+ case BFD_RELOC_PPC_EMB_RELST_LO: r = R_PPC_EMB_RELST_LO; break; -+ case BFD_RELOC_PPC_EMB_RELST_HI: r = R_PPC_EMB_RELST_HI; break; -+ case BFD_RELOC_PPC_EMB_RELST_HA: r = R_PPC_EMB_RELST_HA; break; -+ case BFD_RELOC_PPC_EMB_BIT_FLD: r = R_PPC_EMB_BIT_FLD; break; -+ case BFD_RELOC_PPC_EMB_RELSDA: r = R_PPC_EMB_RELSDA; break; -+ case BFD_RELOC_PPC_VLE_REL8: r = R_PPC_VLE_REL8; break; -+ case BFD_RELOC_PPC_VLE_REL15: r = R_PPC_VLE_REL15; break; -+ case BFD_RELOC_PPC_VLE_REL24: r = R_PPC_VLE_REL24; break; -+ case BFD_RELOC_PPC_VLE_LO16A: r = R_PPC_VLE_LO16A; break; -+ case BFD_RELOC_PPC_VLE_LO16D: r = R_PPC_VLE_LO16D; break; -+ case BFD_RELOC_PPC_VLE_HI16A: r = R_PPC_VLE_HI16A; break; -+ case BFD_RELOC_PPC_VLE_HI16D: r = R_PPC_VLE_HI16D; break; -+ case BFD_RELOC_PPC_VLE_HA16A: r = R_PPC_VLE_HA16A; break; -+ case BFD_RELOC_PPC_VLE_HA16D: r = R_PPC_VLE_HA16D; break; -+ case BFD_RELOC_PPC_VLE_SDA21: r = R_PPC_VLE_SDA21; break; -+ case BFD_RELOC_PPC_VLE_SDA21_LO: r = R_PPC_VLE_SDA21_LO; break; -+ case BFD_RELOC_PPC_VLE_SDAREL_LO16A: -+ r = R_PPC_VLE_SDAREL_LO16A; -+ break; -+ case BFD_RELOC_PPC_VLE_SDAREL_LO16D: -+ r = R_PPC_VLE_SDAREL_LO16D; -+ break; -+ case BFD_RELOC_PPC_VLE_SDAREL_HI16A: -+ r = R_PPC_VLE_SDAREL_HI16A; -+ break; -+ case BFD_RELOC_PPC_VLE_SDAREL_HI16D: -+ r = R_PPC_VLE_SDAREL_HI16D; -+ break; -+ case BFD_RELOC_PPC_VLE_SDAREL_HA16A: -+ r = R_PPC_VLE_SDAREL_HA16A; -+ break; -+ case BFD_RELOC_PPC_VLE_SDAREL_HA16D: -+ r = R_PPC_VLE_SDAREL_HA16D; -+ break; -+ case BFD_RELOC_16_PCREL: r = R_PPC_REL16; break; -+ case BFD_RELOC_LO16_PCREL: r = R_PPC_REL16_LO; break; -+ case BFD_RELOC_HI16_PCREL: r = R_PPC_REL16_HI; break; -+ case BFD_RELOC_HI16_S_PCREL: r = R_PPC_REL16_HA; break; -+ case BFD_RELOC_PPC_AMIGAOS_BREL: r = R_PPC_AMIGAOS_BREL; break; -+ case BFD_RELOC_PPC_AMIGAOS_BREL_LO: r = R_PPC_AMIGAOS_BREL_LO; break; -+ case BFD_RELOC_PPC_AMIGAOS_BREL_HI: r = R_PPC_AMIGAOS_BREL_HI; break; -+ case BFD_RELOC_PPC_AMIGAOS_BREL_HA: r = R_PPC_AMIGAOS_BREL_HA; break; -+ case BFD_RELOC_VTABLE_INHERIT: r = R_PPC_GNU_VTINHERIT; break; -+ case BFD_RELOC_VTABLE_ENTRY: r = R_PPC_GNU_VTENTRY; break; -+ } -+ -+ return ppc_elf_howto_table[r]; -+}; -+ -+static reloc_howto_type * -+ppc_elf_reloc_name_lookup (bfd *abfd ATTRIBUTE_UNUSED, -+ const char *r_name) -+{ -+ unsigned int i; -+ -+ for (i = 0; -+ i < sizeof (ppc_elf_howto_raw) / sizeof (ppc_elf_howto_raw[0]); -+ i++) -+ if (ppc_elf_howto_raw[i].name != NULL -+ && strcasecmp (ppc_elf_howto_raw[i].name, r_name) == 0) -+ return &ppc_elf_howto_raw[i]; -+ -+ return NULL; -+} -+ -+/* Set the howto pointer for a PowerPC ELF reloc. */ -+ -+static void -+ppc_elf_info_to_howto (bfd *abfd ATTRIBUTE_UNUSED, -+ arelent *cache_ptr, -+ Elf_Internal_Rela *dst) -+{ -+ /* Initialize howto table if not already done. */ -+ if (!ppc_elf_howto_table[R_PPC_ADDR32]) -+ ppc_elf_howto_init (); -+ -+ BFD_ASSERT (ELF32_R_TYPE (dst->r_info) < (unsigned int) R_PPC_max); -+ cache_ptr->howto = ppc_elf_howto_table[ELF32_R_TYPE (dst->r_info)]; -+ -+ /* Just because the above assert didn't trigger doesn't mean that -+ ELF32_R_TYPE (dst->r_info) is necessarily a valid relocation. */ -+ if (!cache_ptr->howto) -+ { -+ (*_bfd_error_handler) (_("%B: invalid relocation type %d"), -+ abfd, ELF32_R_TYPE (dst->r_info)); -+ bfd_set_error (bfd_error_bad_value); -+ -+ cache_ptr->howto = ppc_elf_howto_table[R_PPC_NONE]; -+ } -+} -+ -+/* Handle the R_PPC_ADDR16_HA and R_PPC_REL16_HA relocs. */ -+ -+static bfd_reloc_status_type -+ppc_elf_addr16_ha_reloc (bfd *abfd ATTRIBUTE_UNUSED, -+ arelent *reloc_entry, -+ asymbol *symbol, -+ void *data ATTRIBUTE_UNUSED, -+ asection *input_section, -+ bfd *output_bfd, -+ char **error_message ATTRIBUTE_UNUSED) -+{ -+ bfd_vma relocation; -+ -+ if (output_bfd != NULL) -+ { -+ reloc_entry->address += input_section->output_offset; -+ return bfd_reloc_ok; -+ } -+ -+ if (reloc_entry->address > bfd_get_section_limit (abfd, input_section)) -+ return bfd_reloc_outofrange; -+ -+ if (bfd_is_com_section (symbol->section)) -+ relocation = 0; -+ else -+ relocation = symbol->value; -+ -+ relocation += symbol->section->output_section->vma; -+ relocation += symbol->section->output_offset; -+ relocation += reloc_entry->addend; -+ if (reloc_entry->howto->pc_relative) -+ relocation -= reloc_entry->address; -+ -+ reloc_entry->addend += (relocation & 0x8000) << 1; -+ -+ return bfd_reloc_continue; -+} -+ -+static bfd_reloc_status_type -+ppc_elf_unhandled_reloc (bfd *abfd, -+ arelent *reloc_entry, -+ asymbol *symbol, -+ void *data, -+ asection *input_section, -+ bfd *output_bfd, -+ char **error_message) -+{ -+ /* If this is a relocatable link (output_bfd test tells us), just -+ call the generic function. Any adjustment will be done at final -+ link time. */ -+ if (output_bfd != NULL) -+ return bfd_elf_generic_reloc (abfd, reloc_entry, symbol, data, -+ input_section, output_bfd, error_message); -+ -+ if (error_message != NULL) -+ { -+ static char buf[60]; -+ sprintf (buf, _("generic linker can't handle %s"), -+ reloc_entry->howto->name); -+ *error_message = buf; -+ } -+ return bfd_reloc_dangerous; -+} -+ -+/* Sections created by the linker. */ -+ -+typedef struct elf_linker_section -+{ -+ /* Pointer to the bfd section. */ -+ asection *section; -+ /* Section name. */ -+ const char *name; -+ /* Associated bss section name. */ -+ const char *bss_name; -+ /* Associated symbol name. */ -+ const char *sym_name; -+ /* Associated symbol. */ -+ struct elf_link_hash_entry *sym; -+} elf_linker_section_t; -+ -+/* Linked list of allocated pointer entries. This hangs off of the -+ symbol lists, and provides allows us to return different pointers, -+ based on different addend's. */ -+ -+typedef struct elf_linker_section_pointers -+{ -+ /* next allocated pointer for this symbol */ -+ struct elf_linker_section_pointers *next; -+ /* offset of pointer from beginning of section */ -+ bfd_vma offset; -+ /* addend used */ -+ bfd_vma addend; -+ /* which linker section this is */ -+ elf_linker_section_t *lsect; -+} elf_linker_section_pointers_t; -+ -+struct ppc_elf_obj_tdata -+{ -+ struct elf_obj_tdata elf; -+ -+ /* A mapping from local symbols to offsets into the various linker -+ sections added. This is index by the symbol index. */ -+ elf_linker_section_pointers_t **linker_section_pointers; -+ -+ /* Flags used to auto-detect plt type. */ -+ unsigned int makes_plt_call : 1; -+ unsigned int has_rel16 : 1; -+}; -+ -+#define ppc_elf_tdata(bfd) \ -+ ((struct ppc_elf_obj_tdata *) (bfd)->tdata.any) -+ -+#define elf_local_ptr_offsets(bfd) \ -+ (ppc_elf_tdata (bfd)->linker_section_pointers) -+ -+#define is_ppc_elf(bfd) \ -+ (bfd_get_flavour (bfd) == bfd_target_elf_flavour \ -+ && elf_object_id (bfd) == PPC32_ELF_DATA) -+ -+/* Override the generic function because we store some extras. */ -+ -+static bfd_boolean -+ppc_elf_mkobject (bfd *abfd) -+{ -+ return bfd_elf_allocate_object (abfd, sizeof (struct ppc_elf_obj_tdata), -+ PPC32_ELF_DATA); -+} -+ -+/* Fix bad default arch selected for a 32 bit input bfd when the -+ default is 64 bit. */ -+ -+static bfd_boolean -+ppc_elf_object_p (bfd *abfd) -+{ -+ if (abfd->arch_info->the_default && abfd->arch_info->bits_per_word == 64) -+ { -+ Elf_Internal_Ehdr *i_ehdr = elf_elfheader (abfd); -+ -+ if (i_ehdr->e_ident[EI_CLASS] == ELFCLASS32) -+ { -+ /* Relies on arch after 64 bit default being 32 bit default. */ -+ abfd->arch_info = abfd->arch_info->next; -+ BFD_ASSERT (abfd->arch_info->bits_per_word == 32); -+ } -+ } -+ return TRUE; -+} -+ -+/* Function to set whether a module needs the -mrelocatable bit set. */ -+ -+static bfd_boolean -+ppc_elf_set_private_flags (bfd *abfd, flagword flags) -+{ -+ BFD_ASSERT (!elf_flags_init (abfd) -+ || elf_elfheader (abfd)->e_flags == flags); -+ -+ elf_elfheader (abfd)->e_flags = flags; -+ elf_flags_init (abfd) = TRUE; -+ return TRUE; -+} -+ -+/* Support for core dump NOTE sections. */ -+ -+static bfd_boolean -+ppc_elf_grok_prstatus (bfd *abfd, Elf_Internal_Note *note) -+{ -+ int offset; -+ unsigned int size; -+ -+ switch (note->descsz) -+ { -+ default: -+ return FALSE; -+ -+ case 268: /* Linux/PPC. */ -+ /* pr_cursig */ -+ elf_tdata (abfd)->core_signal = bfd_get_16 (abfd, note->descdata + 12); -+ -+ /* pr_pid */ -+ elf_tdata (abfd)->core_lwpid = bfd_get_32 (abfd, note->descdata + 24); -+ -+ /* pr_reg */ -+ offset = 72; -+ size = 192; -+ -+ break; -+ } -+ -+ /* Make a ".reg/999" section. */ -+ return _bfd_elfcore_make_pseudosection (abfd, ".reg", -+ size, note->descpos + offset); -+} -+ -+static bfd_boolean -+ppc_elf_grok_psinfo (bfd *abfd, Elf_Internal_Note *note) -+{ -+ switch (note->descsz) -+ { -+ default: -+ return FALSE; -+ -+ case 128: /* Linux/PPC elf_prpsinfo. */ -+ elf_tdata (abfd)->core_pid -+ = bfd_get_32 (abfd, note->descdata + 16); -+ elf_tdata (abfd)->core_program -+ = _bfd_elfcore_strndup (abfd, note->descdata + 32, 16); -+ elf_tdata (abfd)->core_command -+ = _bfd_elfcore_strndup (abfd, note->descdata + 48, 80); -+ } -+ -+ /* Note that for some reason, a spurious space is tacked -+ onto the end of the args in some (at least one anyway) -+ implementations, so strip it off if it exists. */ -+ -+ { -+ char *command = elf_tdata (abfd)->core_command; -+ int n = strlen (command); -+ -+ if (0 < n && command[n - 1] == ' ') -+ command[n - 1] = '\0'; -+ } -+ -+ return TRUE; -+} -+ -+static char * -+ppc_elf_write_core_note (bfd *abfd, char *buf, int *bufsiz, int note_type, ...) -+{ -+ switch (note_type) -+ { -+ default: -+ return NULL; -+ -+ case NT_PRPSINFO: -+ { -+ char data[128]; -+ va_list ap; -+ -+ va_start (ap, note_type); -+ memset (data, 0, sizeof (data)); -+ strncpy (data + 32, va_arg (ap, const char *), 16); -+ strncpy (data + 48, va_arg (ap, const char *), 80); -+ va_end (ap); -+ return elfcore_write_note (abfd, buf, bufsiz, -+ "CORE", note_type, data, sizeof (data)); -+ } -+ -+ case NT_PRSTATUS: -+ { -+ char data[268]; -+ va_list ap; -+ long pid; -+ int cursig; -+ const void *greg; -+ -+ va_start (ap, note_type); -+ memset (data, 0, 72); -+ pid = va_arg (ap, long); -+ bfd_put_32 (abfd, pid, data + 24); -+ cursig = va_arg (ap, int); -+ bfd_put_16 (abfd, cursig, data + 12); -+ greg = va_arg (ap, const void *); -+ memcpy (data + 72, greg, 192); -+ memset (data + 264, 0, 4); -+ va_end (ap); -+ return elfcore_write_note (abfd, buf, bufsiz, -+ "CORE", note_type, data, sizeof (data)); -+ } -+ } -+} -+ -+static flagword -+ppc_elf_lookup_section_flags (char *flag_name) -+{ -+ -+ if (!strcmp (flag_name, "SHF_PPC_VLE")) -+ return SHF_PPC_VLE; -+ -+ return 0; -+} -+ -+/* Add the VLE flag if required. */ -+ -+bfd_boolean -+ppc_elf_amigaos_section_processing (bfd *abfd, Elf_Internal_Shdr *shdr) -+{ -+ if (bfd_get_mach (abfd) == bfd_mach_ppc_vle -+ && (shdr->sh_flags & SHF_EXECINSTR) != 0) -+ shdr->sh_flags |= SHF_PPC_VLE; -+ -+ return TRUE; -+} -+ -+/* Return address for Ith PLT stub in section PLT, for relocation REL -+ or (bfd_vma) -1 if it should not be included. */ -+ -+static bfd_vma -+ppc_elf_plt_sym_val (bfd_vma i ATTRIBUTE_UNUSED, -+ const asection *plt ATTRIBUTE_UNUSED, -+ const arelent *rel) -+{ -+#ifdef DEBUG -+ fprintf (stderr, "ppc_elf_plt_sym_cal (0x%08x)\n", (unsigned int)rel->address); -+#endif -+ return rel->address; -+} -+ -+/* Handle a PowerPC specific section when reading an object file. This -+ is called when bfd_section_from_shdr finds a section with an unknown -+ type. */ -+ -+static bfd_boolean -+ppc_elf_section_from_shdr (bfd *abfd, -+ Elf_Internal_Shdr *hdr, -+ const char *name, -+ int shindex) -+{ -+ asection *newsect; -+ flagword flags; -+ -+ if (! _bfd_elf_make_section_from_shdr (abfd, hdr, name, shindex)) -+ return FALSE; -+ -+ newsect = hdr->bfd_section; -+ flags = bfd_get_section_flags (abfd, newsect); -+ if (hdr->sh_flags & SHF_EXCLUDE) -+ flags |= SEC_EXCLUDE; -+ -+ if (hdr->sh_type == SHT_ORDERED) -+ flags |= SEC_SORT_ENTRIES; -+ -+ bfd_set_section_flags (abfd, newsect, flags); -+ return TRUE; -+} -+ -+/* Set up any other section flags and such that may be necessary. */ -+ -+static bfd_boolean -+ppc_elf_fake_sections (bfd *abfd ATTRIBUTE_UNUSED, -+ Elf_Internal_Shdr *shdr, -+ asection *asect) -+{ -+ if ((asect->flags & SEC_SORT_ENTRIES) != 0) -+ shdr->sh_type = SHT_ORDERED; -+ -+ return TRUE; -+} -+ -+/* If we have .sbss2 or .PPC.EMB.sbss0 output sections, we -+ need to bump up the number of section headers. */ -+ -+static int -+ppc_elf_additional_program_headers (bfd *abfd, -+ struct bfd_link_info *info ATTRIBUTE_UNUSED) -+{ -+ asection *s; -+// int ret = 0; -+ int ret = 1; -+ -+ s = bfd_get_section_by_name (abfd, ".sbss2"); -+ if (s != NULL && (s->flags & SEC_ALLOC) != 0) -+ ++ret; -+ -+ s = bfd_get_section_by_name (abfd, ".PPC.EMB.sbss0"); -+ if (s != NULL && (s->flags & SEC_ALLOC) != 0) -+ ++ret; -+ -+ return ret; -+} -+ -+/* Modify the segment map for VLE executables. */ -+ -+bfd_boolean -+ppc_elf_amigaos_modify_segment_map (bfd *abfd, -+ struct bfd_link_info *info ATTRIBUTE_UNUSED) -+{ -+ struct elf_segment_map *m, *n; -+ bfd_size_type amt; -+ unsigned int j, k; -+ bfd_boolean sect0_vle, sectj_vle; -+ -+ /* At this point in the link, output sections have already been sorted by -+ LMA and assigned to segments. All that is left to do is to ensure -+ there is no mixing of VLE & non-VLE sections in a text segment. -+ If we find that case, we split the segment. -+ We maintain the original output section order. */ -+ -+ for (m = elf_tdata (abfd)->segment_map; m != NULL; m = m->next) -+ { -+ if (m->count == 0) -+ continue; -+ -+ sect0_vle = (elf_section_flags (m->sections[0]) & SHF_PPC_VLE) != 0; -+ for (j = 1; j < m->count; ++j) -+ { -+ sectj_vle = (elf_section_flags (m->sections[j]) & SHF_PPC_VLE) != 0; -+ -+ if (sectj_vle != sect0_vle) -+ break; -+ } -+ if (j >= m->count) -+ continue; -+ -+ /* sections 0..j-1 stay in this (current) segment, -+ the remainder are put in a new segment. -+ The scan resumes with the new segment. */ -+ -+ /* Fix the new segment. */ -+ amt = sizeof (struct elf_segment_map); -+ amt += (m->count - j - 1) * sizeof (asection *); -+ n = (struct elf_segment_map *) bfd_zalloc (abfd, amt); -+ if (n == NULL) -+ return FALSE; -+ -+ n->p_type = PT_LOAD; -+ n->p_flags = PF_X | PF_R; -+ if (sectj_vle) -+ n->p_flags |= PF_PPC_VLE; -+ n->count = m->count - j; -+ for (k = 0; k < n->count; ++k) -+ { -+ n->sections[k] = m->sections[j+k]; -+ m->sections[j+k] = NULL; -+ } -+ n->next = m->next; -+ m->next = n; -+ -+ /* Fix the current segment */ -+ m->count = j; -+ } -+ -+ return TRUE; -+} -+ -+/* Add extra PPC sections -- Note, for now, make .sbss2 and -+ .PPC.EMB.sbss0 a normal section, and not a bss section so -+ that the linker doesn't crater when trying to make more than -+ 2 sections. */ -+ -+static const struct bfd_elf_special_section ppc_elf_special_sections[] = -+{ -+ { STRING_COMMA_LEN (".plt"), 0, SHT_NOBITS, SHF_ALLOC + SHF_EXECINSTR }, -+ { STRING_COMMA_LEN (".sbss"), -2, SHT_NOBITS, SHF_ALLOC + SHF_WRITE }, -+ { STRING_COMMA_LEN (".sbss2"), -2, SHT_PROGBITS, SHF_ALLOC }, -+ { STRING_COMMA_LEN (".sdata"), -2, SHT_PROGBITS, SHF_ALLOC + SHF_WRITE }, -+ { STRING_COMMA_LEN (".sdata2"), -2, SHT_PROGBITS, SHF_ALLOC }, -+ { STRING_COMMA_LEN (".tags"), 0, SHT_ORDERED, SHF_ALLOC }, -+ { STRING_COMMA_LEN (".PPC.EMB.apuinfo"), 0, SHT_NOTE, 0 }, -+ { STRING_COMMA_LEN (".PPC.EMB.sbss0"), 0, SHT_PROGBITS, SHF_ALLOC }, -+ { STRING_COMMA_LEN (".PPC.EMB.sdata0"), 0, SHT_PROGBITS, SHF_ALLOC }, -+ { NULL, 0, 0, 0, 0 } -+}; -+ -+/* This is what we want for new plt/got. */ -+static struct bfd_elf_special_section ppc_alt_plt = -+ { STRING_COMMA_LEN (".plt"), 0, SHT_PROGBITS, SHF_ALLOC }; -+ -+static const struct bfd_elf_special_section * -+ppc_elf_get_sec_type_attr (bfd *abfd ATTRIBUTE_UNUSED, asection *sec) -+{ -+ const struct bfd_elf_special_section *ssect; -+ -+ /* See if this is one of the special sections. */ -+ if (sec->name == NULL) -+ return NULL; -+ -+ ssect = _bfd_elf_get_special_section (sec->name, ppc_elf_special_sections, -+ sec->use_rela_p); -+ if (ssect != NULL) -+ { -+ if (ssect == ppc_elf_special_sections && (sec->flags & SEC_LOAD) != 0) -+ ssect = &ppc_alt_plt; -+ return ssect; -+ } -+ -+ return _bfd_elf_get_sec_type_attr (abfd, sec); -+} -+ -+/* Very simple linked list structure for recording apuinfo values. */ -+typedef struct apuinfo_list -+{ -+ struct apuinfo_list *next; -+ unsigned long value; -+} -+apuinfo_list; -+ -+static apuinfo_list *head; -+static bfd_boolean apuinfo_set; -+ -+static void -+apuinfo_list_init (void) -+{ -+ head = NULL; -+ apuinfo_set = FALSE; -+} -+ -+static void -+apuinfo_list_add (unsigned long value) -+{ -+ apuinfo_list *entry = head; -+ -+ while (entry != NULL) -+ { -+ if (entry->value == value) -+ return; -+ entry = entry->next; -+ } -+ -+ entry = bfd_malloc (sizeof (* entry)); -+ if (entry == NULL) -+ return; -+ -+ entry->value = value; -+ entry->next = head; -+ head = entry; -+} -+ -+static unsigned -+apuinfo_list_length (void) -+{ -+ apuinfo_list *entry; -+ unsigned long count; -+ -+ for (entry = head, count = 0; -+ entry; -+ entry = entry->next) -+ ++ count; -+ -+ return count; -+} -+ -+static inline unsigned long -+apuinfo_list_element (unsigned long number) -+{ -+ apuinfo_list * entry; -+ -+ for (entry = head; -+ entry && number --; -+ entry = entry->next) -+ ; -+ -+ return entry ? entry->value : 0; -+} -+ -+static void -+apuinfo_list_finish (void) -+{ -+ apuinfo_list *entry; -+ -+ for (entry = head; entry;) -+ { -+ apuinfo_list *next = entry->next; -+ free (entry); -+ entry = next; -+ } -+ -+ head = NULL; -+} -+ -+#define APUINFO_SECTION_NAME ".PPC.EMB.apuinfo" -+#define APUINFO_LABEL "APUinfo" -+ -+/* Scan the input BFDs and create a linked list of -+ the APUinfo values that will need to be emitted. */ -+ -+static void -+ppc_elf_amigaos_begin_write_processing (bfd *abfd, struct bfd_link_info *link_info) -+{ -+ bfd *ibfd; -+ asection *asec; -+ char *buffer = NULL; -+ bfd_size_type largest_input_size = 0; -+ unsigned i; -+ unsigned long length; -+ const char *error_message = NULL; -+ -+ if (link_info == NULL) -+ return; -+ -+ apuinfo_list_init (); -+ -+ /* Read in the input sections contents. */ -+ for (ibfd = link_info->input_bfds; ibfd; ibfd = ibfd->link_next) -+ { -+ unsigned long datum; -+ -+ asec = bfd_get_section_by_name (ibfd, APUINFO_SECTION_NAME); -+ if (asec == NULL) -+ continue; -+ -+ error_message = _("corrupt %s section in %B"); -+ length = asec->size; -+ if (length < 20) -+ goto fail; -+ -+ apuinfo_set = TRUE; -+ if (largest_input_size < asec->size) -+ { -+ if (buffer) -+ free (buffer); -+ largest_input_size = asec->size; -+ buffer = bfd_malloc (largest_input_size); -+ if (!buffer) -+ return; -+ } -+ -+ if (bfd_seek (ibfd, asec->filepos, SEEK_SET) != 0 -+ || (bfd_bread (buffer, length, ibfd) != length)) -+ { -+ error_message = _("unable to read in %s section from %B"); -+ goto fail; -+ } -+ -+ /* Verify the contents of the header. Note - we have to -+ extract the values this way in order to allow for a -+ host whose endian-ness is different from the target. */ -+ datum = bfd_get_32 (ibfd, buffer); -+ if (datum != sizeof APUINFO_LABEL) -+ goto fail; -+ -+ datum = bfd_get_32 (ibfd, buffer + 8); -+ if (datum != 0x2) -+ goto fail; -+ -+ if (strcmp (buffer + 12, APUINFO_LABEL) != 0) -+ goto fail; -+ -+ /* Get the number of bytes used for apuinfo entries. */ -+ datum = bfd_get_32 (ibfd, buffer + 4); -+ if (datum + 20 != length) -+ goto fail; -+ -+ /* Scan the apuinfo section, building a list of apuinfo numbers. */ -+ for (i = 0; i < datum; i += 4) -+ apuinfo_list_add (bfd_get_32 (ibfd, buffer + 20 + i)); -+ } -+ -+ error_message = NULL; -+ -+ if (apuinfo_set) -+ { -+ /* Compute the size of the output section. */ -+ unsigned num_entries = apuinfo_list_length (); -+ -+ /* Set the output section size, if it exists. */ -+ asec = bfd_get_section_by_name (abfd, APUINFO_SECTION_NAME); -+ -+ if (asec && ! bfd_set_section_size (abfd, asec, 20 + num_entries * 4)) -+ { -+ ibfd = abfd; -+ error_message = _("warning: unable to set size of %s section in %B"); -+ } -+ } -+ -+ fail: -+ if (buffer) -+ free (buffer); -+ -+ if (error_message) -+ (*_bfd_error_handler) (error_message, ibfd, APUINFO_SECTION_NAME); -+} -+ -+/* Prevent the output section from accumulating the input sections' -+ contents. We have already stored this in our linked list structure. */ -+ -+static bfd_boolean -+ppc_elf_amigaos_write_section (bfd *abfd ATTRIBUTE_UNUSED, -+ struct bfd_link_info *link_info ATTRIBUTE_UNUSED, -+ asection *asec, -+ bfd_byte *contents ATTRIBUTE_UNUSED) -+{ -+ return apuinfo_set && strcmp (asec->name, APUINFO_SECTION_NAME) == 0; -+} -+ -+/* Finally we can generate the output section. */ -+ -+static void -+ppc_elf_amigaos_final_write_processing (bfd *abfd, bfd_boolean linker ATTRIBUTE_UNUSED) -+{ -+ bfd_byte *buffer; -+ asection *asec; -+ unsigned i; -+ unsigned num_entries; -+ bfd_size_type length; -+ -+ asec = bfd_get_section_by_name (abfd, APUINFO_SECTION_NAME); -+ if (asec == NULL) -+ return; -+ -+ if (!apuinfo_set) -+ return; -+ -+ length = asec->size; -+ if (length < 20) -+ return; -+ -+ buffer = bfd_malloc (length); -+ if (buffer == NULL) -+ { -+ (*_bfd_error_handler) -+ (_("failed to allocate space for new APUinfo section.")); -+ return; -+ } -+ -+ /* Create the apuinfo header. */ -+ num_entries = apuinfo_list_length (); -+ bfd_put_32 (abfd, sizeof APUINFO_LABEL, buffer); -+ bfd_put_32 (abfd, num_entries * 4, buffer + 4); -+ bfd_put_32 (abfd, 0x2, buffer + 8); -+ strcpy ((char *) buffer + 12, APUINFO_LABEL); -+ -+ length = 20; -+ for (i = 0; i < num_entries; i++) -+ { -+ bfd_put_32 (abfd, apuinfo_list_element (i), buffer + length); -+ length += 4; -+ } -+ -+ if (length != asec->size) -+ (*_bfd_error_handler) (_("failed to compute new APUinfo section.")); -+ -+ if (! bfd_set_section_contents (abfd, asec, buffer, (file_ptr) 0, length)) -+ (*_bfd_error_handler) (_("failed to install new APUinfo section.")); -+ -+ free (buffer); -+ -+ apuinfo_list_finish (); -+} -+ -+static bfd_boolean -+is_nonpic_glink_stub (bfd *abfd, asection *glink, bfd_vma off) -+{ -+ bfd_byte buf[GLINK_ENTRY_SIZE]; -+ -+ if (!bfd_get_section_contents (abfd, glink, buf, off, GLINK_ENTRY_SIZE)) -+ return FALSE; -+ -+ return ((bfd_get_32 (abfd, buf + 0) & 0xffff0000) == LIS_11 -+ && (bfd_get_32 (abfd, buf + 4) & 0xffff0000) == LWZ_11_11 -+ && bfd_get_32 (abfd, buf + 8) == MTCTR_11 -+ && bfd_get_32 (abfd, buf + 12) == BCTR); -+} -+ -+static bfd_boolean -+section_covers_vma (bfd *abfd ATTRIBUTE_UNUSED, asection *section, void *ptr) -+{ -+ bfd_vma vma = *(bfd_vma *) ptr; -+ return ((section->flags & SEC_ALLOC) != 0 -+ && section->vma <= vma -+ && vma < section->vma + section->size); -+} -+ -+static long -+ppc_elf_get_synthetic_symtab (bfd *abfd, long symcount, asymbol **syms, -+ long dynsymcount, asymbol **dynsyms, -+ asymbol **ret) -+{ -+ bfd_boolean (*slurp_relocs) (bfd *, asection *, asymbol **, bfd_boolean); -+ asection *plt, *relplt, *dynamic, *glink; -+ bfd_vma glink_vma = 0; -+ bfd_vma resolv_vma = 0; -+ bfd_vma stub_vma; -+ asymbol *s; -+ arelent *p; -+ long count, i; -+ size_t size; -+ char *names; -+ bfd_byte buf[4]; -+ -+ *ret = NULL; -+ -+ if ((abfd->flags & (DYNAMIC | EXEC_P)) == 0) -+ return 0; -+ -+ if (dynsymcount <= 0) -+ return 0; -+ -+ relplt = bfd_get_section_by_name (abfd, ".rela.plt"); -+ if (relplt == NULL) -+ return 0; -+ -+ plt = bfd_get_section_by_name (abfd, ".plt"); -+ if (plt == NULL) -+ return 0; -+ -+ /* Call common code to handle old-style executable PLTs. */ -+ if (elf_section_flags (plt) & SHF_EXECINSTR) -+ return _bfd_elf_get_synthetic_symtab (abfd, symcount, syms, -+ dynsymcount, dynsyms, ret); -+ -+ /* If this object was prelinked, the prelinker stored the address -+ of .glink at got[1]. If it wasn't prelinked, got[1] will be zero. */ -+ dynamic = bfd_get_section_by_name (abfd, ".dynamic"); -+ if (dynamic != NULL) -+ { -+ bfd_byte *dynbuf, *extdyn, *extdynend; -+ size_t extdynsize; -+ void (*swap_dyn_in) (bfd *, const void *, Elf_Internal_Dyn *); -+ -+ if (!bfd_malloc_and_get_section (abfd, dynamic, &dynbuf)) -+ return -1; -+ -+ extdynsize = get_elf_backend_data (abfd)->s->sizeof_dyn; -+ swap_dyn_in = get_elf_backend_data (abfd)->s->swap_dyn_in; -+ -+ extdyn = dynbuf; -+ extdynend = extdyn + dynamic->size; -+ for (; extdyn < extdynend; extdyn += extdynsize) -+ { -+ Elf_Internal_Dyn dyn; -+ (*swap_dyn_in) (abfd, extdyn, &dyn); -+ -+ if (dyn.d_tag == DT_NULL) -+ break; -+ -+ if (dyn.d_tag == DT_PPC_GOT) -+ { -+ unsigned int g_o_t = dyn.d_un.d_val; -+ asection *got = bfd_get_section_by_name (abfd, ".got"); -+ if (got != NULL -+ && bfd_get_section_contents (abfd, got, buf, -+ g_o_t - got->vma + 4, 4)) -+ glink_vma = bfd_get_32 (abfd, buf); -+ break; -+ } -+ } -+ free (dynbuf); -+ } -+ -+ /* Otherwise we read the first plt entry. */ -+ if (glink_vma == 0) -+ { -+ if (bfd_get_section_contents (abfd, plt, buf, 0, 4)) -+ glink_vma = bfd_get_32 (abfd, buf); -+ } -+ -+ if (glink_vma == 0) -+ return 0; -+ -+ /* The .glink section usually does not survive the final -+ link; search for the section (usually .text) where the -+ glink stubs now reside. */ -+ glink = bfd_sections_find_if (abfd, section_covers_vma, &glink_vma); -+ if (glink == NULL) -+ return 0; -+ -+ /* Determine glink PLT resolver by reading the relative branch -+ from the first glink stub. */ -+ if (bfd_get_section_contents (abfd, glink, buf, -+ glink_vma - glink->vma, 4)) -+ { -+ unsigned int insn = bfd_get_32 (abfd, buf); -+ -+ /* The first glink stub may either branch to the resolver ... */ -+ insn ^= B; -+ if ((insn & ~0x3fffffc) == 0) -+ resolv_vma = glink_vma + (insn ^ 0x2000000) - 0x2000000; -+ -+ /* ... or fall through a bunch of NOPs. */ -+ else if ((insn ^ B ^ NOP) == 0) -+ for (i = 4; -+ bfd_get_section_contents (abfd, glink, buf, -+ glink_vma - glink->vma + i, 4); -+ i += 4) -+ if (bfd_get_32 (abfd, buf) != NOP) -+ { -+ resolv_vma = glink_vma + i; -+ break; -+ } -+ } -+ -+ count = relplt->size / sizeof (Elf32_External_Rela); -+ stub_vma = glink_vma - (bfd_vma) count * 16; -+ /* If the stubs are those for -shared/-pie then we might have -+ multiple stubs for each plt entry. If that is the case then -+ there is no way to associate stubs with their plt entries short -+ of figuring out the GOT pointer value used in the stub. */ -+ if (!is_nonpic_glink_stub (abfd, glink, -+ glink_vma - GLINK_ENTRY_SIZE - glink->vma)) -+ return 0; -+ -+ slurp_relocs = get_elf_backend_data (abfd)->s->slurp_reloc_table; -+ if (! (*slurp_relocs) (abfd, relplt, dynsyms, TRUE)) -+ return -1; -+ -+ size = count * sizeof (asymbol); -+ p = relplt->relocation; -+ for (i = 0; i < count; i++, p++) -+ { -+ size += strlen ((*p->sym_ptr_ptr)->name) + sizeof ("@plt"); -+ if (p->addend != 0) -+ size += sizeof ("+0x") - 1 + 8; -+ } -+ -+ size += sizeof (asymbol) + sizeof ("__glink"); -+ -+ if (resolv_vma) -+ size += sizeof (asymbol) + sizeof ("__glink_PLTresolve"); -+ -+ s = *ret = bfd_malloc (size); -+ if (s == NULL) -+ return -1; -+ -+ names = (char *) (s + count + 1 + (resolv_vma != 0)); -+ p = relplt->relocation; -+ for (i = 0; i < count; i++, p++) -+ { -+ size_t len; -+ -+ *s = **p->sym_ptr_ptr; -+ /* Undefined syms won't have BSF_LOCAL or BSF_GLOBAL set. Since -+ we are defining a symbol, ensure one of them is set. */ -+ if ((s->flags & BSF_LOCAL) == 0) -+ s->flags |= BSF_GLOBAL; -+ s->flags |= BSF_SYNTHETIC; -+ s->section = glink; -+ s->value = stub_vma - glink->vma; -+ s->name = names; -+ s->udata.p = NULL; -+ len = strlen ((*p->sym_ptr_ptr)->name); -+ memcpy (names, (*p->sym_ptr_ptr)->name, len); -+ names += len; -+ if (p->addend != 0) -+ { -+ memcpy (names, "+0x", sizeof ("+0x") - 1); -+ names += sizeof ("+0x") - 1; -+ bfd_sprintf_vma (abfd, names, p->addend); -+ names += strlen (names); -+ } -+ memcpy (names, "@plt", sizeof ("@plt")); -+ names += sizeof ("@plt"); -+ ++s; -+ stub_vma += 16; -+ } -+ -+ /* Add a symbol at the start of the glink branch table. */ -+ memset (s, 0, sizeof *s); -+ s->the_bfd = abfd; -+ s->flags = BSF_GLOBAL | BSF_SYNTHETIC; -+ s->section = glink; -+ s->value = glink_vma - glink->vma; -+ s->name = names; -+ memcpy (names, "__glink", sizeof ("__glink")); -+ names += sizeof ("__glink"); -+ s++; -+ count++; -+ -+ if (resolv_vma) -+ { -+ /* Add a symbol for the glink PLT resolver. */ -+ memset (s, 0, sizeof *s); -+ s->the_bfd = abfd; -+ s->flags = BSF_GLOBAL | BSF_SYNTHETIC; -+ s->section = glink; -+ s->value = resolv_vma - glink->vma; -+ s->name = names; -+ memcpy (names, "__glink_PLTresolve", sizeof ("__glink_PLTresolve")); -+ names += sizeof ("__glink_PLTresolve"); -+ s++; -+ count++; -+ } -+ -+ return count; -+} -+ -+/* The following functions are specific to the ELF linker, while -+ functions above are used generally. They appear in this file more -+ or less in the order in which they are called. eg. -+ ppc_elf_check_relocs is called early in the link process, -+ ppc_elf_finish_dynamic_sections is one of the last functions -+ called. */ -+ -+/* Track PLT entries needed for a given symbol. We might need more -+ than one glink entry per symbol when generating a pic binary. */ -+struct plt_entry -+{ -+ struct plt_entry *next; -+ -+ /* -fPIC uses multiple GOT sections, one per file, called ".got2". -+ This field stores the offset into .got2 used to initialise the -+ GOT pointer reg. It will always be at least 32768. (Current -+ gcc always uses an offset of 32768, but ld -r will pack .got2 -+ sections together resulting in larger offsets). */ -+ bfd_vma addend; -+ -+ /* The .got2 section. */ -+ asection *sec; -+ -+ /* PLT refcount or offset. */ -+ union -+ { -+ bfd_signed_vma refcount; -+ bfd_vma offset; -+ } plt; -+ -+ /* .glink stub offset. */ -+ bfd_vma glink_offset; -+}; -+ -+/* Of those relocs that might be copied as dynamic relocs, this function -+ selects those that must be copied when linking a shared library, -+ even when the symbol is local. */ -+ -+static int -+must_be_dyn_reloc (struct bfd_link_info *info, -+ enum elf_ppc_reloc_type r_type) -+{ -+ switch (r_type) -+ { -+ default: -+ return 1; -+ -+ case R_PPC_REL24: -+ case R_PPC_REL14: -+ case R_PPC_REL14_BRTAKEN: -+ case R_PPC_REL14_BRNTAKEN: -+ case R_PPC_REL32: -+ return 0; -+ -+ case R_PPC_TPREL32: -+ case R_PPC_TPREL16: -+ case R_PPC_TPREL16_LO: -+ case R_PPC_TPREL16_HI: -+ case R_PPC_TPREL16_HA: -+ return !info->executable; -+ } -+} -+ -+/* If ELIMINATE_COPY_RELOCS is non-zero, the linker will try to avoid -+ copying dynamic variables from a shared lib into an app's dynbss -+ section, and instead use a dynamic relocation to point into the -+ shared lib. */ -+#define ELIMINATE_COPY_RELOCS 1 -+ -+/* PPC ELF linker hash entry. */ -+ -+struct ppc_elf_link_hash_entry -+{ -+ struct elf_link_hash_entry elf; -+ -+ /* If this symbol is used in the linker created sections, the processor -+ specific backend uses this field to map the field into the offset -+ from the beginning of the section. */ -+ elf_linker_section_pointers_t *linker_section_pointer; -+ -+ /* Track dynamic relocs copied for this symbol. */ -+ struct elf_dyn_relocs *dyn_relocs; -+ -+ /* Contexts in which symbol is used in the GOT (or TOC). -+ TLS_GD .. TLS_TLS bits are or'd into the mask as the -+ corresponding relocs are encountered during check_relocs. -+ tls_optimize clears TLS_GD .. TLS_TPREL when optimizing to -+ indicate the corresponding GOT entry type is not needed. */ -+#define TLS_GD 1 /* GD reloc. */ -+#define TLS_LD 2 /* LD reloc. */ -+#define TLS_TPREL 4 /* TPREL reloc, => IE. */ -+#define TLS_DTPREL 8 /* DTPREL reloc, => LD. */ -+#define TLS_TLS 16 /* Any TLS reloc. */ -+#define TLS_TPRELGD 32 /* TPREL reloc resulting from GD->IE. */ -+#define PLT_IFUNC 64 /* STT_GNU_IFUNC. */ -+ char tls_mask; -+ -+ /* Nonzero if we have seen a small data relocation referring to this -+ symbol. */ -+ unsigned char has_sda_refs; -+}; -+ -+#define ppc_elf_hash_entry(ent) ((struct ppc_elf_link_hash_entry *) (ent)) -+ -+/* PPC ELF linker hash table. */ -+ -+struct ppc_elf_link_hash_table -+{ -+ struct elf_link_hash_table elf; -+ -+ /* Short-cuts to get to dynamic linker sections. */ -+ asection *got; -+ asection *relgot; -+ asection *glink; -+ asection *plt; -+ asection *relplt; -+ asection *iplt; -+ asection *reliplt; -+ asection *dynbss; -+ asection *relbss; -+ asection *dynsbss; -+ asection *relsbss; -+ elf_linker_section_t sdata[2]; -+ asection *sbss; -+ asection *glink_eh_frame; -+ -+ /* The (unloaded but important) .rela.plt.unloaded on VxWorks. */ -+ asection *srelplt2; -+ -+ /* The .got.plt section (VxWorks only)*/ -+ asection *sgotplt; -+ -+ /* Shortcut to __tls_get_addr. */ -+ struct elf_link_hash_entry *tls_get_addr; -+ -+ /* The bfd that forced an old-style PLT. */ -+ bfd *old_bfd; -+ -+ /* TLS local dynamic got entry handling. */ -+ union { -+ bfd_signed_vma refcount; -+ bfd_vma offset; -+ } tlsld_got; -+ -+ /* Offset of branch table to PltResolve function in glink. */ -+ bfd_vma glink_pltresolve; -+ -+ /* Size of reserved GOT entries. */ -+ unsigned int got_header_size; -+ /* Non-zero if allocating the header left a gap. */ -+ unsigned int got_gap; -+ -+ /* The type of PLT we have chosen to use. */ -+ enum ppc_elf_plt_type plt_type; -+ -+ /* Set if we should emit symbols for stubs. */ -+ unsigned int emit_stub_syms:1; -+ -+ /* Set if __tls_get_addr optimization should not be done. */ -+ unsigned int no_tls_get_addr_opt:1; -+ -+ /* True if the target system is VxWorks. */ -+ unsigned int is_vxworks:1; -+ -+ /* The size of PLT entries. */ -+ int plt_entry_size; -+ /* The distance between adjacent PLT slots. */ -+ int plt_slot_size; -+ /* The size of the first PLT entry. */ -+ int plt_initial_entry_size; -+ -+ /* Small local sym cache. */ -+ struct sym_cache sym_cache; -+}; -+ -+/* Rename some of the generic section flags to better document how they -+ are used for ppc32. The flags are only valid for ppc32 elf objects. */ -+ -+/* Nonzero if this section has TLS related relocations. */ -+#define has_tls_reloc sec_flg0 -+ -+/* Nonzero if this section has a call to __tls_get_addr. */ -+#define has_tls_get_addr_call sec_flg1 -+ -+/* Get the PPC ELF linker hash table from a link_info structure. */ -+ -+#define ppc_elf_hash_table(p) \ -+ (elf_hash_table_id ((struct elf_link_hash_table *) ((p)->hash)) \ -+ == PPC32_ELF_DATA ? ((struct ppc_elf_link_hash_table *) ((p)->hash)) : NULL) -+ -+/* Create an entry in a PPC ELF linker hash table. */ -+ -+static struct bfd_hash_entry * -+ppc_elf_link_hash_newfunc (struct bfd_hash_entry *entry, -+ struct bfd_hash_table *table, -+ const char *string) -+{ -+ /* Allocate the structure if it has not already been allocated by a -+ subclass. */ -+ if (entry == NULL) -+ { -+ entry = bfd_hash_allocate (table, -+ sizeof (struct ppc_elf_link_hash_entry)); -+ if (entry == NULL) -+ return entry; -+ } -+ -+ /* Call the allocation method of the superclass. */ -+ entry = _bfd_elf_link_hash_newfunc (entry, table, string); -+ if (entry != NULL) -+ { -+ ppc_elf_hash_entry (entry)->linker_section_pointer = NULL; -+ ppc_elf_hash_entry (entry)->dyn_relocs = NULL; -+ ppc_elf_hash_entry (entry)->tls_mask = 0; -+ ppc_elf_hash_entry (entry)->has_sda_refs = 0; -+ } -+ -+ return entry; -+} -+ -+/* Create a PPC ELF linker hash table. */ -+ -+static struct bfd_link_hash_table * -+ppc_elf_link_hash_table_create (bfd *abfd) -+{ -+ struct ppc_elf_link_hash_table *ret; -+ -+ ret = bfd_zmalloc (sizeof (struct ppc_elf_link_hash_table)); -+ if (ret == NULL) -+ return NULL; -+ -+ if (!_bfd_elf_link_hash_table_init (&ret->elf, abfd, -+ ppc_elf_link_hash_newfunc, -+ sizeof (struct ppc_elf_link_hash_entry), -+ PPC32_ELF_DATA)) -+ { -+ free (ret); -+ return NULL; -+ } -+ -+ ret->elf.init_plt_refcount.refcount = 0; -+ ret->elf.init_plt_refcount.glist = NULL; -+ ret->elf.init_plt_offset.offset = 0; -+ ret->elf.init_plt_offset.glist = NULL; -+ -+ ret->sdata[0].name = ".sdata"; -+ ret->sdata[0].sym_name = "_SDA_BASE_"; -+ ret->sdata[0].bss_name = ".sbss"; -+ -+ ret->sdata[1].name = ".sdata2"; -+ ret->sdata[1].sym_name = "_SDA2_BASE_"; -+ ret->sdata[1].bss_name = ".sbss2"; -+ -+ ret->plt_entry_size = 12; -+ ret->plt_slot_size = 8; -+ ret->plt_initial_entry_size = 72; -+ -+ return &ret->elf.root; -+} -+ -+/* Create .got and the related sections. */ -+ -+static bfd_boolean -+ppc_elf_create_got (bfd *abfd, struct bfd_link_info *info) -+{ -+ struct ppc_elf_link_hash_table *htab; -+ asection *s; -+ flagword flags; -+ -+ if (!_bfd_elf_create_got_section (abfd, info)) -+ return FALSE; -+ -+ htab = ppc_elf_hash_table (info); -+ htab->got = s = bfd_get_linker_section (abfd, ".got"); -+ if (s == NULL) -+ abort (); -+ -+ if (htab->is_vxworks) -+ { -+ htab->sgotplt = bfd_get_linker_section (abfd, ".got.plt"); -+ if (!htab->sgotplt) -+ abort (); -+ } -+ else -+ { -+ /* The powerpc .got has a blrl instruction in it. Mark it -+ executable. */ -+ flags = (SEC_ALLOC | SEC_LOAD | /*SEC_CODE |*/ SEC_HAS_CONTENTS -+ | SEC_IN_MEMORY | SEC_LINKER_CREATED); -+ if (!bfd_set_section_flags (abfd, s, flags)) -+ return FALSE; -+ } -+ -+ htab->relgot = bfd_get_linker_section (abfd, ".rela.got"); -+ if (!htab->relgot) -+ abort (); -+ -+ return TRUE; -+} -+ -+static bfd_boolean -+ppc_elf_create_glink (bfd *abfd, struct bfd_link_info *info) -+{ -+ struct ppc_elf_link_hash_table *htab = ppc_elf_hash_table (info); -+ asection *s; -+ flagword flags; -+ -+ flags = (SEC_ALLOC | SEC_LOAD | SEC_CODE | SEC_READONLY | SEC_HAS_CONTENTS -+ | SEC_IN_MEMORY | SEC_LINKER_CREATED); -+ s = bfd_make_section_anyway_with_flags (abfd, ".glink", flags); -+ htab->glink = s; -+ if (s == NULL -+ || !bfd_set_section_alignment (abfd, s, 4)) -+ return FALSE; -+ -+ if (!info->no_ld_generated_unwind_info) -+ { -+ flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_HAS_CONTENTS -+ | SEC_IN_MEMORY | SEC_LINKER_CREATED); -+ s = bfd_make_section_anyway_with_flags (abfd, ".eh_frame", flags); -+ htab->glink_eh_frame = s; -+ if (s == NULL -+ || !bfd_set_section_alignment (abfd, s, 2)) -+ return FALSE; -+ } -+ -+ flags = SEC_ALLOC | SEC_LINKER_CREATED; -+ s = bfd_make_section_anyway_with_flags (abfd, ".iplt", flags); -+ htab->iplt = s; -+ if (s == NULL -+ || !bfd_set_section_alignment (abfd, s, 4)) -+ return FALSE; -+ -+ flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_HAS_CONTENTS -+ | SEC_IN_MEMORY | SEC_LINKER_CREATED); -+ s = bfd_make_section_anyway_with_flags (abfd, ".rela.iplt", flags); -+ htab->reliplt = s; -+ if (s == NULL -+ || ! bfd_set_section_alignment (abfd, s, 2)) -+ return FALSE; -+ return TRUE; -+} -+ -+/* We have to create .dynsbss and .rela.sbss here so that they get mapped -+ to output sections (just like _bfd_elf_create_dynamic_sections has -+ to create .dynbss and .rela.bss). */ -+ -+static bfd_boolean -+ppc_elf_create_dynamic_sections (bfd *abfd, struct bfd_link_info *info) -+{ -+ struct ppc_elf_link_hash_table *htab; -+ asection *s; -+ flagword flags; -+ -+ htab = ppc_elf_hash_table (info); -+ -+ if (htab->got == NULL -+ && !ppc_elf_create_got (abfd, info)) -+ return FALSE; -+ -+ if (!_bfd_elf_create_dynamic_sections (abfd, info)) -+ return FALSE; -+ -+ if (htab->glink == NULL -+ && !ppc_elf_create_glink (abfd, info)) -+ return FALSE; -+ -+ htab->dynbss = bfd_get_linker_section (abfd, ".dynbss"); -+ s = bfd_make_section_anyway_with_flags (abfd, ".dynsbss", -+ SEC_ALLOC | SEC_LINKER_CREATED); -+ htab->dynsbss = s; -+ if (s == NULL) -+ return FALSE; -+ -+ if (! info->shared) -+ { -+ htab->relbss = bfd_get_linker_section (abfd, ".rela.bss"); -+ flags = (SEC_ALLOC | SEC_LOAD | SEC_READONLY | SEC_HAS_CONTENTS -+ | SEC_IN_MEMORY | SEC_LINKER_CREATED); -+ s = bfd_make_section_anyway_with_flags (abfd, ".rela.sbss", flags); -+ htab->relsbss = s; -+ if (s == NULL -+ || ! bfd_set_section_alignment (abfd, s, 2)) -+ return FALSE; -+ } -+ -+ if (htab->is_vxworks -+ && !elf_vxworks_create_dynamic_sections (abfd, info, &htab->srelplt2)) -+ return FALSE; -+ -+ htab->relplt = bfd_get_linker_section (abfd, ".rela.plt"); -+ htab->plt = s = bfd_get_linker_section (abfd, ".plt"); -+ if (s == NULL) -+ abort (); -+ -+ flags = SEC_ALLOC | SEC_CODE | SEC_LINKER_CREATED | SEC_READONLY; -+ if (htab->plt_type == PLT_VXWORKS) -+ /* The VxWorks PLT is a loaded section with contents. */ -+ flags |= SEC_HAS_CONTENTS | SEC_LOAD | SEC_READONLY; -+ return bfd_set_section_flags (abfd, s, flags); -+} -+ -+/* Copy the extra info we tack onto an elf_link_hash_entry. */ -+ -+static void -+ppc_elf_copy_indirect_symbol (struct bfd_link_info *info, -+ struct elf_link_hash_entry *dir, -+ struct elf_link_hash_entry *ind) -+{ -+ struct ppc_elf_link_hash_entry *edir, *eind; -+ -+ edir = (struct ppc_elf_link_hash_entry *) dir; -+ eind = (struct ppc_elf_link_hash_entry *) ind; -+ -+ edir->tls_mask |= eind->tls_mask; -+ edir->has_sda_refs |= eind->has_sda_refs; -+ -+ /* If called to transfer flags for a weakdef during processing -+ of elf_adjust_dynamic_symbol, don't copy non_got_ref. -+ We clear it ourselves for ELIMINATE_COPY_RELOCS. */ -+ if (!(ELIMINATE_COPY_RELOCS -+ && eind->elf.root.type != bfd_link_hash_indirect -+ && edir->elf.dynamic_adjusted)) -+ edir->elf.non_got_ref |= eind->elf.non_got_ref; -+ -+ edir->elf.ref_dynamic |= eind->elf.ref_dynamic; -+ edir->elf.ref_regular |= eind->elf.ref_regular; -+ edir->elf.ref_regular_nonweak |= eind->elf.ref_regular_nonweak; -+ edir->elf.needs_plt |= eind->elf.needs_plt; -+ edir->elf.pointer_equality_needed |= eind->elf.pointer_equality_needed; -+ -+ if (eind->dyn_relocs != NULL) -+ { -+ if (edir->dyn_relocs != NULL) -+ { -+ struct elf_dyn_relocs **pp; -+ struct elf_dyn_relocs *p; -+ -+ /* Add reloc counts against the indirect sym to the direct sym -+ list. Merge any entries against the same section. */ -+ for (pp = &eind->dyn_relocs; (p = *pp) != NULL; ) -+ { -+ struct elf_dyn_relocs *q; -+ -+ for (q = edir->dyn_relocs; q != NULL; q = q->next) -+ if (q->sec == p->sec) -+ { -+ q->pc_count += p->pc_count; -+ q->count += p->count; -+ *pp = p->next; -+ break; -+ } -+ if (q == NULL) -+ pp = &p->next; -+ } -+ *pp = edir->dyn_relocs; -+ } -+ -+ edir->dyn_relocs = eind->dyn_relocs; -+ eind->dyn_relocs = NULL; -+ } -+ -+ /* If we were called to copy over info for a weak sym, that's all. -+ You might think dyn_relocs need not be copied over; After all, -+ both syms will be dynamic or both non-dynamic so we're just -+ moving reloc accounting around. However, ELIMINATE_COPY_RELOCS -+ code in ppc_elf_adjust_dynamic_symbol needs to check for -+ dyn_relocs in read-only sections, and it does so on what is the -+ DIR sym here. */ -+ if (eind->elf.root.type != bfd_link_hash_indirect) -+ return; -+ -+ /* Copy over the GOT refcount entries that we may have already seen to -+ the symbol which just became indirect. */ -+ edir->elf.got.refcount += eind->elf.got.refcount; -+ eind->elf.got.refcount = 0; -+ -+ /* And plt entries. */ -+ if (eind->elf.plt.plist != NULL) -+ { -+ if (edir->elf.plt.plist != NULL) -+ { -+ struct plt_entry **entp; -+ struct plt_entry *ent; -+ -+ for (entp = &eind->elf.plt.plist; (ent = *entp) != NULL; ) -+ { -+ struct plt_entry *dent; -+ -+ for (dent = edir->elf.plt.plist; dent != NULL; dent = dent->next) -+ if (dent->sec == ent->sec && dent->addend == ent->addend) -+ { -+ dent->plt.refcount += ent->plt.refcount; -+ *entp = ent->next; -+ break; -+ } -+ if (dent == NULL) -+ entp = &ent->next; -+ } -+ *entp = edir->elf.plt.plist; -+ } -+ -+ edir->elf.plt.plist = eind->elf.plt.plist; -+ eind->elf.plt.plist = NULL; -+ } -+ -+ if (eind->elf.dynindx != -1) -+ { -+ if (edir->elf.dynindx != -1) -+ _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr, -+ edir->elf.dynstr_index); -+ edir->elf.dynindx = eind->elf.dynindx; -+ edir->elf.dynstr_index = eind->elf.dynstr_index; -+ eind->elf.dynindx = -1; -+ eind->elf.dynstr_index = 0; -+ } -+} -+ -+/* Hook called by the linker routine which adds symbols from an object -+ file. We use it to put .comm items in .sbss, and not .bss. */ -+ -+static bfd_boolean -+ppc_elf_add_symbol_hook (bfd *abfd, -+ struct bfd_link_info *info, -+ Elf_Internal_Sym *sym, -+ const char **namep ATTRIBUTE_UNUSED, -+ flagword *flagsp ATTRIBUTE_UNUSED, -+ asection **secp, -+ bfd_vma *valp) -+{ -+ if (sym->st_shndx == SHN_COMMON -+ && !info->relocatable -+ && is_ppc_elf (info->output_bfd) -+ && sym->st_size <= elf_gp_size (abfd)) -+ { -+ /* Common symbols less than or equal to -G nn bytes are automatically -+ put into .sbss. */ -+ struct ppc_elf_link_hash_table *htab; -+ -+ htab = ppc_elf_hash_table (info); -+ if (htab->sbss == NULL) -+ { -+ flagword flags = SEC_IS_COMMON | SEC_LINKER_CREATED; -+ -+ if (!htab->elf.dynobj) -+ htab->elf.dynobj = abfd; -+ -+ htab->sbss = bfd_make_section_anyway_with_flags (htab->elf.dynobj, -+ ".sbss", -+ flags); -+ if (htab->sbss == NULL) -+ return FALSE; -+ } -+ -+ *secp = htab->sbss; -+ *valp = sym->st_size; -+ } -+ -+ if ((abfd->flags & DYNAMIC) == 0 -+ && (ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC -+ || ELF_ST_BIND (sym->st_info) == STB_GNU_UNIQUE)) -+ elf_tdata (info->output_bfd)->has_gnu_symbols = TRUE; -+ -+ return TRUE; -+} -+ -+static bfd_boolean -+create_sdata_sym (struct bfd_link_info *info, elf_linker_section_t *lsect) -+{ -+ struct ppc_elf_link_hash_table *htab = ppc_elf_hash_table (info); -+ -+ lsect->sym = elf_link_hash_lookup (&htab->elf, lsect->sym_name, -+ TRUE, FALSE, TRUE); -+ if (lsect->sym == NULL) -+ return FALSE; -+ if (lsect->sym->root.type == bfd_link_hash_new) -+ lsect->sym->non_elf = 0; -+ lsect->sym->ref_regular = 1; -+ _bfd_elf_link_hash_hide_symbol (info, lsect->sym, TRUE); -+ return TRUE; -+} -+ -+/* Create a special linker section. */ -+ -+static bfd_boolean -+ppc_elf_create_linker_section (bfd *abfd, -+ struct bfd_link_info *info, -+ flagword flags, -+ elf_linker_section_t *lsect) -+{ -+ struct ppc_elf_link_hash_table *htab = ppc_elf_hash_table (info); -+ asection *s; -+ -+ flags |= (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS | SEC_IN_MEMORY -+ | SEC_LINKER_CREATED); -+ -+ /* Record the first bfd that needs the special sections. */ -+ if (!htab->elf.dynobj) -+ htab->elf.dynobj = abfd; -+ -+ s = bfd_make_section_anyway_with_flags (htab->elf.dynobj, -+ lsect->name, -+ flags); -+ if (s == NULL -+ || !bfd_set_section_alignment (htab->elf.dynobj, s, 2)) -+ return FALSE; -+ lsect->section = s; -+ -+ return create_sdata_sym (info, lsect); -+} -+ -+/* Find a linker generated pointer with a given addend and type. */ -+ -+static elf_linker_section_pointers_t * -+elf_find_pointer_linker_section -+ (elf_linker_section_pointers_t *linker_pointers, -+ bfd_vma addend, -+ elf_linker_section_t *lsect) -+{ -+ for ( ; linker_pointers != NULL; linker_pointers = linker_pointers->next) -+ if (lsect == linker_pointers->lsect && addend == linker_pointers->addend) -+ return linker_pointers; -+ -+ return NULL; -+} -+ -+/* Allocate a pointer to live in a linker created section. */ -+ -+static bfd_boolean -+elf_create_pointer_linker_section (bfd *abfd, -+ elf_linker_section_t *lsect, -+ struct elf_link_hash_entry *h, -+ const Elf_Internal_Rela *rel) -+{ -+ elf_linker_section_pointers_t **ptr_linker_section_ptr = NULL; -+ elf_linker_section_pointers_t *linker_section_ptr; -+ unsigned long r_symndx = ELF32_R_SYM (rel->r_info); -+ bfd_size_type amt; -+ -+ BFD_ASSERT (lsect != NULL); -+ -+ /* Is this a global symbol? */ -+ if (h != NULL) -+ { -+ struct ppc_elf_link_hash_entry *eh; -+ -+ /* Has this symbol already been allocated? If so, our work is done. */ -+ eh = (struct ppc_elf_link_hash_entry *) h; -+ if (elf_find_pointer_linker_section (eh->linker_section_pointer, -+ rel->r_addend, -+ lsect)) -+ return TRUE; -+ -+ ptr_linker_section_ptr = &eh->linker_section_pointer; -+ } -+ else -+ { -+ BFD_ASSERT (is_ppc_elf (abfd)); -+ -+ /* Allocation of a pointer to a local symbol. */ -+ elf_linker_section_pointers_t **ptr = elf_local_ptr_offsets (abfd); -+ -+ /* Allocate a table to hold the local symbols if first time. */ -+ if (!ptr) -+ { -+ unsigned int num_symbols = elf_symtab_hdr (abfd).sh_info; -+ -+ amt = num_symbols; -+ amt *= sizeof (elf_linker_section_pointers_t *); -+ ptr = bfd_zalloc (abfd, amt); -+ -+ if (!ptr) -+ return FALSE; -+ -+ elf_local_ptr_offsets (abfd) = ptr; -+ } -+ -+ /* Has this symbol already been allocated? If so, our work is done. */ -+ if (elf_find_pointer_linker_section (ptr[r_symndx], -+ rel->r_addend, -+ lsect)) -+ return TRUE; -+ -+ ptr_linker_section_ptr = &ptr[r_symndx]; -+ } -+ -+ /* Allocate space for a pointer in the linker section, and allocate -+ a new pointer record from internal memory. */ -+ BFD_ASSERT (ptr_linker_section_ptr != NULL); -+ amt = sizeof (elf_linker_section_pointers_t); -+ linker_section_ptr = bfd_alloc (abfd, amt); -+ -+ if (!linker_section_ptr) -+ return FALSE; -+ -+ linker_section_ptr->next = *ptr_linker_section_ptr; -+ linker_section_ptr->addend = rel->r_addend; -+ linker_section_ptr->lsect = lsect; -+ *ptr_linker_section_ptr = linker_section_ptr; -+ -+ linker_section_ptr->offset = lsect->section->size; -+ lsect->section->size += 4; -+ -+#ifdef DEBUG -+ fprintf (stderr, -+ "Create pointer in linker section %s, offset = %ld, section size = %ld\n", -+ lsect->name, (long) linker_section_ptr->offset, -+ (long) lsect->section->size); -+#endif -+ -+ return TRUE; -+} -+ -+static struct plt_entry ** -+update_local_sym_info (bfd *abfd, -+ Elf_Internal_Shdr *symtab_hdr, -+ unsigned long r_symndx, -+ int tls_type) -+{ -+ bfd_signed_vma *local_got_refcounts = elf_local_got_refcounts (abfd); -+ struct plt_entry **local_plt; -+ char *local_got_tls_masks; -+ -+ if (local_got_refcounts == NULL) -+ { -+ bfd_size_type size = symtab_hdr->sh_info; -+ -+ size *= (sizeof (*local_got_refcounts) -+ + sizeof (*local_plt) -+ + sizeof (*local_got_tls_masks)); -+ local_got_refcounts = bfd_zalloc (abfd, size); -+ if (local_got_refcounts == NULL) -+ return NULL; -+ elf_local_got_refcounts (abfd) = local_got_refcounts; -+ } -+ -+ local_plt = (struct plt_entry **) (local_got_refcounts + symtab_hdr->sh_info); -+ local_got_tls_masks = (char *) (local_plt + symtab_hdr->sh_info); -+ local_got_tls_masks[r_symndx] |= tls_type; -+ if (tls_type != PLT_IFUNC) -+ local_got_refcounts[r_symndx] += 1; -+ return local_plt + r_symndx; -+} -+ -+static bfd_boolean -+update_plt_info (bfd *abfd, struct plt_entry **plist, -+ asection *sec, bfd_vma addend) -+{ -+ struct plt_entry *ent; -+ -+ if (addend < 32768) -+ sec = NULL; -+ for (ent = *plist; ent != NULL; ent = ent->next) -+ if (ent->sec == sec && ent->addend == addend) -+ break; -+ if (ent == NULL) -+ { -+ bfd_size_type amt = sizeof (*ent); -+ ent = bfd_alloc (abfd, amt); -+ if (ent == NULL) -+ return FALSE; -+ ent->next = *plist; -+ ent->sec = sec; -+ ent->addend = addend; -+ ent->plt.refcount = 0; -+ *plist = ent; -+ } -+ ent->plt.refcount += 1; -+ return TRUE; -+} -+ -+static struct plt_entry * -+find_plt_ent (struct plt_entry **plist, asection *sec, bfd_vma addend) -+{ -+ struct plt_entry *ent; -+ -+ if (addend < 32768) -+ sec = NULL; -+ for (ent = *plist; ent != NULL; ent = ent->next) -+ if (ent->sec == sec && ent->addend == addend) -+ break; -+ return ent; -+} -+ -+static bfd_boolean -+is_branch_reloc (enum elf_ppc_reloc_type r_type) -+{ -+ return (r_type == R_PPC_PLTREL24 -+ || r_type == R_PPC_LOCAL24PC -+ || r_type == R_PPC_REL24 -+ || r_type == R_PPC_REL14 -+ || r_type == R_PPC_REL14_BRTAKEN -+ || r_type == R_PPC_REL14_BRNTAKEN -+ || r_type == R_PPC_ADDR24 -+ || r_type == R_PPC_ADDR14 -+ || r_type == R_PPC_ADDR14_BRTAKEN -+ || r_type == R_PPC_ADDR14_BRNTAKEN); -+} -+ -+static void -+bad_shared_reloc (bfd *abfd, enum elf_ppc_reloc_type r_type) -+{ -+ (*_bfd_error_handler) -+ (_("%B: relocation %s cannot be used when making a shared object"), -+ abfd, -+ ppc_elf_howto_table[r_type]->name); -+ bfd_set_error (bfd_error_bad_value); -+} -+ -+/* Look through the relocs for a section during the first phase, and -+ allocate space in the global offset table or procedure linkage -+ table. */ -+ -+static bfd_boolean -+ppc_elf_check_relocs (bfd *abfd, -+ struct bfd_link_info *info, -+ asection *sec, -+ const Elf_Internal_Rela *relocs) -+{ -+ struct ppc_elf_link_hash_table *htab; -+ Elf_Internal_Shdr *symtab_hdr; -+ struct elf_link_hash_entry **sym_hashes; -+ const Elf_Internal_Rela *rel; -+ const Elf_Internal_Rela *rel_end; -+ asection *got2, *sreloc; -+ struct elf_link_hash_entry *tga; -+ -+ if (info->relocatable) -+ return TRUE; -+ -+ /* Don't do anything special with non-loaded, non-alloced sections. -+ In particular, any relocs in such sections should not affect GOT -+ and PLT reference counting (ie. we don't allow them to create GOT -+ or PLT entries), there's no possibility or desire to optimize TLS -+ relocs, and there's not much point in propagating relocs to shared -+ libs that the dynamic linker won't relocate. */ -+ if ((sec->flags & SEC_ALLOC) == 0) -+ return TRUE; -+ -+#ifdef DEBUG -+ _bfd_error_handler ("ppc_elf_check_relocs called for section %A in %B", -+ sec, abfd); -+#endif -+ -+ BFD_ASSERT (is_ppc_elf (abfd)); -+ -+ /* Initialize howto table if not already done. */ -+ if (!ppc_elf_howto_table[R_PPC_ADDR32]) -+ ppc_elf_howto_init (); -+ -+ htab = ppc_elf_hash_table (info); -+ if (htab->glink == NULL) -+ { -+ if (htab->elf.dynobj == NULL) -+ htab->elf.dynobj = abfd; -+ if (!ppc_elf_create_glink (htab->elf.dynobj, info)) -+ return FALSE; -+ } -+ tga = elf_link_hash_lookup (&htab->elf, "__tls_get_addr", -+ FALSE, FALSE, TRUE); -+ symtab_hdr = &elf_symtab_hdr (abfd); -+ sym_hashes = elf_sym_hashes (abfd); -+ got2 = bfd_get_section_by_name (abfd, ".got2"); -+ sreloc = NULL; -+ -+ rel_end = relocs + sec->reloc_count; -+ for (rel = relocs; rel < rel_end; rel++) -+ { -+ unsigned long r_symndx; -+ enum elf_ppc_reloc_type r_type; -+ struct elf_link_hash_entry *h; -+ int tls_type; -+ -+ r_symndx = ELF32_R_SYM (rel->r_info); -+ if (r_symndx < symtab_hdr->sh_info) -+ h = NULL; -+ else -+ { -+ h = sym_hashes[r_symndx - symtab_hdr->sh_info]; -+ while (h->root.type == bfd_link_hash_indirect -+ || h->root.type == bfd_link_hash_warning) -+ h = (struct elf_link_hash_entry *) h->root.u.i.link; -+ } -+ -+ /* If a relocation refers to _GLOBAL_OFFSET_TABLE_, create the .got. -+ This shows up in particular in an R_PPC_ADDR32 in the eabi -+ startup code. */ -+ if (h != NULL -+ && htab->got == NULL -+ && strcmp (h->root.root.string, "_GLOBAL_OFFSET_TABLE_") == 0) -+ { -+ if (htab->elf.dynobj == NULL) -+ htab->elf.dynobj = abfd; -+ if (!ppc_elf_create_got (htab->elf.dynobj, info)) -+ return FALSE; -+ BFD_ASSERT (h == htab->elf.hgot); -+ } -+ -+ tls_type = 0; -+ r_type = ELF32_R_TYPE (rel->r_info); -+ if (h == NULL && !htab->is_vxworks) -+ { -+ Elf_Internal_Sym *isym = bfd_sym_from_r_symndx (&htab->sym_cache, -+ abfd, r_symndx); -+ if (isym == NULL) -+ return FALSE; -+ -+ if (ELF_ST_TYPE (isym->st_info) == STT_GNU_IFUNC -+ && (!info->shared -+ || is_branch_reloc (r_type))) -+ { -+ struct plt_entry **ifunc; -+ bfd_vma addend; -+ -+ ifunc = update_local_sym_info (abfd, symtab_hdr, r_symndx, -+ PLT_IFUNC); -+ if (ifunc == NULL) -+ return FALSE; -+ -+ /* STT_GNU_IFUNC symbols must have a PLT entry; -+ In a non-pie executable even when there are -+ no plt calls. */ -+ addend = 0; -+ if (r_type == R_PPC_PLTREL24) -+ { -+ ppc_elf_tdata (abfd)->makes_plt_call = 1; -+ if (info->shared) -+ addend = rel->r_addend; -+ } -+ if (!update_plt_info (abfd, ifunc, got2, addend)) -+ return FALSE; -+ } -+ } -+ -+ if (!htab->is_vxworks -+ && is_branch_reloc (r_type) -+ && h != NULL -+ && h == tga) -+ { -+ if (rel != relocs -+ && (ELF32_R_TYPE (rel[-1].r_info) == R_PPC_TLSGD -+ || ELF32_R_TYPE (rel[-1].r_info) == R_PPC_TLSLD)) -+ /* We have a new-style __tls_get_addr call with a marker -+ reloc. */ -+ ; -+ else -+ /* Mark this section as having an old-style call. */ -+ sec->has_tls_get_addr_call = 1; -+ } -+ -+ switch (r_type) -+ { -+ case R_PPC_TLSGD: -+ case R_PPC_TLSLD: -+ /* These special tls relocs tie a call to __tls_get_addr with -+ its parameter symbol. */ -+ break; -+ -+ case R_PPC_GOT_TLSLD16: -+ case R_PPC_GOT_TLSLD16_LO: -+ case R_PPC_GOT_TLSLD16_HI: -+ case R_PPC_GOT_TLSLD16_HA: -+ tls_type = TLS_TLS | TLS_LD; -+ goto dogottls; -+ -+ case R_PPC_GOT_TLSGD16: -+ case R_PPC_GOT_TLSGD16_LO: -+ case R_PPC_GOT_TLSGD16_HI: -+ case R_PPC_GOT_TLSGD16_HA: -+ tls_type = TLS_TLS | TLS_GD; -+ goto dogottls; -+ -+ case R_PPC_GOT_TPREL16: -+ case R_PPC_GOT_TPREL16_LO: -+ case R_PPC_GOT_TPREL16_HI: -+ case R_PPC_GOT_TPREL16_HA: -+ if (!info->executable) -+ info->flags |= DF_STATIC_TLS; -+ tls_type = TLS_TLS | TLS_TPREL; -+ goto dogottls; -+ -+ case R_PPC_GOT_DTPREL16: -+ case R_PPC_GOT_DTPREL16_LO: -+ case R_PPC_GOT_DTPREL16_HI: -+ case R_PPC_GOT_DTPREL16_HA: -+ tls_type = TLS_TLS | TLS_DTPREL; -+ dogottls: -+ sec->has_tls_reloc = 1; -+ /* Fall thru */ -+ -+ /* GOT16 relocations */ -+ case R_PPC_GOT16: -+ case R_PPC_GOT16_LO: -+ case R_PPC_GOT16_HI: -+ case R_PPC_GOT16_HA: -+ /* This symbol requires a global offset table entry. */ -+ if (htab->got == NULL) -+ { -+ if (htab->elf.dynobj == NULL) -+ htab->elf.dynobj = abfd; -+ if (!ppc_elf_create_got (htab->elf.dynobj, info)) -+ return FALSE; -+ } -+ if (h != NULL) -+ { -+ h->got.refcount += 1; -+ ppc_elf_hash_entry (h)->tls_mask |= tls_type; -+ } -+ else -+ /* This is a global offset table entry for a local symbol. */ -+ if (!update_local_sym_info (abfd, symtab_hdr, r_symndx, tls_type)) -+ return FALSE; -+ -+ /* We may also need a plt entry if the symbol turns out to be -+ an ifunc. */ -+ if (h != NULL && !info->shared) -+ { -+ if (!update_plt_info (abfd, &h->plt.plist, NULL, 0)) -+ return FALSE; -+ } -+ break; -+ -+ /* Indirect .sdata relocation. */ -+ case R_PPC_EMB_SDAI16: -+ if (info->shared) -+ { -+ bad_shared_reloc (abfd, r_type); -+ return FALSE; -+ } -+ if (htab->sdata[0].section == NULL -+ && !ppc_elf_create_linker_section (abfd, info, 0, -+ &htab->sdata[0])) -+ return FALSE; -+ if (!elf_create_pointer_linker_section (abfd, &htab->sdata[0], -+ h, rel)) -+ return FALSE; -+ if (h != NULL) -+ { -+ ppc_elf_hash_entry (h)->has_sda_refs = TRUE; -+ h->non_got_ref = TRUE; -+ } -+ break; -+ -+ /* Indirect .sdata2 relocation. */ -+ case R_PPC_EMB_SDA2I16: -+ if (info->shared) -+ { -+ bad_shared_reloc (abfd, r_type); -+ return FALSE; -+ } -+ if (htab->sdata[1].section == NULL -+ && !ppc_elf_create_linker_section (abfd, info, SEC_READONLY, -+ &htab->sdata[1])) -+ return FALSE; -+ if (!elf_create_pointer_linker_section (abfd, &htab->sdata[1], -+ h, rel)) -+ return FALSE; -+ if (h != NULL) -+ { -+ ppc_elf_hash_entry (h)->has_sda_refs = TRUE; -+ h->non_got_ref = TRUE; -+ } -+ break; -+ -+ case R_PPC_VLE_SDAREL_LO16A: -+ case R_PPC_VLE_SDAREL_LO16D: -+ case R_PPC_VLE_SDAREL_HI16A: -+ case R_PPC_VLE_SDAREL_HI16D: -+ case R_PPC_VLE_SDAREL_HA16A: -+ case R_PPC_VLE_SDAREL_HA16D: -+ case R_PPC_SDAREL16: -+ if (htab->sdata[0].sym == NULL -+ && !create_sdata_sym (info, &htab->sdata[0])) -+ return FALSE; -+ -+ if (htab->sdata[1].sym == NULL -+ && !create_sdata_sym (info, &htab->sdata[1])) -+ return FALSE; -+ -+ if (h != NULL) -+ { -+ ppc_elf_hash_entry (h)->has_sda_refs = TRUE; -+ h->non_got_ref = TRUE; -+ } -+ break; -+ -+ case R_PPC_VLE_REL8: -+ case R_PPC_VLE_REL15: -+ case R_PPC_VLE_REL24: -+ case R_PPC_VLE_LO16A: -+ case R_PPC_VLE_LO16D: -+ case R_PPC_VLE_HI16A: -+ case R_PPC_VLE_HI16D: -+ case R_PPC_VLE_HA16A: -+ case R_PPC_VLE_HA16D: -+ break; -+ -+ case R_PPC_EMB_SDA2REL: -+ if (info->shared) -+ { -+ bad_shared_reloc (abfd, r_type); -+ return FALSE; -+ } -+ if (htab->sdata[1].sym == NULL -+ && !create_sdata_sym (info, &htab->sdata[1])) -+ return FALSE; -+ if (h != NULL) -+ { -+ ppc_elf_hash_entry (h)->has_sda_refs = TRUE; -+ h->non_got_ref = TRUE; -+ } -+ break; -+ -+ case R_PPC_VLE_SDA21_LO: -+ case R_PPC_VLE_SDA21: -+ case R_PPC_EMB_SDA21: -+ case R_PPC_EMB_RELSDA: -+ if (info->shared) -+ { -+ bad_shared_reloc (abfd, r_type); -+ return FALSE; -+ } -+ if (htab->sdata[0].sym == NULL -+ && !create_sdata_sym (info, &htab->sdata[0])) -+ return FALSE; -+ if (htab->sdata[1].sym == NULL -+ && !create_sdata_sym (info, &htab->sdata[1])) -+ return FALSE; -+ if (h != NULL) -+ { -+ ppc_elf_hash_entry (h)->has_sda_refs = TRUE; -+ h->non_got_ref = TRUE; -+ } -+ break; -+ -+ case R_PPC_EMB_NADDR32: -+ case R_PPC_EMB_NADDR16: -+ case R_PPC_EMB_NADDR16_LO: -+ case R_PPC_EMB_NADDR16_HI: -+ case R_PPC_EMB_NADDR16_HA: -+ if (info->shared) -+ { -+ bad_shared_reloc (abfd, r_type); -+ return FALSE; -+ } -+ if (h != NULL) -+ h->non_got_ref = TRUE; -+ break; -+ -+ case R_PPC_PLTREL24: -+ if (h == NULL) -+ break; -+ /* Fall through */ -+ case R_PPC_PLT32: -+ case R_PPC_PLTREL32: -+ case R_PPC_PLT16_LO: -+ case R_PPC_PLT16_HI: -+ case R_PPC_PLT16_HA: -+#ifdef DEBUG -+ fprintf (stderr, "Reloc requires a PLT entry\n"); -+#endif -+ /* This symbol requires a procedure linkage table entry. We -+ actually build the entry in finish_dynamic_symbol, -+ because this might be a case of linking PIC code without -+ linking in any dynamic objects, in which case we don't -+ need to generate a procedure linkage table after all. */ -+ -+ if (h == NULL) -+ { -+ /* It does not make sense to have a procedure linkage -+ table entry for a local symbol. */ -+ info->callbacks->einfo (_("%P: %H: %s reloc against local symbol\n"), -+ abfd, sec, rel->r_offset, -+ ppc_elf_howto_table[r_type]->name); -+ bfd_set_error (bfd_error_bad_value); -+ return FALSE; -+ } -+ else -+ { -+ bfd_vma addend = 0; -+ -+ if (r_type == R_PPC_PLTREL24) -+ { -+ ppc_elf_tdata (abfd)->makes_plt_call = 1; -+ if (info->shared) -+ addend = rel->r_addend; -+ } -+ h->needs_plt = 1; -+ if (!update_plt_info (abfd, &h->plt.plist, got2, addend)) -+ return FALSE; -+ } -+ break; -+ -+ /* The following relocations don't need to propagate the -+ relocation if linking a shared object since they are -+ section relative. */ -+ case R_PPC_SECTOFF: -+ case R_PPC_SECTOFF_LO: -+ case R_PPC_SECTOFF_HI: -+ case R_PPC_SECTOFF_HA: -+ case R_PPC_DTPREL16: -+ case R_PPC_DTPREL16_LO: -+ case R_PPC_DTPREL16_HI: -+ case R_PPC_DTPREL16_HA: -+ case R_PPC_TOC16: -+ break; -+ -+ case R_PPC_REL16: -+ case R_PPC_REL16_LO: -+ case R_PPC_REL16_HI: -+ case R_PPC_REL16_HA: -+ ppc_elf_tdata (abfd)->has_rel16 = 1; -+ break; -+ -+ /* These are just markers. */ -+ case R_PPC_TLS: -+ case R_PPC_EMB_MRKREF: -+ case R_PPC_NONE: -+ case R_PPC_max: -+ case R_PPC_RELAX: -+ case R_PPC_RELAX_PLT: -+ case R_PPC_RELAX_PLTREL24: -+ break; -+ -+ /* These should only appear in dynamic objects. */ -+ case R_PPC_COPY: -+ case R_PPC_GLOB_DAT: -+ case R_PPC_JMP_SLOT: -+ case R_PPC_RELATIVE: -+ case R_PPC_IRELATIVE: -+ break; -+ -+ /* These aren't handled yet. We'll report an error later. */ -+ case R_PPC_ADDR30: -+ case R_PPC_EMB_RELSEC16: -+ case R_PPC_EMB_RELST_LO: -+ case R_PPC_EMB_RELST_HI: -+ case R_PPC_EMB_RELST_HA: -+ case R_PPC_EMB_BIT_FLD: -+ break; -+ -+ /* These don't work with a GOT */ -+ case R_PPC_AMIGAOS_BREL: -+ case R_PPC_AMIGAOS_BREL_HI: -+ case R_PPC_AMIGAOS_BREL_LO: -+ case R_PPC_AMIGAOS_BREL_HA: -+ break; -+ -+ /* This refers only to functions defined in the shared library. */ -+ case R_PPC_LOCAL24PC: -+ if (h != NULL && h == htab->elf.hgot && htab->plt_type == PLT_UNSET) -+ { -+ htab->plt_type = PLT_OLD; -+ htab->old_bfd = abfd; -+ } -+ break; -+ -+ /* This relocation describes the C++ object vtable hierarchy. -+ Reconstruct it for later use during GC. */ -+ case R_PPC_GNU_VTINHERIT: -+ if (!bfd_elf_gc_record_vtinherit (abfd, sec, h, rel->r_offset)) -+ return FALSE; -+ break; -+ -+ /* This relocation describes which C++ vtable entries are actually -+ used. Record for later use during GC. */ -+ case R_PPC_GNU_VTENTRY: -+ BFD_ASSERT (h != NULL); -+ if (h != NULL -+ && !bfd_elf_gc_record_vtentry (abfd, sec, h, rel->r_addend)) -+ return FALSE; -+ break; -+ -+ /* We shouldn't really be seeing these. */ -+ case R_PPC_TPREL32: -+ case R_PPC_TPREL16: -+ case R_PPC_TPREL16_LO: -+ case R_PPC_TPREL16_HI: -+ case R_PPC_TPREL16_HA: -+ if (!info->executable) -+ info->flags |= DF_STATIC_TLS; -+ goto dodyn; -+ -+ /* Nor these. */ -+ case R_PPC_DTPMOD32: -+ case R_PPC_DTPREL32: -+ goto dodyn; -+ -+ case R_PPC_REL32: -+ if (h == NULL -+ && got2 != NULL -+ && (sec->flags & SEC_CODE) != 0 -+ && info->shared -+ && htab->plt_type == PLT_UNSET) -+ { -+ /* Old -fPIC gcc code has .long LCTOC1-LCFx just before -+ the start of a function, which assembles to a REL32 -+ reference to .got2. If we detect one of these, then -+ force the old PLT layout because the linker cannot -+ reliably deduce the GOT pointer value needed for -+ PLT call stubs. */ -+ asection *s; -+ Elf_Internal_Sym *isym; -+ -+ isym = bfd_sym_from_r_symndx (&htab->sym_cache, -+ abfd, r_symndx); -+ if (isym == NULL) -+ return FALSE; -+ -+ s = bfd_section_from_elf_index (abfd, isym->st_shndx); -+ if (s == got2) -+ { -+ htab->plt_type = PLT_OLD; -+ htab->old_bfd = abfd; -+ } -+ } -+ if (h == NULL || h == htab->elf.hgot) -+ break; -+ /* fall through */ -+ -+ case R_PPC_ADDR32: -+ case R_PPC_ADDR16: -+ case R_PPC_ADDR16_LO: -+ case R_PPC_ADDR16_HI: -+ case R_PPC_ADDR16_HA: -+ case R_PPC_UADDR32: -+ case R_PPC_UADDR16: -+ if (h != NULL && !info->shared) -+ { -+ /* We may need a plt entry if the symbol turns out to be -+ a function defined in a dynamic object. */ -+ if (!update_plt_info (abfd, &h->plt.plist, NULL, 0)) -+ return FALSE; -+ -+ /* We may need a copy reloc too. */ -+ h->non_got_ref = 1; -+ h->pointer_equality_needed = 1; -+ } -+ goto dodyn; -+ -+ case R_PPC_REL24: -+ case R_PPC_REL14: -+ case R_PPC_REL14_BRTAKEN: -+ case R_PPC_REL14_BRNTAKEN: -+ if (h == NULL) -+ break; -+ if (h == htab->elf.hgot) -+ { -+ if (htab->plt_type == PLT_UNSET) -+ { -+ htab->plt_type = PLT_OLD; -+ htab->old_bfd = abfd; -+ } -+ break; -+ } -+ /* fall through */ -+ -+ case R_PPC_ADDR24: -+ case R_PPC_ADDR14: -+ case R_PPC_ADDR14_BRTAKEN: -+ case R_PPC_ADDR14_BRNTAKEN: -+ if (h != NULL && !info->shared) -+ { -+ /* We may need a plt entry if the symbol turns out to be -+ a function defined in a dynamic object. */ -+ h->needs_plt = 1; -+ if (!update_plt_info (abfd, &h->plt.plist, NULL, 0)) -+ return FALSE; -+ break; -+ } -+ -+ dodyn: -+ /* If we are creating a shared library, and this is a reloc -+ against a global symbol, or a non PC relative reloc -+ against a local symbol, then we need to copy the reloc -+ into the shared library. However, if we are linking with -+ -Bsymbolic, we do not need to copy a reloc against a -+ global symbol which is defined in an object we are -+ including in the link (i.e., DEF_REGULAR is set). At -+ this point we have not seen all the input files, so it is -+ possible that DEF_REGULAR is not set now but will be set -+ later (it is never cleared). In case of a weak definition, -+ DEF_REGULAR may be cleared later by a strong definition in -+ a shared library. We account for that possibility below by -+ storing information in the dyn_relocs field of the hash -+ table entry. A similar situation occurs when creating -+ shared libraries and symbol visibility changes render the -+ symbol local. -+ -+ If on the other hand, we are creating an executable, we -+ may need to keep relocations for symbols satisfied by a -+ dynamic library if we manage to avoid copy relocs for the -+ symbol. */ -+ if ((info->shared -+ && (must_be_dyn_reloc (info, r_type) -+ || (h != NULL -+ && (! info->symbolic -+ || h->root.type == bfd_link_hash_defweak -+ || !h->def_regular)))) -+ || (ELIMINATE_COPY_RELOCS -+ && !info->shared -+ && h != NULL -+ && (h->root.type == bfd_link_hash_defweak -+ || !h->def_regular))) -+ { -+ struct elf_dyn_relocs *p; -+ struct elf_dyn_relocs **rel_head; -+ -+#ifdef DEBUG -+ fprintf (stderr, -+ "ppc_elf_check_relocs needs to " -+ "create relocation for %s\n", -+ (h && h->root.root.string -+ ? h->root.root.string : "<unknown>")); -+#endif -+ if (sreloc == NULL) -+ { -+ if (htab->elf.dynobj == NULL) -+ htab->elf.dynobj = abfd; -+ -+ sreloc = _bfd_elf_make_dynamic_reloc_section -+ (sec, htab->elf.dynobj, 2, abfd, /*rela?*/ TRUE); -+ -+ if (sreloc == NULL) -+ return FALSE; -+ } -+ -+ /* If this is a global symbol, we count the number of -+ relocations we need for this symbol. */ -+ if (h != NULL) -+ { -+ rel_head = &ppc_elf_hash_entry (h)->dyn_relocs; -+ } -+ else -+ { -+ /* Track dynamic relocs needed for local syms too. -+ We really need local syms available to do this -+ easily. Oh well. */ -+ asection *s; -+ void *vpp; -+ Elf_Internal_Sym *isym; -+ -+ isym = bfd_sym_from_r_symndx (&htab->sym_cache, -+ abfd, r_symndx); -+ if (isym == NULL) -+ return FALSE; -+ -+ s = bfd_section_from_elf_index (abfd, isym->st_shndx); -+ if (s == NULL) -+ s = sec; -+ -+ vpp = &elf_section_data (s)->local_dynrel; -+ rel_head = (struct elf_dyn_relocs **) vpp; -+ } -+ -+ p = *rel_head; -+ if (p == NULL || p->sec != sec) -+ { -+ p = bfd_alloc (htab->elf.dynobj, sizeof *p); -+ if (p == NULL) -+ return FALSE; -+ p->next = *rel_head; -+ *rel_head = p; -+ p->sec = sec; -+ p->count = 0; -+ p->pc_count = 0; -+ } -+ -+ p->count += 1; -+ if (!must_be_dyn_reloc (info, r_type)) -+ p->pc_count += 1; -+ } -+ -+ break; -+ } -+ } -+ -+ return TRUE; -+} -+ -+ -+/* Merge object attributes from IBFD into OBFD. Raise an error if -+ there are conflicting attributes. */ -+static bfd_boolean -+ppc_elf_merge_obj_attributes (bfd *ibfd, bfd *obfd) -+{ -+ obj_attribute *in_attr, *in_attrs; -+ obj_attribute *out_attr, *out_attrs; -+ -+ if (!elf_known_obj_attributes_proc (obfd)[0].i) -+ { -+ /* This is the first object. Copy the attributes. */ -+ _bfd_elf_copy_obj_attributes (ibfd, obfd); -+ -+ /* Use the Tag_null value to indicate the attributes have been -+ initialized. */ -+ elf_known_obj_attributes_proc (obfd)[0].i = 1; -+ -+ return TRUE; -+ } -+ -+ in_attrs = elf_known_obj_attributes (ibfd)[OBJ_ATTR_GNU]; -+ out_attrs = elf_known_obj_attributes (obfd)[OBJ_ATTR_GNU]; -+ -+ /* Check for conflicting Tag_GNU_Power_ABI_FP attributes and merge -+ non-conflicting ones. */ -+ in_attr = &in_attrs[Tag_GNU_Power_ABI_FP]; -+ out_attr = &out_attrs[Tag_GNU_Power_ABI_FP]; -+ if (in_attr->i != out_attr->i) -+ { -+ out_attr->type = 1; -+ if (out_attr->i == 0) -+ out_attr->i = in_attr->i; -+ else if (in_attr->i == 0) -+ ; -+ else if (out_attr->i == 1 && in_attr->i == 2) -+ _bfd_error_handler -+ (_("Warning: %B uses hard float, %B uses soft float"), obfd, ibfd); -+ else if (out_attr->i == 1 && in_attr->i == 3) -+ _bfd_error_handler -+ (_("Warning: %B uses double-precision hard float, %B uses single-precision hard float"), -+ obfd, ibfd); -+ else if (out_attr->i == 3 && in_attr->i == 1) -+ _bfd_error_handler -+ (_("Warning: %B uses double-precision hard float, %B uses single-precision hard float"), -+ ibfd, obfd); -+ else if (out_attr->i == 3 && in_attr->i == 2) -+ _bfd_error_handler -+ (_("Warning: %B uses soft float, %B uses single-precision hard float"), -+ ibfd, obfd); -+ else if (out_attr->i == 2 && (in_attr->i == 1 || in_attr->i == 3)) -+ _bfd_error_handler -+ (_("Warning: %B uses hard float, %B uses soft float"), ibfd, obfd); -+ else if (in_attr->i > 3) -+ _bfd_error_handler -+ (_("Warning: %B uses unknown floating point ABI %d"), ibfd, -+ in_attr->i); -+ else -+ _bfd_error_handler -+ (_("Warning: %B uses unknown floating point ABI %d"), obfd, -+ out_attr->i); -+ } -+ -+ /* Check for conflicting Tag_GNU_Power_ABI_Vector attributes and -+ merge non-conflicting ones. */ -+ in_attr = &in_attrs[Tag_GNU_Power_ABI_Vector]; -+ out_attr = &out_attrs[Tag_GNU_Power_ABI_Vector]; -+ if (in_attr->i != out_attr->i) -+ { -+ const char *in_abi = NULL, *out_abi = NULL; -+ -+ switch (in_attr->i) -+ { -+ case 1: in_abi = "generic"; break; -+ case 2: in_abi = "AltiVec"; break; -+ case 3: in_abi = "SPE"; break; -+ } -+ -+ switch (out_attr->i) -+ { -+ case 1: out_abi = "generic"; break; -+ case 2: out_abi = "AltiVec"; break; -+ case 3: out_abi = "SPE"; break; -+ } -+ -+ out_attr->type = 1; -+ if (out_attr->i == 0) -+ out_attr->i = in_attr->i; -+ else if (in_attr->i == 0) -+ ; -+ /* For now, allow generic to transition to AltiVec or SPE -+ without a warning. If GCC marked files with their stack -+ alignment and used don't-care markings for files which are -+ not affected by the vector ABI, we could warn about this -+ case too. */ -+ else if (out_attr->i == 1) -+ out_attr->i = in_attr->i; -+ else if (in_attr->i == 1) -+ ; -+ else if (in_abi == NULL) -+ _bfd_error_handler -+ (_("Warning: %B uses unknown vector ABI %d"), ibfd, -+ in_attr->i); -+ else if (out_abi == NULL) -+ _bfd_error_handler -+ (_("Warning: %B uses unknown vector ABI %d"), obfd, -+ in_attr->i); -+ else -+ _bfd_error_handler -+ (_("Warning: %B uses vector ABI \"%s\", %B uses \"%s\""), -+ ibfd, obfd, in_abi, out_abi); -+ } -+ -+ /* Check for conflicting Tag_GNU_Power_ABI_Struct_Return attributes -+ and merge non-conflicting ones. */ -+ in_attr = &in_attrs[Tag_GNU_Power_ABI_Struct_Return]; -+ out_attr = &out_attrs[Tag_GNU_Power_ABI_Struct_Return]; -+ if (in_attr->i != out_attr->i) -+ { -+ out_attr->type = 1; -+ if (out_attr->i == 0) -+ out_attr->i = in_attr->i; -+ else if (in_attr->i == 0) -+ ; -+ else if (out_attr->i == 1 && in_attr->i == 2) -+ _bfd_error_handler -+ (_("Warning: %B uses r3/r4 for small structure returns, %B uses memory"), obfd, ibfd); -+ else if (out_attr->i == 2 && in_attr->i == 1) -+ _bfd_error_handler -+ (_("Warning: %B uses r3/r4 for small structure returns, %B uses memory"), ibfd, obfd); -+ else if (in_attr->i > 2) -+ _bfd_error_handler -+ (_("Warning: %B uses unknown small structure return convention %d"), ibfd, -+ in_attr->i); -+ else -+ _bfd_error_handler -+ (_("Warning: %B uses unknown small structure return convention %d"), obfd, -+ out_attr->i); -+ } -+ -+ /* Merge Tag_compatibility attributes and any common GNU ones. */ -+ _bfd_elf_merge_object_attributes (ibfd, obfd); -+ -+ return TRUE; -+} -+ -+/* Merge backend specific data from an object file to the output -+ object file when linking. */ -+ -+static bfd_boolean -+ppc_elf_merge_private_bfd_data (bfd *ibfd, bfd *obfd) -+{ -+ flagword old_flags; -+ flagword new_flags; -+ bfd_boolean error; -+ -+ if (!is_ppc_elf (ibfd) || !is_ppc_elf (obfd)) -+ return TRUE; -+ -+ /* Check if we have the same endianness. */ -+ if (! _bfd_generic_verify_endian_match (ibfd, obfd)) -+ return FALSE; -+ -+ if (!ppc_elf_merge_obj_attributes (ibfd, obfd)) -+ return FALSE; -+ -+ new_flags = elf_elfheader (ibfd)->e_flags; -+ old_flags = elf_elfheader (obfd)->e_flags; -+ if (!elf_flags_init (obfd)) -+ { -+ /* First call, no flags set. */ -+ elf_flags_init (obfd) = TRUE; -+ elf_elfheader (obfd)->e_flags = new_flags; -+ } -+ -+ /* Compatible flags are ok. */ -+ else if (new_flags == old_flags) -+ ; -+ -+ /* Incompatible flags. */ -+ else -+ { -+ /* Warn about -mrelocatable mismatch. Allow -mrelocatable-lib -+ to be linked with either. */ -+ error = FALSE; -+ if ((new_flags & EF_PPC_RELOCATABLE) != 0 -+ && (old_flags & (EF_PPC_RELOCATABLE | EF_PPC_RELOCATABLE_LIB)) == 0) -+ { -+ error = TRUE; -+ (*_bfd_error_handler) -+ (_("%B: compiled with -mrelocatable and linked with " -+ "modules compiled normally"), ibfd); -+ } -+ else if ((new_flags & (EF_PPC_RELOCATABLE | EF_PPC_RELOCATABLE_LIB)) == 0 -+ && (old_flags & EF_PPC_RELOCATABLE) != 0) -+ { -+ error = TRUE; -+ (*_bfd_error_handler) -+ (_("%B: compiled normally and linked with " -+ "modules compiled with -mrelocatable"), ibfd); -+ } -+ -+ /* The output is -mrelocatable-lib iff both the input files are. */ -+ if (! (new_flags & EF_PPC_RELOCATABLE_LIB)) -+ elf_elfheader (obfd)->e_flags &= ~EF_PPC_RELOCATABLE_LIB; -+ -+ /* The output is -mrelocatable iff it can't be -mrelocatable-lib, -+ but each input file is either -mrelocatable or -mrelocatable-lib. */ -+ if (! (elf_elfheader (obfd)->e_flags & EF_PPC_RELOCATABLE_LIB) -+ && (new_flags & (EF_PPC_RELOCATABLE_LIB | EF_PPC_RELOCATABLE)) -+ && (old_flags & (EF_PPC_RELOCATABLE_LIB | EF_PPC_RELOCATABLE))) -+ elf_elfheader (obfd)->e_flags |= EF_PPC_RELOCATABLE; -+ -+ /* Do not warn about eabi vs. V.4 mismatch, just or in the bit if -+ any module uses it. */ -+ elf_elfheader (obfd)->e_flags |= (new_flags & EF_PPC_EMB); -+ -+ new_flags &= ~(EF_PPC_RELOCATABLE | EF_PPC_RELOCATABLE_LIB | EF_PPC_EMB); -+ old_flags &= ~(EF_PPC_RELOCATABLE | EF_PPC_RELOCATABLE_LIB | EF_PPC_EMB); -+ -+ /* Warn about any other mismatches. */ -+ if (new_flags != old_flags) -+ { -+ error = TRUE; -+ (*_bfd_error_handler) -+ (_("%B: uses different e_flags (0x%lx) fields " -+ "than previous modules (0x%lx)"), -+ ibfd, (long) new_flags, (long) old_flags); -+ } -+ -+ if (error) -+ { -+ bfd_set_error (bfd_error_bad_value); -+ return FALSE; -+ } -+ } -+ -+ return TRUE; -+} -+ -+static void -+ppc_elf_vle_split16 (bfd *output_bfd, bfd_byte *contents, -+ bfd_vma offset, bfd_vma relocation, -+ split16_format_type split16_format) -+ -+{ -+ bfd_vma insn, top5, bottom11; -+ -+ insn = bfd_get_32 (output_bfd, contents + offset); -+ top5 = relocation >> 11; -+ top5 = top5 << (split16_format == split16a_type ? 20 : 16); -+ bottom11 = relocation & 0x7ff; -+ insn |= top5; -+ insn |= bottom11; -+ bfd_put_32 (output_bfd, insn, contents + offset); -+} -+ -+ -+/* Choose which PLT scheme to use, and set .plt flags appropriately. -+ Returns -1 on error, 0 for old PLT, 1 for new PLT. */ -+int -+ppc_elf_amigaos_select_plt_layout (bfd *output_bfd ATTRIBUTE_UNUSED, -+ struct bfd_link_info *info, -+ enum ppc_elf_plt_type plt_style, -+ int emit_stub_syms) -+{ -+ struct ppc_elf_link_hash_table *htab; -+ flagword flags; -+ -+ htab = ppc_elf_hash_table (info); -+ -+ htab->emit_stub_syms = emit_stub_syms; -+ -+ if (htab->plt_type == PLT_UNSET) -+ { -+ struct elf_link_hash_entry *h; -+ -+ if (plt_style == PLT_OLD) -+ htab->plt_type = PLT_OLD; -+ else if (info->shared -+ && htab->elf.dynamic_sections_created -+ && (h = elf_link_hash_lookup (&htab->elf, "_mcount", -+ FALSE, FALSE, TRUE)) != NULL -+ && (h->type == STT_FUNC -+ || h->needs_plt) -+ && h->ref_regular -+ && !(SYMBOL_CALLS_LOCAL (info, h) -+ || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT -+ && h->root.type == bfd_link_hash_undefweak))) -+ { -+ /* Profiling of shared libs (and pies) is not supported with -+ secure plt, because ppc32 does profiling before a -+ function prologue and a secure plt pic call stubs needs -+ r30 to be set up. */ -+ htab->plt_type = PLT_OLD; -+ } -+ else -+ { -+ bfd *ibfd; -+ enum ppc_elf_plt_type plt_type = plt_style; -+ -+ /* Look through the reloc flags left by ppc_elf_check_relocs. -+ Use the old style bss plt if a file makes plt calls -+ without using the new relocs, and if ld isn't given -+ --secure-plt and we never see REL16 relocs. */ -+ if (plt_type == PLT_UNSET) -+ plt_type = PLT_OLD; -+ for (ibfd = info->input_bfds; ibfd; ibfd = ibfd->link_next) -+ if (is_ppc_elf (ibfd)) -+ { -+ if (ppc_elf_tdata (ibfd)->has_rel16) -+ plt_type = PLT_NEW; -+ else if (ppc_elf_tdata (ibfd)->makes_plt_call) -+ { -+ plt_type = PLT_OLD; -+ htab->old_bfd = ibfd; -+ break; -+ } -+ } -+ htab->plt_type = plt_type; -+ } -+ } -+ if (htab->plt_type == PLT_OLD && plt_style == PLT_NEW) -+ { -+ if (htab->old_bfd != NULL) -+ info->callbacks->einfo (_("%P: bss-plt forced due to %B\n"), -+ htab->old_bfd); -+ else -+ info->callbacks->einfo (_("%P: bss-plt forced by profiling\n")); -+ } -+ -+ BFD_ASSERT (htab->plt_type != PLT_VXWORKS); -+ -+ if (htab->plt_type == PLT_NEW) -+ { -+ flags = (SEC_ALLOC | SEC_LOAD | SEC_HAS_CONTENTS -+ | SEC_IN_MEMORY | SEC_LINKER_CREATED); -+ -+ /* The new PLT is a loaded section. */ -+ if (htab->plt != NULL -+ && !bfd_set_section_flags (htab->elf.dynobj, htab->plt, flags)) -+ return -1; -+ -+ /* The new GOT is not executable. */ -+ if (htab->got != NULL -+ && !bfd_set_section_flags (htab->elf.dynobj, htab->got, flags)) -+ return -1; -+ } -+ else -+ { -+ /* Stop an unused .glink section from affecting .text alignment. */ -+ if (htab->glink != NULL -+ && !bfd_set_section_alignment (htab->elf.dynobj, htab->glink, 0)) -+ return -1; -+ } -+ return htab->plt_type == PLT_NEW; -+} -+ -+/* Return the section that should be marked against GC for a given -+ relocation. */ -+ -+static asection * -+ppc_elf_gc_mark_hook (asection *sec, -+ struct bfd_link_info *info, -+ Elf_Internal_Rela *rel, -+ struct elf_link_hash_entry *h, -+ Elf_Internal_Sym *sym) -+{ -+ if (h != NULL) -+ switch (ELF32_R_TYPE (rel->r_info)) -+ { -+ case R_PPC_GNU_VTINHERIT: -+ case R_PPC_GNU_VTENTRY: -+ return NULL; -+ } -+ -+ return _bfd_elf_gc_mark_hook (sec, info, rel, h, sym); -+} -+ -+/* Update the got, plt and dynamic reloc reference counts for the -+ section being removed. */ -+ -+static bfd_boolean -+ppc_elf_gc_sweep_hook (bfd *abfd, -+ struct bfd_link_info *info, -+ asection *sec, -+ const Elf_Internal_Rela *relocs) -+{ -+ struct ppc_elf_link_hash_table *htab; -+ Elf_Internal_Shdr *symtab_hdr; -+ struct elf_link_hash_entry **sym_hashes; -+ bfd_signed_vma *local_got_refcounts; -+ const Elf_Internal_Rela *rel, *relend; -+ asection *got2; -+ -+ if (info->relocatable) -+ return TRUE; -+ -+ if ((sec->flags & SEC_ALLOC) == 0) -+ return TRUE; -+ -+ elf_section_data (sec)->local_dynrel = NULL; -+ -+ htab = ppc_elf_hash_table (info); -+ symtab_hdr = &elf_symtab_hdr (abfd); -+ sym_hashes = elf_sym_hashes (abfd); -+ local_got_refcounts = elf_local_got_refcounts (abfd); -+ got2 = bfd_get_section_by_name (abfd, ".got2"); -+ -+ relend = relocs + sec->reloc_count; -+ for (rel = relocs; rel < relend; rel++) -+ { -+ unsigned long r_symndx; -+ enum elf_ppc_reloc_type r_type; -+ struct elf_link_hash_entry *h = NULL; -+ -+ r_symndx = ELF32_R_SYM (rel->r_info); -+ if (r_symndx >= symtab_hdr->sh_info) -+ { -+ struct elf_dyn_relocs **pp, *p; -+ struct ppc_elf_link_hash_entry *eh; -+ -+ h = sym_hashes[r_symndx - symtab_hdr->sh_info]; -+ while (h->root.type == bfd_link_hash_indirect -+ || h->root.type == bfd_link_hash_warning) -+ h = (struct elf_link_hash_entry *) h->root.u.i.link; -+ eh = (struct ppc_elf_link_hash_entry *) h; -+ -+ for (pp = &eh->dyn_relocs; (p = *pp) != NULL; pp = &p->next) -+ if (p->sec == sec) -+ { -+ /* Everything must go for SEC. */ -+ *pp = p->next; -+ break; -+ } -+ } -+ -+ r_type = ELF32_R_TYPE (rel->r_info); -+ if (!htab->is_vxworks -+ && h == NULL -+ && local_got_refcounts != NULL -+ && (!info->shared -+ || is_branch_reloc (r_type))) -+ { -+ struct plt_entry **local_plt = (struct plt_entry **) -+ (local_got_refcounts + symtab_hdr->sh_info); -+ char *local_got_tls_masks = (char *) -+ (local_plt + symtab_hdr->sh_info); -+ if ((local_got_tls_masks[r_symndx] & PLT_IFUNC) != 0) -+ { -+ struct plt_entry **ifunc = local_plt + r_symndx; -+ bfd_vma addend = 0; -+ struct plt_entry *ent; -+ -+ if (r_type == R_PPC_PLTREL24 && info->shared) -+ addend = rel->r_addend; -+ ent = find_plt_ent (ifunc, got2, addend); -+ if (ent->plt.refcount > 0) -+ ent->plt.refcount -= 1; -+ continue; -+ } -+ } -+ -+ switch (r_type) -+ { -+ case R_PPC_GOT_TLSLD16: -+ case R_PPC_GOT_TLSLD16_LO: -+ case R_PPC_GOT_TLSLD16_HI: -+ case R_PPC_GOT_TLSLD16_HA: -+ case R_PPC_GOT_TLSGD16: -+ case R_PPC_GOT_TLSGD16_LO: -+ case R_PPC_GOT_TLSGD16_HI: -+ case R_PPC_GOT_TLSGD16_HA: -+ case R_PPC_GOT_TPREL16: -+ case R_PPC_GOT_TPREL16_LO: -+ case R_PPC_GOT_TPREL16_HI: -+ case R_PPC_GOT_TPREL16_HA: -+ case R_PPC_GOT_DTPREL16: -+ case R_PPC_GOT_DTPREL16_LO: -+ case R_PPC_GOT_DTPREL16_HI: -+ case R_PPC_GOT_DTPREL16_HA: -+ case R_PPC_GOT16: -+ case R_PPC_GOT16_LO: -+ case R_PPC_GOT16_HI: -+ case R_PPC_GOT16_HA: -+ if (h != NULL) -+ { -+ if (h->got.refcount > 0) -+ h->got.refcount--; -+ if (!info->shared) -+ { -+ struct plt_entry *ent; -+ -+ ent = find_plt_ent (&h->plt.plist, NULL, 0); -+ if (ent != NULL && ent->plt.refcount > 0) -+ ent->plt.refcount -= 1; -+ } -+ } -+ else if (local_got_refcounts != NULL) -+ { -+ if (local_got_refcounts[r_symndx] > 0) -+ local_got_refcounts[r_symndx]--; -+ } -+ break; -+ -+ case R_PPC_REL24: -+ case R_PPC_REL14: -+ case R_PPC_REL14_BRTAKEN: -+ case R_PPC_REL14_BRNTAKEN: -+ case R_PPC_REL32: -+ if (h == NULL || h == htab->elf.hgot) -+ break; -+ /* Fall thru */ -+ -+ case R_PPC_ADDR32: -+ case R_PPC_ADDR24: -+ case R_PPC_ADDR16: -+ case R_PPC_ADDR16_LO: -+ case R_PPC_ADDR16_HI: -+ case R_PPC_ADDR16_HA: -+ case R_PPC_ADDR14: -+ case R_PPC_ADDR14_BRTAKEN: -+ case R_PPC_ADDR14_BRNTAKEN: -+ case R_PPC_UADDR32: -+ case R_PPC_UADDR16: -+ if (info->shared) -+ break; -+ -+ case R_PPC_PLT32: -+ case R_PPC_PLTREL24: -+ case R_PPC_PLTREL32: -+ case R_PPC_PLT16_LO: -+ case R_PPC_PLT16_HI: -+ case R_PPC_PLT16_HA: -+ if (h != NULL) -+ { -+ bfd_vma addend = 0; -+ struct plt_entry *ent; -+ -+ if (r_type == R_PPC_PLTREL24 && info->shared) -+ addend = rel->r_addend; -+ ent = find_plt_ent (&h->plt.plist, got2, addend); -+ if (ent != NULL && ent->plt.refcount > 0) -+ ent->plt.refcount -= 1; -+ } -+ break; -+ -+ default: -+ break; -+ } -+ } -+ return TRUE; -+} -+ -+/* Set plt output section type, htab->tls_get_addr, and call the -+ generic ELF tls_setup function. */ -+ -+asection * -+ppc_elf_amigaos_tls_setup (bfd *obfd, -+ struct bfd_link_info *info, -+ int no_tls_get_addr_opt) -+{ -+ struct ppc_elf_link_hash_table *htab; -+ -+ htab = ppc_elf_hash_table (info); -+ htab->tls_get_addr = elf_link_hash_lookup (&htab->elf, "__tls_get_addr", -+ FALSE, FALSE, TRUE); -+ if (!no_tls_get_addr_opt) -+ { -+ struct elf_link_hash_entry *opt, *tga; -+ opt = elf_link_hash_lookup (&htab->elf, "__tls_get_addr_opt", -+ FALSE, FALSE, TRUE); -+ if (opt != NULL -+ && (opt->root.type == bfd_link_hash_defined -+ || opt->root.type == bfd_link_hash_defweak)) -+ { -+ /* If glibc supports an optimized __tls_get_addr call stub, -+ signalled by the presence of __tls_get_addr_opt, and we'll -+ be calling __tls_get_addr via a plt call stub, then -+ make __tls_get_addr point to __tls_get_addr_opt. */ -+ tga = htab->tls_get_addr; -+ if (htab->elf.dynamic_sections_created -+ && tga != NULL -+ && (tga->type == STT_FUNC -+ || tga->needs_plt) -+ && !(SYMBOL_CALLS_LOCAL (info, tga) -+ || (ELF_ST_VISIBILITY (tga->other) != STV_DEFAULT -+ && tga->root.type == bfd_link_hash_undefweak))) -+ { -+ struct plt_entry *ent; -+ for (ent = tga->plt.plist; ent != NULL; ent = ent->next) -+ if (ent->plt.refcount > 0) -+ break; -+ if (ent != NULL) -+ { -+ tga->root.type = bfd_link_hash_indirect; -+ tga->root.u.i.link = &opt->root; -+ ppc_elf_copy_indirect_symbol (info, opt, tga); -+ if (opt->dynindx != -1) -+ { -+ /* Use __tls_get_addr_opt in dynamic relocations. */ -+ opt->dynindx = -1; -+ _bfd_elf_strtab_delref (elf_hash_table (info)->dynstr, -+ opt->dynstr_index); -+ if (!bfd_elf_link_record_dynamic_symbol (info, opt)) -+ return FALSE; -+ } -+ htab->tls_get_addr = opt; -+ } -+ } -+ } -+ else -+ no_tls_get_addr_opt = TRUE; -+ } -+ htab->no_tls_get_addr_opt = no_tls_get_addr_opt; -+ if (htab->plt_type == PLT_NEW -+ && htab->plt != NULL -+ && htab->plt->output_section != NULL) -+ { -+ elf_section_type (htab->plt->output_section) = SHT_PROGBITS; -+ elf_section_flags (htab->plt->output_section) = SHF_ALLOC + SHF_WRITE; -+ } -+ -+ return _bfd_elf_tls_setup (obfd, info); -+} -+ -+/* Return TRUE iff REL is a branch reloc with a global symbol matching -+ HASH. */ -+ -+static bfd_boolean -+branch_reloc_hash_match (const bfd *ibfd, -+ const Elf_Internal_Rela *rel, -+ const struct elf_link_hash_entry *hash) -+{ -+ Elf_Internal_Shdr *symtab_hdr = &elf_symtab_hdr (ibfd); -+ enum elf_ppc_reloc_type r_type = ELF32_R_TYPE (rel->r_info); -+ unsigned int r_symndx = ELF32_R_SYM (rel->r_info); -+ -+ if (r_symndx >= symtab_hdr->sh_info && is_branch_reloc (r_type)) -+ { -+ struct elf_link_hash_entry **sym_hashes = elf_sym_hashes (ibfd); -+ struct elf_link_hash_entry *h; -+ -+ h = sym_hashes[r_symndx - symtab_hdr->sh_info]; -+ while (h->root.type == bfd_link_hash_indirect -+ || h->root.type == bfd_link_hash_warning) -+ h = (struct elf_link_hash_entry *) h->root.u.i.link; -+ if (h == hash) -+ return TRUE; -+ } -+ return FALSE; -+} -+ -+/* Run through all the TLS relocs looking for optimization -+ opportunities. */ -+ -+bfd_boolean -+ppc_elf_amigaos_tls_optimize (bfd *obfd ATTRIBUTE_UNUSED, -+ struct bfd_link_info *info) -+{ -+ bfd *ibfd; -+ asection *sec; -+ struct ppc_elf_link_hash_table *htab; -+ int pass; -+ -+ if (info->relocatable || !info->executable) -+ return TRUE; -+ -+ htab = ppc_elf_hash_table (info); -+ if (htab == NULL) -+ return FALSE; -+ -+ /* Make two passes through the relocs. First time check that tls -+ relocs involved in setting up a tls_get_addr call are indeed -+ followed by such a call. If they are not, don't do any tls -+ optimization. On the second pass twiddle tls_mask flags to -+ notify relocate_section that optimization can be done, and -+ adjust got and plt refcounts. */ -+ for (pass = 0; pass < 2; ++pass) -+ for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next) -+ { -+ Elf_Internal_Sym *locsyms = NULL; -+ Elf_Internal_Shdr *symtab_hdr = &elf_symtab_hdr (ibfd); -+ asection *got2 = bfd_get_section_by_name (ibfd, ".got2"); -+ -+ for (sec = ibfd->sections; sec != NULL; sec = sec->next) -+ if (sec->has_tls_reloc && !bfd_is_abs_section (sec->output_section)) -+ { -+ Elf_Internal_Rela *relstart, *rel, *relend; -+ int expecting_tls_get_addr = 0; -+ -+ /* Read the relocations. */ -+ relstart = _bfd_elf_link_read_relocs (ibfd, sec, NULL, NULL, -+ info->keep_memory); -+ if (relstart == NULL) -+ return FALSE; -+ -+ relend = relstart + sec->reloc_count; -+ for (rel = relstart; rel < relend; rel++) -+ { -+ enum elf_ppc_reloc_type r_type; -+ unsigned long r_symndx; -+ struct elf_link_hash_entry *h = NULL; -+ char *tls_mask; -+ char tls_set, tls_clear; -+ bfd_boolean is_local; -+ bfd_signed_vma *got_count; -+ -+ r_symndx = ELF32_R_SYM (rel->r_info); -+ if (r_symndx >= symtab_hdr->sh_info) -+ { -+ struct elf_link_hash_entry **sym_hashes; -+ -+ sym_hashes = elf_sym_hashes (ibfd); -+ h = sym_hashes[r_symndx - symtab_hdr->sh_info]; -+ while (h->root.type == bfd_link_hash_indirect -+ || h->root.type == bfd_link_hash_warning) -+ h = (struct elf_link_hash_entry *) h->root.u.i.link; -+ } -+ -+ is_local = FALSE; -+ if (h == NULL -+ || !h->def_dynamic) -+ is_local = TRUE; -+ -+ r_type = ELF32_R_TYPE (rel->r_info); -+ /* If this section has old-style __tls_get_addr calls -+ without marker relocs, then check that each -+ __tls_get_addr call reloc is preceded by a reloc -+ that conceivably belongs to the __tls_get_addr arg -+ setup insn. If we don't find matching arg setup -+ relocs, don't do any tls optimization. */ -+ if (pass == 0 -+ && sec->has_tls_get_addr_call -+ && h != NULL -+ && h == htab->tls_get_addr -+ && !expecting_tls_get_addr -+ && is_branch_reloc (r_type)) -+ { -+ info->callbacks->minfo ("%H __tls_get_addr lost arg, " -+ "TLS optimization disabled\n", -+ ibfd, sec, rel->r_offset); -+ if (elf_section_data (sec)->relocs != relstart) -+ free (relstart); -+ return TRUE; -+ } -+ -+ expecting_tls_get_addr = 0; -+ switch (r_type) -+ { -+ case R_PPC_GOT_TLSLD16: -+ case R_PPC_GOT_TLSLD16_LO: -+ expecting_tls_get_addr = 1; -+ /* Fall thru */ -+ -+ case R_PPC_GOT_TLSLD16_HI: -+ case R_PPC_GOT_TLSLD16_HA: -+ /* These relocs should never be against a symbol -+ defined in a shared lib. Leave them alone if -+ that turns out to be the case. */ -+ if (!is_local) -+ continue; -+ -+ /* LD -> LE */ -+ tls_set = 0; -+ tls_clear = TLS_LD; -+ break; -+ -+ case R_PPC_GOT_TLSGD16: -+ case R_PPC_GOT_TLSGD16_LO: -+ expecting_tls_get_addr = 1; -+ /* Fall thru */ -+ -+ case R_PPC_GOT_TLSGD16_HI: -+ case R_PPC_GOT_TLSGD16_HA: -+ if (is_local) -+ /* GD -> LE */ -+ tls_set = 0; -+ else -+ /* GD -> IE */ -+ tls_set = TLS_TLS | TLS_TPRELGD; -+ tls_clear = TLS_GD; -+ break; -+ -+ case R_PPC_GOT_TPREL16: -+ case R_PPC_GOT_TPREL16_LO: -+ case R_PPC_GOT_TPREL16_HI: -+ case R_PPC_GOT_TPREL16_HA: -+ if (is_local) -+ { -+ /* IE -> LE */ -+ tls_set = 0; -+ tls_clear = TLS_TPREL; -+ break; -+ } -+ else -+ continue; -+ -+ case R_PPC_TLSGD: -+ case R_PPC_TLSLD: -+ expecting_tls_get_addr = 2; -+ tls_set = 0; -+ tls_clear = 0; -+ break; -+ -+ default: -+ continue; -+ } -+ -+ if (pass == 0) -+ { -+ if (!expecting_tls_get_addr -+ || (expecting_tls_get_addr == 1 -+ && !sec->has_tls_get_addr_call)) -+ continue; -+ -+ if (rel + 1 < relend -+ && branch_reloc_hash_match (ibfd, rel + 1, -+ htab->tls_get_addr)) -+ continue; -+ -+ /* Uh oh, we didn't find the expected call. We -+ could just mark this symbol to exclude it -+ from tls optimization but it's safer to skip -+ the entire optimization. */ -+ info->callbacks->minfo (_("%H arg lost __tls_get_addr, " -+ "TLS optimization disabled\n"), -+ ibfd, sec, rel->r_offset); -+ if (elf_section_data (sec)->relocs != relstart) -+ free (relstart); -+ return TRUE; -+ } -+ -+ if (expecting_tls_get_addr) -+ { -+ struct plt_entry *ent; -+ bfd_vma addend = 0; -+ -+ if (info->shared -+ && ELF32_R_TYPE (rel[1].r_info) == R_PPC_PLTREL24) -+ addend = rel[1].r_addend; -+ ent = find_plt_ent (&htab->tls_get_addr->plt.plist, -+ got2, addend); -+ if (ent != NULL && ent->plt.refcount > 0) -+ ent->plt.refcount -= 1; -+ -+ if (expecting_tls_get_addr == 2) -+ continue; -+ } -+ -+ if (h != NULL) -+ { -+ tls_mask = &ppc_elf_hash_entry (h)->tls_mask; -+ got_count = &h->got.refcount; -+ } -+ else -+ { -+ bfd_signed_vma *lgot_refs; -+ struct plt_entry **local_plt; -+ char *lgot_masks; -+ -+ if (locsyms == NULL) -+ { -+ locsyms = (Elf_Internal_Sym *) symtab_hdr->contents; -+ if (locsyms == NULL) -+ locsyms = bfd_elf_get_elf_syms (ibfd, symtab_hdr, -+ symtab_hdr->sh_info, -+ 0, NULL, NULL, NULL); -+ if (locsyms == NULL) -+ { -+ if (elf_section_data (sec)->relocs != relstart) -+ free (relstart); -+ return FALSE; -+ } -+ } -+ lgot_refs = elf_local_got_refcounts (ibfd); -+ if (lgot_refs == NULL) -+ abort (); -+ local_plt = (struct plt_entry **) -+ (lgot_refs + symtab_hdr->sh_info); -+ lgot_masks = (char *) (local_plt + symtab_hdr->sh_info); -+ tls_mask = &lgot_masks[r_symndx]; -+ got_count = &lgot_refs[r_symndx]; -+ } -+ -+ if (tls_set == 0) -+ { -+ /* We managed to get rid of a got entry. */ -+ if (*got_count > 0) -+ *got_count -= 1; -+ } -+ -+ *tls_mask |= tls_set; -+ *tls_mask &= ~tls_clear; -+ } -+ -+ if (elf_section_data (sec)->relocs != relstart) -+ free (relstart); -+ } -+ -+ if (locsyms != NULL -+ && (symtab_hdr->contents != (unsigned char *) locsyms)) -+ { -+ if (!info->keep_memory) -+ free (locsyms); -+ else -+ symtab_hdr->contents = (unsigned char *) locsyms; -+ } -+ } -+ return TRUE; -+} -+ -+/* Return true if we have dynamic relocs that apply to read-only sections. */ -+ -+static bfd_boolean -+readonly_dynrelocs (struct elf_link_hash_entry *h) -+{ -+ struct elf_dyn_relocs *p; -+ -+ for (p = ppc_elf_hash_entry (h)->dyn_relocs; p != NULL; p = p->next) -+ { -+ asection *s = p->sec->output_section; -+ -+ if (s != NULL -+ && ((s->flags & (SEC_READONLY | SEC_ALLOC)) -+ == (SEC_READONLY | SEC_ALLOC))) -+ return TRUE; -+ } -+ return FALSE; -+} -+ -+/* Adjust a symbol defined by a dynamic object and referenced by a -+ regular object. The current definition is in some section of the -+ dynamic object, but we're not including those sections. We have to -+ change the definition to something the rest of the link can -+ understand. */ -+ -+static bfd_boolean -+ppc_elf_adjust_dynamic_symbol (struct bfd_link_info *info, -+ struct elf_link_hash_entry *h) -+{ -+ struct ppc_elf_link_hash_table *htab; -+ asection *s; -+ -+#ifdef DEBUG -+ fprintf (stderr, "ppc_elf_adjust_dynamic_symbol called for %s\n", -+ h->root.root.string); -+#endif -+ -+ /* Make sure we know what is going on here. */ -+ htab = ppc_elf_hash_table (info); -+ BFD_ASSERT (htab->elf.dynobj != NULL -+ && (h->needs_plt -+ || h->type == STT_GNU_IFUNC -+ || h->u.weakdef != NULL -+ || (h->def_dynamic -+ && h->ref_regular -+ && !h->def_regular))); -+ -+ /* Deal with function syms. */ -+ if (h->type == STT_FUNC -+ || h->type == STT_GNU_IFUNC -+ || h->needs_plt) -+ { -+ /* Clear procedure linkage table information for any symbol that -+ won't need a .plt entry. */ -+ struct plt_entry *ent; -+ for (ent = h->plt.plist; ent != NULL; ent = ent->next) -+ if (ent->plt.refcount > 0) -+ break; -+ if (ent == NULL -+ || (h->type != STT_GNU_IFUNC -+ && (SYMBOL_CALLS_LOCAL (info, h) -+ || (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT -+ && h->root.type == bfd_link_hash_undefweak)))) -+ { -+ /* A PLT entry is not required/allowed when: -+ -+ 1. We are not using ld.so; because then the PLT entry -+ can't be set up, so we can't use one. In this case, -+ ppc_elf_adjust_dynamic_symbol won't even be called. -+ -+ 2. GC has rendered the entry unused. -+ -+ 3. We know for certain that a call to this symbol -+ will go to this object, or will remain undefined. */ -+ h->plt.plist = NULL; -+ h->needs_plt = 0; -+ } -+ else -+ { -+ /* After adjust_dynamic_symbol, non_got_ref set in the -+ non-shared case means that we have allocated space in -+ .dynbss for the symbol and thus dyn_relocs for this -+ symbol should be discarded. -+ If we get here we know we are making a PLT entry for this -+ symbol, and in an executable we'd normally resolve -+ relocations against this symbol to the PLT entry. Allow -+ dynamic relocs if the reference is weak, and the dynamic -+ relocs will not cause text relocation. */ -+ if (!h->ref_regular_nonweak -+ && h->non_got_ref -+ && h->type != STT_GNU_IFUNC -+ && !htab->is_vxworks -+ && !ppc_elf_hash_entry (h)->has_sda_refs -+ && !readonly_dynrelocs (h)) -+ h->non_got_ref = 0; -+ } -+ return TRUE; -+ } -+ else -+ h->plt.plist = NULL; -+ -+ /* If this is a weak symbol, and there is a real definition, the -+ processor independent code will have arranged for us to see the -+ real definition first, and we can just use the same value. */ -+ if (h->u.weakdef != NULL) -+ { -+ BFD_ASSERT (h->u.weakdef->root.type == bfd_link_hash_defined -+ || h->u.weakdef->root.type == bfd_link_hash_defweak); -+ h->root.u.def.section = h->u.weakdef->root.u.def.section; -+ h->root.u.def.value = h->u.weakdef->root.u.def.value; -+ if (ELIMINATE_COPY_RELOCS) -+ h->non_got_ref = h->u.weakdef->non_got_ref; -+ return TRUE; -+ } -+ -+ /* This is a reference to a symbol defined by a dynamic object which -+ is not a function. */ -+ -+ /* If we are creating a shared library, we must presume that the -+ only references to the symbol are via the global offset table. -+ For such cases we need not do anything here; the relocations will -+ be handled correctly by relocate_section. */ -+ if (info->shared) -+ return TRUE; -+ -+ /* If there are no references to this symbol that do not use the -+ GOT, we don't need to generate a copy reloc. */ -+ if (!h->non_got_ref) -+ return TRUE; -+ -+ /* If we didn't find any dynamic relocs in read-only sections, then -+ we'll be keeping the dynamic relocs and avoiding the copy reloc. -+ We can't do this if there are any small data relocations. This -+ doesn't work on VxWorks, where we can not have dynamic -+ relocations (other than copy and jump slot relocations) in an -+ executable. */ -+ if (ELIMINATE_COPY_RELOCS -+ && !ppc_elf_hash_entry (h)->has_sda_refs -+ && !htab->is_vxworks -+ && !h->def_regular -+ && !readonly_dynrelocs (h)) -+ { -+ h->non_got_ref = 0; -+ return TRUE; -+ } -+ -+ /* We must allocate the symbol in our .dynbss section, which will -+ become part of the .bss section of the executable. There will be -+ an entry for this symbol in the .dynsym section. The dynamic -+ object will contain position independent code, so all references -+ from the dynamic object to this symbol will go through the global -+ offset table. The dynamic linker will use the .dynsym entry to -+ determine the address it must put in the global offset table, so -+ both the dynamic object and the regular object will refer to the -+ same memory location for the variable. -+ -+ Of course, if the symbol is referenced using SDAREL relocs, we -+ must instead allocate it in .sbss. */ -+ -+ if (ppc_elf_hash_entry (h)->has_sda_refs) -+ s = htab->dynsbss; -+ else -+ s = htab->dynbss; -+ BFD_ASSERT (s != NULL); -+ -+ /* We must generate a R_PPC_COPY reloc to tell the dynamic linker to -+ copy the initial value out of the dynamic object and into the -+ runtime process image. We need to remember the offset into the -+ .rela.bss section we are going to use. */ -+ if ((h->root.u.def.section->flags & SEC_ALLOC) != 0 && h->size != 0) -+ { -+ asection *srel; -+ -+ if (ppc_elf_hash_entry (h)->has_sda_refs) -+ srel = htab->relsbss; -+ else -+ srel = htab->relbss; -+ BFD_ASSERT (srel != NULL); -+ srel->size += sizeof (Elf32_External_Rela); -+ h->needs_copy = 1; -+ } -+ -+ return _bfd_elf_adjust_dynamic_copy (h, s); -+} -+ -+/* Generate a symbol to mark plt call stubs. For non-PIC code the sym is -+ xxxxxxxx.plt_call32.<callee> where xxxxxxxx is a hex number, usually 0, -+ specifying the addend on the plt relocation. For -fpic code, the sym -+ is xxxxxxxx.plt_pic32.<callee>, and for -fPIC -+ xxxxxxxx.got2.plt_pic32.<callee>. */ -+ -+static bfd_boolean -+add_stub_sym (struct plt_entry *ent, -+ struct elf_link_hash_entry *h, -+ struct bfd_link_info *info) -+{ -+ struct elf_link_hash_entry *sh; -+ size_t len1, len2, len3; -+ char *name; -+ const char *stub; -+ struct ppc_elf_link_hash_table *htab = ppc_elf_hash_table (info); -+ -+ if (info->shared) -+ stub = ".plt_pic32."; -+ else -+ stub = ".plt_call32."; -+ -+ len1 = strlen (h->root.root.string); -+ len2 = strlen (stub); -+ len3 = 0; -+ if (ent->sec) -+ len3 = strlen (ent->sec->name); -+ name = bfd_malloc (len1 + len2 + len3 + 9); -+ if (name == NULL) -+ return FALSE; -+ sprintf (name, "%08x", (unsigned) ent->addend & 0xffffffff); -+ if (ent->sec) -+ memcpy (name + 8, ent->sec->name, len3); -+ memcpy (name + 8 + len3, stub, len2); -+ memcpy (name + 8 + len3 + len2, h->root.root.string, len1 + 1); -+ sh = elf_link_hash_lookup (&htab->elf, name, TRUE, FALSE, FALSE); -+ if (sh == NULL) -+ return FALSE; -+ if (sh->root.type == bfd_link_hash_new) -+ { -+ sh->root.type = bfd_link_hash_defined; -+ sh->root.u.def.section = htab->glink; -+ sh->root.u.def.value = ent->glink_offset; -+ sh->ref_regular = 1; -+ sh->def_regular = 1; -+ sh->ref_regular_nonweak = 1; -+ sh->forced_local = 1; -+ sh->non_elf = 0; -+ } -+ return TRUE; -+} -+ -+/* Allocate NEED contiguous space in .got, and return the offset. -+ Handles allocation of the got header when crossing 32k. */ -+ -+static bfd_vma -+allocate_got (struct ppc_elf_link_hash_table *htab, unsigned int need) -+{ -+ bfd_vma where; -+ unsigned int max_before_header; -+ -+ if (htab->plt_type == PLT_VXWORKS) -+ { -+ where = htab->got->size; -+ htab->got->size += need; -+ } -+ else -+ { -+ max_before_header = htab->plt_type == PLT_NEW ? 32768 : 32764; -+ if (need <= htab->got_gap) -+ { -+ where = max_before_header - htab->got_gap; -+ htab->got_gap -= need; -+ } -+ else -+ { -+ if (htab->got->size + need > max_before_header -+ && htab->got->size <= max_before_header) -+ { -+ htab->got_gap = max_before_header - htab->got->size; -+ htab->got->size = max_before_header + htab->got_header_size; -+ } -+ where = htab->got->size; -+ htab->got->size += need; -+ } -+ } -+ return where; -+} -+ -+/* Allocate space in associated reloc sections for dynamic relocs. */ -+ -+static bfd_boolean -+allocate_dynrelocs (struct elf_link_hash_entry *h, void *inf) -+{ -+ struct bfd_link_info *info = inf; -+ struct ppc_elf_link_hash_entry *eh; -+ struct ppc_elf_link_hash_table *htab; -+ struct elf_dyn_relocs *p; -+ -+ if (h->root.type == bfd_link_hash_indirect) -+ return TRUE; -+ -+ htab = ppc_elf_hash_table (info); -+ if (htab->elf.dynamic_sections_created -+ || h->type == STT_GNU_IFUNC) -+ { -+ struct plt_entry *ent; -+ bfd_boolean doneone = FALSE; -+ bfd_vma plt_offset = 0, glink_offset = 0; -+ bfd_boolean dyn; -+ -+ for (ent = h->plt.plist; ent != NULL; ent = ent->next) -+ if (ent->plt.refcount > 0) -+ { -+ /* Make sure this symbol is output as a dynamic symbol. */ -+ if (h->dynindx == -1 -+ && !h->forced_local -+ && !h->def_regular -+ && htab->elf.dynamic_sections_created) -+ { -+ if (! bfd_elf_link_record_dynamic_symbol (info, h)) -+ return FALSE; -+ } -+ -+ dyn = htab->elf.dynamic_sections_created; -+ if (info->shared -+ || h->type == STT_GNU_IFUNC -+ || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, h)) -+ { -+ asection *s = htab->plt; -+ if (!dyn || h->dynindx == -1) -+ s = htab->iplt; -+ -+ if (htab->plt_type == PLT_NEW || !dyn || h->dynindx == -1) -+ { -+ if (!doneone) -+ { -+ plt_offset = s->size; -+ s->size += 4; -+ } -+ ent->plt.offset = plt_offset; -+ -+ s = htab->glink; -+ if (!doneone || info->shared) -+ { -+ glink_offset = s->size; -+ s->size += GLINK_ENTRY_SIZE; -+ if (h == htab->tls_get_addr -+ && !htab->no_tls_get_addr_opt) -+ s->size += TLS_GET_ADDR_GLINK_SIZE - GLINK_ENTRY_SIZE; -+ } -+ if (!doneone -+ && !info->shared -+ && h->def_dynamic -+ && !h->def_regular) -+ { -+ h->root.u.def.section = s; -+ h->root.u.def.value = glink_offset; -+ } -+ ent->glink_offset = glink_offset; -+ -+ if (htab->emit_stub_syms -+ && !add_stub_sym (ent, h, info)) -+ return FALSE; -+ } -+ else -+ { -+ if (!doneone) -+ { -+ /* If this is the first .plt entry, make room -+ for the special first entry. */ -+ if (s->size == 0) -+ s->size += htab->plt_initial_entry_size; -+ -+ /* The PowerPC PLT is actually composed of two -+ parts, the first part is 2 words (for a load -+ and a jump), and then there is a remaining -+ word available at the end. */ -+ plt_offset = (htab->plt_initial_entry_size -+ + (htab->plt_slot_size -+ * ((s->size -+ - htab->plt_initial_entry_size) -+ / htab->plt_entry_size))); -+ -+ /* If this symbol is not defined in a regular -+ file, and we are not generating a shared -+ library, then set the symbol to this location -+ in the .plt. This is to avoid text -+ relocations, and is required to make -+ function pointers compare as equal between -+ the normal executable and the shared library. */ -+ if (! info->shared -+ && h->def_dynamic -+ && !h->def_regular) -+ { -+ h->root.u.def.section = s; -+ h->root.u.def.value = plt_offset; -+ } -+ -+ /* Make room for this entry. */ -+ s->size += htab->plt_entry_size; -+ /* After the 8192nd entry, room for two entries -+ is allocated. */ -+ if (htab->plt_type == PLT_OLD -+ && (s->size - htab->plt_initial_entry_size) -+ / htab->plt_entry_size -+ > PLT_NUM_SINGLE_ENTRIES) -+ s->size += htab->plt_entry_size; -+ } -+ ent->plt.offset = plt_offset; -+ } -+ -+ /* We also need to make an entry in the .rela.plt section. */ -+ if (!doneone) -+ { -+ if (!htab->elf.dynamic_sections_created -+ || h->dynindx == -1) -+ htab->reliplt->size += sizeof (Elf32_External_Rela); -+ else -+ { -+ htab->relplt->size += sizeof (Elf32_External_Rela); -+ -+ if (htab->plt_type == PLT_VXWORKS) -+ { -+ /* Allocate space for the unloaded relocations. */ -+ if (!info->shared -+ && htab->elf.dynamic_sections_created) -+ { -+ if (ent->plt.offset -+ == (bfd_vma) htab->plt_initial_entry_size) -+ { -+ htab->srelplt2->size -+ += (sizeof (Elf32_External_Rela) -+ * VXWORKS_PLTRESOLVE_RELOCS); -+ } -+ -+ htab->srelplt2->size -+ += (sizeof (Elf32_External_Rela) -+ * VXWORKS_PLT_NON_JMP_SLOT_RELOCS); -+ } -+ -+ /* Every PLT entry has an associated GOT entry in -+ .got.plt. */ -+ htab->sgotplt->size += 4; -+ } -+ } -+ doneone = TRUE; -+ } -+ } -+ else -+ ent->plt.offset = (bfd_vma) -1; -+ } -+ else -+ ent->plt.offset = (bfd_vma) -1; -+ -+ if (!doneone) -+ { -+ h->plt.plist = NULL; -+ h->needs_plt = 0; -+ } -+ } -+ else -+ { -+ h->plt.plist = NULL; -+ h->needs_plt = 0; -+ } -+ -+ eh = (struct ppc_elf_link_hash_entry *) h; -+ if (eh->elf.got.refcount > 0) -+ { -+ bfd_boolean dyn; -+ unsigned int need; -+ -+ /* Make sure this symbol is output as a dynamic symbol. */ -+ if (eh->elf.dynindx == -1 -+ && !eh->elf.forced_local -+ && eh->elf.type != STT_GNU_IFUNC -+ && htab->elf.dynamic_sections_created) -+ { -+ if (!bfd_elf_link_record_dynamic_symbol (info, &eh->elf)) -+ return FALSE; -+ } -+ -+ need = 0; -+ if ((eh->tls_mask & TLS_TLS) != 0) -+ { -+ if ((eh->tls_mask & TLS_LD) != 0) -+ { -+ if (!eh->elf.def_dynamic) -+ /* We'll just use htab->tlsld_got.offset. This should -+ always be the case. It's a little odd if we have -+ a local dynamic reloc against a non-local symbol. */ -+ htab->tlsld_got.refcount += 1; -+ else -+ need += 8; -+ } -+ if ((eh->tls_mask & TLS_GD) != 0) -+ need += 8; -+ if ((eh->tls_mask & (TLS_TPREL | TLS_TPRELGD)) != 0) -+ need += 4; -+ if ((eh->tls_mask & TLS_DTPREL) != 0) -+ need += 4; -+ } -+ else -+ need += 4; -+ if (need == 0) -+ eh->elf.got.offset = (bfd_vma) -1; -+ else -+ { -+ eh->elf.got.offset = allocate_got (htab, need); -+ dyn = htab->elf.dynamic_sections_created; -+ if ((info->shared -+ || WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, 0, &eh->elf)) -+ && (ELF_ST_VISIBILITY (eh->elf.other) == STV_DEFAULT -+ || eh->elf.root.type != bfd_link_hash_undefweak)) -+ { -+ asection *rsec = htab->relgot; -+ /* All the entries we allocated need relocs. -+ Except LD only needs one. */ -+ if ((eh->tls_mask & TLS_LD) != 0 -+ && eh->elf.def_dynamic) -+ need -= 4; -+ rsec->size += need * (sizeof (Elf32_External_Rela) / 4); -+ } -+ } -+ } -+ else -+ eh->elf.got.offset = (bfd_vma) -1; -+ -+ if (eh->dyn_relocs == NULL -+ || !htab->elf.dynamic_sections_created) -+ return TRUE; -+ -+ /* In the shared -Bsymbolic case, discard space allocated for -+ dynamic pc-relative relocs against symbols which turn out to be -+ defined in regular objects. For the normal shared case, discard -+ space for relocs that have become local due to symbol visibility -+ changes. */ -+ -+ if (info->shared) -+ { -+ /* Relocs that use pc_count are those that appear on a call insn, -+ or certain REL relocs (see must_be_dyn_reloc) that can be -+ generated via assembly. We want calls to protected symbols to -+ resolve directly to the function rather than going via the plt. -+ If people want function pointer comparisons to work as expected -+ then they should avoid writing weird assembly. */ -+ if (SYMBOL_CALLS_LOCAL (info, h)) -+ { -+ struct elf_dyn_relocs **pp; -+ -+ for (pp = &eh->dyn_relocs; (p = *pp) != NULL; ) -+ { -+ p->count -= p->pc_count; -+ p->pc_count = 0; -+ if (p->count == 0) -+ *pp = p->next; -+ else -+ pp = &p->next; -+ } -+ } -+ -+ if (htab->is_vxworks) -+ { -+ struct elf_dyn_relocs **pp; -+ -+ for (pp = &eh->dyn_relocs; (p = *pp) != NULL; ) -+ { -+ if (strcmp (p->sec->output_section->name, ".tls_vars") == 0) -+ *pp = p->next; -+ else -+ pp = &p->next; -+ } -+ } -+ -+ /* Discard relocs on undefined symbols that must be local. */ -+ if (eh->dyn_relocs != NULL -+ && h->root.type == bfd_link_hash_undefined -+ && (ELF_ST_VISIBILITY (h->other) == STV_HIDDEN -+ || ELF_ST_VISIBILITY (h->other) == STV_INTERNAL)) -+ eh->dyn_relocs = NULL; -+ -+ /* Also discard relocs on undefined weak syms with non-default -+ visibility. */ -+ if (eh->dyn_relocs != NULL -+ && h->root.type == bfd_link_hash_undefweak) -+ { -+ if (ELF_ST_VISIBILITY (h->other) != STV_DEFAULT) -+ eh->dyn_relocs = NULL; -+ -+ /* Make sure undefined weak symbols are output as a dynamic -+ symbol in PIEs. */ -+ else if (h->dynindx == -1 -+ && !h->forced_local -+ && !h->def_regular) -+ { -+ if (! bfd_elf_link_record_dynamic_symbol (info, h)) -+ return FALSE; -+ } -+ } -+ } -+ else if (ELIMINATE_COPY_RELOCS) -+ { -+ /* For the non-shared case, discard space for relocs against -+ symbols which turn out to need copy relocs or are not -+ dynamic. */ -+ -+ if (!h->non_got_ref -+ && !h->def_regular) -+ { -+ /* Make sure this symbol is output as a dynamic symbol. -+ Undefined weak syms won't yet be marked as dynamic. */ -+ if (h->dynindx == -1 -+ && !h->forced_local) -+ { -+ if (! bfd_elf_link_record_dynamic_symbol (info, h)) -+ return FALSE; -+ } -+ -+ /* If that succeeded, we know we'll be keeping all the -+ relocs. */ -+ if (h->dynindx != -1) -+ goto keep; -+ } -+ -+ eh->dyn_relocs = NULL; -+ -+ keep: ; -+ } -+ -+ /* Finally, allocate space. */ -+ for (p = eh->dyn_relocs; p != NULL; p = p->next) -+ { -+ asection *sreloc = elf_section_data (p->sec)->sreloc; -+ if (!htab->elf.dynamic_sections_created) -+ sreloc = htab->reliplt; -+ sreloc->size += p->count * sizeof (Elf32_External_Rela); -+ } -+ -+ return TRUE; -+} -+ -+/* Set DF_TEXTREL if we find any dynamic relocs that apply to -+ read-only sections. */ -+ -+static bfd_boolean -+maybe_set_textrel (struct elf_link_hash_entry *h, void *info) -+{ -+ if (h->root.type == bfd_link_hash_indirect) -+ return TRUE; -+ -+ if (readonly_dynrelocs (h)) -+ { -+ ((struct bfd_link_info *) info)->flags |= DF_TEXTREL; -+ -+ /* Not an error, just cut short the traversal. */ -+ return FALSE; -+ } -+ return TRUE; -+} -+ -+static const unsigned char glink_eh_frame_cie[] = -+{ -+ 0, 0, 0, 16, /* length. */ -+ 0, 0, 0, 0, /* id. */ -+ 1, /* CIE version. */ -+ 'z', 'R', 0, /* Augmentation string. */ -+ 4, /* Code alignment. */ -+ 0x7c, /* Data alignment. */ -+ 65, /* RA reg. */ -+ 1, /* Augmentation size. */ -+ DW_EH_PE_pcrel | DW_EH_PE_sdata4, /* FDE encoding. */ -+ DW_CFA_def_cfa, 1, 0 /* def_cfa: r1 offset 0. */ -+}; -+ -+/* Set the sizes of the dynamic sections. */ -+ -+static bfd_boolean -+ppc_elf_size_dynamic_sections (bfd *output_bfd ATTRIBUTE_UNUSED, -+ struct bfd_link_info *info) -+{ -+ struct ppc_elf_link_hash_table *htab; -+ asection *s; -+ bfd_boolean relocs; -+ bfd *ibfd; -+ -+#ifdef DEBUG -+ fprintf (stderr, "ppc_elf_size_dynamic_sections called\n"); -+#endif -+ -+ htab = ppc_elf_hash_table (info); -+ BFD_ASSERT (htab->elf.dynobj != NULL); -+ -+#ifdef DEBUG -+ fprintf (stderr, "ppc_elf_size_dynamic_sections: dynamic_sections_created = %d\n", elf_hash_table (info)->dynamic_sections_created); -+#endif -+ -+ if (elf_hash_table (info)->dynamic_sections_created) -+ { -+ /* Set the contents of the .interp section to the interpreter. */ -+ if (info->executable) -+ { -+ s = bfd_get_linker_section (htab->elf.dynobj, ".interp"); -+ BFD_ASSERT (s != NULL); -+ s->size = sizeof ELF_DYNAMIC_INTERPRETER; -+ s->contents = (unsigned char *) ELF_DYNAMIC_INTERPRETER; -+ } -+ } -+ -+ if (htab->plt_type == PLT_OLD) -+ htab->got_header_size = 16; -+ else if (htab->plt_type == PLT_NEW) -+ htab->got_header_size = 12; -+ -+ /* Set up .got offsets for local syms, and space for local dynamic -+ relocs. */ -+ for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next) -+ { -+ bfd_signed_vma *local_got; -+ bfd_signed_vma *end_local_got; -+ struct plt_entry **local_plt; -+ struct plt_entry **end_local_plt; -+ char *lgot_masks; -+ bfd_size_type locsymcount; -+ Elf_Internal_Shdr *symtab_hdr; -+ -+#ifdef DEBUG -+ fprintf (stderr, "ppc_elf_size_dynamic_sections: is_ppc_elf() = %d (flavour = %d)\n", is_ppc_elf (ibfd), bfd_get_flavour (ibfd)); -+#endif -+ -+ if (!is_ppc_elf (ibfd)) -+ continue; -+ -+ for (s = ibfd->sections; s != NULL; s = s->next) -+ { -+ struct elf_dyn_relocs *p; -+ -+ for (p = ((struct elf_dyn_relocs *) -+ elf_section_data (s)->local_dynrel); -+ p != NULL; -+ p = p->next) -+ { -+ if (!bfd_is_abs_section (p->sec) -+ && bfd_is_abs_section (p->sec->output_section)) -+ { -+ /* Input section has been discarded, either because -+ it is a copy of a linkonce section or due to -+ linker script /DISCARD/, so we'll be discarding -+ the relocs too. */ -+ } -+ else if (htab->is_vxworks -+ && strcmp (p->sec->output_section->name, -+ ".tls_vars") == 0) -+ { -+ /* Relocations in vxworks .tls_vars sections are -+ handled specially by the loader. */ -+ } -+ else if (p->count != 0) -+ { -+ asection *sreloc = elf_section_data (p->sec)->sreloc; -+ if (!htab->elf.dynamic_sections_created) -+ sreloc = htab->reliplt; -+ sreloc->size += p->count * sizeof (Elf32_External_Rela); -+ if ((p->sec->output_section->flags -+ & (SEC_READONLY | SEC_ALLOC)) -+ == (SEC_READONLY | SEC_ALLOC)) -+ info->flags |= DF_TEXTREL; -+ } -+ } -+ } -+ -+ local_got = elf_local_got_refcounts (ibfd); -+ if (!local_got) -+ continue; -+ -+ symtab_hdr = &elf_symtab_hdr (ibfd); -+ locsymcount = symtab_hdr->sh_info; -+ end_local_got = local_got + locsymcount; -+ local_plt = (struct plt_entry **) end_local_got; -+ end_local_plt = local_plt + locsymcount; -+ lgot_masks = (char *) end_local_plt; -+ -+ for (; local_got < end_local_got; ++local_got, ++lgot_masks) -+ if (*local_got > 0) -+ { -+ unsigned int need = 0; -+ if ((*lgot_masks & TLS_TLS) != 0) -+ { -+ if ((*lgot_masks & TLS_GD) != 0) -+ need += 8; -+ if ((*lgot_masks & TLS_LD) != 0) -+ htab->tlsld_got.refcount += 1; -+ if ((*lgot_masks & (TLS_TPREL | TLS_TPRELGD)) != 0) -+ need += 4; -+ if ((*lgot_masks & TLS_DTPREL) != 0) -+ need += 4; -+ } -+ else -+ need += 4; -+ if (need == 0) -+ *local_got = (bfd_vma) -1; -+ else -+ { -+ *local_got = allocate_got (htab, need); -+ if (info->shared) -+ htab->relgot->size += (need -+ * (sizeof (Elf32_External_Rela) / 4)); -+ } -+ } -+ else -+ *local_got = (bfd_vma) -1; -+ -+ if (htab->is_vxworks) -+ continue; -+ -+ /* Allocate space for calls to local STT_GNU_IFUNC syms in .iplt. */ -+ for (; local_plt < end_local_plt; ++local_plt) -+ { -+ struct plt_entry *ent; -+ bfd_boolean doneone = FALSE; -+ bfd_vma plt_offset = 0, glink_offset = 0; -+ -+ for (ent = *local_plt; ent != NULL; ent = ent->next) -+ if (ent->plt.refcount > 0) -+ { -+ s = htab->iplt; -+ -+ if (!doneone) -+ { -+ plt_offset = s->size; -+ s->size += 4; -+ } -+ ent->plt.offset = plt_offset; -+ -+ s = htab->glink; -+ if (!doneone || info->shared) -+ { -+ glink_offset = s->size; -+ s->size += GLINK_ENTRY_SIZE; -+ } -+ ent->glink_offset = glink_offset; -+ -+ if (!doneone) -+ { -+ htab->reliplt->size += sizeof (Elf32_External_Rela); -+ doneone = TRUE; -+ } -+ } -+ else -+ ent->plt.offset = (bfd_vma) -1; -+ } -+ } -+ -+ /* Allocate space for global sym dynamic relocs. */ -+ elf_link_hash_traverse (elf_hash_table (info), allocate_dynrelocs, info); -+ -+ if (htab->tlsld_got.refcount > 0) -+ { -+ htab->tlsld_got.offset = allocate_got (htab, 8); -+ if (info->shared) -+ htab->relgot->size += sizeof (Elf32_External_Rela); -+ } -+ else -+ htab->tlsld_got.offset = (bfd_vma) -1; -+ -+ if (htab->got != NULL && htab->plt_type != PLT_VXWORKS) -+ { -+ unsigned int g_o_t = 32768; -+ -+ /* If we haven't allocated the header, do so now. When we get here, -+ for old plt/got the got size will be 0 to 32764 (not allocated), -+ or 32780 to 65536 (header allocated). For new plt/got, the -+ corresponding ranges are 0 to 32768 and 32780 to 65536. */ -+ if (htab->got->size <= 32768) -+ { -+ g_o_t = htab->got->size; -+ if (htab->plt_type == PLT_OLD) -+ g_o_t += 4; -+ htab->got->size += htab->got_header_size; -+ } -+ -+ htab->elf.hgot->root.u.def.value = g_o_t; -+ } -+ if (info->shared) -+ { -+ struct elf_link_hash_entry *sda = htab->sdata[0].sym; -+ if (sda != NULL -+ && !(sda->root.type == bfd_link_hash_defined -+ || sda->root.type == bfd_link_hash_defweak)) -+ { -+ sda->root.type = bfd_link_hash_defined; -+ sda->root.u.def.section = htab->elf.hgot->root.u.def.section; -+ sda->root.u.def.value = htab->elf.hgot->root.u.def.value; -+ } -+ } -+ -+ if (htab->glink != NULL -+ && htab->glink->size != 0 -+ && htab->elf.dynamic_sections_created) -+ { -+ htab->glink_pltresolve = htab->glink->size; -+ /* Space for the branch table. */ -+ htab->glink->size += htab->glink->size / (GLINK_ENTRY_SIZE / 4) - 4; -+ /* Pad out to align the start of PLTresolve. */ -+ htab->glink->size += -htab->glink->size & 15; -+ htab->glink->size += GLINK_PLTRESOLVE; -+ -+ if (htab->emit_stub_syms) -+ { -+ struct elf_link_hash_entry *sh; -+ sh = elf_link_hash_lookup (&htab->elf, "__glink", -+ TRUE, FALSE, FALSE); -+ if (sh == NULL) -+ return FALSE; -+ if (sh->root.type == bfd_link_hash_new) -+ { -+ sh->root.type = bfd_link_hash_defined; -+ sh->root.u.def.section = htab->glink; -+ sh->root.u.def.value = htab->glink_pltresolve; -+ sh->ref_regular = 1; -+ sh->def_regular = 1; -+ sh->ref_regular_nonweak = 1; -+ sh->forced_local = 1; -+ sh->non_elf = 0; -+ } -+ sh = elf_link_hash_lookup (&htab->elf, "__glink_PLTresolve", -+ TRUE, FALSE, FALSE); -+ if (sh == NULL) -+ return FALSE; -+ if (sh->root.type == bfd_link_hash_new) -+ { -+ sh->root.type = bfd_link_hash_defined; -+ sh->root.u.def.section = htab->glink; -+ sh->root.u.def.value = htab->glink->size - GLINK_PLTRESOLVE; -+ sh->ref_regular = 1; -+ sh->def_regular = 1; -+ sh->ref_regular_nonweak = 1; -+ sh->forced_local = 1; -+ sh->non_elf = 0; -+ } -+ } -+ } -+ -+ if (htab->glink != NULL -+ && htab->glink->size != 0 -+ && htab->glink_eh_frame != NULL -+ && !bfd_is_abs_section (htab->glink_eh_frame->output_section) -+ && _bfd_elf_eh_frame_present (info)) -+ { -+ s = htab->glink_eh_frame; -+ s->size = sizeof (glink_eh_frame_cie) + 20; -+ if (info->shared) -+ { -+ s->size += 4; -+ if (htab->glink->size - GLINK_PLTRESOLVE + 8 >= 256) -+ s->size += 4; -+ } -+ } -+ -+ /* We've now determined the sizes of the various dynamic sections. -+ Allocate memory for them. */ -+ relocs = FALSE; -+ for (s = htab->elf.dynobj->sections; s != NULL; s = s->next) -+ { -+ bfd_boolean strip_section = TRUE; -+ -+ if ((s->flags & SEC_LINKER_CREATED) == 0) -+ continue; -+ -+ if (s == htab->plt -+ || s == htab->got) -+ { -+ /* We'd like to strip these sections if they aren't needed, but if -+ we've exported dynamic symbols from them we must leave them. -+ It's too late to tell BFD to get rid of the symbols. */ -+ if (htab->elf.hplt != NULL) -+ strip_section = FALSE; -+ /* Strip this section if we don't need it; see the -+ comment below. */ -+ } -+ else if (s == htab->iplt -+ || s == htab->glink -+ || s == htab->glink_eh_frame -+ || s == htab->sgotplt -+ || s == htab->sbss -+ || s == htab->dynbss -+ || s == htab->dynsbss -+ || s == htab->sdata[0].section -+ || s == htab->sdata[1].section) -+ { -+ /* Strip these too. */ -+ } -+ else if (CONST_STRNEQ (bfd_get_section_name (htab->elf.dynobj, s), -+ ".rela")) -+ { -+ if (s->size != 0) -+ { -+ /* Remember whether there are any relocation sections. */ -+ relocs = TRUE; -+ -+ /* We use the reloc_count field as a counter if we need -+ to copy relocs into the output file. */ -+ s->reloc_count = 0; -+ } -+ } -+ else -+ { -+ /* It's not one of our sections, so don't allocate space. */ -+ continue; -+ } -+ -+ if (s->size == 0 && strip_section) -+ { -+ /* If we don't need this section, strip it from the -+ output file. This is mostly to handle .rela.bss and -+ .rela.plt. We must create both sections in -+ create_dynamic_sections, because they must be created -+ before the linker maps input sections to output -+ sections. The linker does that before -+ adjust_dynamic_symbol is called, and it is that -+ function which decides whether anything needs to go -+ into these sections. */ -+ s->flags |= SEC_EXCLUDE; -+ continue; -+ } -+ -+ if ((s->flags & SEC_HAS_CONTENTS) == 0) -+ continue; -+ -+ /* Allocate memory for the section contents. */ -+ s->contents = bfd_zalloc (htab->elf.dynobj, s->size); -+ if (s->contents == NULL) -+ return FALSE; -+ } -+ -+ if (htab->elf.dynamic_sections_created) -+ { -+ /* Add some entries to the .dynamic section. We fill in the -+ values later, in ppc_elf_finish_dynamic_sections, but we -+ must add the entries now so that we get the correct size for -+ the .dynamic section. The DT_DEBUG entry is filled in by the -+ dynamic linker and used by the debugger. */ -+#define add_dynamic_entry(TAG, VAL) \ -+ _bfd_elf_add_dynamic_entry (info, TAG, VAL) -+ -+ if (info->executable) -+ { -+ if (!add_dynamic_entry (DT_DEBUG, 0)) -+ return FALSE; -+ } -+ -+ if (htab->plt != NULL && htab->plt->size != 0) -+ { -+ if (!add_dynamic_entry (DT_PLTGOT, 0) -+ || !add_dynamic_entry (DT_PLTRELSZ, 0) -+ || !add_dynamic_entry (DT_PLTREL, DT_RELA) -+ || !add_dynamic_entry (DT_JMPREL, 0)) -+ return FALSE; -+ } -+ -+ if (htab->glink != NULL && htab->glink->size != 0) -+ { -+ if (!add_dynamic_entry (DT_PPC_GOT, 0)) -+ return FALSE; -+ if (!htab->no_tls_get_addr_opt -+ && htab->tls_get_addr != NULL -+ && htab->tls_get_addr->plt.plist != NULL -+ && !add_dynamic_entry (DT_PPC_TLSOPT, 0)) -+ return FALSE; -+ } -+ -+ if (relocs) -+ { -+ if (!add_dynamic_entry (DT_RELA, 0) -+ || !add_dynamic_entry (DT_RELASZ, 0) -+ || !add_dynamic_entry (DT_RELAENT, sizeof (Elf32_External_Rela))) -+ return FALSE; -+ } -+ -+ /* If any dynamic relocs apply to a read-only section, then we -+ need a DT_TEXTREL entry. */ -+ if ((info->flags & DF_TEXTREL) == 0) -+ elf_link_hash_traverse (elf_hash_table (info), maybe_set_textrel, -+ info); -+ -+ if ((info->flags & DF_TEXTREL) != 0) -+ { -+ if (!add_dynamic_entry (DT_TEXTREL, 0)) -+ return FALSE; -+ } -+ if (htab->is_vxworks -+ && !elf_vxworks_add_dynamic_entries (output_bfd, info)) -+ return FALSE; -+ -+ /* Flag it as a version 2 dynamic binary */ -+ if (!add_dynamic_entry(DT_AMIGAOS_DYNVERSION, 2)) -+ return FALSE; -+ } -+#undef add_dynamic_entry -+ -+ if (htab->glink_eh_frame != NULL -+ && htab->glink_eh_frame->contents != NULL) -+ { -+ unsigned char *p = htab->glink_eh_frame->contents; -+ bfd_vma val; -+ -+ memcpy (p, glink_eh_frame_cie, sizeof (glink_eh_frame_cie)); -+ /* CIE length (rewrite in case little-endian). */ -+ bfd_put_32 (htab->elf.dynobj, sizeof (glink_eh_frame_cie) - 4, p); -+ p += sizeof (glink_eh_frame_cie); -+ /* FDE length. */ -+ val = htab->glink_eh_frame->size - 4 - sizeof (glink_eh_frame_cie); -+ bfd_put_32 (htab->elf.dynobj, val, p); -+ p += 4; -+ /* CIE pointer. */ -+ val = p - htab->glink_eh_frame->contents; -+ bfd_put_32 (htab->elf.dynobj, val, p); -+ p += 4; -+ /* Offset to .glink. Set later. */ -+ p += 4; -+ /* .glink size. */ -+ bfd_put_32 (htab->elf.dynobj, htab->glink->size, p); -+ p += 4; -+ /* Augmentation. */ -+ p += 1; -+ -+ if (info->shared -+ && htab->elf.dynamic_sections_created) -+ { -+ bfd_vma adv = (htab->glink->size - GLINK_PLTRESOLVE + 8) >> 2; -+ if (adv < 64) -+ *p++ = DW_CFA_advance_loc + adv; -+ else if (adv < 256) -+ { -+ *p++ = DW_CFA_advance_loc1; -+ *p++ = adv; -+ } -+ else if (adv < 65536) -+ { -+ *p++ = DW_CFA_advance_loc2; -+ bfd_put_16 (htab->elf.dynobj, adv, p); -+ p += 2; -+ } -+ else -+ { -+ *p++ = DW_CFA_advance_loc4; -+ bfd_put_32 (htab->elf.dynobj, adv, p); -+ p += 4; -+ } -+ *p++ = DW_CFA_register; -+ *p++ = 65; -+ p++; -+ *p++ = DW_CFA_advance_loc + 4; -+ *p++ = DW_CFA_restore_extended; -+ *p++ = 65; -+ } -+ BFD_ASSERT ((bfd_vma) ((p + 3 - htab->glink_eh_frame->contents) & -4) -+ == htab->glink_eh_frame->size); -+ } -+ -+ return TRUE; -+} -+ -+/* Return TRUE if symbol should be hashed in the `.gnu.hash' section. */ -+ -+static bfd_boolean -+ppc_elf_hash_symbol (struct elf_link_hash_entry *h) -+{ -+ if (h->plt.plist != NULL -+ && !h->def_regular -+ && (!h->pointer_equality_needed -+ || !h->ref_regular_nonweak)) -+ return FALSE; -+ -+ return _bfd_elf_hash_symbol (h); -+} -+ -+#define ARRAY_SIZE(a) (sizeof (a) / sizeof ((a)[0])) -+ -+/* Relaxation trampolines. r12 is available for clobbering (r11, is -+ used for some functions that are allowed to break the ABI). */ -+static const int shared_stub_entry[] = -+ { -+ 0x7c0802a6, /* mflr 0 */ -+ 0x429f0005, /* bcl 20, 31, .Lxxx */ -+ 0x7d8802a6, /* mflr 12 */ -+ 0x3d8c0000, /* addis 12, 12, (xxx-.Lxxx)@ha */ -+ 0x398c0008, /* addi 12, 12, (xxx-.Lxxx)@l */ -+ 0x7c0803a6, /* mtlr 0 */ -+ 0x7d8903a6, /* mtctr 12 */ -+ 0x4e800420, /* bctr */ -+ }; -+ -+static const int stub_entry[] = -+ { -+ 0x3d800000, /* lis 12,xxx@ha */ -+ 0x398c0000, /* addi 12,12,xxx@l */ -+ 0x7d8903a6, /* mtctr 12 */ -+ 0x4e800420, /* bctr */ -+ }; -+ -+static bfd_boolean -+ppc_elf_relax_section (bfd *abfd, -+ asection *isec, -+ struct bfd_link_info *link_info, -+ bfd_boolean *again) -+{ -+ struct one_fixup -+ { -+ struct one_fixup *next; -+ asection *tsec; -+ /* Final link, can use the symbol offset. For a -+ relocatable link we use the symbol's index. */ -+ bfd_vma toff; -+ bfd_vma trampoff; -+ }; -+ -+ Elf_Internal_Shdr *symtab_hdr; -+ bfd_byte *contents = NULL; -+ Elf_Internal_Sym *isymbuf = NULL; -+ Elf_Internal_Rela *internal_relocs = NULL; -+ Elf_Internal_Rela *irel, *irelend; -+ struct one_fixup *fixups = NULL; -+ unsigned changes = 0; -+ struct ppc_elf_link_hash_table *htab; -+ bfd_size_type trampoff; -+ asection *got2; -+ bfd_boolean maybe_pasted; -+ -+ *again = FALSE; -+ -+ /* Nothing to do if there are no relocations, and no need to do -+ anything with non-alloc or non-code sections. */ -+ if ((isec->flags & SEC_ALLOC) == 0 -+ || (isec->flags & SEC_CODE) == 0 -+ || (isec->flags & SEC_RELOC) == 0 -+ || isec->reloc_count == 0) -+ return TRUE; -+ -+ /* We cannot represent the required PIC relocs in the output, so don't -+ do anything. The linker doesn't support mixing -shared and -r -+ anyway. */ -+ if (link_info->relocatable && link_info->shared) -+ return TRUE; -+ -+ trampoff = (isec->size + 3) & (bfd_vma) -4; -+ maybe_pasted = (strcmp (isec->output_section->name, ".init") == 0 -+ || strcmp (isec->output_section->name, ".fini") == 0); -+ /* Space for a branch around any trampolines. */ -+ if (maybe_pasted) -+ trampoff += 4; -+ -+ symtab_hdr = &elf_symtab_hdr (abfd); -+ -+ /* Get a copy of the native relocations. */ -+ internal_relocs = _bfd_elf_link_read_relocs (abfd, isec, NULL, NULL, -+ link_info->keep_memory); -+ if (internal_relocs == NULL) -+ goto error_return; -+ -+ htab = ppc_elf_hash_table (link_info); -+ got2 = bfd_get_section_by_name (abfd, ".got2"); -+ -+ irelend = internal_relocs + isec->reloc_count; -+ for (irel = internal_relocs; irel < irelend; irel++) -+ { -+ unsigned long r_type = ELF32_R_TYPE (irel->r_info); -+ bfd_vma toff, roff; -+ asection *tsec; -+ struct one_fixup *f; -+ size_t insn_offset = 0; -+ bfd_vma max_branch_offset, val; -+ bfd_byte *hit_addr; -+ unsigned long t0; -+ struct elf_link_hash_entry *h; -+ struct plt_entry **plist; -+ unsigned char sym_type; -+ -+ switch (r_type) -+ { -+ case R_PPC_REL24: -+ case R_PPC_LOCAL24PC: -+ case R_PPC_PLTREL24: -+ max_branch_offset = 1 << 25; -+ break; -+ -+ case R_PPC_REL14: -+ case R_PPC_REL14_BRTAKEN: -+ case R_PPC_REL14_BRNTAKEN: -+ max_branch_offset = 1 << 15; -+ break; -+ -+ default: -+ continue; -+ } -+ -+ /* Get the value of the symbol referred to by the reloc. */ -+ h = NULL; -+ if (ELF32_R_SYM (irel->r_info) < symtab_hdr->sh_info) -+ { -+ /* A local symbol. */ -+ Elf_Internal_Sym *isym; -+ -+ /* Read this BFD's local symbols. */ -+ if (isymbuf == NULL) -+ { -+ isymbuf = (Elf_Internal_Sym *) symtab_hdr->contents; -+ if (isymbuf == NULL) -+ isymbuf = bfd_elf_get_elf_syms (abfd, symtab_hdr, -+ symtab_hdr->sh_info, 0, -+ NULL, NULL, NULL); -+ if (isymbuf == 0) -+ goto error_return; -+ } -+ isym = isymbuf + ELF32_R_SYM (irel->r_info); -+ if (isym->st_shndx == SHN_UNDEF) -+ tsec = bfd_und_section_ptr; -+ else if (isym->st_shndx == SHN_ABS) -+ tsec = bfd_abs_section_ptr; -+ else if (isym->st_shndx == SHN_COMMON) -+ tsec = bfd_com_section_ptr; -+ else -+ tsec = bfd_section_from_elf_index (abfd, isym->st_shndx); -+ -+ toff = isym->st_value; -+ sym_type = ELF_ST_TYPE (isym->st_info); -+ } -+ else -+ { -+ /* Global symbol handling. */ -+ unsigned long indx; -+ -+ indx = ELF32_R_SYM (irel->r_info) - symtab_hdr->sh_info; -+ h = elf_sym_hashes (abfd)[indx]; -+ -+ while (h->root.type == bfd_link_hash_indirect -+ || h->root.type == bfd_link_hash_warning) -+ h = (struct elf_link_hash_entry *) h->root.u.i.link; -+ -+ if (h->root.type == bfd_link_hash_defined -+ || h->root.type == bfd_link_hash_defweak) -+ { -+ tsec = h->root.u.def.section; -+ toff = h->root.u.def.value; -+ } -+ else if (h->root.type == bfd_link_hash_undefined -+ || h->root.type == bfd_link_hash_undefweak) -+ { -+ tsec = bfd_und_section_ptr; -+ toff = link_info->relocatable ? indx : 0; -+ } -+ else -+ continue; -+ -+ sym_type = h->type; -+ } -+ -+ /* The condition here under which we call find_plt_ent must -+ match that in relocate_section. If we call find_plt_ent here -+ but not in relocate_section, or vice versa, then the branch -+ destination used here may be incorrect. */ -+ plist = NULL; -+ if (h != NULL) -+ { -+ /* We know is_branch_reloc (r_type) is true. */ -+ if (h->type == STT_GNU_IFUNC -+ || r_type == R_PPC_PLTREL24) -+ plist = &h->plt.plist; -+ } -+ else if (sym_type == STT_GNU_IFUNC -+ && elf_local_got_offsets (abfd) != NULL) -+ { -+ bfd_vma *local_got_offsets = elf_local_got_offsets (abfd); -+ struct plt_entry **local_plt = (struct plt_entry **) -+ (local_got_offsets + symtab_hdr->sh_info); -+ plist = local_plt + ELF32_R_SYM (irel->r_info); -+ } -+ if (plist != NULL) -+ { -+ bfd_vma addend = 0; -+ struct plt_entry *ent; -+ -+ if (r_type == R_PPC_PLTREL24 && link_info->shared) -+ addend = irel->r_addend; -+ ent = find_plt_ent (plist, got2, addend); -+ if (ent != NULL) -+ { -+ if (htab->plt_type == PLT_NEW -+ || h == NULL -+ || !htab->elf.dynamic_sections_created -+ || h->dynindx == -1) -+ { -+ tsec = htab->glink; -+ toff = ent->glink_offset; -+ } -+ else -+ { -+ tsec = htab->plt; -+ toff = ent->plt.offset; -+ } -+ } -+ } -+ -+ /* If the branch and target are in the same section, you have -+ no hope of adding stubs. We'll error out later should the -+ branch overflow. */ -+ if (tsec == isec) -+ continue; -+ -+ /* There probably isn't any reason to handle symbols in -+ SEC_MERGE sections; SEC_MERGE doesn't seem a likely -+ attribute for a code section, and we are only looking at -+ branches. However, implement it correctly here as a -+ reference for other target relax_section functions. */ -+ if (0 && tsec->sec_info_type == SEC_INFO_TYPE_MERGE) -+ { -+ /* At this stage in linking, no SEC_MERGE symbol has been -+ adjusted, so all references to such symbols need to be -+ passed through _bfd_merged_section_offset. (Later, in -+ relocate_section, all SEC_MERGE symbols *except* for -+ section symbols have been adjusted.) -+ -+ gas may reduce relocations against symbols in SEC_MERGE -+ sections to a relocation against the section symbol when -+ the original addend was zero. When the reloc is against -+ a section symbol we should include the addend in the -+ offset passed to _bfd_merged_section_offset, since the -+ location of interest is the original symbol. On the -+ other hand, an access to "sym+addend" where "sym" is not -+ a section symbol should not include the addend; Such an -+ access is presumed to be an offset from "sym"; The -+ location of interest is just "sym". */ -+ if (sym_type == STT_SECTION) -+ toff += irel->r_addend; -+ -+ toff = _bfd_merged_section_offset (abfd, &tsec, -+ elf_section_data (tsec)->sec_info, -+ toff); -+ -+ if (sym_type != STT_SECTION) -+ toff += irel->r_addend; -+ } -+ /* PLTREL24 addends are special. */ -+ else if (r_type != R_PPC_PLTREL24) -+ toff += irel->r_addend; -+ -+ /* Attempted -shared link of non-pic code loses. */ -+ if (tsec->output_section == NULL) -+ continue; -+ -+ roff = irel->r_offset; -+ -+ /* If the branch is in range, no need to do anything. */ -+ if (tsec != bfd_und_section_ptr -+ && (!link_info->relocatable -+ /* A relocatable link may have sections moved during -+ final link, so do not presume they remain in range. */ -+ || tsec->output_section == isec->output_section)) -+ { -+ bfd_vma symaddr, reladdr; -+ -+ symaddr = tsec->output_section->vma + tsec->output_offset + toff; -+ reladdr = isec->output_section->vma + isec->output_offset + roff; -+ if (symaddr - reladdr + max_branch_offset < 2 * max_branch_offset) -+ continue; -+ } -+ -+ /* Look for an existing fixup to this address. */ -+ for (f = fixups; f ; f = f->next) -+ if (f->tsec == tsec && f->toff == toff) -+ break; -+ -+ if (f == NULL) -+ { -+ size_t size; -+ unsigned long stub_rtype; -+ -+ val = trampoff - roff; -+ if (val >= max_branch_offset) -+ /* Oh dear, we can't reach a trampoline. Don't try to add -+ one. We'll report an error later. */ -+ continue; -+ -+ if (link_info->shared) -+ { -+ size = 4 * ARRAY_SIZE (shared_stub_entry); -+ insn_offset = 12; -+ } -+ else -+ { -+ size = 4 * ARRAY_SIZE (stub_entry); -+ insn_offset = 0; -+ } -+ stub_rtype = R_PPC_RELAX; -+ if (tsec == htab->plt -+ || tsec == htab->glink) -+ { -+ stub_rtype = R_PPC_RELAX_PLT; -+ if (r_type == R_PPC_PLTREL24) -+ stub_rtype = R_PPC_RELAX_PLTREL24; -+ } -+ -+ /* Hijack the old relocation. Since we need two -+ relocations for this use a "composite" reloc. */ -+ irel->r_info = ELF32_R_INFO (ELF32_R_SYM (irel->r_info), -+ stub_rtype); -+ irel->r_offset = trampoff + insn_offset; -+ if (r_type == R_PPC_PLTREL24 -+ && stub_rtype != R_PPC_RELAX_PLTREL24) -+ irel->r_addend = 0; -+ -+ /* Record the fixup so we don't do it again this section. */ -+ f = bfd_malloc (sizeof (*f)); -+ f->next = fixups; -+ f->tsec = tsec; -+ f->toff = toff; -+ f->trampoff = trampoff; -+ fixups = f; -+ -+ trampoff += size; -+ changes++; -+ } -+ else -+ { -+ val = f->trampoff - roff; -+ if (val >= max_branch_offset) -+ continue; -+ -+ /* Nop out the reloc, since we're finalizing things here. */ -+ irel->r_info = ELF32_R_INFO (0, R_PPC_NONE); -+ } -+ -+ /* Get the section contents. */ -+ if (contents == NULL) -+ { -+ /* Get cached copy if it exists. */ -+ if (elf_section_data (isec)->this_hdr.contents != NULL) -+ contents = elf_section_data (isec)->this_hdr.contents; -+ else -+ { -+ /* Go get them off disk. */ -+ if (!bfd_malloc_and_get_section (abfd, isec, &contents)) -+ goto error_return; -+ } -+ } -+ -+ /* Fix up the existing branch to hit the trampoline. */ -+ hit_addr = contents + roff; -+ switch (r_type) -+ { -+ case R_PPC_REL24: -+ case R_PPC_LOCAL24PC: -+ case R_PPC_PLTREL24: -+ t0 = bfd_get_32 (abfd, hit_addr); -+ t0 &= ~0x3fffffc; -+ t0 |= val & 0x3fffffc; -+ bfd_put_32 (abfd, t0, hit_addr); -+ break; -+ -+ case R_PPC_REL14: -+ case R_PPC_REL14_BRTAKEN: -+ case R_PPC_REL14_BRNTAKEN: -+ t0 = bfd_get_32 (abfd, hit_addr); -+ t0 &= ~0xfffc; -+ t0 |= val & 0xfffc; -+ bfd_put_32 (abfd, t0, hit_addr); -+ break; -+ } -+ } -+ -+ /* Write out the trampolines. */ -+ if (fixups != NULL) -+ { -+ const int *stub; -+ bfd_byte *dest; -+ int i, size; -+ -+ do -+ { -+ struct one_fixup *f = fixups; -+ fixups = fixups->next; -+ free (f); -+ } -+ while (fixups); -+ -+ contents = bfd_realloc_or_free (contents, trampoff); -+ if (contents == NULL) -+ goto error_return; -+ -+ isec->size = (isec->size + 3) & (bfd_vma) -4; -+ dest = contents + isec->size; -+ /* Branch around the trampolines. */ -+ if (maybe_pasted) -+ { -+ bfd_vma val = B + trampoff - isec->size; -+ bfd_put_32 (abfd, val, dest); -+ dest += 4; -+ } -+ isec->size = trampoff; -+ -+ if (link_info->shared) -+ { -+ stub = shared_stub_entry; -+ size = ARRAY_SIZE (shared_stub_entry); -+ } -+ else -+ { -+ stub = stub_entry; -+ size = ARRAY_SIZE (stub_entry); -+ } -+ -+ i = 0; -+ while (dest < contents + trampoff) -+ { -+ bfd_put_32 (abfd, stub[i], dest); -+ i++; -+ if (i == size) -+ i = 0; -+ dest += 4; -+ } -+ BFD_ASSERT (i == 0); -+ } -+ -+ if (isymbuf != NULL -+ && symtab_hdr->contents != (unsigned char *) isymbuf) -+ { -+ if (! link_info->keep_memory) -+ free (isymbuf); -+ else -+ { -+ /* Cache the symbols for elf_link_input_bfd. */ -+ symtab_hdr->contents = (unsigned char *) isymbuf; -+ } -+ } -+ -+ if (contents != NULL -+ && elf_section_data (isec)->this_hdr.contents != contents) -+ { -+ if (!changes && !link_info->keep_memory) -+ free (contents); -+ else -+ { -+ /* Cache the section contents for elf_link_input_bfd. */ -+ elf_section_data (isec)->this_hdr.contents = contents; -+ } -+ } -+ -+ if (changes != 0) -+ { -+ /* Append sufficient NOP relocs so we can write out relocation -+ information for the trampolines. */ -+ Elf_Internal_Shdr *rel_hdr; -+ Elf_Internal_Rela *new_relocs = bfd_malloc ((changes + isec->reloc_count) -+ * sizeof (*new_relocs)); -+ unsigned ix; -+ -+ if (!new_relocs) -+ goto error_return; -+ memcpy (new_relocs, internal_relocs, -+ isec->reloc_count * sizeof (*new_relocs)); -+ for (ix = changes; ix--;) -+ { -+ irel = new_relocs + ix + isec->reloc_count; -+ -+ irel->r_info = ELF32_R_INFO (0, R_PPC_NONE); -+ } -+ if (internal_relocs != elf_section_data (isec)->relocs) -+ free (internal_relocs); -+ elf_section_data (isec)->relocs = new_relocs; -+ isec->reloc_count += changes; -+ rel_hdr = _bfd_elf_single_rel_hdr (isec); -+ rel_hdr->sh_size += changes * rel_hdr->sh_entsize; -+ } -+ else if (elf_section_data (isec)->relocs != internal_relocs) -+ free (internal_relocs); -+ -+ *again = changes != 0; -+ if (!*again && link_info->relocatable) -+ { -+ /* Convert the internal relax relocs to external form. */ -+ for (irel = internal_relocs; irel < irelend; irel++) -+ if (ELF32_R_TYPE (irel->r_info) == R_PPC_RELAX) -+ { -+ unsigned long r_symndx = ELF32_R_SYM (irel->r_info); -+ -+ /* Rewrite the reloc and convert one of the trailing nop -+ relocs to describe this relocation. */ -+ BFD_ASSERT (ELF32_R_TYPE (irelend[-1].r_info) == R_PPC_NONE); -+ /* The relocs are at the bottom 2 bytes */ -+ irel[0].r_offset += 2; -+ memmove (irel + 1, irel, (irelend - irel - 1) * sizeof (*irel)); -+ irel[0].r_info = ELF32_R_INFO (r_symndx, R_PPC_ADDR16_HA); -+ irel[1].r_offset += 4; -+ irel[1].r_info = ELF32_R_INFO (r_symndx, R_PPC_ADDR16_LO); -+ irel++; -+ } -+ } -+ -+ return TRUE; -+ -+ error_return: -+ if (isymbuf != NULL && (unsigned char *) isymbuf != symtab_hdr->contents) -+ free (isymbuf); -+ if (contents != NULL -+ && elf_section_data (isec)->this_hdr.contents != contents) -+ free (contents); -+ if (internal_relocs != NULL -+ && elf_section_data (isec)->relocs != internal_relocs) -+ free (internal_relocs); -+ return FALSE; -+} -+ -+/* What to do when ld finds relocations against symbols defined in -+ discarded sections. */ -+ -+static unsigned int -+ppc_elf_action_discarded (asection *sec) -+{ -+ if (strcmp (".fixup", sec->name) == 0) -+ return 0; -+ -+ if (strcmp (".got2", sec->name) == 0) -+ return 0; -+ -+ return _bfd_elf_default_action_discarded (sec); -+} -+ -+/* Fill in the address for a pointer generated in a linker section. */ -+ -+static bfd_vma -+elf_finish_pointer_linker_section (bfd *input_bfd, -+ elf_linker_section_t *lsect, -+ struct elf_link_hash_entry *h, -+ bfd_vma relocation, -+ const Elf_Internal_Rela *rel) -+{ -+ elf_linker_section_pointers_t *linker_section_ptr; -+ -+ BFD_ASSERT (lsect != NULL); -+ -+ if (h != NULL) -+ { -+ /* Handle global symbol. */ -+ struct ppc_elf_link_hash_entry *eh; -+ -+ eh = (struct ppc_elf_link_hash_entry *) h; -+ BFD_ASSERT (eh->elf.def_regular); -+ linker_section_ptr = eh->linker_section_pointer; -+ } -+ else -+ { -+ /* Handle local symbol. */ -+ unsigned long r_symndx = ELF32_R_SYM (rel->r_info); -+ -+ BFD_ASSERT (is_ppc_elf (input_bfd)); -+ BFD_ASSERT (elf_local_ptr_offsets (input_bfd) != NULL); -+ linker_section_ptr = elf_local_ptr_offsets (input_bfd)[r_symndx]; -+ } -+ -+ linker_section_ptr = elf_find_pointer_linker_section (linker_section_ptr, -+ rel->r_addend, -+ lsect); -+ BFD_ASSERT (linker_section_ptr != NULL); -+ -+ /* Offset will always be a multiple of four, so use the bottom bit -+ as a "written" flag. */ -+ if ((linker_section_ptr->offset & 1) == 0) -+ { -+ bfd_put_32 (lsect->section->owner, -+ relocation + linker_section_ptr->addend, -+ lsect->section->contents + linker_section_ptr->offset); -+ linker_section_ptr->offset += 1; -+ } -+ -+ relocation = (lsect->section->output_section->vma -+ + lsect->section->output_offset -+ + linker_section_ptr->offset - 1 -+ - SYM_VAL (lsect->sym)); -+ -+#ifdef DEBUG -+ fprintf (stderr, -+ "Finish pointer in linker section %s, offset = %ld (0x%lx)\n", -+ lsect->name, (long) relocation, (long) relocation); -+#endif -+ -+ return relocation; -+} -+ -+#define PPC_LO(v) ((v) & 0xffff) -+#define PPC_HI(v) (((v) >> 16) & 0xffff) -+#define PPC_HA(v) PPC_HI ((v) + 0x8000) -+ -+static void -+write_glink_stub (struct plt_entry *ent, asection *plt_sec, unsigned char *p, -+ struct bfd_link_info *info) -+{ -+ struct ppc_elf_link_hash_table *htab = ppc_elf_hash_table (info); -+ bfd *output_bfd = info->output_bfd; -+ bfd_vma plt; -+ -+ plt = ((ent->plt.offset & ~1) -+ + plt_sec->output_section->vma -+ + plt_sec->output_offset); -+ -+ if (info->shared) -+ { -+ bfd_vma got = 0; -+ -+ if (ent->addend >= 32768) -+ got = (ent->addend -+ + ent->sec->output_section->vma -+ + ent->sec->output_offset); -+ else if (htab->elf.hgot != NULL) -+ got = SYM_VAL (htab->elf.hgot); -+ -+ plt -= got; -+ -+ if (plt + 0x8000 < 0x10000) -+ { -+ bfd_put_32 (output_bfd, LWZ_11_30 + PPC_LO (plt), p); -+ p += 4; -+ bfd_put_32 (output_bfd, MTCTR_11, p); -+ p += 4; -+ bfd_put_32 (output_bfd, BCTR, p); -+ p += 4; -+ bfd_put_32 (output_bfd, NOP, p); -+ p += 4; -+ } -+ else -+ { -+ bfd_put_32 (output_bfd, ADDIS_11_30 + PPC_HA (plt), p); -+ p += 4; -+ bfd_put_32 (output_bfd, LWZ_11_11 + PPC_LO (plt), p); -+ p += 4; -+ bfd_put_32 (output_bfd, MTCTR_11, p); -+ p += 4; -+ bfd_put_32 (output_bfd, BCTR, p); -+ p += 4; -+ } -+ } -+ else -+ { -+ bfd_put_32 (output_bfd, LIS_11 + PPC_HA (plt), p); -+ p += 4; -+ bfd_put_32 (output_bfd, LWZ_11_11 + PPC_LO (plt), p); -+ p += 4; -+ bfd_put_32 (output_bfd, MTCTR_11, p); -+ p += 4; -+ bfd_put_32 (output_bfd, BCTR, p); -+ p += 4; -+ } -+} -+ -+/* Return true if symbol is defined statically. */ -+ -+static bfd_boolean -+is_static_defined (struct elf_link_hash_entry *h) -+{ -+ return ((h->root.type == bfd_link_hash_defined -+ || h->root.type == bfd_link_hash_defweak) -+ && h->root.u.def.section != NULL -+ && h->root.u.def.section->output_section != NULL); -+} -+ -+/* If INSN is an opcode that may be used with an @tls operand, return -+ the transformed insn for TLS optimisation, otherwise return 0. If -+ REG is non-zero only match an insn with RB or RA equal to REG. */ -+ -+unsigned int -+_bfd_elf_amigaos_ppc_at_tls_transform (unsigned int insn, unsigned int reg) -+{ -+ unsigned int rtra; -+ -+ if ((insn & (0x3f << 26)) != 31 << 26) -+ return 0; -+ -+ if (reg == 0 || ((insn >> 11) & 0x1f) == reg) -+ rtra = insn & ((1 << 26) - (1 << 16)); -+ else if (((insn >> 16) & 0x1f) == reg) -+ rtra = (insn & (0x1f << 21)) | ((insn & (0x1f << 11)) << 5); -+ else -+ return 0; -+ -+ if ((insn & (0x3ff << 1)) == 266 << 1) -+ /* add -> addi. */ -+ insn = 14 << 26; -+ else if ((insn & (0x1f << 1)) == 23 << 1 -+ && ((insn & (0x1f << 6)) < 14 << 6 -+ || ((insn & (0x1f << 6)) >= 16 << 6 -+ && (insn & (0x1f << 6)) < 24 << 6))) -+ /* load and store indexed -> dform. */ -+ insn = (32 | ((insn >> 6) & 0x1f)) << 26; -+ else if ((insn & (((0x1a << 5) | 0x1f) << 1)) == 21 << 1) -+ /* ldx, ldux, stdx, stdux -> ld, ldu, std, stdu. */ -+ insn = ((58 | ((insn >> 6) & 4)) << 26) | ((insn >> 6) & 1); -+ else if ((insn & (((0x1f << 5) | 0x1f) << 1)) == 341 << 1) -+ /* lwax -> lwa. */ -+ insn = (58 << 26) | 2; -+ else -+ return 0; -+ insn |= rtra; -+ return insn; -+} -+ -+/* If INSN is an opcode that may be used with an @tprel operand, return -+ the transformed insn for an undefined weak symbol, ie. with the -+ thread pointer REG operand removed. Otherwise return 0. */ -+ -+unsigned int -+_bfd_elf_amigaos_ppc_at_tprel_transform (unsigned int insn, unsigned int reg) -+{ -+ if ((insn & (0x1f << 16)) == reg << 16 -+ && ((insn & (0x3f << 26)) == 14u << 26 /* addi */ -+ || (insn & (0x3f << 26)) == 15u << 26 /* addis */ -+ || (insn & (0x3f << 26)) == 32u << 26 /* lwz */ -+ || (insn & (0x3f << 26)) == 34u << 26 /* lbz */ -+ || (insn & (0x3f << 26)) == 36u << 26 /* stw */ -+ || (insn & (0x3f << 26)) == 38u << 26 /* stb */ -+ || (insn & (0x3f << 26)) == 40u << 26 /* lhz */ -+ || (insn & (0x3f << 26)) == 42u << 26 /* lha */ -+ || (insn & (0x3f << 26)) == 44u << 26 /* sth */ -+ || (insn & (0x3f << 26)) == 46u << 26 /* lmw */ -+ || (insn & (0x3f << 26)) == 47u << 26 /* stmw */ -+ || (insn & (0x3f << 26)) == 48u << 26 /* lfs */ -+ || (insn & (0x3f << 26)) == 50u << 26 /* lfd */ -+ || (insn & (0x3f << 26)) == 52u << 26 /* stfs */ -+ || (insn & (0x3f << 26)) == 54u << 26 /* stfd */ -+ || ((insn & (0x3f << 26)) == 58u << 26 /* lwa,ld,lmd */ -+ && (insn & 3) != 1) -+ || ((insn & (0x3f << 26)) == 62u << 26 /* std, stmd */ -+ && ((insn & 3) == 0 || (insn & 3) == 3)))) -+ { -+ insn &= ~(0x1f << 16); -+ } -+ else if ((insn & (0x1f << 21)) == reg << 21 -+ && ((insn & (0x3e << 26)) == 24u << 26 /* ori, oris */ -+ || (insn & (0x3e << 26)) == 26u << 26 /* xori,xoris */ -+ || (insn & (0x3e << 26)) == 28u << 26 /* andi,andis */)) -+ { -+ insn &= ~(0x1f << 21); -+ insn |= (insn & (0x1f << 16)) << 5; -+ if ((insn & (0x3e << 26)) == 26 << 26 /* xori,xoris */) -+ insn -= 2 >> 26; /* convert to ori,oris */ -+ } -+ else -+ insn = 0; -+ return insn; -+} -+ -+static bfd_boolean -+is_insn_ds_form (unsigned int insn) -+{ -+ return ((insn & (0x3f << 26)) == 58u << 26 /* ld,ldu,lwa */ -+ || (insn & (0x3f << 26)) == 62u << 26 /* std,stdu,stq */ -+ || (insn & (0x3f << 26)) == 57u << 26 /* lfdp */ -+ || (insn & (0x3f << 26)) == 61u << 26 /* stfdp */); -+} -+ -+static bfd_boolean -+is_insn_dq_form (unsigned int insn) -+{ -+ return (insn & (0x3f << 26)) == 56u << 26; /* lq */ -+} -+ -+/* The RELOCATE_SECTION function is called by the ELF backend linker -+ to handle the relocations for a section. -+ -+ The relocs are always passed as Rela structures; if the section -+ actually uses Rel structures, the r_addend field will always be -+ zero. -+ -+ This function is responsible for adjust the section contents as -+ necessary, and (if using Rela relocs and generating a -+ relocatable output file) adjusting the reloc addend as -+ necessary. -+ -+ This function does not have to worry about setting the reloc -+ address or the reloc symbol index. -+ -+ LOCAL_SYMS is a pointer to the swapped in local symbols. -+ -+ LOCAL_SECTIONS is an array giving the section in the input file -+ corresponding to the st_shndx field of each local symbol. -+ -+ The global hash table entry for the global symbols can be found -+ via elf_sym_hashes (input_bfd). -+ -+ When generating relocatable output, this function must handle -+ STB_LOCAL/STT_SECTION symbols specially. The output symbol is -+ going to be the section symbol corresponding to the output -+ section, which means that the addend must be adjusted -+ accordingly. */ -+ -+static bfd_boolean -+ppc_elf_relocate_section (bfd *output_bfd, -+ struct bfd_link_info *info, -+ bfd *input_bfd, -+ asection *input_section, -+ bfd_byte *contents, -+ Elf_Internal_Rela *relocs, -+ Elf_Internal_Sym *local_syms, -+ asection **local_sections) -+{ -+ Elf_Internal_Shdr *symtab_hdr; -+ struct elf_link_hash_entry **sym_hashes; -+ struct ppc_elf_link_hash_table *htab; -+ Elf_Internal_Rela *rel; -+ Elf_Internal_Rela *relend; -+ Elf_Internal_Rela outrel; -+ asection *got2, *sreloc = NULL; -+ bfd_vma *local_got_offsets; -+ bfd_boolean ret = TRUE; -+ bfd_vma d_offset = (bfd_big_endian (output_bfd) ? 2 : 0); -+ bfd_boolean is_vxworks_tls; -+ -+#ifdef DEBUG -+ _bfd_error_handler ("ppc_elf_relocate_section called for %B section %A, " -+ "%ld relocations%s", -+ input_bfd, input_section, -+ (long) input_section->reloc_count, -+ (info->relocatable) ? " (relocatable)" : ""); -+#endif -+ -+ got2 = bfd_get_section_by_name (input_bfd, ".got2"); -+ -+ /* Initialize howto table if not already done. */ -+ if (!ppc_elf_howto_table[R_PPC_ADDR32]) -+ ppc_elf_howto_init (); -+ -+ htab = ppc_elf_hash_table (info); -+ local_got_offsets = elf_local_got_offsets (input_bfd); -+ symtab_hdr = &elf_symtab_hdr (input_bfd); -+ sym_hashes = elf_sym_hashes (input_bfd); -+ /* We have to handle relocations in vxworks .tls_vars sections -+ specially, because the dynamic loader is 'weird'. */ -+ is_vxworks_tls = (htab->is_vxworks && info->shared -+ && !strcmp (input_section->output_section->name, -+ ".tls_vars")); -+ rel = relocs; -+ relend = relocs + input_section->reloc_count; -+ for (; rel < relend; rel++) -+ { -+ enum elf_ppc_reloc_type r_type; -+ bfd_vma addend; -+ bfd_reloc_status_type r; -+ Elf_Internal_Sym *sym; -+ asection *sec; -+ struct elf_link_hash_entry *h; -+ const char *sym_name; -+ reloc_howto_type *howto; -+ unsigned long r_symndx; -+ bfd_vma relocation; -+ bfd_vma branch_bit, from; -+ bfd_boolean unresolved_reloc; -+ bfd_boolean warned; -+ unsigned int tls_type, tls_mask, tls_gd; -+ struct plt_entry **ifunc; -+ -+ r_type = ELF32_R_TYPE (rel->r_info); -+ sym = NULL; -+ sec = NULL; -+ h = NULL; -+ unresolved_reloc = FALSE; -+ warned = FALSE; -+ r_symndx = ELF32_R_SYM (rel->r_info); -+ -+ if (r_symndx < symtab_hdr->sh_info) -+ { -+ sym = local_syms + r_symndx; -+ sec = local_sections[r_symndx]; -+ sym_name = bfd_elf_sym_name (input_bfd, symtab_hdr, sym, sec); -+ -+ relocation = _bfd_elf_rela_local_sym (output_bfd, sym, &sec, rel); -+ } -+ else -+ { -+ RELOC_FOR_GLOBAL_SYMBOL (info, input_bfd, input_section, rel, -+ r_symndx, symtab_hdr, sym_hashes, -+ h, sec, relocation, -+ unresolved_reloc, warned); -+ -+ sym_name = h->root.root.string; -+ } -+ -+ if (sec != NULL && discarded_section (sec)) -+ { -+ /* For relocs against symbols from removed linkonce sections, -+ or sections discarded by a linker script, we just want the -+ section contents zeroed. Avoid any special processing. */ -+ howto = NULL; -+ if (r_type < R_PPC_max) -+ howto = ppc_elf_howto_table[r_type]; -+ RELOC_AGAINST_DISCARDED_SECTION (info, input_bfd, input_section, -+ rel, 1, relend, howto, 0, contents); -+ } -+ -+ if (info->relocatable) -+ { -+ if (got2 != NULL -+ && r_type == R_PPC_PLTREL24 -+ && rel->r_addend != 0) -+ { -+ /* R_PPC_PLTREL24 is rather special. If non-zero, the -+ addend specifies the GOT pointer offset within .got2. */ -+ rel->r_addend += got2->output_offset; -+ } -+ continue; -+ } -+ -+ /* TLS optimizations. Replace instruction sequences and relocs -+ based on information we collected in tls_optimize. We edit -+ RELOCS so that --emit-relocs will output something sensible -+ for the final instruction stream. */ -+ tls_mask = 0; -+ tls_gd = 0; -+ if (h != NULL) -+ tls_mask = ((struct ppc_elf_link_hash_entry *) h)->tls_mask; -+ else if (local_got_offsets != NULL) -+ { -+ struct plt_entry **local_plt; -+ char *lgot_masks; -+ local_plt -+ = (struct plt_entry **) (local_got_offsets + symtab_hdr->sh_info); -+ lgot_masks = (char *) (local_plt + symtab_hdr->sh_info); -+ tls_mask = lgot_masks[r_symndx]; -+ } -+ -+ /* Ensure reloc mapping code below stays sane. */ -+ if ((R_PPC_GOT_TLSLD16 & 3) != (R_PPC_GOT_TLSGD16 & 3) -+ || (R_PPC_GOT_TLSLD16_LO & 3) != (R_PPC_GOT_TLSGD16_LO & 3) -+ || (R_PPC_GOT_TLSLD16_HI & 3) != (R_PPC_GOT_TLSGD16_HI & 3) -+ || (R_PPC_GOT_TLSLD16_HA & 3) != (R_PPC_GOT_TLSGD16_HA & 3) -+ || (R_PPC_GOT_TLSLD16 & 3) != (R_PPC_GOT_TPREL16 & 3) -+ || (R_PPC_GOT_TLSLD16_LO & 3) != (R_PPC_GOT_TPREL16_LO & 3) -+ || (R_PPC_GOT_TLSLD16_HI & 3) != (R_PPC_GOT_TPREL16_HI & 3) -+ || (R_PPC_GOT_TLSLD16_HA & 3) != (R_PPC_GOT_TPREL16_HA & 3)) -+ abort (); -+ switch (r_type) -+ { -+ default: -+ break; -+ -+ case R_PPC_GOT_TPREL16: -+ case R_PPC_GOT_TPREL16_LO: -+ if ((tls_mask & TLS_TLS) != 0 -+ && (tls_mask & TLS_TPREL) == 0) -+ { -+ bfd_vma insn; -+ -+ insn = bfd_get_32 (output_bfd, contents + rel->r_offset - d_offset); -+ insn &= 31 << 21; -+ insn |= 0x3c020000; /* addis 0,2,0 */ -+ bfd_put_32 (output_bfd, insn, contents + rel->r_offset - d_offset); -+ r_type = R_PPC_TPREL16_HA; -+ rel->r_info = ELF32_R_INFO (r_symndx, r_type); -+ } -+ break; -+ -+ case R_PPC_TLS: -+ if ((tls_mask & TLS_TLS) != 0 -+ && (tls_mask & TLS_TPREL) == 0) -+ { -+ bfd_vma insn; -+ -+ insn = bfd_get_32 (output_bfd, contents + rel->r_offset); -+ insn = _bfd_elf_ppc_at_tls_transform (insn, 2); -+ if (insn == 0) -+ abort (); -+ bfd_put_32 (output_bfd, insn, contents + rel->r_offset); -+ r_type = R_PPC_TPREL16_LO; -+ rel->r_info = ELF32_R_INFO (r_symndx, r_type); -+ -+ /* Was PPC_TLS which sits on insn boundary, now -+ PPC_TPREL16_LO which is at low-order half-word. */ -+ rel->r_offset += d_offset; -+ } -+ break; -+ -+ case R_PPC_GOT_TLSGD16_HI: -+ case R_PPC_GOT_TLSGD16_HA: -+ tls_gd = TLS_TPRELGD; -+ if ((tls_mask & TLS_TLS) != 0 && (tls_mask & TLS_GD) == 0) -+ goto tls_gdld_hi; -+ break; -+ -+ case R_PPC_GOT_TLSLD16_HI: -+ case R_PPC_GOT_TLSLD16_HA: -+ if ((tls_mask & TLS_TLS) != 0 && (tls_mask & TLS_LD) == 0) -+ { -+ tls_gdld_hi: -+ if ((tls_mask & tls_gd) != 0) -+ r_type = (((r_type - (R_PPC_GOT_TLSGD16 & 3)) & 3) -+ + R_PPC_GOT_TPREL16); -+ else -+ { -+ bfd_put_32 (output_bfd, NOP, contents + rel->r_offset); -+ rel->r_offset -= d_offset; -+ r_type = R_PPC_NONE; -+ } -+ rel->r_info = ELF32_R_INFO (r_symndx, r_type); -+ } -+ break; -+ -+ case R_PPC_GOT_TLSGD16: -+ case R_PPC_GOT_TLSGD16_LO: -+ tls_gd = TLS_TPRELGD; -+ if ((tls_mask & TLS_TLS) != 0 && (tls_mask & TLS_GD) == 0) -+ goto tls_ldgd_opt; -+ break; -+ -+ case R_PPC_GOT_TLSLD16: -+ case R_PPC_GOT_TLSLD16_LO: -+ if ((tls_mask & TLS_TLS) != 0 && (tls_mask & TLS_LD) == 0) -+ { -+ unsigned int insn1, insn2; -+ bfd_vma offset; -+ -+ tls_ldgd_opt: -+ offset = (bfd_vma) -1; -+ /* If not using the newer R_PPC_TLSGD/LD to mark -+ __tls_get_addr calls, we must trust that the call -+ stays with its arg setup insns, ie. that the next -+ reloc is the __tls_get_addr call associated with -+ the current reloc. Edit both insns. */ -+ if (input_section->has_tls_get_addr_call -+ && rel + 1 < relend -+ && branch_reloc_hash_match (input_bfd, rel + 1, -+ htab->tls_get_addr)) -+ offset = rel[1].r_offset; -+ if ((tls_mask & tls_gd) != 0) -+ { -+ /* IE */ -+ insn1 = bfd_get_32 (output_bfd, -+ contents + rel->r_offset - d_offset); -+ insn1 &= (1 << 26) - 1; -+ insn1 |= 32 << 26; /* lwz */ -+ if (offset != (bfd_vma) -1) -+ { -+ rel[1].r_info = ELF32_R_INFO (STN_UNDEF, R_PPC_NONE); -+ insn2 = 0x7c631214; /* add 3,3,2 */ -+ bfd_put_32 (output_bfd, insn2, contents + offset); -+ } -+ r_type = (((r_type - (R_PPC_GOT_TLSGD16 & 3)) & 3) -+ + R_PPC_GOT_TPREL16); -+ rel->r_info = ELF32_R_INFO (r_symndx, r_type); -+ } -+ else -+ { -+ /* LE */ -+ insn1 = 0x3c620000; /* addis 3,2,0 */ -+ if (tls_gd == 0) -+ { -+ /* Was an LD reloc. */ -+ for (r_symndx = 0; -+ r_symndx < symtab_hdr->sh_info; -+ r_symndx++) -+ if (local_sections[r_symndx] == sec) -+ break; -+ if (r_symndx >= symtab_hdr->sh_info) -+ r_symndx = STN_UNDEF; -+ rel->r_addend = htab->elf.tls_sec->vma + DTP_OFFSET; -+ if (r_symndx != STN_UNDEF) -+ rel->r_addend -= (local_syms[r_symndx].st_value -+ + sec->output_offset -+ + sec->output_section->vma); -+ } -+ r_type = R_PPC_TPREL16_HA; -+ rel->r_info = ELF32_R_INFO (r_symndx, r_type); -+ if (offset != (bfd_vma) -1) -+ { -+ rel[1].r_info = ELF32_R_INFO (r_symndx, R_PPC_TPREL16_LO); -+ rel[1].r_offset = offset + d_offset; -+ rel[1].r_addend = rel->r_addend; -+ insn2 = 0x38630000; /* addi 3,3,0 */ -+ bfd_put_32 (output_bfd, insn2, contents + offset); -+ } -+ } -+ bfd_put_32 (output_bfd, insn1, -+ contents + rel->r_offset - d_offset); -+ if (tls_gd == 0) -+ { -+ /* We changed the symbol on an LD reloc. Start over -+ in order to get h, sym, sec etc. right. */ -+ rel--; -+ continue; -+ } -+ } -+ break; -+ -+ case R_PPC_TLSGD: -+ if ((tls_mask & TLS_TLS) != 0 && (tls_mask & TLS_GD) == 0) -+ { -+ unsigned int insn2; -+ bfd_vma offset = rel->r_offset; -+ -+ if ((tls_mask & TLS_TPRELGD) != 0) -+ { -+ /* IE */ -+ r_type = R_PPC_NONE; -+ insn2 = 0x7c631214; /* add 3,3,2 */ -+ } -+ else -+ { -+ /* LE */ -+ r_type = R_PPC_TPREL16_LO; -+ rel->r_offset += d_offset; -+ insn2 = 0x38630000; /* addi 3,3,0 */ -+ } -+ rel->r_info = ELF32_R_INFO (r_symndx, r_type); -+ bfd_put_32 (output_bfd, insn2, contents + offset); -+ /* Zap the reloc on the _tls_get_addr call too. */ -+ BFD_ASSERT (offset == rel[1].r_offset); -+ rel[1].r_info = ELF32_R_INFO (STN_UNDEF, R_PPC_NONE); -+ } -+ break; -+ -+ case R_PPC_TLSLD: -+ if ((tls_mask & TLS_TLS) != 0 && (tls_mask & TLS_LD) == 0) -+ { -+ unsigned int insn2; -+ -+ for (r_symndx = 0; -+ r_symndx < symtab_hdr->sh_info; -+ r_symndx++) -+ if (local_sections[r_symndx] == sec) -+ break; -+ if (r_symndx >= symtab_hdr->sh_info) -+ r_symndx = STN_UNDEF; -+ rel->r_addend = htab->elf.tls_sec->vma + DTP_OFFSET; -+ if (r_symndx != STN_UNDEF) -+ rel->r_addend -= (local_syms[r_symndx].st_value -+ + sec->output_offset -+ + sec->output_section->vma); -+ -+ rel->r_info = ELF32_R_INFO (r_symndx, R_PPC_TPREL16_LO); -+ rel->r_offset += d_offset; -+ insn2 = 0x38630000; /* addi 3,3,0 */ -+ bfd_put_32 (output_bfd, insn2, -+ contents + rel->r_offset - d_offset); -+ /* Zap the reloc on the _tls_get_addr call too. */ -+ BFD_ASSERT (rel->r_offset - d_offset == rel[1].r_offset); -+ rel[1].r_info = ELF32_R_INFO (STN_UNDEF, R_PPC_NONE); -+ rel--; -+ continue; -+ } -+ break; -+ } -+ -+ /* Handle other relocations that tweak non-addend part of insn. */ -+ branch_bit = 0; -+ switch (r_type) -+ { -+ default: -+ break; -+ -+ /* Branch taken prediction relocations. */ -+ case R_PPC_ADDR14_BRTAKEN: -+ case R_PPC_REL14_BRTAKEN: -+ branch_bit = BRANCH_PREDICT_BIT; -+ /* Fall thru */ -+ -+ /* Branch not taken prediction relocations. */ -+ case R_PPC_ADDR14_BRNTAKEN: -+ case R_PPC_REL14_BRNTAKEN: -+ { -+ bfd_vma insn; -+ -+ insn = bfd_get_32 (output_bfd, contents + rel->r_offset); -+ insn &= ~BRANCH_PREDICT_BIT; -+ insn |= branch_bit; -+ -+ from = (rel->r_offset -+ + input_section->output_offset -+ + input_section->output_section->vma); -+ -+ /* Invert 'y' bit if not the default. */ -+ if ((bfd_signed_vma) (relocation + rel->r_addend - from) < 0) -+ insn ^= BRANCH_PREDICT_BIT; -+ -+ bfd_put_32 (output_bfd, insn, contents + rel->r_offset); -+ break; -+ } -+ } -+ -+ ifunc = NULL; -+ if (!htab->is_vxworks) -+ { -+ struct plt_entry *ent; -+ -+ if (h != NULL) -+ { -+ if (h->type == STT_GNU_IFUNC) -+ ifunc = &h->plt.plist; -+ } -+ else if (local_got_offsets != NULL -+ && ELF_ST_TYPE (sym->st_info) == STT_GNU_IFUNC) -+ { -+ struct plt_entry **local_plt; -+ -+ local_plt = (struct plt_entry **) (local_got_offsets -+ + symtab_hdr->sh_info); -+ ifunc = local_plt + r_symndx; -+ } -+ -+ ent = NULL; -+ if (ifunc != NULL -+ && (!info->shared -+ || is_branch_reloc (r_type))) -+ { -+ addend = 0; -+ if (r_type == R_PPC_PLTREL24 && info->shared) -+ addend = rel->r_addend; -+ ent = find_plt_ent (ifunc, got2, addend); -+ } -+ if (ent != NULL) -+ { -+ if (h == NULL && (ent->plt.offset & 1) == 0) -+ { -+ Elf_Internal_Rela rela; -+ bfd_byte *loc; -+ -+ rela.r_offset = (htab->iplt->output_section->vma -+ + htab->iplt->output_offset -+ + ent->plt.offset); -+ rela.r_info = ELF32_R_INFO (0, R_PPC_IRELATIVE); -+ rela.r_addend = relocation; -+ loc = htab->reliplt->contents; -+ loc += (htab->reliplt->reloc_count++ -+ * sizeof (Elf32_External_Rela)); -+ bfd_elf32_swap_reloca_out (output_bfd, &rela, loc); -+ -+ ent->plt.offset |= 1; -+ } -+ if (h == NULL && (ent->glink_offset & 1) == 0) -+ { -+ unsigned char *p = ((unsigned char *) htab->glink->contents -+ + ent->glink_offset); -+ write_glink_stub (ent, htab->iplt, p, info); -+ ent->glink_offset |= 1; -+ } -+ -+ unresolved_reloc = FALSE; -+ if (htab->plt_type == PLT_NEW -+ || !htab->elf.dynamic_sections_created -+ || h == NULL) -+ relocation = (htab->glink->output_section->vma -+ + htab->glink->output_offset -+ + (ent->glink_offset & ~1)); -+ else -+ relocation = (htab->plt->output_section->vma -+ + htab->plt->output_offset -+ + ent->plt.offset); -+ } -+ } -+ -+ addend = rel->r_addend; -+ tls_type = 0; -+ howto = NULL; -+ if (r_type < R_PPC_max) -+ howto = ppc_elf_howto_table[r_type]; -+ switch (r_type) -+ { -+ default: -+ info->callbacks->einfo -+ (_("%P: %B: unknown relocation type %d for symbol %s\n"), -+ input_bfd, (int) r_type, sym_name); -+ -+ bfd_set_error (bfd_error_bad_value); -+ ret = FALSE; -+ continue; -+ -+ case R_PPC_NONE: -+ case R_PPC_TLS: -+ case R_PPC_TLSGD: -+ case R_PPC_TLSLD: -+ case R_PPC_EMB_MRKREF: -+ case R_PPC_GNU_VTINHERIT: -+ case R_PPC_GNU_VTENTRY: -+ continue; -+ -+ /* GOT16 relocations. Like an ADDR16 using the symbol's -+ address in the GOT as relocation value instead of the -+ symbol's value itself. Also, create a GOT entry for the -+ symbol and put the symbol value there. */ -+ case R_PPC_GOT_TLSGD16: -+ case R_PPC_GOT_TLSGD16_LO: -+ case R_PPC_GOT_TLSGD16_HI: -+ case R_PPC_GOT_TLSGD16_HA: -+ tls_type = TLS_TLS | TLS_GD; -+ goto dogot; -+ -+ case R_PPC_GOT_TLSLD16: -+ case R_PPC_GOT_TLSLD16_LO: -+ case R_PPC_GOT_TLSLD16_HI: -+ case R_PPC_GOT_TLSLD16_HA: -+ tls_type = TLS_TLS | TLS_LD; -+ goto dogot; -+ -+ case R_PPC_GOT_TPREL16: -+ case R_PPC_GOT_TPREL16_LO: -+ case R_PPC_GOT_TPREL16_HI: -+ case R_PPC_GOT_TPREL16_HA: -+ tls_type = TLS_TLS | TLS_TPREL; -+ goto dogot; -+ -+ case R_PPC_GOT_DTPREL16: -+ case R_PPC_GOT_DTPREL16_LO: -+ case R_PPC_GOT_DTPREL16_HI: -+ case R_PPC_GOT_DTPREL16_HA: -+ tls_type = TLS_TLS | TLS_DTPREL; -+ goto dogot; -+ -+ case R_PPC_GOT16: -+ case R_PPC_GOT16_LO: -+ case R_PPC_GOT16_HI: -+ case R_PPC_GOT16_HA: -+ tls_mask = 0; -+ dogot: -+ { -+ /* Relocation is to the entry for this symbol in the global -+ offset table. */ -+ bfd_vma off; -+ bfd_vma *offp; -+ unsigned long indx; -+ -+ if (htab->got == NULL) -+ abort (); -+ -+ indx = 0; -+ if (tls_type == (TLS_TLS | TLS_LD) -+ && (h == NULL -+ || !h->def_dynamic)) -+ offp = &htab->tlsld_got.offset; -+ else if (h != NULL) -+ { -+ bfd_boolean dyn; -+ dyn = htab->elf.dynamic_sections_created; -+ if (! WILL_CALL_FINISH_DYNAMIC_SYMBOL (dyn, info->shared, h) -+ || (info->shared -+ && SYMBOL_REFERENCES_LOCAL (info, h))) -+ /* This is actually a static link, or it is a -+ -Bsymbolic link and the symbol is defined -+ locally, or the symbol was forced to be local -+ because of a version file. */ -+ ; -+ else -+ { -+ BFD_ASSERT (h->dynindx != -1); -+ indx = h->dynindx; -+ unresolved_reloc = FALSE; -+ } -+ offp = &h->got.offset; -+ } -+ else -+ { -+ if (local_got_offsets == NULL) -+ abort (); -+ offp = &local_got_offsets[r_symndx]; -+ } -+ -+ /* The offset must always be a multiple of 4. We use the -+ least significant bit to record whether we have already -+ processed this entry. */ -+ off = *offp; -+ if ((off & 1) != 0) -+ off &= ~1; -+ else -+ { -+ unsigned int tls_m = (tls_mask -+ & (TLS_LD | TLS_GD | TLS_DTPREL -+ | TLS_TPREL | TLS_TPRELGD)); -+ -+ if (offp == &htab->tlsld_got.offset) -+ tls_m = TLS_LD; -+ else if (h == NULL -+ || !h->def_dynamic) -+ tls_m &= ~TLS_LD; -+ -+ /* We might have multiple got entries for this sym. -+ Initialize them all. */ -+ do -+ { -+ int tls_ty = 0; -+ -+ if ((tls_m & TLS_LD) != 0) -+ { -+ tls_ty = TLS_TLS | TLS_LD; -+ tls_m &= ~TLS_LD; -+ } -+ else if ((tls_m & TLS_GD) != 0) -+ { -+ tls_ty = TLS_TLS | TLS_GD; -+ tls_m &= ~TLS_GD; -+ } -+ else if ((tls_m & TLS_DTPREL) != 0) -+ { -+ tls_ty = TLS_TLS | TLS_DTPREL; -+ tls_m &= ~TLS_DTPREL; -+ } -+ else if ((tls_m & (TLS_TPREL | TLS_TPRELGD)) != 0) -+ { -+ tls_ty = TLS_TLS | TLS_TPREL; -+ tls_m = 0; -+ } -+ -+ /* Generate relocs for the dynamic linker. */ -+ if ((info->shared || indx != 0) -+ && (offp == &htab->tlsld_got.offset -+ || h == NULL -+ || ELF_ST_VISIBILITY (h->other) == STV_DEFAULT -+ || h->root.type != bfd_link_hash_undefweak)) -+ { -+ asection *rsec = htab->relgot; -+ bfd_byte * loc; -+ -+ outrel.r_offset = (htab->got->output_section->vma -+ + htab->got->output_offset -+ + off); -+ outrel.r_addend = 0; -+ if (tls_ty & (TLS_LD | TLS_GD)) -+ { -+ outrel.r_info = ELF32_R_INFO (indx, R_PPC_DTPMOD32); -+ if (tls_ty == (TLS_TLS | TLS_GD)) -+ { -+ loc = rsec->contents; -+ loc += (rsec->reloc_count++ -+ * sizeof (Elf32_External_Rela)); -+ bfd_elf32_swap_reloca_out (output_bfd, -+ &outrel, loc); -+ outrel.r_offset += 4; -+ outrel.r_info -+ = ELF32_R_INFO (indx, R_PPC_DTPREL32); -+ } -+ } -+ else if (tls_ty == (TLS_TLS | TLS_DTPREL)) -+ outrel.r_info = ELF32_R_INFO (indx, R_PPC_DTPREL32); -+ else if (tls_ty == (TLS_TLS | TLS_TPREL)) -+ outrel.r_info = ELF32_R_INFO (indx, R_PPC_TPREL32); -+ else if (indx != 0) -+ outrel.r_info = ELF32_R_INFO (indx, R_PPC_GLOB_DAT); -+ else if (ifunc != NULL) -+ outrel.r_info = ELF32_R_INFO (0, R_PPC_IRELATIVE); -+ else -+ outrel.r_info = ELF32_R_INFO (0, R_PPC_RELATIVE); -+ if (indx == 0 && tls_ty != (TLS_TLS | TLS_LD)) -+ { -+ outrel.r_addend += relocation; -+ if (tls_ty & (TLS_GD | TLS_DTPREL | TLS_TPREL)) -+ outrel.r_addend -= htab->elf.tls_sec->vma; -+ } -+ loc = rsec->contents; -+ loc += (rsec->reloc_count++ -+ * sizeof (Elf32_External_Rela)); -+ bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc); -+ } -+ -+ /* Init the .got section contents if we're not -+ emitting a reloc. */ -+ else -+ { -+ bfd_vma value = relocation; -+ -+ if (tls_ty == (TLS_TLS | TLS_LD)) -+ value = 1; -+ else if (tls_ty != 0) -+ { -+ value -= htab->elf.tls_sec->vma + DTP_OFFSET; -+ if (tls_ty == (TLS_TLS | TLS_TPREL)) -+ value += DTP_OFFSET - TP_OFFSET; -+ -+ if (tls_ty == (TLS_TLS | TLS_GD)) -+ { -+ bfd_put_32 (output_bfd, value, -+ htab->got->contents + off + 4); -+ value = 1; -+ } -+ } -+ bfd_put_32 (output_bfd, value, -+ htab->got->contents + off); -+ } -+ -+ off += 4; -+ if (tls_ty & (TLS_LD | TLS_GD)) -+ off += 4; -+ } -+ while (tls_m != 0); -+ -+ off = *offp; -+ *offp = off | 1; -+ } -+ -+ if (off >= (bfd_vma) -2) -+ abort (); -+ -+ if ((tls_type & TLS_TLS) != 0) -+ { -+ if (tls_type != (TLS_TLS | TLS_LD)) -+ { -+ if ((tls_mask & TLS_LD) != 0 -+ && !(h == NULL -+ || !h->def_dynamic)) -+ off += 8; -+ if (tls_type != (TLS_TLS | TLS_GD)) -+ { -+ if ((tls_mask & TLS_GD) != 0) -+ off += 8; -+ if (tls_type != (TLS_TLS | TLS_DTPREL)) -+ { -+ if ((tls_mask & TLS_DTPREL) != 0) -+ off += 4; -+ } -+ } -+ } -+ } -+ -+ relocation = (htab->got->output_section->vma -+ + htab->got->output_offset -+ + off -+ - SYM_VAL (htab->elf.hgot)); -+ -+ /* Addends on got relocations don't make much sense. -+ x+off@got is actually x@got+off, and since the got is -+ generated by a hash table traversal, the value in the -+ got at entry m+n bears little relation to the entry m. */ -+ if (addend != 0) -+ info->callbacks->einfo -+ (_("%P: %H: non-zero addend on %s reloc against `%s'\n"), -+ input_bfd, input_section, rel->r_offset, -+ howto->name, -+ sym_name); -+ } -+ break; -+ -+ /* Relocations that need no special processing. */ -+ case R_PPC_LOCAL24PC: -+ /* It makes no sense to point a local relocation -+ at a symbol not in this object. */ -+ if (unresolved_reloc) -+ { -+ if (! (*info->callbacks->undefined_symbol) (info, -+ h->root.root.string, -+ input_bfd, -+ input_section, -+ rel->r_offset, -+ TRUE)) -+ return FALSE; -+ continue; -+ } -+ break; -+ -+ case R_PPC_DTPREL16: -+ case R_PPC_DTPREL16_LO: -+ case R_PPC_DTPREL16_HI: -+ case R_PPC_DTPREL16_HA: -+ addend -= htab->elf.tls_sec->vma + DTP_OFFSET; -+ break; -+ -+ /* Relocations that may need to be propagated if this is a shared -+ object. */ -+ case R_PPC_TPREL16: -+ case R_PPC_TPREL16_LO: -+ case R_PPC_TPREL16_HI: -+ case R_PPC_TPREL16_HA: -+ if (h != NULL -+ && h->root.type == bfd_link_hash_undefweak -+ && h->dynindx == -1) -+ { -+ /* Make this relocation against an undefined weak symbol -+ resolve to zero. This is really just a tweak, since -+ code using weak externs ought to check that they are -+ defined before using them. */ -+ bfd_byte *p = contents + rel->r_offset - d_offset; -+ unsigned int insn = bfd_get_32 (output_bfd, p); -+ insn = _bfd_elf_amigaos_ppc_at_tprel_transform (insn, 2); -+ if (insn != 0) -+ bfd_put_32 (output_bfd, insn, p); -+ break; -+ } -+ addend -= htab->elf.tls_sec->vma + TP_OFFSET; -+ /* The TPREL16 relocs shouldn't really be used in shared -+ libs as they will result in DT_TEXTREL being set, but -+ support them anyway. */ -+ goto dodyn; -+ -+ case R_PPC_TPREL32: -+ addend -= htab->elf.tls_sec->vma + TP_OFFSET; -+ goto dodyn; -+ -+ case R_PPC_DTPREL32: -+ addend -= htab->elf.tls_sec->vma + DTP_OFFSET; -+ goto dodyn; -+ -+ case R_PPC_DTPMOD32: -+ relocation = 1; -+ addend = 0; -+ goto dodyn; -+ -+ case R_PPC_REL16: -+ case R_PPC_REL16_LO: -+ case R_PPC_REL16_HI: -+ case R_PPC_REL16_HA: -+ break; -+ -+ case R_PPC_REL32: -+ if (h == NULL || h == htab->elf.hgot) -+ break; -+ /* fall through */ -+ -+ case R_PPC_ADDR32: -+ case R_PPC_ADDR16: -+ case R_PPC_ADDR16_LO: -+ case R_PPC_ADDR16_HI: -+ case R_PPC_ADDR16_HA: -+ case R_PPC_UADDR32: -+ case R_PPC_UADDR16: -+ goto dodyn; -+ -+ case R_PPC_VLE_REL8: -+ case R_PPC_VLE_REL15: -+ case R_PPC_VLE_REL24: -+ case R_PPC_REL24: -+ case R_PPC_REL14: -+ case R_PPC_REL14_BRTAKEN: -+ case R_PPC_REL14_BRNTAKEN: -+ /* If these relocations are not to a named symbol, they can be -+ handled right here, no need to bother the dynamic linker. */ -+ if (SYMBOL_CALLS_LOCAL (info, h) -+ || h == htab->elf.hgot) -+ break; -+ /* fall through */ -+ -+ case R_PPC_ADDR24: -+ case R_PPC_ADDR14: -+ case R_PPC_ADDR14_BRTAKEN: -+ case R_PPC_ADDR14_BRNTAKEN: -+ if (h != NULL && !info->shared) -+ break; -+ /* fall through */ -+ -+ dodyn: -+ if ((input_section->flags & SEC_ALLOC) == 0 -+ || is_vxworks_tls) -+ break; -+ -+ if ((info->shared -+ && !(h != NULL -+ && ((h->root.type == bfd_link_hash_undefined -+ && (ELF_ST_VISIBILITY (h->other) == STV_HIDDEN -+ || ELF_ST_VISIBILITY (h->other) == STV_INTERNAL)) -+ || (h->root.type == bfd_link_hash_undefweak -+ && ELF_ST_VISIBILITY (h->other) != STV_DEFAULT))) -+ && (must_be_dyn_reloc (info, r_type) -+ || !SYMBOL_CALLS_LOCAL (info, h))) -+ || (ELIMINATE_COPY_RELOCS -+ && !info->shared -+ && h != NULL -+ && h->dynindx != -1 -+ && !h->non_got_ref -+ && !h->def_regular)) -+ { -+ int skip; -+ bfd_byte * loc; -+#ifdef DEBUG -+ fprintf (stderr, "ppc_elf_relocate_section needs to " -+ "create relocation for %s\n", -+ (h && h->root.root.string -+ ? h->root.root.string : "<unknown>")); -+#endif -+ -+ /* When generating a shared object, these relocations -+ are copied into the output file to be resolved at run -+ time. */ -+ if (sreloc == NULL) -+ { -+ sreloc = elf_section_data (input_section)->sreloc; -+ if (!htab->elf.dynamic_sections_created) -+ sreloc = htab->reliplt; -+ if (sreloc == NULL) -+ return FALSE; -+ } -+ -+ skip = 0; -+ outrel.r_offset = _bfd_elf_section_offset (output_bfd, info, -+ input_section, -+ rel->r_offset); -+ if (outrel.r_offset == (bfd_vma) -1 -+ || outrel.r_offset == (bfd_vma) -2) -+ skip = (int) outrel.r_offset; -+ outrel.r_offset += (input_section->output_section->vma -+ + input_section->output_offset); -+ -+ if (skip) -+ memset (&outrel, 0, sizeof outrel); -+ else if ((h != NULL -+ && (h->root.type == bfd_link_hash_undefined -+ || h->root.type == bfd_link_hash_undefweak)) -+ || !SYMBOL_REFERENCES_LOCAL (info, h)) -+ { -+ BFD_ASSERT (h->dynindx != -1); -+ unresolved_reloc = FALSE; -+ outrel.r_info = ELF32_R_INFO (h->dynindx, r_type); -+ outrel.r_addend = rel->r_addend; -+ } -+ else -+ { -+ outrel.r_addend = relocation + rel->r_addend; -+ -+ if (r_type != R_PPC_ADDR32) -+ { -+ long indx = 0; -+ -+ if (ifunc != NULL) -+ { -+ /* If we get here when building a static -+ executable, then the libc startup function -+ responsible for applying indirect function -+ relocations is going to complain about -+ the reloc type. -+ If we get here when building a dynamic -+ executable, it will be because we have -+ a text relocation. The dynamic loader -+ will set the text segment writable and -+ non-executable to apply text relocations. -+ So we'll segfault when trying to run the -+ indirection function to resolve the reloc. */ -+ info->callbacks->einfo -+ (_("%P: %H: relocation %s for indirect " -+ "function %s unsupported\n"), -+ input_bfd, input_section, rel->r_offset, -+ howto->name, -+ sym_name); -+ ret = FALSE; -+ } -+ else if (r_symndx == STN_UNDEF || bfd_is_abs_section (sec)) -+ ; -+ else if (sec == NULL || sec->owner == NULL) -+ { -+ bfd_set_error (bfd_error_bad_value); -+ ret = FALSE; -+ } -+ else -+ { -+ asection *osec; -+ -+ /* We are turning this relocation into one -+ against a section symbol. It would be -+ proper to subtract the symbol's value, -+ osec->vma, from the emitted reloc addend, -+ but ld.so expects buggy relocs. -+ FIXME: Why not always use a zero index? */ -+ osec = sec->output_section; -+ indx = elf_section_data (osec)->dynindx; -+ if (indx == 0) -+ { -+ osec = htab->elf.text_index_section; -+ indx = elf_section_data (osec)->dynindx; -+ } -+ BFD_ASSERT (indx != 0); -+#ifdef DEBUG -+ if (indx == 0) -+ printf ("indx=%ld section=%s flags=%08x name=%s\n", -+ indx, osec->name, osec->flags, -+ h->root.root.string); -+#endif -+ } -+ -+ outrel.r_info = ELF32_R_INFO (indx, r_type); -+ } -+ else if (ifunc != NULL) -+ outrel.r_info = ELF32_R_INFO (0, R_PPC_IRELATIVE); -+ else -+ outrel.r_info = ELF32_R_INFO (0, R_PPC_RELATIVE); -+ } -+ -+ loc = sreloc->contents; -+ loc += sreloc->reloc_count++ * sizeof (Elf32_External_Rela); -+ bfd_elf32_swap_reloca_out (output_bfd, &outrel, loc); -+ -+ if (skip == -1) -+ continue; -+ -+ /* This reloc will be computed at runtime. We clear the memory -+ so that it contains predictable value. */ -+ if (! skip -+ && ((input_section->flags & SEC_ALLOC) != 0 -+ || ELF32_R_TYPE (outrel.r_info) != R_PPC_RELATIVE)) -+ { -+ relocation = howto->pc_relative ? outrel.r_offset : 0; -+ addend = 0; -+ break; -+ } -+ } -+ break; -+ -+ case R_PPC_RELAX_PLT: -+ case R_PPC_RELAX_PLTREL24: -+ if (h != NULL) -+ { -+ struct plt_entry *ent; -+ bfd_vma got2_addend = 0; -+ -+ if (r_type == R_PPC_RELAX_PLTREL24) -+ { -+ if (info->shared) -+ got2_addend = addend; -+ addend = 0; -+ } -+ ent = find_plt_ent (&h->plt.plist, got2, got2_addend); -+ if (htab->plt_type == PLT_NEW) -+ relocation = (htab->glink->output_section->vma -+ + htab->glink->output_offset -+ + ent->glink_offset); -+ else -+ relocation = (htab->plt->output_section->vma -+ + htab->plt->output_offset -+ + ent->plt.offset); -+ } -+ /* Fall thru */ -+ -+ case R_PPC_RELAX: -+ if (info->shared) -+ relocation -= (input_section->output_section->vma -+ + input_section->output_offset -+ + rel->r_offset - 4); -+ -+ { -+ unsigned long t0; -+ unsigned long t1; -+ -+ t0 = bfd_get_32 (output_bfd, contents + rel->r_offset); -+ t1 = bfd_get_32 (output_bfd, contents + rel->r_offset + 4); -+ -+ /* We're clearing the bits for R_PPC_ADDR16_HA -+ and R_PPC_ADDR16_LO here. */ -+ t0 &= ~0xffff; -+ t1 &= ~0xffff; -+ -+ /* t0 is HA, t1 is LO */ -+ relocation += addend; -+ t0 |= ((relocation + 0x8000) >> 16) & 0xffff; -+ t1 |= relocation & 0xffff; -+ -+ bfd_put_32 (output_bfd, t0, contents + rel->r_offset); -+ bfd_put_32 (output_bfd, t1, contents + rel->r_offset + 4); -+ -+ /* Rewrite the reloc and convert one of the trailing nop -+ relocs to describe this relocation. */ -+ BFD_ASSERT (ELF32_R_TYPE (relend[-1].r_info) == R_PPC_NONE); -+ /* The relocs are at the bottom 2 bytes */ -+ rel[0].r_offset += 2; -+ memmove (rel + 1, rel, (relend - rel - 1) * sizeof (*rel)); -+ rel[0].r_info = ELF32_R_INFO (r_symndx, R_PPC_ADDR16_HA); -+ rel[1].r_offset += 4; -+ rel[1].r_info = ELF32_R_INFO (r_symndx, R_PPC_ADDR16_LO); -+ rel++; -+ } -+ continue; -+ -+ /* Indirect .sdata relocation. */ -+ case R_PPC_EMB_SDAI16: -+ BFD_ASSERT (htab->sdata[0].section != NULL); -+ if (!is_static_defined (htab->sdata[0].sym)) -+ { -+ unresolved_reloc = TRUE; -+ break; -+ } -+ relocation -+ = elf_finish_pointer_linker_section (input_bfd, &htab->sdata[0], -+ h, relocation, rel); -+ addend = 0; -+ break; -+ -+ /* Indirect .sdata2 relocation. */ -+ case R_PPC_EMB_SDA2I16: -+ BFD_ASSERT (htab->sdata[1].section != NULL); -+ if (!is_static_defined (htab->sdata[1].sym)) -+ { -+ unresolved_reloc = TRUE; -+ break; -+ } -+ relocation -+ = elf_finish_pointer_linker_section (input_bfd, &htab->sdata[1], -+ h, relocation, rel); -+ addend = 0; -+ break; -+ -+ /* Handle the TOC16 reloc. We want to use the offset within the .got -+ section, not the actual VMA. This is appropriate when generating -+ an embedded ELF object, for which the .got section acts like the -+ AIX .toc section. */ -+ case R_PPC_TOC16: /* phony GOT16 relocations */ -+ if (sec == NULL || sec->output_section == NULL) -+ { -+ unresolved_reloc = TRUE; -+ break; -+ } -+ BFD_ASSERT (strcmp (bfd_get_section_name (sec->owner, sec), -+ ".got") == 0 -+ || strcmp (bfd_get_section_name (sec->owner, sec), -+ ".cgot") == 0); -+ -+ addend -= sec->output_section->vma + sec->output_offset + 0x8000; -+ break; -+ -+ case R_PPC_PLTREL24: -+ if (h != NULL && ifunc == NULL) -+ { -+ struct plt_entry *ent = find_plt_ent (&h->plt.plist, got2, -+ info->shared ? addend : 0); -+ if (ent == NULL -+ || htab->plt == NULL) -+ { -+ /* We didn't make a PLT entry for this symbol. This -+ happens when statically linking PIC code, or when -+ using -Bsymbolic. */ -+ } -+ else -+ { -+ /* Relocation is to the entry for this symbol in the -+ procedure linkage table. */ -+ unresolved_reloc = FALSE; -+ if (htab->plt_type == PLT_NEW) -+ relocation = (htab->glink->output_section->vma -+ + htab->glink->output_offset -+ + ent->glink_offset); -+ else -+ relocation = (htab->plt->output_section->vma -+ + htab->plt->output_offset -+ + ent->plt.offset); -+ } -+ } -+ -+ /* R_PPC_PLTREL24 is rather special. If non-zero, the -+ addend specifies the GOT pointer offset within .got2. -+ Don't apply it to the relocation field. */ -+ addend = 0; -+ break; -+ -+ /* Relocate against _SDA_BASE_. */ -+ case R_PPC_SDAREL16: -+ { -+ const char *name; -+ struct elf_link_hash_entry *sda = htab->sdata[0].sym; -+ -+ if (sec == NULL -+ || sec->output_section == NULL -+ || !is_static_defined (sda)) -+ { -+ unresolved_reloc = TRUE; -+ break; -+ } -+ addend -= SYM_VAL (sda); -+ -+ name = bfd_get_section_name (output_bfd, sec->output_section); -+ if (! ((CONST_STRNEQ (name, ".sdata") -+ && (name[6] == 0 || name[6] == '.')) -+ || (CONST_STRNEQ (name, ".sbss") -+ && (name[5] == 0 || name[5] == '.')))) -+ { -+ info->callbacks->einfo -+ (_("%P: %B: the target (%s) of a %s relocation is " -+ "in the wrong output section (%s)\n"), -+ input_bfd, -+ sym_name, -+ howto->name, -+ name); -+ } -+ } -+ break; -+ -+ /* Relocate against _SDA2_BASE_. */ -+ case R_PPC_EMB_SDA2REL: -+ { -+ const char *name; -+ struct elf_link_hash_entry *sda = htab->sdata[1].sym; -+ -+ if (sec == NULL -+ || sec->output_section == NULL -+ || !is_static_defined (sda)) -+ { -+ unresolved_reloc = TRUE; -+ break; -+ } -+ addend -= SYM_VAL (sda); -+ -+ name = bfd_get_section_name (output_bfd, sec->output_section); -+ if (! (CONST_STRNEQ (name, ".sdata2") -+ || CONST_STRNEQ (name, ".sbss2"))) -+ { -+ info->callbacks->einfo -+ (_("%P: %B: the target (%s) of a %s relocation is " -+ "in the wrong output section (%s)\n"), -+ input_bfd, -+ sym_name, -+ howto->name, -+ name); -+ } -+ } -+ break; -+#if 0 -+ case R_PPC_AMIGAOS_BREL: -+ case R_PPC_AMIGAOS_BREL_HI: -+ case R_PPC_AMIGAOS_BREL_LO: -+ case R_PPC_AMIGAOS_BREL_HA: -+ { -+ if (data_section == NULL) -+ data_section = bfd_get_section_by_name (output_bfd, ".data"); -+ -+ if (sec) -+ { -+ const char *name = bfd_get_section_name (abfd, sec->output_section); -+ if (strcmp (name, ".sdata") != 0 -+ && strcmp (name, ".sbss") != 0 -+ && strcmp (name, ".data") != 0 -+ && strcmp (name, ".bss") != 0 -+ && strncmp (name, ".ctors", 6) != 0 -+ && strncmp (name, ".dtors", 6) != 0) -+ { -+ (*_bfd_error_handler) (_("%s: The target (%s) of a %s relocation is in the wrong output section (%s)"), -+ input_bfd, -+ sym_name, -+ howto->name, -+ name); -+ } -+ } -+ -+ addend = addend - data_section->vma; -+ -+ if (r_type == R_PPC_AMIGAOS_BREL_HA) -+ addend += ((relocation + addend) & 0x8000) << 1; -+ -+ } -+ break; -+#endif -+ case R_PPC_VLE_LO16A: -+ relocation = (relocation + addend) & 0xffff; -+ ppc_elf_vle_split16 (output_bfd, contents, rel->r_offset, -+ relocation, split16a_type); -+ continue; -+ -+ case R_PPC_VLE_LO16D: -+ relocation = (relocation + addend) & 0xffff; -+ ppc_elf_vle_split16 (output_bfd, contents, rel->r_offset, -+ relocation, split16d_type); -+ continue; -+ -+ case R_PPC_VLE_HI16A: -+ relocation = ((relocation + addend) >> 16) & 0xffff; -+ ppc_elf_vle_split16 (output_bfd, contents, rel->r_offset, -+ relocation, split16a_type); -+ continue; -+ -+ case R_PPC_VLE_HI16D: -+ relocation = ((relocation + addend) >> 16) & 0xffff; -+ ppc_elf_vle_split16 (output_bfd, contents, rel->r_offset, -+ relocation, split16d_type); -+ continue; -+ -+ case R_PPC_VLE_HA16A: -+ { -+ bfd_vma value = relocation + addend; -+ value = (((value >> 16) + ((value & 0x8000) ? 1 : 0)) & 0xffff); -+ ppc_elf_vle_split16 (output_bfd, contents, rel->r_offset, -+ value, split16a_type); -+ } -+ continue; -+ -+ case R_PPC_VLE_HA16D: -+ { -+ bfd_vma value = relocation + addend; -+ value = (((value >> 16) + ((value & 0x8000) ? 1 : 0)) & 0xffff); -+ ppc_elf_vle_split16 (output_bfd, contents, rel->r_offset, -+ value, split16d_type); -+ } -+ continue; -+ -+ /* Relocate against either _SDA_BASE_, _SDA2_BASE_, or 0. */ -+ case R_PPC_EMB_SDA21: -+ case R_PPC_VLE_SDA21: -+ case R_PPC_EMB_RELSDA: -+ case R_PPC_VLE_SDA21_LO: -+ { -+ const char *name; -+ int reg; -+ struct elf_link_hash_entry *sda = NULL; -+ -+ if (sec == NULL || sec->output_section == NULL) -+ { -+ unresolved_reloc = TRUE; -+ break; -+ } -+ -+ name = bfd_get_section_name (output_bfd, sec->output_section); -+ if (((CONST_STRNEQ (name, ".sdata") -+ && (name[6] == 0 || name[6] == '.')) -+ || (CONST_STRNEQ (name, ".sbss") -+ && (name[5] == 0 || name[5] == '.')))) -+ { -+ reg = 13; -+ sda = htab->sdata[0].sym; -+ } -+ else if (CONST_STRNEQ (name, ".sdata2") -+ || CONST_STRNEQ (name, ".sbss2")) -+ { -+ reg = 2; -+ sda = htab->sdata[1].sym; -+ } -+ else if (strcmp (name, ".PPC.EMB.sdata0") == 0 -+ || strcmp (name, ".PPC.EMB.sbss0") == 0) -+ { -+ reg = 0; -+ } -+ else -+ { -+ info->callbacks->einfo -+ (_("%P: %B: the target (%s) of a %s relocation is " -+ "in the wrong output section (%s)\n"), -+ input_bfd, -+ sym_name, -+ howto->name, -+ name); -+ -+ bfd_set_error (bfd_error_bad_value); -+ ret = FALSE; -+ continue; -+ } -+ -+ if (sda != NULL) -+ { -+ if (!is_static_defined (sda)) -+ { -+ unresolved_reloc = TRUE; -+ break; -+ } -+ addend -= SYM_VAL (sda); -+ } -+ -+ if (reg == 0 -+ && (r_type == R_PPC_VLE_SDA21 -+ || r_type == R_PPC_VLE_SDA21_LO)) -+ { -+ /* Use the split20 format. */ -+ bfd_vma insn, bits12to15, bits21to31; -+ bfd_vma value = (relocation + rel->r_offset) & 0xffff; -+ /* Propagate sign bit, if necessary. */ -+ insn = (value & 0x8000) ? 0x70107800 : 0x70000000; -+ bits12to15 = value & 0x700; -+ bits21to31 = value & 0x7ff; -+ insn |= bits12to15; -+ insn |= bits21to31; -+ bfd_put_32 (output_bfd, insn, contents + rel->r_offset); -+ continue; -+ } -+ else if (r_type == R_PPC_EMB_SDA21 -+ || r_type == R_PPC_VLE_SDA21 -+ || r_type == R_PPC_VLE_SDA21_LO) -+ { -+ bfd_vma insn; /* Fill in register field. */ -+ -+ insn = bfd_get_32 (output_bfd, contents + rel->r_offset); -+ insn = (insn & ~RA_REGISTER_MASK) | (reg << RA_REGISTER_SHIFT); -+ bfd_put_32 (output_bfd, insn, contents + rel->r_offset); -+ } -+ } -+ break; -+ -+ case R_PPC_VLE_SDAREL_LO16A: -+ case R_PPC_VLE_SDAREL_LO16D: -+ case R_PPC_VLE_SDAREL_HI16A: -+ case R_PPC_VLE_SDAREL_HI16D: -+ case R_PPC_VLE_SDAREL_HA16A: -+ case R_PPC_VLE_SDAREL_HA16D: -+ { -+ bfd_vma value; -+ const char *name; -+ //int reg; -+ struct elf_link_hash_entry *sda = NULL; -+ -+ if (sec == NULL || sec->output_section == NULL) -+ { -+ unresolved_reloc = TRUE; -+ break; -+ } -+ -+ name = bfd_get_section_name (output_bfd, sec->output_section); -+ if (((CONST_STRNEQ (name, ".sdata") -+ && (name[6] == 0 || name[6] == '.')) -+ || (CONST_STRNEQ (name, ".sbss") -+ && (name[5] == 0 || name[5] == '.')))) -+ { -+ //reg = 13; -+ sda = htab->sdata[0].sym; -+ } -+ else if (CONST_STRNEQ (name, ".sdata2") -+ || CONST_STRNEQ (name, ".sbss2")) -+ { -+ //reg = 2; -+ sda = htab->sdata[1].sym; -+ } -+ else -+ { -+ (*_bfd_error_handler) -+ (_("%B: the target (%s) of a %s relocation is " -+ "in the wrong output section (%s)"), -+ input_bfd, -+ sym_name, -+ howto->name, -+ name); -+ -+ bfd_set_error (bfd_error_bad_value); -+ ret = FALSE; -+ continue; -+ } -+ -+ if (sda != NULL) -+ { -+ if (!is_static_defined (sda)) -+ { -+ unresolved_reloc = TRUE; -+ break; -+ } -+ } -+ -+ value = sda->root.u.def.section->output_section->vma -+ + sda->root.u.def.section->output_offset; -+ -+ if (r_type == R_PPC_VLE_SDAREL_LO16A) -+ { -+ value = (value + addend) & 0xffff; -+ ppc_elf_vle_split16 (output_bfd, contents, rel->r_offset, -+ value, split16a_type); -+ } -+ else if (r_type == R_PPC_VLE_SDAREL_LO16D) -+ { -+ value = (value + addend) & 0xffff; -+ ppc_elf_vle_split16 (output_bfd, contents, rel->r_offset, -+ value, split16d_type); -+ } -+ else if (r_type == R_PPC_VLE_SDAREL_HI16A) -+ { -+ value = ((value + addend) >> 16) & 0xffff; -+ ppc_elf_vle_split16 (output_bfd, contents, rel->r_offset, -+ value, split16a_type); -+ } -+ else if (r_type == R_PPC_VLE_SDAREL_HI16D) -+ { -+ value = ((value + addend) >> 16) & 0xffff; -+ ppc_elf_vle_split16 (output_bfd, contents, rel->r_offset, -+ value, split16d_type); -+ } -+ else if (r_type == R_PPC_VLE_SDAREL_HA16A) -+ { -+ value += addend; -+ value = (((value >> 16) + ((value & 0x8000) ? 1 : 0)) & 0xffff); -+ ppc_elf_vle_split16 (output_bfd, contents, rel->r_offset, -+ value, split16a_type); -+ } -+ else if (r_type == R_PPC_VLE_SDAREL_HA16D) -+ { -+ value += addend; -+ value = (((value >> 16) + ((value & 0x8000) ? 1 : 0)) & 0xffff); -+ ppc_elf_vle_split16 (output_bfd, contents, rel->r_offset, -+ value, split16d_type); -+ } -+ } -+ continue; -+ -+ /* Relocate against the beginning of the section. */ -+ case R_PPC_SECTOFF: -+ case R_PPC_SECTOFF_LO: -+ case R_PPC_SECTOFF_HI: -+ case R_PPC_SECTOFF_HA: -+ if (sec == NULL || sec->output_section == NULL) -+ { -+ unresolved_reloc = TRUE; -+ break; -+ } -+ addend -= sec->output_section->vma; -+ break; -+ -+ /* Negative relocations. */ -+ case R_PPC_EMB_NADDR32: -+ case R_PPC_EMB_NADDR16: -+ case R_PPC_EMB_NADDR16_LO: -+ case R_PPC_EMB_NADDR16_HI: -+ case R_PPC_EMB_NADDR16_HA: -+ addend -= 2 * relocation; -+ break; -+ -+ case R_PPC_COPY: -+ case R_PPC_GLOB_DAT: -+ case R_PPC_JMP_SLOT: -+ case R_PPC_RELATIVE: -+ case R_PPC_IRELATIVE: -+ case R_PPC_PLT32: -+ case R_PPC_PLTREL32: -+ case R_PPC_PLT16_LO: -+ case R_PPC_PLT16_HI: -+ case R_PPC_PLT16_HA: -+ case R_PPC_ADDR30: -+ case R_PPC_EMB_RELSEC16: -+ case R_PPC_EMB_RELST_LO: -+ case R_PPC_EMB_RELST_HI: -+ case R_PPC_EMB_RELST_HA: -+ case R_PPC_EMB_BIT_FLD: -+ info->callbacks->einfo -+ (_("%P: %B: relocation %s is not yet supported for symbol %s\n"), -+ input_bfd, -+ howto->name, -+ sym_name); -+ -+ bfd_set_error (bfd_error_invalid_operation); -+ ret = FALSE; -+ continue; -+ } -+ -+ /* Do any further special processing. */ -+ switch (r_type) -+ { -+ default: -+ break; -+ -+ case R_PPC_ADDR16_HA: -+ case R_PPC_REL16_HA: -+ case R_PPC_SECTOFF_HA: -+ case R_PPC_TPREL16_HA: -+ case R_PPC_DTPREL16_HA: -+ case R_PPC_EMB_NADDR16_HA: -+ case R_PPC_EMB_RELST_HA: -+ /* It's just possible that this symbol is a weak symbol -+ that's not actually defined anywhere. In that case, -+ 'sec' would be NULL, and we should leave the symbol -+ alone (it will be set to zero elsewhere in the link). */ -+ if (sec == NULL) -+ break; -+ /* Fall thru */ -+ -+ case R_PPC_PLT16_HA: -+ case R_PPC_GOT16_HA: -+ case R_PPC_GOT_TLSGD16_HA: -+ case R_PPC_GOT_TLSLD16_HA: -+ case R_PPC_GOT_TPREL16_HA: -+ case R_PPC_GOT_DTPREL16_HA: -+ /* Add 0x10000 if sign bit in 0:15 is set. -+ Bits 0:15 are not used. */ -+ addend += 0x8000; -+ break; -+ -+ case R_PPC_ADDR16: -+ case R_PPC_ADDR16_LO: -+ case R_PPC_GOT16: -+ case R_PPC_GOT16_LO: -+ case R_PPC_SDAREL16: -+ case R_PPC_SECTOFF: -+ case R_PPC_SECTOFF_LO: -+ case R_PPC_DTPREL16: -+ case R_PPC_DTPREL16_LO: -+ case R_PPC_TPREL16: -+ case R_PPC_TPREL16_LO: -+ case R_PPC_GOT_TLSGD16: -+ case R_PPC_GOT_TLSGD16_LO: -+ case R_PPC_GOT_TLSLD16: -+ case R_PPC_GOT_TLSLD16_LO: -+ case R_PPC_GOT_DTPREL16: -+ case R_PPC_GOT_DTPREL16_LO: -+ case R_PPC_GOT_TPREL16: -+ case R_PPC_GOT_TPREL16_LO: -+ { -+ /* The 32-bit ABI lacks proper relocations to deal with -+ certain 64-bit instructions. Prevent damage to bits -+ that make up part of the insn opcode. */ -+ unsigned int insn, mask, lobit; -+ -+ insn = bfd_get_32 (output_bfd, contents + rel->r_offset - d_offset); -+ mask = 0; -+ if (is_insn_ds_form (insn)) -+ mask = 3; -+ else if (is_insn_dq_form (insn)) -+ mask = 15; -+ else -+ break; -+ lobit = mask & (relocation + addend); -+ if (lobit != 0) -+ { -+ addend -= lobit; -+ info->callbacks->einfo -+ (_("%P: %H: error: %s against `%s' not a multiple of %u\n"), -+ input_bfd, input_section, rel->r_offset, -+ howto->name, sym_name, mask + 1); -+ bfd_set_error (bfd_error_bad_value); -+ ret = FALSE; -+ } -+ addend += insn & mask; -+ } -+ break; -+ } -+ -+#ifdef DEBUG -+ fprintf (stderr, "\ttype = %s (%d), name = %s, symbol index = %ld, " -+ "offset = %ld, addend = %ld\n", -+ howto->name, -+ (int) r_type, -+ sym_name, -+ r_symndx, -+ (long) rel->r_offset, -+ (long) addend); -+#endif -+ -+ if (unresolved_reloc -+ && !((input_section->flags & SEC_DEBUGGING) != 0 -+ && h->def_dynamic) -+ && _bfd_elf_section_offset (output_bfd, info, input_section, -+ rel->r_offset) != (bfd_vma) -1) -+ { -+ info->callbacks->einfo -+ (_("%P: %H: unresolvable %s relocation against symbol `%s'\n"), -+ input_bfd, input_section, rel->r_offset, -+ howto->name, -+ sym_name); -+ ret = FALSE; -+ } -+ -+ r = _bfd_final_link_relocate (howto, -+ input_bfd, -+ input_section, -+ contents, -+ rel->r_offset, -+ relocation, -+ addend); -+ -+#ifdef DEBUG -+ fprintf (stderr, "%p %p %p\n", (void *)rel->r_offset, (void *)relocation, (void *)addend); -+#endif -+ if (r != bfd_reloc_ok) -+ { -+ if (r == bfd_reloc_overflow) -+ { -+ if (warned) -+ continue; -+ if (h != NULL -+ && h->root.type == bfd_link_hash_undefweak -+ && howto->pc_relative) -+ { -+ /* Assume this is a call protected by other code that -+ detect the symbol is undefined. If this is the case, -+ we can safely ignore the overflow. If not, the -+ program is hosed anyway, and a little warning isn't -+ going to help. */ -+ -+ continue; -+ } -+ -+ if (! (*info->callbacks->reloc_overflow) (info, -+ (h ? &h->root : NULL), -+ sym_name, -+ howto->name, -+ rel->r_addend, -+ input_bfd, -+ input_section, -+ rel->r_offset)) -+ return FALSE; -+ } -+ else -+ { -+ info->callbacks->einfo -+ (_("%P: %H: %s reloc against `%s': error %d\n"), -+ input_bfd, input_section, rel->r_offset, -+ howto->name, sym_name, (int) r); -+ ret = FALSE; -+ } -+ } -+ } -+ -+#ifdef DEBUG -+ fprintf (stderr, "\n"); -+#endif -+ -+ return ret; -+} -+ -+/* Finish up dynamic symbol handling. We set the contents of various -+ dynamic sections here. */ -+ -+static bfd_boolean -+ppc_elf_finish_dynamic_symbol (bfd *output_bfd, -+ struct bfd_link_info *info, -+ struct elf_link_hash_entry *h, -+ Elf_Internal_Sym *sym) -+{ -+ struct ppc_elf_link_hash_table *htab; -+ struct plt_entry *ent; -+ bfd_boolean doneone; -+ -+#ifdef DEBUG -+ fprintf (stderr, "ppc_elf_finish_dynamic_symbol called for %s", -+ h->root.root.string); -+#endif -+ -+ htab = ppc_elf_hash_table (info); -+ BFD_ASSERT (htab->elf.dynobj != NULL); -+ -+ doneone = FALSE; -+ for (ent = h->plt.plist; ent != NULL; ent = ent->next) -+ if (ent->plt.offset != (bfd_vma) -1) -+ { -+ if (!doneone) -+ { -+ Elf_Internal_Rela rela; -+ bfd_byte *loc; -+ bfd_vma reloc_index; -+ -+ if (htab->plt_type == PLT_NEW -+ || !htab->elf.dynamic_sections_created -+ || h->dynindx == -1) -+ reloc_index = ent->plt.offset / 4; -+ else -+ { -+ reloc_index = ((ent->plt.offset - htab->plt_initial_entry_size) -+ / htab->plt_slot_size); -+ if (reloc_index > PLT_NUM_SINGLE_ENTRIES -+ && htab->plt_type == PLT_OLD) -+ reloc_index -= (reloc_index - PLT_NUM_SINGLE_ENTRIES) / 2; -+ } -+ -+ /* This symbol has an entry in the procedure linkage table. -+ Set it up. */ -+ if (htab->plt_type == PLT_VXWORKS -+ && htab->elf.dynamic_sections_created -+ && h->dynindx != -1) -+ { -+ bfd_vma got_offset; -+ const bfd_vma *plt_entry; -+ -+ /* The first three entries in .got.plt are reserved. */ -+ got_offset = (reloc_index + 3) * 4; -+ -+ /* Use the right PLT. */ -+ plt_entry = info->shared ? ppc_elf_vxworks_pic_plt_entry -+ : ppc_elf_vxworks_plt_entry; -+ -+ /* Fill in the .plt on VxWorks. */ -+ if (info->shared) -+ { -+ bfd_put_32 (output_bfd, -+ plt_entry[0] | PPC_HA (got_offset), -+ htab->plt->contents + ent->plt.offset + 0); -+ bfd_put_32 (output_bfd, -+ plt_entry[1] | PPC_LO (got_offset), -+ htab->plt->contents + ent->plt.offset + 4); -+ } -+ else -+ { -+ bfd_vma got_loc = got_offset + SYM_VAL (htab->elf.hgot); -+ -+ bfd_put_32 (output_bfd, -+ plt_entry[0] | PPC_HA (got_loc), -+ htab->plt->contents + ent->plt.offset + 0); -+ bfd_put_32 (output_bfd, -+ plt_entry[1] | PPC_LO (got_loc), -+ htab->plt->contents + ent->plt.offset + 4); -+ } -+ -+ bfd_put_32 (output_bfd, plt_entry[2], -+ htab->plt->contents + ent->plt.offset + 8); -+ bfd_put_32 (output_bfd, plt_entry[3], -+ htab->plt->contents + ent->plt.offset + 12); -+ -+ /* This instruction is an immediate load. The value loaded is -+ the byte offset of the R_PPC_JMP_SLOT relocation from the -+ start of the .rela.plt section. The value is stored in the -+ low-order 16 bits of the load instruction. */ -+ /* NOTE: It appears that this is now an index rather than a -+ prescaled offset. */ -+ bfd_put_32 (output_bfd, -+ plt_entry[4] | reloc_index, -+ htab->plt->contents + ent->plt.offset + 16); -+ /* This instruction is a PC-relative branch whose target is -+ the start of the PLT section. The address of this branch -+ instruction is 20 bytes beyond the start of this PLT entry. -+ The address is encoded in bits 6-29, inclusive. The value -+ stored is right-shifted by two bits, permitting a 26-bit -+ offset. */ -+ bfd_put_32 (output_bfd, -+ (plt_entry[5] -+ | (-(ent->plt.offset + 20) & 0x03fffffc)), -+ htab->plt->contents + ent->plt.offset + 20); -+ bfd_put_32 (output_bfd, plt_entry[6], -+ htab->plt->contents + ent->plt.offset + 24); -+ bfd_put_32 (output_bfd, plt_entry[7], -+ htab->plt->contents + ent->plt.offset + 28); -+ -+ /* Fill in the GOT entry corresponding to this PLT slot with -+ the address immediately after the "bctr" instruction -+ in this PLT entry. */ -+ bfd_put_32 (output_bfd, (htab->plt->output_section->vma -+ + htab->plt->output_offset -+ + ent->plt.offset + 16), -+ htab->sgotplt->contents + got_offset); -+ -+ if (!info->shared) -+ { -+ /* Fill in a couple of entries in .rela.plt.unloaded. */ -+ loc = htab->srelplt2->contents -+ + ((VXWORKS_PLTRESOLVE_RELOCS + reloc_index -+ * VXWORKS_PLT_NON_JMP_SLOT_RELOCS) -+ * sizeof (Elf32_External_Rela)); -+ -+ /* Provide the @ha relocation for the first instruction. */ -+ rela.r_offset = (htab->plt->output_section->vma -+ + htab->plt->output_offset -+ + ent->plt.offset + 2); -+ rela.r_info = ELF32_R_INFO (htab->elf.hgot->indx, -+ R_PPC_ADDR16_HA); -+ rela.r_addend = got_offset; -+ bfd_elf32_swap_reloca_out (output_bfd, &rela, loc); -+ loc += sizeof (Elf32_External_Rela); -+ -+ /* Provide the @l relocation for the second instruction. */ -+ rela.r_offset = (htab->plt->output_section->vma -+ + htab->plt->output_offset -+ + ent->plt.offset + 6); -+ rela.r_info = ELF32_R_INFO (htab->elf.hgot->indx, -+ R_PPC_ADDR16_LO); -+ rela.r_addend = got_offset; -+ bfd_elf32_swap_reloca_out (output_bfd, &rela, loc); -+ loc += sizeof (Elf32_External_Rela); -+ -+ /* Provide a relocation for the GOT entry corresponding to this -+ PLT slot. Point it at the middle of the .plt entry. */ -+ rela.r_offset = (htab->sgotplt->output_section->vma -+ + htab->sgotplt->output_offset -+ + got_offset); -+ rela.r_info = ELF32_R_INFO (htab->elf.hplt->indx, -+ R_PPC_ADDR32); -+ rela.r_addend = ent->plt.offset + 16; -+ bfd_elf32_swap_reloca_out (output_bfd, &rela, loc); -+ } -+ -+ /* VxWorks uses non-standard semantics for R_PPC_JMP_SLOT. -+ In particular, the offset for the relocation is not the -+ address of the PLT entry for this function, as specified -+ by the ABI. Instead, the offset is set to the address of -+ the GOT slot for this function. See EABI 4.4.4.1. */ -+ rela.r_offset = (htab->sgotplt->output_section->vma -+ + htab->sgotplt->output_offset -+ + got_offset); -+ -+ } -+ else -+ { -+ asection *splt = htab->plt; -+ if (!htab->elf.dynamic_sections_created -+ || h->dynindx == -1) -+ splt = htab->iplt; -+ -+ rela.r_offset = (splt->output_section->vma -+ + splt->output_offset -+ + ent->plt.offset); -+#ifdef DEBUG -+ fprintf (stderr, " r_offset = %p ", (void *)rela.r_offset); -+#endif -+ if (htab->plt_type == PLT_OLD -+ || !htab->elf.dynamic_sections_created -+ || h->dynindx == -1) -+ { -+ /* We don't need to fill in the .plt. The ppc dynamic -+ linker will fill it in. */ -+#ifdef DEBUG -+ fprintf (stderr, " not filling in .plt "); -+#endif -+ } -+ else -+ { -+ bfd_vma val = (htab->glink_pltresolve + ent->plt.offset -+ + htab->glink->output_section->vma -+ + htab->glink->output_offset); -+ bfd_put_32 (output_bfd, val, -+ splt->contents + ent->plt.offset); -+ } -+ } -+ -+ /* Fill in the entry in the .rela.plt section. */ -+ rela.r_addend = 0; -+ if (!htab->elf.dynamic_sections_created -+ || h->dynindx == -1) -+ { -+ BFD_ASSERT (h->type == STT_GNU_IFUNC -+ && h->def_regular -+ && (h->root.type == bfd_link_hash_defined -+ || h->root.type == bfd_link_hash_defweak)); -+ rela.r_info = ELF32_R_INFO (0, R_PPC_IRELATIVE); -+ rela.r_addend = SYM_VAL (h); -+ } -+ else -+ rela.r_info = ELF32_R_INFO (h->dynindx, R_PPC_JMP_SLOT); -+ -+ if (!htab->elf.dynamic_sections_created -+ || h->dynindx == -1) -+ loc = (htab->reliplt->contents -+ + (htab->reliplt->reloc_count++ -+ * sizeof (Elf32_External_Rela))); -+ else -+ loc = (htab->relplt->contents -+ + reloc_index * sizeof (Elf32_External_Rela)); -+ bfd_elf32_swap_reloca_out (output_bfd, &rela, loc); -+ -+#ifdef DEBUG -+ fprintf (stderr, " r_offset = %p r_addednd = %p, r_info = 0x%08x, h->def_regular = %d", (void *)rela.r_offset, (void *)rela.r_addend, (unsigned int)rela.r_info, (int)h->def_regular); -+#endif -+ if (!h->def_regular) -+ { -+ /* Mark the symbol as undefined, rather than as -+ defined in the .plt section. Leave the value if -+ there were any relocations where pointer equality -+ matters (this is a clue for the dynamic linker, to -+ make function pointer comparisons work between an -+ application and shared library), otherwise set it -+ to zero. */ -+ sym->st_shndx = SHN_UNDEF; -+ if (!h->pointer_equality_needed) -+ { -+ /* THF: This is peculiar. The compiler generates a R_PPC_REL24 for externally referenced -+ * symbols impoted from libc.so. Relocation in elf.library requires the symbol to have it's .plt -+ * stub value, but the linker specifically clears the value to 0, resulting in run-time -+ * errors when the binary tries to call libc functions. -+ */ -+ // sym->st_value = 0; -+ } -+ else if (!h->ref_regular_nonweak) -+ { -+ /* This breaks function pointer comparisons, but -+ that is better than breaking tests for a NULL -+ function pointer. */ -+ sym->st_value = 0; -+ } -+ } -+ else if (h->type == STT_GNU_IFUNC -+ && !info->shared) -+ { -+ /* Set the value of ifunc symbols in a non-pie -+ executable to the glink entry. This is to avoid -+ text relocations. We can't do this for ifunc in -+ allocate_dynrelocs, as we do for normal dynamic -+ function symbols with plt entries, because we need -+ to keep the original value around for the ifunc -+ relocation. */ -+ sym->st_shndx = (_bfd_elf_section_from_bfd_section -+ (output_bfd, htab->glink->output_section)); -+ sym->st_value = (ent->glink_offset -+ + htab->glink->output_offset -+ + htab->glink->output_section->vma); -+ } -+ doneone = TRUE; -+ } -+ -+ if (htab->plt_type == PLT_NEW -+ || !htab->elf.dynamic_sections_created -+ || h->dynindx == -1) -+ { -+ unsigned char *p; -+ asection *splt = htab->plt; -+ if (!htab->elf.dynamic_sections_created -+ || h->dynindx == -1) -+ splt = htab->iplt; -+ -+ p = (unsigned char *) htab->glink->contents + ent->glink_offset; -+ -+ if (h == htab->tls_get_addr && !htab->no_tls_get_addr_opt) -+ { -+ bfd_put_32 (output_bfd, LWZ_11_3, p); -+ p += 4; -+ bfd_put_32 (output_bfd, LWZ_12_3 + 4, p); -+ p += 4; -+ bfd_put_32 (output_bfd, MR_0_3, p); -+ p += 4; -+ bfd_put_32 (output_bfd, CMPWI_11_0, p); -+ p += 4; -+ bfd_put_32 (output_bfd, ADD_3_12_2, p); -+ p += 4; -+ bfd_put_32 (output_bfd, BEQLR, p); -+ p += 4; -+ bfd_put_32 (output_bfd, MR_3_0, p); -+ p += 4; -+ bfd_put_32 (output_bfd, NOP, p); -+ p += 4; -+ } -+ -+ write_glink_stub (ent, splt, p, info); -+ -+ if (!info->shared) -+ /* We only need one non-PIC glink stub. */ -+ break; -+ } -+ else -+ break; -+ } -+ -+ if (h->needs_copy) -+ { -+ asection *s; -+ Elf_Internal_Rela rela; -+ bfd_byte *loc; -+ -+ /* This symbols needs a copy reloc. Set it up. */ -+ -+#ifdef DEBUG -+ fprintf (stderr, ", copy"); -+#endif -+ -+ BFD_ASSERT (h->dynindx != -1); -+ -+ if (ppc_elf_hash_entry (h)->has_sda_refs) -+ s = htab->relsbss; -+ else -+ s = htab->relbss; -+ BFD_ASSERT (s != NULL); -+ -+ rela.r_offset = SYM_VAL (h); -+ rela.r_info = ELF32_R_INFO (h->dynindx, R_PPC_COPY); -+ rela.r_addend = 0; -+ loc = s->contents + s->reloc_count++ * sizeof (Elf32_External_Rela); -+ bfd_elf32_swap_reloca_out (output_bfd, &rela, loc); -+ } -+ -+#ifdef DEBUG -+ fprintf (stderr, " SYM_VAL(%p) ", (void *)SYM_VAL(h)); -+#endif -+#ifdef DEBUG -+ fprintf (stderr, "\n"); -+#endif -+ -+ return TRUE; -+} -+ -+static enum elf_reloc_type_class -+ppc_elf_reloc_type_class (const Elf_Internal_Rela *rela) -+{ -+ switch (ELF32_R_TYPE (rela->r_info)) -+ { -+ case R_PPC_RELATIVE: -+ return reloc_class_relative; -+ case R_PPC_REL24: -+ case R_PPC_ADDR24: -+ case R_PPC_JMP_SLOT: -+ return reloc_class_plt; -+ case R_PPC_COPY: -+ return reloc_class_copy; -+ default: -+ return reloc_class_normal; -+ } -+} -+ -+/* Finish up the dynamic sections. */ -+ -+static bfd_boolean -+ppc_elf_finish_dynamic_sections (bfd *output_bfd, -+ struct bfd_link_info *info) -+{ -+ asection *sdyn; -+ asection *splt; -+ struct ppc_elf_link_hash_table *htab; -+ bfd_vma got; -+ bfd *dynobj; -+ bfd_boolean ret = TRUE; -+ -+#ifdef DEBUG -+ fprintf (stderr, "ppc_elf_finish_dynamic_sections called\n"); -+#endif -+ -+ htab = ppc_elf_hash_table (info); -+ dynobj = elf_hash_table (info)->dynobj; -+ sdyn = bfd_get_linker_section (dynobj, ".dynamic"); -+ if (htab->is_vxworks) -+ splt = bfd_get_linker_section (dynobj, ".plt"); -+ else -+ splt = NULL; -+ -+ got = 0; -+ if (htab->elf.hgot != NULL) -+ got = SYM_VAL (htab->elf.hgot); -+ -+ if (htab->elf.dynamic_sections_created) -+ { -+ Elf32_External_Dyn *dyncon, *dynconend; -+ -+ BFD_ASSERT (htab->plt != NULL && sdyn != NULL); -+ -+ dyncon = (Elf32_External_Dyn *) sdyn->contents; -+ dynconend = (Elf32_External_Dyn *) (sdyn->contents + sdyn->size); -+ for (; dyncon < dynconend; dyncon++) -+ { -+ Elf_Internal_Dyn dyn; -+ asection *s; -+ -+ bfd_elf32_swap_dyn_in (dynobj, dyncon, &dyn); -+ -+ switch (dyn.d_tag) -+ { -+ case DT_PLTGOT: -+ if (htab->is_vxworks) -+ s = htab->sgotplt; -+ else -+ s = htab->plt; -+ dyn.d_un.d_ptr = s->output_section->vma + s->output_offset; -+ break; -+ -+ case DT_PLTRELSZ: -+ dyn.d_un.d_val = htab->relplt->size; -+ break; -+ -+ case DT_JMPREL: -+ s = htab->relplt; -+ dyn.d_un.d_ptr = s->output_section->vma + s->output_offset; -+ break; -+ -+ case DT_PPC_GOT: -+ dyn.d_un.d_ptr = got; -+ break; -+ -+ case DT_RELASZ: -+ if (htab->is_vxworks) -+ { -+ if (htab->relplt) -+ dyn.d_un.d_ptr -= htab->relplt->size; -+ break; -+ } -+ continue; -+ -+ default: -+ if (htab->is_vxworks -+ && elf_vxworks_finish_dynamic_entry (output_bfd, &dyn)) -+ break; -+ continue; -+ } -+ -+ bfd_elf32_swap_dyn_out (output_bfd, &dyn, dyncon); -+ } -+ } -+ -+ if (htab->got != NULL) -+ { -+ if (htab->elf.hgot->root.u.def.section == htab->got -+ || htab->elf.hgot->root.u.def.section == htab->sgotplt) -+ { -+ unsigned char *p = htab->elf.hgot->root.u.def.section->contents; -+ -+ p += htab->elf.hgot->root.u.def.value; -+ if (htab->plt_type == PLT_OLD) -+ { -+ /* Add a blrl instruction at _GLOBAL_OFFSET_TABLE_-4 -+ so that a function can easily find the address of -+ _GLOBAL_OFFSET_TABLE_. */ -+ BFD_ASSERT (htab->elf.hgot->root.u.def.value - 4 -+ < htab->elf.hgot->root.u.def.section->size); -+ bfd_put_32 (output_bfd, 0x4e800021, p - 4); -+ } -+ -+ if (sdyn != NULL) -+ { -+ bfd_vma val = sdyn->output_section->vma + sdyn->output_offset; -+ BFD_ASSERT (htab->elf.hgot->root.u.def.value -+ < htab->elf.hgot->root.u.def.section->size); -+ bfd_put_32 (output_bfd, val, p); -+ } -+ } -+ else -+ { -+ info->callbacks->einfo (_("%P: %s not defined in linker created %s\n"), -+ htab->elf.hgot->root.root.string, -+ (htab->sgotplt != NULL -+ ? htab->sgotplt->name : htab->got->name)); -+ bfd_set_error (bfd_error_bad_value); -+ ret = FALSE; -+ } -+ -+ elf_section_data (htab->got->output_section)->this_hdr.sh_entsize = 4; -+ } -+ -+ /* Fill in the first entry in the VxWorks procedure linkage table. */ -+ if (splt && splt->size > 0) -+ { -+ /* Use the right PLT. */ -+ const bfd_vma *plt_entry = (info->shared -+ ? ppc_elf_vxworks_pic_plt0_entry -+ : ppc_elf_vxworks_plt0_entry); -+ -+ if (!info->shared) -+ { -+ bfd_vma got_value = SYM_VAL (htab->elf.hgot); -+ -+ bfd_put_32 (output_bfd, plt_entry[0] | PPC_HA (got_value), -+ splt->contents + 0); -+ bfd_put_32 (output_bfd, plt_entry[1] | PPC_LO (got_value), -+ splt->contents + 4); -+ } -+ else -+ { -+ bfd_put_32 (output_bfd, plt_entry[0], splt->contents + 0); -+ bfd_put_32 (output_bfd, plt_entry[1], splt->contents + 4); -+ } -+ bfd_put_32 (output_bfd, plt_entry[2], splt->contents + 8); -+ bfd_put_32 (output_bfd, plt_entry[3], splt->contents + 12); -+ bfd_put_32 (output_bfd, plt_entry[4], splt->contents + 16); -+ bfd_put_32 (output_bfd, plt_entry[5], splt->contents + 20); -+ bfd_put_32 (output_bfd, plt_entry[6], splt->contents + 24); -+ bfd_put_32 (output_bfd, plt_entry[7], splt->contents + 28); -+ -+ if (! info->shared) -+ { -+ Elf_Internal_Rela rela; -+ bfd_byte *loc; -+ -+ loc = htab->srelplt2->contents; -+ -+ /* Output the @ha relocation for the first instruction. */ -+ rela.r_offset = (htab->plt->output_section->vma -+ + htab->plt->output_offset -+ + 2); -+ rela.r_info = ELF32_R_INFO (htab->elf.hgot->indx, R_PPC_ADDR16_HA); -+ rela.r_addend = 0; -+ bfd_elf32_swap_reloca_out (output_bfd, &rela, loc); -+ loc += sizeof (Elf32_External_Rela); -+ -+ /* Output the @l relocation for the second instruction. */ -+ rela.r_offset = (htab->plt->output_section->vma -+ + htab->plt->output_offset -+ + 6); -+ rela.r_info = ELF32_R_INFO (htab->elf.hgot->indx, R_PPC_ADDR16_LO); -+ rela.r_addend = 0; -+ bfd_elf32_swap_reloca_out (output_bfd, &rela, loc); -+ loc += sizeof (Elf32_External_Rela); -+ -+ /* Fix up the remaining relocations. They may have the wrong -+ symbol index for _G_O_T_ or _P_L_T_ depending on the order -+ in which symbols were output. */ -+ while (loc < htab->srelplt2->contents + htab->srelplt2->size) -+ { -+ Elf_Internal_Rela rel; -+ -+ bfd_elf32_swap_reloc_in (output_bfd, loc, &rel); -+ rel.r_info = ELF32_R_INFO (htab->elf.hgot->indx, R_PPC_ADDR16_HA); -+ bfd_elf32_swap_reloc_out (output_bfd, &rel, loc); -+ loc += sizeof (Elf32_External_Rela); -+ -+ bfd_elf32_swap_reloc_in (output_bfd, loc, &rel); -+ rel.r_info = ELF32_R_INFO (htab->elf.hgot->indx, R_PPC_ADDR16_LO); -+ bfd_elf32_swap_reloc_out (output_bfd, &rel, loc); -+ loc += sizeof (Elf32_External_Rela); -+ -+ bfd_elf32_swap_reloc_in (output_bfd, loc, &rel); -+ rel.r_info = ELF32_R_INFO (htab->elf.hplt->indx, R_PPC_ADDR32); -+ bfd_elf32_swap_reloc_out (output_bfd, &rel, loc); -+ loc += sizeof (Elf32_External_Rela); -+ } -+ } -+ } -+ -+ if (htab->glink != NULL -+ && htab->glink->contents != NULL -+ && htab->elf.dynamic_sections_created) -+ { -+ unsigned char *p; -+ unsigned char *endp; -+ bfd_vma res0; -+ unsigned int i; -+ -+ /* -+ * PIC glink code is the following: -+ * -+ * # ith PLT code stub. -+ * addis 11,30,(plt+(i-1)*4-got)@ha -+ * lwz 11,(plt+(i-1)*4-got)@l(11) -+ * mtctr 11 -+ * bctr -+ * -+ * # A table of branches, one for each plt entry. -+ * # The idea is that the plt call stub loads ctr and r11 with these -+ * # addresses, so (r11 - res_0) gives the plt index * 4. -+ * res_0: b PLTresolve -+ * res_1: b PLTresolve -+ * . -+ * # Some number of entries towards the end can be nops -+ * res_n_m3: nop -+ * res_n_m2: nop -+ * res_n_m1: -+ * -+ * PLTresolve: -+ * addis 11,11,(1f-res_0)@ha -+ * mflr 0 -+ * bcl 20,31,1f -+ * 1: addi 11,11,(1b-res_0)@l -+ * mflr 12 -+ * mtlr 0 -+ * sub 11,11,12 # r11 = index * 4 -+ * addis 12,12,(got+4-1b)@ha -+ * lwz 0,(got+4-1b)@l(12) # got[1] address of dl_runtime_resolve -+ * lwz 12,(got+8-1b)@l(12) # got[2] contains the map address -+ * mtctr 0 -+ * add 0,11,11 -+ * add 11,0,11 # r11 = index * 12 = reloc offset. -+ * bctr -+ */ -+ static const unsigned int pic_plt_resolve[] = -+ { -+ ADDIS_11_11, -+ MFLR_0, -+ BCL_20_31, -+ ADDI_11_11, -+ MFLR_12, -+ MTLR_0, -+ SUB_11_11_12, -+ ADDIS_12_12, -+ LWZ_0_12, -+ LWZ_12_12, -+ MTCTR_0, -+ ADD_0_11_11, -+ ADD_11_0_11, -+ BCTR, -+ NOP, -+ NOP -+ }; -+ -+ /* -+ * Non-PIC glink code is a little simpler. -+ * -+ * # ith PLT code stub. -+ * lis 11,(plt+(i-1)*4)@ha -+ * lwz 11,(plt+(i-1)*4)@l(11) -+ * mtctr 11 -+ * bctr -+ * -+ * The branch table is the same, then comes -+ * -+ * PLTresolve: -+ * lis 12,(got+4)@ha -+ * addis 11,11,(-res_0)@ha -+ * lwz 0,(got+4)@l(12) # got[1] address of dl_runtime_resolve -+ * addi 11,11,(-res_0)@l # r11 = index * 4 -+ * mtctr 0 -+ * add 0,11,11 -+ * lwz 12,(got+8)@l(12) # got[2] contains the map address -+ * add 11,0,11 # r11 = index * 12 = reloc offset. -+ * bctr -+ */ -+ static const unsigned int plt_resolve[] = -+ { -+ LIS_12, -+ ADDIS_11_11, -+ LWZ_0_12, -+ ADDI_11_11, -+ MTCTR_0, -+ ADD_0_11_11, -+ LWZ_12_12, -+ ADD_11_0_11, -+ BCTR, -+ NOP, -+ NOP, -+ NOP, -+ NOP, -+ NOP, -+ NOP, -+ NOP -+ }; -+ -+ if (ARRAY_SIZE (pic_plt_resolve) != GLINK_PLTRESOLVE / 4) -+ abort (); -+ if (ARRAY_SIZE (plt_resolve) != GLINK_PLTRESOLVE / 4) -+ abort (); -+ -+ /* Build the branch table, one for each plt entry (less one), -+ and perhaps some padding. */ -+ p = htab->glink->contents; -+ p += htab->glink_pltresolve; -+ endp = htab->glink->contents; -+ endp += htab->glink->size - GLINK_PLTRESOLVE; -+ while (p < endp - 8 * 4) -+ { -+ bfd_put_32 (output_bfd, B + endp - p, p); -+ p += 4; -+ } -+ while (p < endp) -+ { -+ bfd_put_32 (output_bfd, NOP, p); -+ p += 4; -+ } -+ -+ res0 = (htab->glink_pltresolve -+ + htab->glink->output_section->vma -+ + htab->glink->output_offset); -+ -+ /* Last comes the PLTresolve stub. */ -+ if (info->shared) -+ { -+ bfd_vma bcl; -+ -+ for (i = 0; i < ARRAY_SIZE (pic_plt_resolve); i++) -+ { -+ bfd_put_32 (output_bfd, pic_plt_resolve[i], p); -+ p += 4; -+ } -+ p -= 4 * ARRAY_SIZE (pic_plt_resolve); -+ -+ bcl = (htab->glink->size - GLINK_PLTRESOLVE + 3*4 -+ + htab->glink->output_section->vma -+ + htab->glink->output_offset); -+ -+ bfd_put_32 (output_bfd, -+ ADDIS_11_11 + PPC_HA (bcl - res0), p + 0*4); -+ bfd_put_32 (output_bfd, -+ ADDI_11_11 + PPC_LO (bcl - res0), p + 3*4); -+ bfd_put_32 (output_bfd, -+ ADDIS_12_12 + PPC_HA (got + 4 - bcl), p + 7*4); -+ if (PPC_HA (got + 4 - bcl) == PPC_HA (got + 8 - bcl)) -+ { -+ bfd_put_32 (output_bfd, -+ LWZ_0_12 + PPC_LO (got + 4 - bcl), p + 8*4); -+ bfd_put_32 (output_bfd, -+ LWZ_12_12 + PPC_LO (got + 8 - bcl), p + 9*4); -+ } -+ else -+ { -+ bfd_put_32 (output_bfd, -+ LWZU_0_12 + PPC_LO (got + 4 - bcl), p + 8*4); -+ bfd_put_32 (output_bfd, -+ LWZ_12_12 + 4, p + 9*4); -+ } -+ } -+ else -+ { -+ for (i = 0; i < ARRAY_SIZE (plt_resolve); i++) -+ { -+ bfd_put_32 (output_bfd, plt_resolve[i], p); -+ p += 4; -+ } -+ p -= 4 * ARRAY_SIZE (plt_resolve); -+ -+ bfd_put_32 (output_bfd, -+ LIS_12 + PPC_HA (got + 4), p + 0*4); -+ bfd_put_32 (output_bfd, -+ ADDIS_11_11 + PPC_HA (-res0), p + 1*4); -+ bfd_put_32 (output_bfd, -+ ADDI_11_11 + PPC_LO (-res0), p + 3*4); -+ if (PPC_HA (got + 4) == PPC_HA (got + 8)) -+ { -+ bfd_put_32 (output_bfd, -+ LWZ_0_12 + PPC_LO (got + 4), p + 2*4); -+ bfd_put_32 (output_bfd, -+ LWZ_12_12 + PPC_LO (got + 8), p + 6*4); -+ } -+ else -+ { -+ bfd_put_32 (output_bfd, -+ LWZU_0_12 + PPC_LO (got + 4), p + 2*4); -+ bfd_put_32 (output_bfd, -+ LWZ_12_12 + 4, p + 6*4); -+ } -+ } -+ } -+ -+ if (htab->glink_eh_frame != NULL -+ && htab->glink_eh_frame->contents != NULL) -+ { -+ unsigned char *p = htab->glink_eh_frame->contents; -+ bfd_vma val; -+ -+ p += sizeof (glink_eh_frame_cie); -+ /* FDE length. */ -+ p += 4; -+ /* CIE pointer. */ -+ p += 4; -+ /* Offset to .glink. */ -+ val = (htab->glink->output_section->vma -+ + htab->glink->output_offset); -+ val -= (htab->glink_eh_frame->output_section->vma -+ + htab->glink_eh_frame->output_offset); -+ val -= p - htab->glink_eh_frame->contents; -+ bfd_put_32 (htab->elf.dynobj, val, p); -+ -+ if (htab->glink_eh_frame->sec_info_type == SEC_INFO_TYPE_EH_FRAME -+ && !_bfd_elf_write_section_eh_frame (output_bfd, info, -+ htab->glink_eh_frame, -+ htab->glink_eh_frame->contents)) -+ return FALSE; -+ } -+ -+ return ret; -+} -+ -+#define TARGET_BIG_SYM bfd_elf32_amigaos_vec -+#define TARGET_BIG_NAME "elf32-amigaos" -+#define ELF_ARCH bfd_arch_powerpc -+#define ELF_TARGET_ID PPC32_ELF_DATA -+#define ELF_MACHINE_CODE EM_PPC -+#ifdef __QNXTARGET__ -+#define ELF_MAXPAGESIZE 0x1000 -+#else -+#define ELF_MAXPAGESIZE 0x10000 -+#endif -+#define ELF_MINPAGESIZE 0x1000 -+#define ELF_COMMONPAGESIZE 0x1000 -+#define elf_info_to_howto ppc_elf_info_to_howto -+ -+#ifdef EM_CYGNUS_POWERPC -+#define ELF_MACHINE_ALT1 EM_CYGNUS_POWERPC -+#endif -+ -+#ifdef EM_PPC_OLD -+#define ELF_MACHINE_ALT2 EM_PPC_OLD -+#endif -+ -+#define elf_backend_plt_not_loaded 1 -+#define elf_backend_can_gc_sections 1 -+#define elf_backend_can_refcount 1 -+#define elf_backend_rela_normal 1 -+ -+#define bfd_elf32_mkobject ppc_elf_mkobject -+#define bfd_elf32_bfd_merge_private_bfd_data ppc_elf_merge_private_bfd_data -+#define bfd_elf32_bfd_relax_section ppc_elf_relax_section -+#define bfd_elf32_bfd_reloc_type_lookup ppc_elf_reloc_type_lookup -+#define bfd_elf32_bfd_reloc_name_lookup ppc_elf_reloc_name_lookup -+#define bfd_elf32_bfd_set_private_flags ppc_elf_set_private_flags -+#define bfd_elf32_bfd_link_hash_table_create ppc_elf_link_hash_table_create -+#define bfd_elf32_get_synthetic_symtab ppc_elf_get_synthetic_symtab -+ -+#define elf_backend_object_p ppc_elf_object_p -+#define elf_backend_gc_mark_hook ppc_elf_gc_mark_hook -+#define elf_backend_gc_sweep_hook ppc_elf_gc_sweep_hook -+#define elf_backend_section_from_shdr ppc_elf_section_from_shdr -+#define elf_backend_relocate_section ppc_elf_relocate_section -+#define elf_backend_create_dynamic_sections ppc_elf_create_dynamic_sections -+#define elf_backend_check_relocs ppc_elf_check_relocs -+#define elf_backend_copy_indirect_symbol ppc_elf_copy_indirect_symbol -+#define elf_backend_adjust_dynamic_symbol ppc_elf_adjust_dynamic_symbol -+#define elf_backend_add_symbol_hook ppc_elf_add_symbol_hook -+#define elf_backend_size_dynamic_sections ppc_elf_size_dynamic_sections -+#define elf_backend_hash_symbol ppc_elf_hash_symbol -+#define elf_backend_finish_dynamic_symbol ppc_elf_finish_dynamic_symbol -+#define elf_backend_finish_dynamic_sections ppc_elf_finish_dynamic_sections -+#define elf_backend_fake_sections ppc_elf_fake_sections -+#define elf_backend_additional_program_headers ppc_elf_additional_program_headers -+#define elf_backend_modify_segment_map ppc_elf_amigaos_modify_segment_map -+#define elf_backend_grok_prstatus ppc_elf_grok_prstatus -+#define elf_backend_grok_psinfo ppc_elf_grok_psinfo -+#define elf_backend_write_core_note ppc_elf_write_core_note -+#define elf_backend_reloc_type_class ppc_elf_reloc_type_class -+#define elf_backend_begin_write_processing ppc_elf_amigaos_begin_write_processing -+#define elf_backend_final_write_processing ppc_elf_amigaos_final_write_processing -+#define elf_backend_write_section ppc_elf_amigaos_write_section -+#define elf_backend_get_sec_type_attr ppc_elf_get_sec_type_attr -+#define elf_backend_plt_sym_val ppc_elf_plt_sym_val -+#define elf_backend_action_discarded ppc_elf_action_discarded -+#define elf_backend_init_index_section _bfd_elf_init_1_index_section -+#define elf_backend_post_process_headers _bfd_elf_set_osabi -+#define elf_backend_lookup_section_flags_hook ppc_elf_lookup_section_flags -+#define elf_backend_section_processing ppc_elf_amigaos_section_processing -+ -+#include "elf32-target.h" ---- /dev/null 2015-09-06 08:42:34.091999986 +0100 +++ ld/emultempl/amigaos.em 2016-01-03 01:46:50.647001071 +0000 @@ -0,0 +1,2513 @@ +# This shell script emits a C file. -*- C -*- @@ -12489,533 +2514,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/ppc-amigaos/recipes/patches/gcc/0001-Changes-for-AmigaOS-version-of-gcc.p b/ppc-amigaos/recipes/patches/gcc/0001-Changes-for-AmigaOS-version-of-gcc.p index 98441d3..6a3cfe7 100644 --- a/ppc-amigaos/recipes/patches/gcc/0001-Changes-for-AmigaOS-version-of-gcc.p +++ b/ppc-amigaos/recipes/patches/gcc/0001-Changes-for-AmigaOS-version-of-gcc.p @@ -1,7 +1,7 @@ -From eecb39df390b5b8cd36a8a417f61d4afba24c187 Mon Sep 17 00:00:00 2001 +From 9b5e45b7156520dca8a4b652a7e628899cd8e4ca Mon Sep 17 00:00:00 2001 From: Sebastian Bauer <mail@sebastianbauer.info> Date: Tue, 17 Feb 2015 20:25:55 +0100 -Subject: [PATCH 1/6] Changes for AmigaOS version of gcc. +Subject: [PATCH 1/9] Changes for AmigaOS version of gcc. --- fixincludes/configure | 1 + @@ -12,8 +12,8 @@ Subject: [PATCH 1/6] Changes for AmigaOS version of gcc. gcc/config.gcc | 8 + gcc/config.host | 6 + gcc/config/rs6000/amigaos-protos.h | 41 + - gcc/config/rs6000/amigaos.c | 466 +++++++++ - gcc/config/rs6000/amigaos.h | 431 ++++++++ + gcc/config/rs6000/amigaos.c | 463 +++++++++ + gcc/config/rs6000/amigaos.h | 426 ++++++++ gcc/config/rs6000/amigaos.opt | 37 + gcc/config/rs6000/rs6000-builtin.def | 7 + gcc/config/rs6000/rs6000.c | 176 +++- @@ -21,8 +21,8 @@ Subject: [PATCH 1/6] Changes for AmigaOS version of gcc. gcc/config/rs6000/rs6000.md | 27 +- gcc/config/rs6000/t-amigaos | 20 + gcc/cp/typeck.c | 16 + - gcc/doc/extend.texi | 167 +++ - gcc/doc/invoke.texi | 136 +++ + gcc/doc/extend.texi | 168 +++ + gcc/doc/invoke.texi | 161 +++ gcc/expr.c | 1 - gcc/gcc.c | 12 +- gcc/prefix.c | 2 +- @@ -43,7 +43,7 @@ Subject: [PATCH 1/6] Changes for AmigaOS version of gcc. libstdc++-v3/crossconfig.m4 | 8 + libstdc++-v3/include/c_global/cstddef | 3 + libstdc++-v3/include/c_std/cstddef | 3 + - 39 files changed, 3879 insertions(+), 77 deletions(-) + 39 files changed, 3897 insertions(+), 77 deletions(-) create mode 100644 gcc/config/rs6000/amigaos-protos.h create mode 100644 gcc/config/rs6000/amigaos.c create mode 100644 gcc/config/rs6000/amigaos.h @@ -89,10 +89,10 @@ index f8f352fb7153445782727eb3311d4305f33fa260..66a501d80528fdd50b4cd2f9f3282e3c * ) diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 07c6f0af71749b653c16ef7843a191e0bd9aa95d..c464690a51e62c8ba92fa3543dccb70488bd12f9 100644 +index 6c5adc0bb58cfce74f1fe26b1eec436bdbfb4fe0..f4844f4ce706174cfb8c49c6475e2cf39da9027a 100644 --- gcc/Makefile.in +++ gcc/Makefile.in -@@ -1972,12 +1972,13 @@ default-c.o: config/default-c.c +@@ -2018,12 +2018,13 @@ default-c.o: config/default-c.c CFLAGS-prefix.o += -DPREFIX=\"$(prefix)\" -DBASEVER=$(BASEVER_s) prefix.o: $(BASEVER) @@ -107,10 +107,10 @@ index 07c6f0af71749b653c16ef7843a191e0bd9aa95d..c464690a51e62c8ba92fa3543dccb704 -DDEFAULT_REAL_TARGET_MACHINE=\"$(real_target_noncanonical)\" \ -DDEFAULT_TARGET_MACHINE=\"$(target_noncanonical)\" \ diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c -index 117f89c023842aa8ea10a6a94088f4095246d9e3..4e1bbf417e6b774bdaa6c01dccef933fc73505ea 100644 +index f2846bb26e7ce77d6a80e25ca7ae670c7e6eddaa..e28b252787d03fe90b6dd1595987356def147ae2 100644 --- gcc/c-family/c-common.c +++ gcc/c-family/c-common.c -@@ -381,12 +381,13 @@ static tree handle_vector_size_attribute (tree *, tree, tree, int, +@@ -368,12 +368,13 @@ static tree handle_vector_size_attribute (tree *, tree, tree, int, bool *); static tree handle_nonnull_attribute (tree *, tree, tree, int, bool *); static tree handle_nothrow_attribute (tree *, tree, tree, int, bool *); @@ -124,7 +124,7 @@ index 117f89c023842aa8ea10a6a94088f4095246d9e3..4e1bbf417e6b774bdaa6c01dccef933f static tree handle_alloc_align_attribute (tree *, tree, tree, int, bool *); static tree handle_assume_aligned_attribute (tree *, tree, tree, int, bool *); static tree handle_target_attribute (tree *, tree, tree, int, bool *); -@@ -755,12 +756,17 @@ const struct attribute_spec c_common_attribute_table[] = +@@ -760,12 +761,17 @@ const struct attribute_spec c_common_attribute_table[] = handle_nothrow_attribute, false }, { "may_alias", 0, 0, false, true, false, NULL, false }, { "cleanup", 1, 1, true, false, false, @@ -142,7 +142,7 @@ index 117f89c023842aa8ea10a6a94088f4095246d9e3..4e1bbf417e6b774bdaa6c01dccef933f to prevent its usage in source code. */ { "type generic", 0, 0, false, true, true, handle_type_generic_attribute, false }, -@@ -9218,12 +9224,32 @@ handle_warn_unused_result_attribute (tree *node, tree name, +@@ -9343,12 +9349,32 @@ handle_warn_unused_result_attribute (tree *node, tree name, *no_add_attrs = true; } @@ -176,10 +176,10 @@ index 117f89c023842aa8ea10a6a94088f4095246d9e3..4e1bbf417e6b774bdaa6c01dccef933f int ARG_UNUSED (flags), bool *no_add_attrs) { diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c -index ffba66bb6c4cf935bc86fc3896fadcc5e40023a7..a98622b16f546b88eb7fdce9ca7631c3ca37470a 100644 +index 59a3c6153b7f3a4fe1a488d8c92a92dcca4171f3..b1c5cd6d3db3bd6d21185bcb49af14d9bfc83d12 100644 --- gcc/c/c-typeck.c +++ gcc/c/c-typeck.c -@@ -2888,12 +2888,14 @@ build_function_call_vec (location_t loc, vec<location_t> arg_loc, +@@ -2947,12 +2947,14 @@ build_function_call_vec (location_t loc, vec<location_t> arg_loc, tree fntype, fundecl = 0; tree name = NULL_TREE, result; tree tem; @@ -194,7 +194,7 @@ index ffba66bb6c4cf935bc86fc3896fadcc5e40023a7..a98622b16f546b88eb7fdce9ca7631c3 /* Convert anything with function type to a pointer-to-function. */ if (TREE_CODE (function) == FUNCTION_DECL) -@@ -2950,12 +2952,35 @@ build_function_call_vec (location_t loc, vec<location_t> arg_loc, +@@ -3009,12 +3011,35 @@ build_function_call_vec (location_t loc, vec<location_t> arg_loc, if (fundecl && TREE_THIS_VOLATILE (fundecl)) current_function_returns_abnormally = 1; @@ -231,10 +231,10 @@ index ffba66bb6c4cf935bc86fc3896fadcc5e40023a7..a98622b16f546b88eb7fdce9ca7631c3 origtypes, function, fundecl); if (nargs < 0) diff --git a/gcc/config.gcc b/gcc/config.gcc -index c835734128b0aef5a0b558ccd7ad24fd17bb9bee..6fcd952f5235f04160e5de45aff781993bf120a1 100644 +index f66e48cd1caacb9d1d4258146a2afe3dc2d1b424..d262672083d57bd77846ba9277aeb3ef5279d11e 100644 --- gcc/config.gcc +++ gcc/config.gcc -@@ -2245,12 +2245,20 @@ nvptx-*) +@@ -2294,12 +2294,20 @@ nvptx-*) fi ;; pdp11-*-*) @@ -256,11 +256,11 @@ index c835734128b0aef5a0b558ccd7ad24fd17bb9bee..6fcd952f5235f04160e5de45aff78199 # ;; powerpc-*-darwin*) diff --git a/gcc/config.host b/gcc/config.host -index b0f5940c26379ebc75e0ca462cbb2cb01dabd2fa..51675e166b9833d327ec43fcca67d6a2b3560068 100644 +index 44f2f56ff7502a513b89002b0e2c96518a67ea96..4ad954ae257e56ed06a1bc7d544413bc6869a296 100644 --- gcc/config.host +++ gcc/config.host -@@ -242,12 +242,18 @@ case ${host} in - exit 1 +@@ -250,12 +250,18 @@ case ${host} in + host_lto_plugin_soname=liblto_plugin-0.dll ;; i[34567]86-*-darwin* | x86_64-*-darwin*) out_host_hook_obj="${out_host_hook_obj} host-i386-darwin.o" @@ -272,12 +272,12 @@ index b0f5940c26379ebc75e0ca462cbb2cb01dabd2fa..51675e166b9833d327ec43fcca67d6a2 + host_can_use_collect2=no + host_xm_defines=HOST_LACKS_INODE_NUMBERS + ;; - powerpc-*-beos*) - host_can_use_collect2=no - ;; powerpc-*-darwin*) out_host_hook_obj="${out_host_hook_obj} host-ppc-darwin.o" host_xmake_file="${host_xmake_file} rs6000/x-darwin" + ;; + powerpc64-*-darwin*) + out_host_hook_obj="${out_host_hook_obj} host-ppc64-darwin.o" diff --git a/gcc/config/rs6000/amigaos-protos.h b/gcc/config/rs6000/amigaos-protos.h new file mode 100644 index 0000000000000000000000000000000000000000..eb5f8fc5f3d546b8d8e1cdd8118a3085079df50e @@ -327,10 +327,10 @@ index 0000000000000000000000000000000000000000..eb5f8fc5f3d546b8d8e1cdd8118a3085 +//#endif /* RTX_CODE */ diff --git a/gcc/config/rs6000/amigaos.c b/gcc/config/rs6000/amigaos.c new file mode 100644 -index 0000000000000000000000000000000000000000..0f575a38e4dc4aac0b454c56bf62f625c0f7eb9c +index 0000000000000000000000000000000000000000..a6da7d543241e2fc8cf51a952633c62e19d7d875 --- /dev/null +++ gcc/config/rs6000/amigaos.c -@@ -0,0 +1,466 @@ +@@ -0,0 +1,463 @@ +/* Subroutines used for code generation on Amiga OS 4 + Copyright (C) 2003 Free Software Foundation, Inc. + Contributed by Thomas Frieden (ThomasF@hyperion-entertainment.com) @@ -382,6 +382,7 @@ index 0000000000000000000000000000000000000000..0f575a38e4dc4aac0b454c56bf62f625 +#include "fold-const.h" +#include "langhooks.h" +#include "explow.h" ++#include "emit-rtl.h" + +#undef DEBUG +#ifdef DEBUG @@ -400,10 +401,6 @@ index 0000000000000000000000000000000000000000..0f575a38e4dc4aac0b454c56bf62f625 +static const char * __attribute__((used)) amigaos_stack_cookie = "$STACK:768000"; +#endif /* __amigaos4__ */ + -+#if 0 -+const char *amigaos_crt_string; -+#endif -+ +/* Initialize a variable CUM of type CUMULATIVE_ARGS + for a call to a function whose data type is FNTYPE. + For a library call, FNTYPE is 0. @@ -799,10 +796,10 @@ index 0000000000000000000000000000000000000000..0f575a38e4dc4aac0b454c56bf62f625 +} diff --git a/gcc/config/rs6000/amigaos.h b/gcc/config/rs6000/amigaos.h new file mode 100644 -index 0000000000000000000000000000000000000000..4556163c22a8fadc51c9ed7401c7e6c414e58c0e +index 0000000000000000000000000000000000000000..94fa93c0be047c08987d7acbc7c71413e164014c --- /dev/null +++ gcc/config/rs6000/amigaos.h -@@ -0,0 +1,431 @@ +@@ -0,0 +1,426 @@ +/* Definitions of target machine for GNU compiler, for AmigaOS. + Copyright (C) 1997, 2003, 2005 Free Software Foundation, Inc. + @@ -1172,11 +1169,6 @@ index 0000000000000000000000000000000000000000..4556163c22a8fadc51c9ed7401c7e6c4 +/* Used as cookie for linear vararg passing */ +#define CALL_LINEARVARARGS 0x10000000 + -+/* AmigaOS specific options */ -+ -+/* Strings provided for own options management in rs6000.c */ -+/*extern const char *amigaos_crt_string;*/ -+ +#define SUB3TARGET_OVERRIDE_OPTIONS \ +do \ +{ \ @@ -1278,12 +1270,12 @@ index 0000000000000000000000000000000000000000..93d74f10bea8c1b23c82a9650bb0c3c1 +Target Driver +Generated binary employs the dynamic linker for shared objects. diff --git a/gcc/config/rs6000/rs6000-builtin.def b/gcc/config/rs6000/rs6000-builtin.def -index 7b79efcedb31000524ac8ac485a054bef70ff9c3..07ecb46ca445f2503529b61f1acecfd722b673ce 100644 +index 5b82b00449e3a0740e78aad67430a7c373127795..1a31571335d00d1bae578af1eb371ec53b5586c0 100644 --- gcc/config/rs6000/rs6000-builtin.def +++ gcc/config/rs6000/rs6000-builtin.def -@@ -1985,6 +1985,13 @@ RS6000_BUILTIN_X (RS6000_BUILTIN_MTFSF, "__builtin_mtfsf", - RS6000_BTC_MISC | RS6000_BTC_UNARY | RS6000_BTC_VOID, - CODE_FOR_rs6000_mtfsf) +@@ -2022,6 +2022,13 @@ BU_SPECIAL_X (RS6000_BUILTIN_CPU_IS, "__builtin_cpu_is", + BU_SPECIAL_X (RS6000_BUILTIN_CPU_SUPPORTS, "__builtin_cpu_supports", + RS6000_BTM_ALWAYS, RS6000_BTC_MISC) /* Darwin CfString builtin. */ BU_SPECIAL_X (RS6000_BUILTIN_CFSTRING, "__builtin_cfstring", RS6000_BTM_ALWAYS, @@ -1296,11 +1288,11 @@ index 7b79efcedb31000524ac8ac485a054bef70ff9c3..07ecb46ca445f2503529b61f1acecfd7 + RS6000_BTC_MISC, /* ATTR */ \ + CODE_FOR_nothing) /* ICODE */ diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c -index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1164374ee 100644 +index 1d0076c41f0f1f08ef10f306efd1ec3aca4ea6a6..cd79b2034b59168b07c84dd6bf32faaf4a648cd0 100644 --- gcc/config/rs6000/rs6000.c +++ gcc/config/rs6000/rs6000.c -@@ -161,12 +161,18 @@ typedef struct rs6000_stack { - not in save_size */ +@@ -120,12 +120,18 @@ typedef struct rs6000_stack { + int altivec_padding_size; /* size of altivec alignment padding */ int spe_gp_size; /* size of 64-bit GPR save size for SPE */ int spe_padding_size; HOST_WIDE_INT total_size; /* total bytes allocated for stack */ @@ -1318,7 +1310,7 @@ index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1 This is added to the cfun structure. */ typedef struct GTY(()) machine_function { -@@ -1426,12 +1432,18 @@ static const struct attribute_spec rs6000_attribute_table[] = +@@ -1515,12 +1521,18 @@ static const struct attribute_spec rs6000_attribute_table[] = #undef TARGET_ASM_FUNCTION_PROLOGUE #define TARGET_ASM_FUNCTION_PROLOGUE rs6000_output_function_prologue @@ -1337,7 +1329,7 @@ index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1 #undef TARGET_LEGITIMIZE_ADDRESS #define TARGET_LEGITIMIZE_ADDRESS rs6000_legitimize_address -@@ -6957,12 +6969,20 @@ rs6000_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED, +@@ -7478,12 +7490,20 @@ rs6000_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED, { enum tls_model model = SYMBOL_REF_TLS_MODEL (x); if (model != 0) @@ -1358,7 +1350,7 @@ index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1 case TFmode: case TDmode: case TImode: -@@ -8549,12 +8569,21 @@ rs6000_emit_move (rtx dest, rtx source, machine_mode mode) +@@ -9105,12 +9125,21 @@ rs6000_emit_move (rtx dest, rtx source, machine_mode mode) tmp = gen_rtx_PLUS (mode, tmp, addend); tmp = force_operand (tmp, operands[0]); } @@ -1380,7 +1372,7 @@ index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1 || ! nonimmediate_operand (operands[0], mode))) goto emit_set; -@@ -8852,12 +8881,20 @@ rs6000_emit_move (rtx dest, rtx source, machine_mode mode) +@@ -9409,12 +9438,20 @@ rs6000_emit_move (rtx dest, rtx source, machine_mode mode) #endif emit_insn (gen_macho_high (target, operands[1])); emit_insn (gen_macho_low (operands[0], target, operands[1])); @@ -1401,7 +1393,7 @@ index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1 } /* If this is a SYMBOL_REF that refers to a constant pool entry, -@@ -9372,12 +9409,18 @@ init_cumulative_args (CUMULATIVE_ARGS *cum, tree fntype, +@@ -9931,12 +9968,18 @@ init_cumulative_args (CUMULATIVE_ARGS *cum, tree fntype, if ((!fntype && rs6000_default_long_calls) || (fntype && lookup_attribute ("longcall", TYPE_ATTRIBUTES (fntype)) @@ -1420,7 +1412,7 @@ index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1 if (fntype) { tree ret_type = TREE_TYPE (fntype); -@@ -10023,12 +10066,21 @@ rs6000_function_arg_advance_1 (CUMULATIVE_ARGS *cum, machine_mode mode, +@@ -10593,12 +10636,21 @@ rs6000_function_arg_advance_1 (CUMULATIVE_ARGS *cum, machine_mode mode, fprintf (stderr, "nargs = %4d, proto = %d, mode = %4s, ", cum->nargs_prototype, cum->prototype, GET_MODE_NAME (mode)); fprintf (stderr, "named = %d, align = %d, depth = %d\n", @@ -1442,8 +1434,8 @@ index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1 rs6000_function_arg_advance (cumulative_args_t cum, machine_mode mode, const_tree type, bool named) { -@@ -11189,12 +11241,18 @@ setup_incoming_varargs (cumulative_args_t cum, machine_mode mode, - save_area = virtual_incoming_args_rtx; +@@ -11765,12 +11817,18 @@ setup_incoming_varargs (cumulative_args_t cum, machine_mode mode, + save_area = crtl->args.internal_arg_pointer; if (targetm.calls.must_pass_in_stack (mode, type)) first_reg_offset += rs6000_arg_size (TYPE_MODE (type), type); @@ -1461,7 +1453,7 @@ index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1 { int n_gpr, nregs = GP_ARG_NUM_REG - first_reg_offset; -@@ -11316,13 +11374,13 @@ rs6000_build_builtin_va_list (void) +@@ -11891,13 +11949,13 @@ rs6000_build_builtin_va_list (void) return build_array_type (record, build_index_type (size_zero_node)); } @@ -1476,7 +1468,7 @@ index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1 tree gpr, fpr, ovf, sav, t; /* Only SVR4 needs something special. */ -@@ -11351,12 +11409,21 @@ rs6000_va_start (tree valist, rtx nextarg) +@@ -11926,12 +11984,21 @@ rs6000_va_start (tree valist, rtx nextarg) words = crtl->args.info.words; n_gpr = MIN (crtl->args.info.sysv_gregno - GP_ARG_MIN_REG, GP_ARG_NUM_REG); @@ -1493,12 +1485,12 @@ index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1 + } + if (TARGET_DEBUG_ARG) - fprintf (stderr, "va_start: words = "HOST_WIDE_INT_PRINT_DEC", n_gpr = " - HOST_WIDE_INT_PRINT_DEC", n_fpr = "HOST_WIDE_INT_PRINT_DEC"\n", + fprintf (stderr, "va_start: words = " HOST_WIDE_INT_PRINT_DEC", n_gpr = " + HOST_WIDE_INT_PRINT_DEC", n_fpr = " HOST_WIDE_INT_PRINT_DEC"\n", words, n_gpr, n_fpr); if (cfun->va_list_gpr_size) -@@ -11402,12 +11469,18 @@ rs6000_va_start (tree valist, rtx nextarg) +@@ -11977,12 +12044,18 @@ rs6000_va_start (tree valist, rtx nextarg) t = fold_build_pointer_plus_hwi (t, cfun->machine->varargs_save_offset); t = build2 (MODIFY_EXPR, TREE_TYPE (sav), sav, t); TREE_SIDE_EFFECTS (t) = 1; @@ -1517,7 +1509,7 @@ index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1 rs6000_gimplify_va_arg (tree valist, tree type, gimple_seq *pre_p, gimple_seq *post_p) { -@@ -14155,12 +14228,20 @@ rs6000_expand_builtin (tree exp, rtx target, rtx subtarget ATTRIBUTE_UNUSED, +@@ -14822,12 +14895,20 @@ rs6000_expand_builtin (tree exp, rtx target, rtx subtarget ATTRIBUTE_UNUSED, size_t i; rtx ret; bool success; @@ -1538,7 +1530,7 @@ index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1 const char *name1 = rs6000_builtin_info[uns_fcode].name; const char *name2 = ((icode != CODE_FOR_nothing) ? get_insn_name ((int)icode) -@@ -19214,13 +19295,22 @@ print_operand_address (FILE *file, rtx x) +@@ -20333,13 +20414,22 @@ print_operand_address (FILE *file, rtx x) #endif #if TARGET_ELF else if (GET_CODE (x) == LO_SUM && REG_P (XEXP (x, 0)) @@ -1561,7 +1553,7 @@ index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1 { /* This hack along with a corresponding hack in rs6000_output_addr_const_extra arranges to output addends -@@ -21827,12 +21917,25 @@ rs6000_stack_info (void) +@@ -23422,12 +23512,25 @@ rs6000_stack_info (void) - info_ptr->first_altivec_reg_save); /* Does this function call anything? */ @@ -1587,7 +1579,7 @@ index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1 || df_regs_ever_live_p (CR4_REGNO)) { info_ptr->cr_save_p = 1; -@@ -21944,13 +22047,19 @@ rs6000_stack_info (void) +@@ -23539,13 +23642,19 @@ rs6000_stack_info (void) info_ptr->lr_save_offset = 2*reg_size; break; @@ -1607,7 +1599,7 @@ index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1 /* Align stack so SPE GPR save area is aligned on a double-word boundary. */ if (info_ptr->spe_gp_size != 0 && info_ptr->cr_save_offset != 0) -@@ -22004,12 +22113,16 @@ rs6000_stack_info (void) +@@ -23599,12 +23708,16 @@ rs6000_stack_info (void) + ehrd_size + ehcr_size + info_ptr->cr_size @@ -1624,7 +1616,7 @@ index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1 info_ptr->total_size = RS6000_ALIGN (non_fixed_size + info_ptr->fixed_size, ABI_STACK_BOUNDARY / BITS_PER_UNIT); -@@ -22188,12 +22301,17 @@ debug_stack_info (rs6000_stack_t *info) +@@ -23759,12 +23872,17 @@ debug_stack_info (rs6000_stack_t *info) if (info->lr_save_p) fprintf (stderr, "\tlr_save_p = %5d\n", info->lr_save_p); @@ -1642,8 +1634,8 @@ index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1 if (info->push_p) fprintf (stderr, "\tpush_p = %5d\n", info->push_p); -@@ -22224,12 +22342,17 @@ debug_stack_info (rs6000_stack_t *info) - if (info->cr_save_offset) +@@ -23795,12 +23913,17 @@ debug_stack_info (rs6000_stack_t *info) + if (info->cr_save_p) fprintf (stderr, "\tcr_save_offset = %5d\n", info->cr_save_offset); if (info->varargs_save_offset) @@ -1655,12 +1647,12 @@ index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1 +#endif + if (info->total_size) - fprintf (stderr, "\ttotal_size = "HOST_WIDE_INT_PRINT_DEC"\n", + fprintf (stderr, "\ttotal_size = " HOST_WIDE_INT_PRINT_DEC"\n", info->total_size); if (info->vars_size) - fprintf (stderr, "\tvars_size = "HOST_WIDE_INT_PRINT_DEC"\n", -@@ -22253,12 +22376,17 @@ debug_stack_info (rs6000_stack_t *info) + fprintf (stderr, "\tvars_size = " HOST_WIDE_INT_PRINT_DEC"\n", +@@ -23824,12 +23947,17 @@ debug_stack_info (rs6000_stack_t *info) if (info->altivec_size) fprintf (stderr, "\taltivec_size = %5d\n", info->altivec_size); @@ -1678,7 +1670,7 @@ index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1 if (info->spe_padding_size) fprintf (stderr, "\tspe_padding_size = %5d\n", -@@ -23989,12 +24117,28 @@ rs6000_emit_prologue (void) +@@ -25616,12 +25744,28 @@ rs6000_emit_prologue (void) emit_frame_save (frame_reg_rtx, reg_mode, info->first_gp_reg_save + i, info->gp_save_offset + frame_off + reg_size * i, @@ -1707,7 +1699,7 @@ index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1 rtvec p; for (i = 0; ; ++i) -@@ -24446,12 +24590,19 @@ rs6000_emit_prologue (void) +@@ -26075,12 +26219,19 @@ rs6000_emit_prologue (void) if (!info->lr_save_p) emit_move_insn (lr, gen_rtx_REG (Pmode, 0)); @@ -1727,7 +1719,7 @@ index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1 register values in the caller of this function. This R2 may have already been changed from the value in the caller. We don't attempt to write accurate DWARF EH frame info for R2 -@@ -24502,12 +24653,17 @@ rs6000_output_savres_externs (FILE *file) +@@ -26172,12 +26323,17 @@ rs6000_output_savres_externs (FILE *file) & REST_NOINLINE_FPRS_DOESNT_RESTORE_LR) == 0; int sel = SAVRES_FPR | (lr ? SAVRES_LR : 0); name = rs6000_savres_routine_name (info, regno, sel); @@ -1745,7 +1737,7 @@ index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1 static void rs6000_output_function_prologue (FILE *file, -@@ -25319,12 +25475,30 @@ rs6000_emit_epilogue (int sibcall) +@@ -27032,12 +27188,30 @@ rs6000_emit_epilogue (int sibcall) + reg_size * (int) i); emit_move_insn (gen_rtx_REG (reg_mode, regno), mem); @@ -1777,11 +1769,11 @@ index f5c2d422a8076e6fa5da3b864ade636c54cd9af8..ee0ea2ffabb6b9c6fdcba687d88be1e1 && info->first_gp_reg_save != 32) { diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h -index 653c2c94e11a6f22d20fe3e33532e4d354c2be5e..99ad439bc53ba7194804bb9bcb47e5756e7175e2 100644 +index 8c6bd07dd5e58cbe887533f9057288d65a96a57a..aaabef41e436a18cc62394cb040db89f2d563cfc 100644 --- gcc/config/rs6000/rs6000.h +++ gcc/config/rs6000/rs6000.h -@@ -2771,6 +2771,9 @@ enum rs6000_builtin_type_index - #define void_type_internal_node (rs6000_builtin_types[RS6000_BTI_void]) +@@ -2846,6 +2846,9 @@ enum rs6000_builtin_type_index + #define ibm128_float_type_node (rs6000_builtin_types[RS6000_BTI_ibm128_float]) extern GTY(()) tree rs6000_builtin_types[RS6000_BTI_MAX]; extern GTY(()) tree rs6000_builtin_decls[RS6000_BUILTIN_COUNT]; @@ -1791,10 +1783,10 @@ index 653c2c94e11a6f22d20fe3e33532e4d354c2be5e..99ad439bc53ba7194804bb9bcb47e575 +/* Used by amigaos port */ +void rs6000_va_start (tree valist, rtx nextarg); diff --git a/gcc/config/rs6000/rs6000.md b/gcc/config/rs6000/rs6000.md -index 0e5883c7fc895a454d3677f0818c4f13b625c9ce..c8304a75b801c6c5fbe7617e0b42eb46ad15d050 100644 +index 849b19a7b0b0c834d9cc571fa7d101b654ca8c77..7d25ce7a6ab03d8af07ebc3df12fe14391cc7941 100644 --- gcc/config/rs6000/rs6000.md +++ gcc/config/rs6000/rs6000.md -@@ -10950,12 +10950,37 @@ +@@ -9694,12 +9694,37 @@ "TARGET_TOC" "la %0,%a1" "&& TARGET_CMODEL != CMODEL_SMALL && reload_completed" @@ -1832,7 +1824,7 @@ index 0e5883c7fc895a454d3677f0818c4f13b625c9ce..c8304a75b801c6c5fbe7617e0b42eb46 ;; be needed there. (define_insn "elf_high" [(set (match_operand:SI 0 "gpc_reg_operand" "=b*r") -@@ -10964,13 +10989,13 @@ +@@ -9708,13 +9733,13 @@ "lis %0,%1@ha") (define_insn "elf_low" @@ -1874,10 +1866,10 @@ index 0000000000000000000000000000000000000000..15d9d3fd5a5f0c8109cd158242745fa5 +MULTILIB_DIRNAMES = newlib clib2 +#MULTILIB_REUSE = =mcrt=newlib diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c -index 22792556c2431d1875e36cee2304c91d709102ea..cd6a6f14e32a9ee078dd048f5d20965960ac4f44 100644 +index cef5604bd0b478255f02e3a5eb15c63effd3e68f..36267c9a5d7085e4cf0c314317cf8632a20c5218 100644 --- gcc/cp/typeck.c +++ gcc/cp/typeck.c -@@ -3525,12 +3525,28 @@ cp_build_function_call_vec (tree function, vec<tree, va_gc> **params, +@@ -3596,12 +3596,28 @@ cp_build_function_call_vec (tree function, vec<tree, va_gc> **params, return error_mark_node; } @@ -1907,16 +1899,17 @@ index 22792556c2431d1875e36cee2304c91d709102ea..cd6a6f14e32a9ee078dd048f5d209659 allocated = make_tree_vector (); params = &allocated; diff --git a/gcc/doc/extend.texi b/gcc/doc/extend.texi -index 70a09032d433c2834f6d1458dcaee92763616570..f63512c1029aa2168a89824ce284844387121082 100644 +index a5a8b23df275b70f047a3af9f79fa18a8542dcc0..217473723a6c8ae5d407dd0a70ba0004d647fd0a 100644 --- gcc/doc/extend.texi +++ gcc/doc/extend.texi -@@ -4508,12 +4508,163 @@ The @code{weak} attribute causes the declaration to be emitted as a weak - symbol rather than a global. This is primarily useful in defining - library functions that can be overridden in user code, though it can - also be used with non-function declarations. Weak symbols are supported - for ELF targets, and also for a.out targets when using the GNU assembler - and linker. +@@ -3347,12 +3347,164 @@ int foo () + @} + @end smallexample + @noindent + results in warning on line 5. + ++ +@item libcall +@cindex AmigaOS specific function attributes +On AmigaOS, the @code{libcall} attribute is used to declare function @@ -2068,18 +2061,18 @@ index 70a09032d433c2834f6d1458dcaee92763616570..f63512c1029aa2168a89824ce2848443 +@} +@end smallexample + - @item weakref - @itemx weakref ("@var{target}") - @cindex @code{weakref} function attribute - The @code{weakref} attribute marks a declaration as a weak reference. - Without arguments, it should be accompanied by an @code{alias} attribute - naming the target symbol. Optionally, the @var{target} may be given as -@@ -5698,12 +5849,28 @@ struct + @item weak + @cindex @code{weak} function attribute + The @code{weak} attribute causes the declaration to be emitted as a weak + symbol rather than a global. This is primarily useful in defining + library functions that can be overridden in user code, though it can + also be used with non-function declarations. Weak symbols are supported +@@ -6109,12 +6261,28 @@ For full documentation of the struct attributes please see the + documentation in @ref{x86 Variable Attributes}. - @noindent - Here, @code{t5} takes up 2 bytes. - @end enumerate - @end table + @cindex @code{altivec} variable attribute, PowerPC + For documentation of @code{altivec} attribute please see the + documentation in @ref{PowerPC Type Attributes}. +@subsection AmigaOS PPC Variable Attributes + @@ -2097,34 +2090,59 @@ index 70a09032d433c2834f6d1458dcaee92763616570..f63512c1029aa2168a89824ce2848443 + +@end table + - @subsection Xstormy16 Variable Attributes - - One attribute is currently defined for xstormy16 configurations: - @code{below100}. + @node RL78 Variable Attributes + @subsection RL78 Variable Attributes - @table @code + @cindex @code{saddr} variable attribute, RL78 + The RL78 back end supports the @code{saddr} variable attribute. This + specifies placement of the corresponding variable in the SADDR area, diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi -index d3be5899c57fa2147893f27c7c7bddac98bd4ff4..68ecbffa0f2f92f5ecc7331e8e855240134dbcdf 100644 +index 821f8fd8594b815a3a7f5fd45bdcb1a02b20c5b3..29dfa9ed3691129229ba1550315982ed3848e001 100644 --- gcc/doc/invoke.texi +++ gcc/doc/invoke.texi -@@ -1109,12 +1109,16 @@ See RS/6000 and PowerPC Options. +@@ -1187,12 +1187,41 @@ See RS/6000 and PowerPC Options. + -mauto-litpools -mno-auto-litpools @gol -mtarget-align -mno-target-align @gol -mlongcalls -mno-longcalls} @emph{zSeries Options} See S/390 and zSeries Options. - ++ +@emph{AmigaOS PPC options} +@gccoptlist{-mcrt=@var{crt} -mbaserel -mno-baserel @gol +-mcheck68kfuncptr} + - @item Code Generation Options - @xref{Code Gen Options,,Options for Code Generation Conventions}. - @gccoptlist{-fcall-saved-@var{reg} -fcall-used-@var{reg} @gol - -ffixed-@var{reg} -fexceptions @gol - -fnon-call-exceptions -fdelete-dead-exceptions -funwind-tables @gol - -fasynchronous-unwind-tables @gol -@@ -12227,12 +12231,13 @@ platform. ++@item Code Generation Options ++@xref{Code Gen Options,,Options for Code Generation Conventions}. ++@gccoptlist{-fcall-saved-@var{reg} -fcall-used-@var{reg} @gol ++-ffixed-@var{reg} -fexceptions @gol ++-fnon-call-exceptions -fdelete-dead-exceptions -funwind-tables @gol ++-fasynchronous-unwind-tables @gol ++-fno-gnu-unique @gol ++-finhibit-size-directive -finstrument-functions @gol ++-finstrument-functions-exclude-function-list=@var{sym},@var{sym},@dots{} @gol ++-finstrument-functions-exclude-file-list=@var{file},@var{file},@dots{} @gol ++-fno-common -fno-ident @gol ++-fpcc-struct-return -fpic -fPIC -fpie -fPIE @gol ++-fno-jump-tables @gol ++-frecord-gcc-switches @gol ++-freg-struct-return -fshort-enums @gol ++-fshort-double -fshort-wchar @gol ++-fverbose-asm -fpack-struct[=@var{n}] -fstack-check @gol ++-fstack-limit-register=@var{reg} -fstack-limit-symbol=@var{sym} @gol ++-fno-stack-limit -fsplit-stack @gol ++-fleading-underscore -ftls-model=@var{model} @gol ++-fstack-reuse=@var{reuse_level} @gol ++-ftrapv -fwrapv -fbounds-check @gol ++-fvisibility=@r{[}default@r{|}internal@r{|}hidden@r{|}protected@r{]} @gol ++-fstrict-volatile-bitfields -fsync-libcalls} + @end table + + + @node Overall Options + @section Options Controlling the Kind of Output + +@@ -12810,12 +12839,13 @@ platform. * VMS Options:: * VxWorks Options:: * x86 Options:: @@ -2138,7 +2156,7 @@ index d3be5899c57fa2147893f27c7c7bddac98bd4ff4..68ecbffa0f2f92f5ecc7331e8e855240 @node AArch64 Options @subsection AArch64 Options @cindex AArch64 Options -@@ -23178,12 +23183,143 @@ These options are defined for Xstormy16: +@@ -24369,12 +24399,143 @@ These options are defined for Xstormy16: @table @gcctabopt @item -msim @opindex msim @@ -2283,10 +2301,10 @@ index d3be5899c57fa2147893f27c7c7bddac98bd4ff4..68ecbffa0f2f92f5ecc7331e8e855240 These options are supported for Xtensa targets: diff --git a/gcc/expr.c b/gcc/expr.c -index 5c095507f4a303b1c4ab3519d165735be5a37d07..fb57de6652c4bd9dd39300eaaf6c3b2b8aad5fb8 100644 +index 29d22b07256ce0adcb8c8eae5249847e144caf4b..8c63a7362c87d8558c3713fb56c0b5a453eb9214 100644 --- gcc/expr.c +++ gcc/expr.c -@@ -8134,13 +8134,12 @@ expand_expr_real_2 (sepops ops, rtx target, machine_mode tmode, +@@ -8077,13 +8077,12 @@ expand_expr_real_2 (sepops ops, rtx target, machine_mode tmode, tree treeop0, treeop1, treeop2; #define REDUCE_BIT_FIELD(expr) (reduce_bit_field \ ? reduce_to_bit_field_precision ((expr), \ @@ -2301,10 +2319,10 @@ index 5c095507f4a303b1c4ab3519d165735be5a37d07..fb57de6652c4bd9dd39300eaaf6c3b2b treeop0 = ops->op0; treeop1 = ops->op1; diff --git a/gcc/gcc.c b/gcc/gcc.c -index d956c36b151eea45681aa650c39c522f85be359f..d4d061080ba1166fb14069094556246b32265da4 100644 +index 1af59209b312ea52408690393ed80e55d093ecf3..e88e6d3497c13a4e9a5d92d71de6128678ec546f 100644 --- gcc/gcc.c +++ gcc/gcc.c -@@ -2730,13 +2730,13 @@ execute (void) +@@ -2930,13 +2930,13 @@ execute (void) commands[0].argv[0] = (string) ? string : commands[0].argv[0]; } @@ -2319,7 +2337,7 @@ index d956c36b151eea45681aa650c39c522f85be359f..d4d061080ba1166fb14069094556246b command args. */ commands[n_commands].prog = argbuf[i + 1]; commands[n_commands].argv -@@ -4261,13 +4261,12 @@ process_command (unsigned int decoded_options_count, +@@ -4480,13 +4480,12 @@ process_command (unsigned int decoded_options_count, add_prefix (&exec_prefixes, standard_exec_prefix, "BINUTILS", PREFIX_PRIORITY_LAST, 2, 0); #endif @@ -2328,12 +2346,12 @@ index d956c36b151eea45681aa650c39c522f85be359f..d4d061080ba1166fb14069094556246b } - gcc_assert (!IS_ABSOLUTE_PATH (tooldir_base_prefix)); - tooldir_prefix2 = concat (tooldir_base_prefix, spec_host_machine, + tooldir_prefix2 = concat (tooldir_base_prefix, spec_machine, dir_separator_str, NULL); /* Look for tools relative to the location from which the driver is running, or, if that is not available, the configured prefix. */ -@@ -6312,12 +6311,17 @@ give_switch (int switchnum, int omit_first_word) +@@ -6558,12 +6557,17 @@ give_switch (int switchnum, int omit_first_word) if (dot) (CONST_CAST (char *, arg))[length] = '.'; do_spec_1 (suffix_subst, 1, NULL); @@ -2351,7 +2369,7 @@ index d956c36b151eea45681aa650c39c522f85be359f..d4d061080ba1166fb14069094556246b do_spec_1 (" ", 0, NULL); switches[switchnum].validated = true; } -@@ -6702,13 +6706,15 @@ is_directory (const char *path1, bool linker) +@@ -6948,13 +6952,15 @@ is_directory (const char *path1, bool linker) len1 = strlen (path1); path = (char *) alloca (3 + len1); memcpy (path, path1, len1); @@ -2367,7 +2385,7 @@ index d956c36b151eea45681aa650c39c522f85be359f..d4d061080ba1166fb14069094556246b if (linker && IS_DIR_SEPARATOR (path[0]) && ((cp - path == 6 -@@ -7223,22 +7229,24 @@ driver::set_up_specs () const +@@ -7492,22 +7498,24 @@ driver::set_up_specs () const ? gcc_exec_prefix : standard_exec_prefix, machine_suffix, standard_startfile_prefix, NULL), @@ -2393,7 +2411,7 @@ index d956c36b151eea45681aa650c39c522f85be359f..d4d061080ba1166fb14069094556246b for (struct user_specs *uptr = user_specs_head; uptr; uptr = uptr->next) { diff --git a/gcc/prefix.c b/gcc/prefix.c -index 3d7532380d5ea5b6a56fd89688cbd76a5d01df57..4ce2ce2e576ca3ad7e9ffee2a2ddc0d25620b3b9 100644 +index 366eecec7dfbc8893f0a9f62a1df42cb5ed5fa69..2ba2c197f1481a48738a77b2722d616eef6b1818 100644 --- gcc/prefix.c +++ gcc/prefix.c @@ -326,13 +326,13 @@ update_path (const char *path, const char *key) @@ -2432,10 +2450,10 @@ index a8d4a14d273b153b117b507ec76356635ccd876e..a9cc1066050e10b539149027a5c159f2 # ifndef HAVE_MEMPCPY static void *mempcpy PARAMS ((void *dest, const void *src, size_t n)); diff --git a/libcpp/line-map.c b/libcpp/line-map.c -index f9260d00008988a5b5f6b23e03f8f9abd61edd16..b48616406c55ca77e0ebfaa795f83bc661445f3e 100644 +index 2e61895bb35bf6814b8040fdb0859772e28adf19..a6e84edce4b17f95763ac4a6c333ff39cb2855f5 100644 --- libcpp/line-map.c +++ libcpp/line-map.c -@@ -717,12 +717,15 @@ linemap_ordinary_map_lookup (struct line_maps *set, source_location line) +@@ -938,12 +938,15 @@ linemap_ordinary_map_lookup (struct line_maps *set, source_location line) mn = LINEMAPS_ORDINARY_CACHE (set); mx = LINEMAPS_ORDINARY_USED (set); @@ -2452,10 +2470,10 @@ index f9260d00008988a5b5f6b23e03f8f9abd61edd16..b48616406c55ca77e0ebfaa795f83bc6 } else diff --git a/libgcc/config.host b/libgcc/config.host -index 4329891fb986fee1c1e01ee367df18c927a7a4b8..9b5c8e2c189ad14dbadbd8e982b6e25113a41fa5 100644 +index b61a579bea0a7e7783596b99d6bdf119cb6213ab..0e514866482cef396d34a1dd39de840bc0daa941 100644 --- libgcc/config.host +++ libgcc/config.host -@@ -956,12 +956,15 @@ nios2-*-*) +@@ -975,12 +975,15 @@ nios2-*-*) tmake_file="$tmake_file nios2/t-nios2 t-softfp-sfdf t-softfp-excl t-softfp" extra_parts="$extra_parts crti.o crtn.o" ;; @@ -2523,10 +2541,10 @@ index 0000000000000000000000000000000000000000..da1e303eed7e60df883971a610e8904d + $(INSTALL_DATA) $(SHLIB_DIR)/$(SHLIB_SONAME) \ + $(DESTDIR)$(inst_libdir)/libgcc$(SHLIB_EXT); diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in -index f06cc69a973bcf39235febce84a2d7fad7130eed..a3d556b812465e04f339b04bfee766aaaa8eb65b 100644 +index c7a45680917a53367c2e1f459cdc921c4d7148ab..7151e59e38eb126f3962cd2370aef45c6be042ea 100644 --- libiberty/Makefile.in +++ libiberty/Makefile.in -@@ -140,12 +140,13 @@ CFILES = alloca.c argv.c asprintf.c atexit.c \ +@@ -141,12 +141,13 @@ CFILES = alloca.c argv.c asprintf.c atexit.c \ make-temp-file.c md5.c memchr.c memcmp.c memcpy.c memmem.c \ memmove.c mempcpy.c memset.c mkstemps.c \ objalloc.c obstack.c \ @@ -2540,7 +2558,7 @@ index f06cc69a973bcf39235febce84a2d7fad7130eed..a3d556b812465e04f339b04bfee766aa simple-object.c simple-object-coff.c simple-object-elf.c \ simple-object-mach-o.c simple-object-xcoff.c \ snprintf.c sort.c \ -@@ -207,12 +208,13 @@ CONFIGURED_OFILES = ./asprintf.$(objext) ./atexit.$(objext) \ +@@ -208,12 +209,13 @@ CONFIGURED_OFILES = ./asprintf.$(objext) ./atexit.$(objext) \ ./getcwd.$(objext) ./getpagesize.$(objext) \ ./gettimeofday.$(objext) \ ./index.$(objext) ./insque.$(objext) \ @@ -2554,7 +2572,7 @@ index f06cc69a973bcf39235febce84a2d7fad7130eed..a3d556b812465e04f339b04bfee766aa ./random.$(objext) ./rename.$(objext) ./rindex.$(objext) \ ./setenv.$(objext) \ ./setproctitle.$(objext) \ -@@ -1120,12 +1122,19 @@ $(CONFIGURED_OFILES): stamp-picdir stamp-noasandir +@@ -1119,12 +1121,19 @@ $(CONFIGURED_OFILES): stamp-picdir stamp-noasandir else true; fi if [ x"$(NOASANFLAG)" != x ]; then \ $(COMPILE.c) $(PICFLAG) $(NOASANFLAG) $(srcdir)/pex-win32.c -o noasan/$@; \ @@ -2613,10 +2631,10 @@ index 0f2c069f0ccf5a7d91e4913548e068c247e12efb..6ba5c4aa4f814fbc28f03127d22e9125 const char *base; diff --git a/libiberty/configure b/libiberty/configure -index b06cab24efa57a9bc6aff387d47833188b796e53..645595a1fdbe34c8387fd19ad78dc1132b4760e3 100755 +index bde78ffd25db650445a3a0bbe0b03e79efb786cb..31b6bb40db646f3c5a6cc4e02b766f069e66e7cf 100755 --- libiberty/configure +++ libiberty/configure -@@ -6809,12 +6809,13 @@ fi +@@ -7055,12 +7055,13 @@ fi # Figure out which version of pexecute to use. case "${host}" in @@ -2631,10 +2649,10 @@ index b06cab24efa57a9bc6aff387d47833188b796e53..645595a1fdbe34c8387fd19ad78dc113 if test x$gcc_no_link = xyes; then if test "x${ac_cv_func_mmap_fixed_mapped+set}" != xset; then diff --git a/libiberty/configure.ac b/libiberty/configure.ac -index 922aa86e9b03719135b2b12ee5aad1c0cbd74342..1c5704ff8cf09fc7446aea2d17e163c9589af542 100644 +index 9d3f2988d5d240d95a2bdc3829e8837efcc6b898..4b921054786e0260add9796888b7ffb79f2f5bab 100644 --- libiberty/configure.ac +++ libiberty/configure.ac -@@ -685,12 +685,13 @@ fi +@@ -693,12 +693,13 @@ fi # Figure out which version of pexecute to use. case "${host}" in @@ -3176,10 +3194,10 @@ index 0000000000000000000000000000000000000000..0c61a108764c8501f8a2e9552c7c0749 + return 0; +} diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure -index 8cd4c76e70d82a9913c45f26b99e386ad659a3a0..b14ada402280cf8afa221731680d82b794a83352 100755 +index 41797a971b536fa06dc4b6d4733f75e6aef2d6a3..921cca221ee01662ac8e1be2c20077b55586db9f 100755 --- libstdc++-v3/configure +++ libstdc++-v3/configure -@@ -77229,12 +77229,171 @@ done +@@ -78187,12 +78187,171 @@ done $as_echo "#define HAVE_TANF 1" >>confdefs.h @@ -3351,7 +3369,7 @@ index 8cd4c76e70d82a9913c45f26b99e386ad659a3a0..b14ada402280cf8afa221731680d82b7 esac fi -@@ -80295,43 +80454,1687 @@ $as_echo "$gxx_include_dir" >&6; } +@@ -81355,43 +81514,1687 @@ $as_echo "$gxx_include_dir" >&6; } WARN_FLAGS='-Wall -Wextra -Wwrite-strings -Wcast-qual -Wabi' @@ -5063,7 +5081,7 @@ index 8cd4c76e70d82a9913c45f26b99e386ad659a3a0..b14ada402280cf8afa221731680d82b7 # loading this file, other *unset* `ac_cv_foo' will be assigned the # following values. -@@ -81494,12 +83297,13 @@ fi +@@ -82558,12 +84361,13 @@ fi TIMESTAMP='$TIMESTAMP' RM='$RM' ofile='$ofile' @@ -5078,10 +5096,10 @@ index 8cd4c76e70d82a9913c45f26b99e386ad659a3a0..b14ada402280cf8afa221731680d82b7 CC="$CC" acx_cv_header_stdint="$acx_cv_header_stdint" diff --git a/libstdc++-v3/configure.ac b/libstdc++-v3/configure.ac -index 580fb8b2eb8ab25bed4872f1d071ba925cf3dcff..76ddbdae13f46336f68672e217e5dfa2fdffee97 100644 +index 9e19e9927fd1b56e24199189cc8e4df505855b73..50512c8a2d66cff6fadc54d22a9223f1840e0de0 100644 --- libstdc++-v3/configure.ac +++ libstdc++-v3/configure.ac -@@ -492,12 +492,15 @@ fi +@@ -495,12 +495,15 @@ fi GLIBCXX_EXPORT_INSTALL_INFO # Export all the include and flag information to Makefiles. @@ -5098,10 +5116,10 @@ index 580fb8b2eb8ab25bed4872f1d071ba925cf3dcff..76ddbdae13f46336f68672e217e5dfa2 AC_CONFIG_FILES([scripts/testsuite_flags],[chmod +x scripts/testsuite_flags]) AC_CONFIG_FILES([scripts/extract_symvers],[chmod +x scripts/extract_symvers]) diff --git a/libstdc++-v3/crossconfig.m4 b/libstdc++-v3/crossconfig.m4 -index 10247f940b55ee77df940044c3889b08b51cfb4c..c7d1034f4870e92dfd502d25bc7cc858f6a19370 100644 +index ece12567794b7e61418bfb654318bf994dd99fc9..bcb83c81017bfb5496431f8b7f60018cfee93df9 100644 --- libstdc++-v3/crossconfig.m4 +++ libstdc++-v3/crossconfig.m4 -@@ -266,11 +266,19 @@ case "${host}" in +@@ -267,11 +267,19 @@ case "${host}" in AC_DEFINE(HAVE_SINF) AC_DEFINE(HAVE_SINHF) AC_DEFINE(HAVE_SQRTF) @@ -5122,10 +5140,10 @@ index 10247f940b55ee77df940044c3889b08b51cfb4c..c7d1034f4870e92dfd502d25bc7cc858 esac ]) diff --git a/libstdc++-v3/include/c_global/cstddef b/libstdc++-v3/include/c_global/cstddef -index 33f4f8f76bd497d345ec7440b9397427e26671eb..7c39a30d2bc41b4eb82b13c3d390cfce52854457 100644 +index 1739121001e71914d148b804190e0c5ae0767e91..69a511c116b90e706e30ec00c5644bc7ce5f54ab 100644 --- libstdc++-v3/include/c_global/cstddef +++ libstdc++-v3/include/c_global/cstddef -@@ -44,12 +44,15 @@ +@@ -49,12 +49,15 @@ #include <bits/c++config.h> #include <stddef.h> @@ -5142,7 +5160,7 @@ index 33f4f8f76bd497d345ec7440b9397427e26671eb..7c39a30d2bc41b4eb82b13c3d390cfce #endif // _GLIBCXX_CSTDDEF diff --git a/libstdc++-v3/include/c_std/cstddef b/libstdc++-v3/include/c_std/cstddef -index d46a4ea16388d674917a74620c3f50d43de84bb6..9189ed063448a45439a265bf4a51cc36e0c731ed 100644 +index 58d4f4bb060de34ea2284d1b3ce908e360268a8a..21a77fcc3af4e3f05f2a79274dfa89c7e586dad1 100644 --- libstdc++-v3/include/c_std/cstddef +++ libstdc++-v3/include/c_std/cstddef @@ -44,12 +44,15 @@ @@ -5162,5 +5180,5 @@ index d46a4ea16388d674917a74620c3f50d43de84bb6..9189ed063448a45439a265bf4a51cc36 #endif // _GLIBCXX_CSTDDEF -- -2.1.4 +1.9.1 diff --git a/ppc-amigaos/recipes/patches/gcc/0002-Added-new-function-attribute-lineartags-and-pragma-a.p b/ppc-amigaos/recipes/patches/gcc/0002-Added-new-function-attribute-lineartags-and-pragma-a.p index 1eec43a..1ec270e 100644 --- a/ppc-amigaos/recipes/patches/gcc/0002-Added-new-function-attribute-lineartags-and-pragma-a.p +++ b/ppc-amigaos/recipes/patches/gcc/0002-Added-new-function-attribute-lineartags-and-pragma-a.p @@ -1,7 +1,7 @@ -From c8d51b6ed56c643f9744d7a18fee3b13a76b98d3 Mon Sep 17 00:00:00 2001 +From cf7a9bcb04858a3a694cc64ccd440dd560bfc7a9 Mon Sep 17 00:00:00 2001 From: Sebastian Bauer <mail@sebastianbauer.info> Date: Fri, 14 Nov 2014 20:03:56 +0100 -Subject: [PATCH 2/6] Added new function attribute "lineartags" and pragma +Subject: [PATCH 2/9] Added new function attribute "lineartags" and pragma "amigaos tagtype". Functions that have the lineartags attribute are assumed to be functions @@ -38,10 +38,10 @@ functions. 5 files changed, 171 insertions(+) diff --git a/gcc/c-family/c-pragma.c b/gcc/c-family/c-pragma.c -index 6894f0e7c3d1ea932ff05f370680be3d18dfcf94..24278250901bfa75c9aae9be63a62351f33e390e 100644 +index c73aa8221049b85949b0b62e88f58120e43aa39d..6cda91994f9140398841610063c297735b797863 100644 --- gcc/c-family/c-pragma.c +++ gcc/c-family/c-pragma.c -@@ -1066,12 +1066,21 @@ handle_pragma_message (cpp_reader *ARG_UNUSED(dummy)) +@@ -1124,12 +1124,21 @@ handle_pragma_message (cpp_reader *ARG_UNUSED(dummy)) warning (OPT_Wpragmas, "junk at end of %<#pragma message%>"); if (TREE_STRING_LENGTH (message) > 1) @@ -63,7 +63,7 @@ index 6894f0e7c3d1ea932ff05f370680be3d18dfcf94..24278250901bfa75c9aae9be63a62351 void mark_valid_location_for_stdc_pragma (bool flag) -@@ -1483,12 +1492,13 @@ init_pragma (void) +@@ -1555,12 +1564,13 @@ init_pragma (void) c_register_pragma_with_expansion (0, "redefine_extname", handle_pragma_redefine_extname); @@ -75,18 +75,18 @@ index 6894f0e7c3d1ea932ff05f370680be3d18dfcf94..24278250901bfa75c9aae9be63a62351 REGISTER_TARGET_PRAGMAS (); #endif - /* Allow plugins to register their own pragmas. */ - invoke_plugin_callbacks (PLUGIN_PRAGMAS, NULL); + global_sso = default_sso; + c_register_pragma (0, "scalar_storage_order", diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c -index 86cbc404a4c10edac0ce2341ae0099f624ee36ea..cc77530b090576db35610468052d84763c3965fd 100644 +index 1b6bacd7498fb8ec37dc4b76bcfa26eacc1c8e1b..60eecd4854780322205cee5d47727d3376a6c9eb 100644 --- gcc/c/c-parser.c +++ gcc/c/c-parser.c -@@ -80,12 +80,74 @@ along with GCC; see the file COPYING3. If not see - #include "cgraph.h" - #include "plugin.h" - #include "omp-low.h" - #include "builtins.h" - #include "gomp-constants.h" +@@ -84,12 +84,74 @@ set_c_expr_source_range (c_expr *expr, + { + expr->src_range = src_range; + if (expr->value) + set_source_range (expr->value, src_range); + } +static htab_t amigaos_tagdecl_to_type; + @@ -156,7 +156,7 @@ index 86cbc404a4c10edac0ce2341ae0099f624ee36ea..cc77530b090576db35610468052d8476 void c_parse_init (void) { -@@ -2390,12 +2452,15 @@ c_parser_declspecs (c_parser *parser, struct c_declspecs *specs, +@@ -2514,12 +2576,15 @@ c_parser_declspecs (c_parser *parser, struct c_declspecs *specs, goto out; attrs_ok = true; seen_type = true; @@ -172,7 +172,7 @@ index 86cbc404a4c10edac0ce2341ae0099f624ee36ea..cc77530b090576db35610468052d8476 if (!typespec_ok) goto out; attrs_ok = true; -@@ -9590,12 +9655,32 @@ c_parser_objc_at_dynamic_declaration (c_parser *parser) +@@ -10011,12 +10076,32 @@ c_parser_objc_at_dynamic_declaration (c_parser *parser) } c_parser_skip_until_found (parser, CPP_SEMICOLON, "expected %<;%>"); objc_add_dynamic_declaration (loc, list); @@ -205,7 +205,7 @@ index 86cbc404a4c10edac0ce2341ae0099f624ee36ea..cc77530b090576db35610468052d8476 true if we actually parsed such a pragma. */ static bool -@@ -9777,12 +9862,56 @@ c_parser_pragma (c_parser *parser, enum pragma_context context) +@@ -10210,12 +10295,56 @@ c_parser_pragma (c_parser *parser, enum pragma_context context, bool *if_p) break; } @@ -263,10 +263,10 @@ index 86cbc404a4c10edac0ce2341ae0099f624ee36ea..cc77530b090576db35610468052d8476 c_parser_skip_to_pragma_eol (parser); diff --git a/gcc/c/c-typeck.c b/gcc/c/c-typeck.c -index a98622b16f546b88eb7fdce9ca7631c3ca37470a..2c03a10f1127c2bec5d9280ecc2f786fd5d13153 100644 +index b1c5cd6d3db3bd6d21185bcb49af14d9bfc83d12..ebb7f5741007c6769e4af94c3c6b856af305132c 100644 --- gcc/c/c-typeck.c +++ gcc/c/c-typeck.c -@@ -3100,12 +3100,14 @@ convert_arguments (location_t loc, vec<location_t> arg_loc, tree typelist, +@@ -3169,12 +3169,14 @@ convert_arguments (location_t loc, vec<location_t> arg_loc, tree typelist, unsigned int parmnum; bool error_args = false; const bool type_generic = fundecl @@ -281,7 +281,7 @@ index a98622b16f546b88eb7fdce9ca7631c3ca37470a..2c03a10f1127c2bec5d9280ecc2f786f if (TREE_CODE (function) == ADDR_EXPR && TREE_CODE (TREE_OPERAND (function, 0)) == FUNCTION_DECL) function = TREE_OPERAND (function, 0); -@@ -3139,12 +3141,14 @@ convert_arguments (location_t loc, vec<location_t> arg_loc, tree typelist, +@@ -3208,12 +3210,14 @@ convert_arguments (location_t loc, vec<location_t> arg_loc, tree typelist, if (flag_cilkplus && fundecl && is_cilkplus_reduce_builtin (fundecl)) return vec_safe_length (values); @@ -296,7 +296,7 @@ index a98622b16f546b88eb7fdce9ca7631c3ca37470a..2c03a10f1127c2bec5d9280ecc2f786f { tree type = typetail ? TREE_VALUE (typetail) : 0; tree valtype = TREE_TYPE (val); -@@ -3193,12 +3197,32 @@ convert_arguments (location_t loc, vec<location_t> arg_loc, tree typelist, +@@ -3262,12 +3266,32 @@ convert_arguments (location_t loc, vec<location_t> arg_loc, tree typelist, } val = c_fully_fold (val, false, NULL); STRIP_TYPE_NOPS (val); @@ -348,10 +348,10 @@ index eb5f8fc5f3d546b8d8e1cdd8118a3085079df50e..3b8c994cdbd192eaf7112c780f0106a4 extern int amigaos_baserel_operand(rtx x); extern int amigaos_not_baserel_tree_p(tree decl); diff --git a/gcc/config/rs6000/amigaos.c b/gcc/config/rs6000/amigaos.c -index 0f575a38e4dc4aac0b454c56bf62f625c0f7eb9c..ccf4f912cb66cd424a2398c6535e05fa493f39f1 100644 +index a6da7d543241e2fc8cf51a952633c62e19d7d875..797261177e46a34ac0aba97f2b9c2b8af8df2e72 100644 --- gcc/config/rs6000/amigaos.c +++ gcc/config/rs6000/amigaos.c -@@ -345,12 +345,19 @@ amigaos_handle_linearvarargs_attribute (tree *node, tree name, +@@ -342,12 +342,19 @@ amigaos_handle_linearvarargs_attribute (tree *node, tree name, *no_add_attrs = true; } @@ -372,5 +372,5 @@ index 0f575a38e4dc4aac0b454c56bf62f625c0f7eb9c..ccf4f912cb66cd424a2398c6535e05fa amigaos_legitimize_baserel_address (rtx addr) { -- -2.1.4 +1.9.1 diff --git a/ppc-amigaos/recipes/patches/gcc/0003-Disable-.machine-directive-generation.p b/ppc-amigaos/recipes/patches/gcc/0003-Disable-.machine-directive-generation.p index edadf9d..2d5dc30 100644 --- a/ppc-amigaos/recipes/patches/gcc/0003-Disable-.machine-directive-generation.p +++ b/ppc-amigaos/recipes/patches/gcc/0003-Disable-.machine-directive-generation.p @@ -1,7 +1,7 @@ -From 43dda55bb84a70181e84f496fd8417ed3c22db54 Mon Sep 17 00:00:00 2001 +From 0f8e76ecc9220e1d4e1f311a52a5e80bd4ad8bb8 Mon Sep 17 00:00:00 2001 From: Sebastian Bauer <mail@sebastianbauer.info> Date: Thu, 9 Jul 2015 06:54:37 +0200 -Subject: [PATCH 3/6] Disable .machine directive generation. +Subject: [PATCH 3/9] Disable .machine directive generation. It breaks manual args to the assembler with different flavor, e.g., -Wa,-m440. This is probably not the right fix. @@ -12,10 +12,10 @@ This reverts parts of a commit from 2015-03-03. 1 file changed, 3 insertions(+) diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c -index ee0ea2ffabb6b9c6fdcba687d88be1e1164374ee..19544afa364f7f7ab1a5c5a61ad7891218398f99 100644 +index cd79b2034b59168b07c84dd6bf32faaf4a648cd0..14b40fe386382a6b418176084c57ec8db73b4280 100644 --- gcc/config/rs6000/rs6000.c +++ gcc/config/rs6000/rs6000.c -@@ -5191,12 +5191,14 @@ rs6000_file_start (void) +@@ -5689,12 +5689,14 @@ rs6000_file_start (void) } #ifdef USING_ELFOS_H @@ -25,12 +25,12 @@ index ee0ea2ffabb6b9c6fdcba687d88be1e1164374ee..19544afa364f7f7ab1a5c5a61ad78912 + /* Temporarily disabled as it overrides e.g., -mcpu=440 */ +#if 0 fputs ("\t.machine ", asm_out_file); - if ((rs6000_isa_flags & OPTION_MASK_DIRECT_MOVE) != 0) + if ((rs6000_isa_flags & OPTION_MASK_MODULO) != 0) + fputs ("power9\n", asm_out_file); + else if ((rs6000_isa_flags & OPTION_MASK_DIRECT_MOVE) != 0) fputs ("power8\n", asm_out_file); else if ((rs6000_isa_flags & OPTION_MASK_POPCNTD) != 0) - fputs ("power7\n", asm_out_file); - else if ((rs6000_isa_flags & OPTION_MASK_CMPB) != 0) -@@ -5206,12 +5208,13 @@ rs6000_file_start (void) +@@ -5706,12 +5708,13 @@ rs6000_file_start (void) else if ((rs6000_isa_flags & OPTION_MASK_MFCRF) != 0) fputs ("power4\n", asm_out_file); else if ((rs6000_isa_flags & OPTION_MASK_POWERPC64) != 0) @@ -43,7 +43,7 @@ index ee0ea2ffabb6b9c6fdcba687d88be1e1164374ee..19544afa364f7f7ab1a5c5a61ad78912 if (DEFAULT_ABI == ABI_ELFv2) fprintf (file, "\t.abiversion 2\n"); - + } -- -2.1.4 +1.9.1 diff --git a/ppc-amigaos/recipes/patches/gcc/0004-The-default-link-mode-is-static-for-AmigaOS.p b/ppc-amigaos/recipes/patches/gcc/0004-The-default-link-mode-is-static-for-AmigaOS.p index 5eeb4e5..7b3da9e 100644 --- a/ppc-amigaos/recipes/patches/gcc/0004-The-default-link-mode-is-static-for-AmigaOS.p +++ b/ppc-amigaos/recipes/patches/gcc/0004-The-default-link-mode-is-static-for-AmigaOS.p @@ -1,7 +1,7 @@ -From 8eb1aa062283f82007d639e862278a750f314da5 Mon Sep 17 00:00:00 2001 +From 0a073e9854a2f5b558631929467837cec073d624 Mon Sep 17 00:00:00 2001 From: Sebastian Bauer <mail@sebastianbauer.info> Date: Wed, 2 Dec 2015 20:56:33 +0100 -Subject: [PATCH 4/6] The default link mode is static for AmigaOS. +Subject: [PATCH 4/9] The default link mode is static for AmigaOS. Changed the g++ driver to reflect this. --- @@ -9,10 +9,10 @@ Changed the g++ driver to reflect this. 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/cp/g++spec.c b/gcc/cp/g++spec.c -index 6536d7e776f861b4bd40277e96c80a635cbcc85e..ff1d77eaefc20039f7e5df48ffb849ee533b9797 100644 +index 03cbde090cb361f7f6244c97a91c8ad567d9a092..c8dec4b7a0ad1d95811dd9a50a7916e3b4c76336 100644 --- gcc/cp/g++spec.c +++ gcc/cp/g++spec.c -@@ -102,14 +102,14 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options, +@@ -101,14 +101,14 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options, /* By default, we throw on the math library if we have one. */ int need_math = (MATH_LIBRARY[0] != '\0'); @@ -29,7 +29,7 @@ index 6536d7e776f861b4bd40277e96c80a635cbcc85e..ff1d77eaefc20039f7e5df48ffb849ee /* The total number of arguments with the new stuff. */ unsigned int argc; -@@ -196,12 +196,16 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options, +@@ -195,12 +195,16 @@ lang_specific_driver (struct cl_decoded_option **in_decoded_options, break; case OPT_static: @@ -47,5 +47,5 @@ index 6536d7e776f861b4bd40277e96c80a635cbcc85e..ff1d77eaefc20039f7e5df48ffb849ee case OPT_static_libstdc__: library = library >= 0 ? 2 : library; -- -2.1.4 +1.9.1 diff --git a/ppc-amigaos/recipes/patches/gcc/0005-Disable-the-usage-of-dev-urandom-when-compiling-for-.p b/ppc-amigaos/recipes/patches/gcc/0005-Disable-the-usage-of-dev-urandom-when-compiling-for-.p index 99621d8..16ab194 100644 --- a/ppc-amigaos/recipes/patches/gcc/0005-Disable-the-usage-of-dev-urandom-when-compiling-for-.p +++ b/ppc-amigaos/recipes/patches/gcc/0005-Disable-the-usage-of-dev-urandom-when-compiling-for-.p @@ -1,7 +1,7 @@ -From c9b38a7315faed955e2f01e37f84d06ba32aa9b5 Mon Sep 17 00:00:00 2001 +From 5e6d152e0100b004ae0400739db545dcfa5f9671 Mon Sep 17 00:00:00 2001 From: Sebastian Bauer <mail@sebastianbauer.info> Date: Wed, 2 Dec 2015 21:39:42 +0100 -Subject: [PATCH 5/6] Disable the usage of /dev/urandom when compiling for +Subject: [PATCH 5/9] Disable the usage of /dev/urandom when compiling for AmigaOS. --- @@ -10,10 +10,10 @@ Subject: [PATCH 5/6] Disable the usage of /dev/urandom when compiling for 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/gcc/gcc.c b/gcc/gcc.c -index d4d061080ba1166fb14069094556246b32265da4..8239a6b2152ac192498cd8a50b0d4b9c7db45c62 100644 +index e88e6d3497c13a4e9a5d92d71de6128678ec546f..eb56ea7242ab51c941b88d72f8dee2a0381e2c8f 100644 --- gcc/gcc.c +++ gcc/gcc.c -@@ -9124,22 +9124,25 @@ print_asm_header_spec_function (int arg ATTRIBUTE_UNUSED, +@@ -9511,22 +9511,25 @@ print_asm_header_spec_function (int arg ATTRIBUTE_UNUSED, /* Get a random number for -frandom-seed */ static unsigned HOST_WIDE_INT @@ -40,10 +40,10 @@ index d4d061080ba1166fb14069094556246b32265da4..8239a6b2152ac192498cd8a50b0d4b9c struct timeval tv; diff --git a/gcc/toplev.c b/gcc/toplev.c -index cb6c51739ffc40d19f83efafb02d7670e4da2915..3ba2210c953d2dde2ab919808b86ed3e7a4f4d1e 100644 +index 8979d2634260b1e5ad1183ed26da444c47cd3631..de6cdfc5dfdadbef3851fa842d6566648720ffa7 100644 --- gcc/toplev.c +++ gcc/toplev.c -@@ -288,22 +288,22 @@ static void +@@ -238,22 +238,22 @@ static void init_local_tick (void) { if (!flag_random_seed) @@ -69,5 +69,5 @@ index cb6c51739ffc40d19f83efafb02d7670e4da2915..3ba2210c953d2dde2ab919808b86ed3e gettimeofday (&tv, NULL); -- -2.1.4 +1.9.1 diff --git a/ppc-amigaos/recipes/patches/gcc/0006-Expand-arg-zero-on-AmigaOS-using-the-PROGDIR-assign.p b/ppc-amigaos/recipes/patches/gcc/0006-Expand-arg-zero-on-AmigaOS-using-the-PROGDIR-assign.p index 6f15af2..07158d9 100644 --- a/ppc-amigaos/recipes/patches/gcc/0006-Expand-arg-zero-on-AmigaOS-using-the-PROGDIR-assign.p +++ b/ppc-amigaos/recipes/patches/gcc/0006-Expand-arg-zero-on-AmigaOS-using-the-PROGDIR-assign.p @@ -1,7 +1,7 @@ -From 85c5321c36040abb1c3b70cb1e0f9bf217178957 Mon Sep 17 00:00:00 2001 +From 2b3f8d96dd38b95816ee32ab6e7564b4cf9001dd Mon Sep 17 00:00:00 2001 From: Sebastian Bauer <mail@sebastianbauer.info> Date: Sat, 5 Dec 2015 13:17:26 +0100 -Subject: [PATCH 6/6] Expand arg zero on AmigaOS using the PROGDIR: assign. +Subject: [PATCH 6/9] Expand arg zero on AmigaOS using the PROGDIR: assign. This should make sure that the proper relative paths are computed during process_command(). @@ -10,10 +10,10 @@ process_command(). 1 file changed, 10 insertions(+) diff --git a/gcc/gcc.c b/gcc/gcc.c -index 8239a6b2152ac192498cd8a50b0d4b9c7db45c62..f6f1ba3195a4ffc8e335d7abe797d4b006fc96d5 100644 +index eb56ea7242ab51c941b88d72f8dee2a0381e2c8f..4184cf1f3ac8063f9ae8f4b76da1e5e33c6f76cd 100644 --- gcc/gcc.c +++ gcc/gcc.c -@@ -6898,12 +6898,22 @@ compare_files (char *cmpfile[]) +@@ -7166,12 +7166,22 @@ driver::~driver () int driver::main (int argc, char **argv) { @@ -37,5 +37,5 @@ index 8239a6b2152ac192498cd8a50b0d4b9c7db45c62..f6f1ba3195a4ffc8e335d7abe797d4b0 set_up_specs (); putenv_COLLECT_GCC (argv[0]); -- -2.1.4 +1.9.1 diff --git a/ppc-amigaos/recipes/patches/gcc/0007-Some-AmigaOS-4.x-compability-changes-for-posix-threa.p b/ppc-amigaos/recipes/patches/gcc/0007-Some-AmigaOS-4.x-compability-changes-for-posix-threa.p new file mode 100644 index 0000000..87b8e77 --- /dev/null +++ b/ppc-amigaos/recipes/patches/gcc/0007-Some-AmigaOS-4.x-compability-changes-for-posix-threa.p @@ -0,0 +1,85 @@ +From 213fc9c82cbd5935a67a991a753478994b9eb968 Mon Sep 17 00:00:00 2001 +From: Sebastian Bauer <mail@sebastianbauer.info> +Date: Thu, 21 Jan 2016 20:46:59 +0100 +Subject: [PATCH 7/9] Some AmigaOS 4.x compability changes for posix thread + support. + +--- + libgcc/gthr-posix.h | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/libgcc/gthr-posix.h b/libgcc/gthr-posix.h +index 555c0fe2458fa3e0e96d769d3f36ae35db47e1bb..daee24052b68cea2159d68abd6cf6817e0d7a81b 100644 +--- libgcc/gthr-posix.h ++++ libgcc/gthr-posix.h +@@ -29,12 +29,16 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + /* POSIX threads specific definitions. + Easy, since the interface is just one-to-one mapping. */ + + #define __GTHREADS 1 + #define __GTHREADS_CXX0X 1 + ++#ifdef __amigaos4__ ++#include <exec/types.h> ++#endif ++ + #include <pthread.h> + + #if ((defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)) \ + || !defined(_GTHREAD_USE_MUTEX_TIMEDLOCK)) + # include <unistd.h> + # if defined(_POSIX_TIMEOUTS) && _POSIX_TIMEOUTS >= 0 +@@ -107,13 +111,15 @@ __gthrw(pthread_join) + __gthrw(pthread_equal) + __gthrw(pthread_self) + __gthrw(pthread_detach) + #ifndef __BIONIC__ + __gthrw(pthread_cancel) + #endif ++#ifndef __amigaos4__ + __gthrw(sched_yield) ++#endif + + __gthrw(pthread_mutex_lock) + __gthrw(pthread_mutex_trylock) + #if _GTHREAD_USE_MUTEX_TIMEDLOCK + __gthrw(pthread_mutex_timedlock) + #endif +@@ -444,14 +450,16 @@ __gthread_objc_thread_get_priority (void) + } + + /* Yield our process time to another thread. */ + static inline void + __gthread_objc_thread_yield (void) + { ++#ifndef __amigaos4__ + if (__gthread_active_p ()) + __gthrw_(sched_yield) (); ++#endif + } + + /* Terminate the current thread. */ + static inline int + __gthread_objc_thread_exit (void) + { +@@ -686,13 +694,17 @@ __gthread_self (void) + return __gthrw_(pthread_self) (); + } + + static inline int + __gthread_yield (void) + { ++#ifdef __amigaos4__ ++ return 1; ++#else + return __gthrw_(sched_yield) (); ++#endif + } + + static inline int + __gthread_once (__gthread_once_t *__once, void (*__func) (void)) + { + if (__gthread_active_p ()) +-- +1.9.1 + diff --git a/ppc-amigaos/recipes/patches/gcc/0008-Added-libstc-support-for-AmigaOS.p b/ppc-amigaos/recipes/patches/gcc/0008-Added-libstc-support-for-AmigaOS.p new file mode 100644 index 0000000..d2998b2 --- /dev/null +++ b/ppc-amigaos/recipes/patches/gcc/0008-Added-libstc-support-for-AmigaOS.p @@ -0,0 +1,624 @@ +From 385667d2ba86a86f1d44651999d293a797650f30 Mon Sep 17 00:00:00 2001 +From: Sebastian Bauer <mail@sebastianbauer.info> +Date: Fri, 22 Jan 2016 20:04:50 +0100 +Subject: [PATCH 8/9] Added libstc++ support for AmigaOS. + +--- + libstdc++-v3/config/os/amigaos/ctype_base.h | 59 +++++++ + .../config/os/amigaos/ctype_configure_char.cc | 99 ++++++++++++ + libstdc++-v3/config/os/amigaos/ctype_inline.h | 173 ++++++++++++++++++++ + libstdc++-v3/config/os/amigaos/error_constants.h | 178 +++++++++++++++++++++ + libstdc++-v3/config/os/amigaos/os_defines.h | 43 +++++ + libstdc++-v3/configure.host | 3 + + 6 files changed, 555 insertions(+) + create mode 100644 libstdc++-v3/config/os/amigaos/ctype_base.h + create mode 100644 libstdc++-v3/config/os/amigaos/ctype_configure_char.cc + create mode 100644 libstdc++-v3/config/os/amigaos/ctype_inline.h + create mode 100644 libstdc++-v3/config/os/amigaos/error_constants.h + create mode 100644 libstdc++-v3/config/os/amigaos/os_defines.h + +diff --git a/libstdc++-v3/config/os/amigaos/ctype_base.h b/libstdc++-v3/config/os/amigaos/ctype_base.h +new file mode 100644 +index 0000000000000000000000000000000000000000..260b6142b6fc6a11a1e5f0bf7820b592d09f285e +--- /dev/null ++++ libstdc++-v3/config/os/amigaos/ctype_base.h +@@ -0,0 +1,59 @@ ++// Locale support -*- C++ -*- ++ ++// Copyright (C) 1997-2015 Free Software Foundation, Inc. ++// ++// This file is part of the GNU ISO C++ Library. This library is free ++// software; you can redistribute it and/or modify it under the ++// terms of the GNU General Public License as published by the ++// Free Software Foundation; either version 3, or (at your option) ++// any later version. ++ ++// This library is distributed in the hope that it will be useful, ++// but WITHOUT ANY WARRANTY; without even the implied warranty of ++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++// GNU General Public License for more details. ++ ++// Under Section 7 of GPL version 3, you are granted additional ++// permissions described in the GCC Runtime Library Exception, version ++// 3.1, as published by the Free Software Foundation. ++ ++// You should have received a copy of the GNU General Public License and ++// a copy of the GCC Runtime Library Exception along with this program; ++// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see ++// <http://www.gnu.org/licenses/>. ++ ++// ++// ISO C++ 14882: 22.1 Locales ++// ++ ++// Default information, may not be appropriate for specific host. ++ ++namespace std _GLIBCXX_VISIBILITY(default) ++{ ++_GLIBCXX_BEGIN_NAMESPACE_VERSION ++ ++ /// @brief Base class for ctype. ++ struct ctype_base ++ { ++ // Non-standard typedefs. ++ typedef const int* __to_type; ++ ++ // NB: Offsets into ctype<char>::_M_table force a particular size ++ // on the mask type. Because of this, we don't use an enum. ++ typedef unsigned int mask; ++ static const mask upper = 1 << 0; ++ static const mask lower = 1 << 1; ++ static const mask alpha = 1 << 2; ++ static const mask digit = 1 << 3; ++ static const mask xdigit = 1 << 4; ++ static const mask space = 1 << 5; ++ static const mask print = 1 << 6; ++ static const mask graph = (1 << 2) | (1 << 3) | (1 << 9); // alnum|punct ++ static const mask cntrl = 1 << 8; ++ static const mask punct = 1 << 9; ++ static const mask alnum = (1 << 2) | (1 << 3); // alpha|digit ++ static const mask blank = 1 << 10; ++ }; ++ ++_GLIBCXX_END_NAMESPACE_VERSION ++} // namespace +diff --git a/libstdc++-v3/config/os/amigaos/ctype_configure_char.cc b/libstdc++-v3/config/os/amigaos/ctype_configure_char.cc +new file mode 100644 +index 0000000000000000000000000000000000000000..e6f4895aee78da54bc6b1e01df00816206361c41 +--- /dev/null ++++ libstdc++-v3/config/os/amigaos/ctype_configure_char.cc +@@ -0,0 +1,99 @@ ++// Locale support -*- C++ -*- ++ ++// Copyright (C) 2011-2015 Free Software Foundation, Inc. ++// ++// This file is part of the GNU ISO C++ Library. This library is free ++// software; you can redistribute it and/or modify it under the ++// terms of the GNU General Public License as published by the ++// Free Software Foundation; either version 3, or (at your option) ++// any later version. ++ ++// This library is distributed in the hope that it will be useful, ++// but WITHOUT ANY WARRANTY; without even the implied warranty of ++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++// GNU General Public License for more details. ++ ++// Under Section 7 of GPL version 3, you are granted additional ++// permissions described in the GCC Runtime Library Exception, version ++// 3.1, as published by the Free Software Foundation. ++ ++// You should have received a copy of the GNU General Public License and ++// a copy of the GCC Runtime Library Exception along with this program; ++// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see ++// <http://www.gnu.org/licenses/>. ++ ++/** @file ctype_configure_char.cc */ ++ ++// ++// ISO C++ 14882: 22.1 Locales ++// ++ ++#include <locale> ++#include <cstdlib> ++#include <cstring> ++ ++namespace std _GLIBCXX_VISIBILITY(default) ++{ ++_GLIBCXX_BEGIN_NAMESPACE_VERSION ++ ++// Information as gleaned from /usr/include/ctype.h ++ ++ const ctype_base::mask* ++ ctype<char>::classic_table() throw() ++ { return 0; } ++ ++ ctype<char>::ctype(__c_locale, const mask* __table, bool __del, ++ size_t __refs) ++ : facet(__refs), _M_del(__table != 0 && __del), ++ _M_toupper(NULL), _M_tolower(NULL), ++ _M_table(__table ? __table : classic_table()) ++ { ++ memset(_M_widen, 0, sizeof(_M_widen)); ++ _M_widen_ok = 0; ++ memset(_M_narrow, 0, sizeof(_M_narrow)); ++ _M_narrow_ok = 0; ++ } ++ ++ ctype<char>::ctype(const mask* __table, bool __del, size_t __refs) ++ : facet(__refs), _M_del(__table != 0 && __del), ++ _M_toupper(NULL), _M_tolower(NULL), ++ _M_table(__table ? __table : classic_table()) ++ { ++ memset(_M_widen, 0, sizeof(_M_widen)); ++ _M_widen_ok = 0; ++ memset(_M_narrow, 0, sizeof(_M_narrow)); ++ _M_narrow_ok = 0; ++ } ++ ++ char ++ ctype<char>::do_toupper(char __c) const ++ { return ::toupper((int) __c); } ++ ++ const char* ++ ctype<char>::do_toupper(char* __low, const char* __high) const ++ { ++ while (__low < __high) ++ { ++ *__low = ::toupper((int) *__low); ++ ++__low; ++ } ++ return __high; ++ } ++ ++ char ++ ctype<char>::do_tolower(char __c) const ++ { return ::tolower((int) __c); } ++ ++ const char* ++ ctype<char>::do_tolower(char* __low, const char* __high) const ++ { ++ while (__low < __high) ++ { ++ *__low = ::tolower((int) *__low); ++ ++__low; ++ } ++ return __high; ++ } ++ ++_GLIBCXX_END_NAMESPACE_VERSION ++} // namespace +diff --git a/libstdc++-v3/config/os/amigaos/ctype_inline.h b/libstdc++-v3/config/os/amigaos/ctype_inline.h +new file mode 100644 +index 0000000000000000000000000000000000000000..cfa0146ae6b70623c2fe63b864ceef7bce0d5fe0 +--- /dev/null ++++ libstdc++-v3/config/os/amigaos/ctype_inline.h +@@ -0,0 +1,173 @@ ++// Locale support -*- C++ -*- ++ ++// Copyright (C) 2000-2015 Free Software Foundation, Inc. ++// ++// This file is part of the GNU ISO C++ Library. This library is free ++// software; you can redistribute it and/or modify it under the ++// terms of the GNU General Public License as published by the ++// Free Software Foundation; either version 3, or (at your option) ++// any later version. ++ ++// This library is distributed in the hope that it will be useful, ++// but WITHOUT ANY WARRANTY; without even the implied warranty of ++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++// GNU General Public License for more details. ++ ++// Under Section 7 of GPL version 3, you are granted additional ++// permissions described in the GCC Runtime Library Exception, version ++// 3.1, as published by the Free Software Foundation. ++ ++// You should have received a copy of the GNU General Public License and ++// a copy of the GCC Runtime Library Exception along with this program; ++// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see ++// <http://www.gnu.org/licenses/>. ++ ++/** @file bits/ctype_inline.h ++ * This is an internal header file, included by other library headers. ++ * Do not attempt to use it directly. @headername{locale} ++ */ ++ ++// ++// ISO C++ 14882: 22.1 Locales ++// ++ ++// ctype bits to be inlined go here. Non-inlinable (ie virtual do_*) ++// functions go in ctype.cc ++ ++// The following definitions are portable, but insanely slow. If one ++// cares at all about performance, then specialized ctype ++// functionality should be added for the native os in question: see ++// the config/os/bits/ctype_*.h files. ++ ++// Constructing a synthetic "C" table should be seriously considered... ++ ++namespace std _GLIBCXX_VISIBILITY(default) ++{ ++_GLIBCXX_BEGIN_NAMESPACE_VERSION ++ ++ bool ++ ctype<char>:: ++ is(mask __m, char __c) const ++ { ++ if (_M_table) ++ return _M_table[static_cast<unsigned char>(__c)] & __m; ++ else ++ { ++ bool __ret = false; ++ const size_t __bitmasksize = 15; ++ size_t __bitcur = 0; // Lowest bitmask in ctype_base == 0 ++ for (; __bitcur <= __bitmasksize; ++__bitcur) ++ { ++ const mask __bit = static_cast<mask>(1 << __bitcur); ++ if (__m & __bit) ++ { ++ bool __testis; ++ switch (__bit) ++ { ++ case space: ++ __testis = isspace(__c); ++ break; ++ case print: ++ __testis = isprint(__c); ++ break; ++ case cntrl: ++ __testis = iscntrl(__c); ++ break; ++ case upper: ++ __testis = isupper(__c); ++ break; ++ case lower: ++ __testis = islower(__c); ++ break; ++ case alpha: ++ __testis = isalpha(__c); ++ break; ++ case digit: ++ __testis = isdigit(__c); ++ break; ++ case punct: ++ __testis = ispunct(__c); ++ break; ++ case xdigit: ++ __testis = isxdigit(__c); ++ break; ++ case alnum: ++ __testis = isalnum(__c); ++ break; ++ case graph: ++ __testis = isgraph(__c); ++ break; ++#ifdef _GLIBCXX_USE_C99_CTYPE_TR1 ++ case blank: ++ __testis = isblank(__c); ++ break; ++#endif ++ default: ++ __testis = false; ++ break; ++ } ++ __ret |= __testis; ++ } ++ } ++ return __ret; ++ } ++ } ++ ++ const char* ++ ctype<char>:: ++ is(const char* __low, const char* __high, mask* __vec) const ++ { ++ if (_M_table) ++ while (__low < __high) ++ *__vec++ = _M_table[static_cast<unsigned char>(*__low++)]; ++ else ++ { ++ // Highest bitmask in ctype_base == 11. ++ const size_t __bitmasksize = 15; ++ for (;__low < __high; ++__vec, ++__low) ++ { ++ mask __m = 0; ++ // Lowest bitmask in ctype_base == 0 ++ size_t __i = 0; ++ for (;__i <= __bitmasksize; ++__i) ++ { ++ const mask __bit = static_cast<mask>(1 << __i); ++ if (this->is(__bit, *__low)) ++ __m |= __bit; ++ } ++ *__vec = __m; ++ } ++ } ++ return __high; ++ } ++ ++ const char* ++ ctype<char>:: ++ scan_is(mask __m, const char* __low, const char* __high) const ++ { ++ if (_M_table) ++ while (__low < __high ++ && !(_M_table[static_cast<unsigned char>(*__low)] & __m)) ++ ++__low; ++ else ++ while (__low < __high && !this->is(__m, *__low)) ++ ++__low; ++ return __low; ++ } ++ ++ const char* ++ ctype<char>:: ++ scan_not(mask __m, const char* __low, const char* __high) const ++ { ++ if (_M_table) ++ while (__low < __high ++ && (_M_table[static_cast<unsigned char>(*__low)] & __m) != 0) ++ ++__low; ++ else ++ while (__low < __high && this->is(__m, *__low) != 0) ++ ++__low; ++ return __low; ++ } ++ ++_GLIBCXX_END_NAMESPACE_VERSION ++} // namespace +diff --git a/libstdc++-v3/config/os/amigaos/error_constants.h b/libstdc++-v3/config/os/amigaos/error_constants.h +new file mode 100644 +index 0000000000000000000000000000000000000000..74492cf61c875eac28cb8a86d5bfdb3b8807aa16 +--- /dev/null ++++ libstdc++-v3/config/os/amigaos/error_constants.h +@@ -0,0 +1,178 @@ ++// Specific definitions for generic platforms -*- C++ -*- ++ ++// Copyright (C) 2007-2015 Free Software Foundation, Inc. ++// ++// This file is part of the GNU ISO C++ Library. This library is free ++// software; you can redistribute it and/or modify it under the ++// terms of the GNU General Public License as published by the ++// Free Software Foundation; either version 3, or (at your option) ++// any later version. ++ ++// This library is distributed in the hope that it will be useful, ++// but WITHOUT ANY WARRANTY; without even the implied warranty of ++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++// GNU General Public License for more details. ++ ++// Under Section 7 of GPL version 3, you are granted additional ++// permissions described in the GCC Runtime Library Exception, version ++// 3.1, as published by the Free Software Foundation. ++ ++// You should have received a copy of the GNU General Public License and ++// a copy of the GCC Runtime Library Exception along with this program; ++// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see ++// <http://www.gnu.org/licenses/>. ++ ++/** @file bits/error_constants.h ++ * This is an internal header file, included by other library headers. ++ * Do not attempt to use it directly. @headername{system_error} ++ */ ++ ++#ifndef _GLIBCXX_ERROR_CONSTANTS ++#define _GLIBCXX_ERROR_CONSTANTS 1 ++ ++#include <bits/c++config.h> ++#include <cerrno> ++ ++namespace std _GLIBCXX_VISIBILITY(default) ++{ ++_GLIBCXX_BEGIN_NAMESPACE_VERSION ++ ++ enum class errc ++ { ++ address_family_not_supported = EAFNOSUPPORT, ++ address_in_use = EADDRINUSE, ++ address_not_available = EADDRNOTAVAIL, ++ already_connected = EISCONN, ++ argument_list_too_long = E2BIG, ++ argument_out_of_domain = EDOM, ++ bad_address = EFAULT, ++ bad_file_descriptor = EBADF, ++ ++#ifdef _GLIBCXX_HAVE_EBADMSG ++ bad_message = EBADMSG, ++#endif ++ ++ broken_pipe = EPIPE, ++ connection_aborted = ECONNABORTED, ++ connection_already_in_progress = EALREADY, ++ connection_refused = ECONNREFUSED, ++ connection_reset = ECONNRESET, ++ cross_device_link = EXDEV, ++ destination_address_required = EDESTADDRREQ, ++ device_or_resource_busy = EBUSY, ++ directory_not_empty = ENOTEMPTY, ++ executable_format_error = ENOEXEC, ++ file_exists = EEXIST, ++ file_too_large = EFBIG, ++ filename_too_long = ENAMETOOLONG, ++ function_not_supported = ENOSYS, ++ host_unreachable = EHOSTUNREACH, ++ ++#ifdef _GLIBCXX_HAVE_EIDRM ++ identifier_removed = EIDRM, ++#endif ++ ++ illegal_byte_sequence = EILSEQ, ++ inappropriate_io_control_operation = ENOTTY, ++ interrupted = EINTR, ++ invalid_argument = EINVAL, ++ invalid_seek = ESPIPE, ++ io_error = EIO, ++ is_a_directory = EISDIR, ++ message_size = EMSGSIZE, ++ network_down = ENETDOWN, ++ network_reset = ENETRESET, ++ network_unreachable = ENETUNREACH, ++ no_buffer_space = ENOBUFS, ++ no_child_process = ECHILD, ++ ++#ifdef _GLIBCXX_HAVE_ENOLINK ++ no_link = ENOLINK, ++#endif ++ ++ no_lock_available = ENOLCK, ++ ++#ifdef _GLIBCXX_HAVE_ENODATA ++ no_message_available = ENODATA, ++#endif ++ ++ no_message = ENOMSG, ++ no_protocol_option = ENOPROTOOPT, ++ no_space_on_device = ENOSPC, ++ ++#ifdef _GLIBCXX_HAVE_ENOSR ++ no_stream_resources = ENOSR, ++#endif ++ ++ no_such_device_or_address = ENXIO, ++ no_such_device = ENODEV, ++ no_such_file_or_directory = ENOENT, ++ no_such_process = ESRCH, ++ not_a_directory = ENOTDIR, ++ not_a_socket = ENOTSOCK, ++ ++#ifdef _GLIBCXX_HAVE_ENOSTR ++ not_a_stream = ENOSTR, ++#endif ++ ++ not_connected = ENOTCONN, ++ not_enough_memory = ENOMEM, ++ ++#ifdef _GLIBCXX_HAVE_ENOTSUP ++ not_supported = ENOTSUP, ++#endif ++ ++#ifdef _GLIBCXX_HAVE_ECANCELED ++ operation_canceled = ECANCELED, ++#endif ++ ++ operation_in_progress = EINPROGRESS, ++ operation_not_permitted = EPERM, ++ operation_not_supported = EOPNOTSUPP, ++ operation_would_block = EWOULDBLOCK, ++ ++#ifdef _GLIBCXX_HAVE_EOWNERDEAD ++ owner_dead = EOWNERDEAD, ++#endif ++ ++ permission_denied = EACCES, ++ ++#ifdef _GLIBCXX_HAVE_EPROTO ++ protocol_error = EPROTO, ++#endif ++ ++ protocol_not_supported = EPROTONOSUPPORT, ++ read_only_file_system = EROFS, ++ resource_deadlock_would_occur = EDEADLK, ++ resource_unavailable_try_again = EAGAIN, ++ result_out_of_range = ERANGE, ++ ++#ifdef _GLIBCXX_HAVE_ENOTRECOVERABLE ++ state_not_recoverable = ENOTRECOVERABLE, ++#endif ++ ++#ifdef _GLIBCXX_HAVE_ETIME ++ stream_timeout = ETIME, ++#endif ++ ++#ifdef _GLIBCXX_HAVE_ETXTBSY ++ text_file_busy = ETXTBSY, ++#endif ++ ++ timed_out = ETIMEDOUT, ++ too_many_files_open_in_system = ENFILE, ++ too_many_files_open = EMFILE, ++ too_many_links = EMLINK, ++ too_many_symbolic_link_levels = ELOOP, ++ ++#ifdef _GLIBCXX_HAVE_EOVERFLOW ++ value_too_large = EOVERFLOW, ++#endif ++ ++ wrong_protocol_type = EPROTOTYPE ++ }; ++ ++_GLIBCXX_END_NAMESPACE_VERSION ++} // namespace ++ ++#endif +diff --git a/libstdc++-v3/config/os/amigaos/os_defines.h b/libstdc++-v3/config/os/amigaos/os_defines.h +new file mode 100644 +index 0000000000000000000000000000000000000000..346f063958cd7e80ebf97be4acee0bdf391cb811 +--- /dev/null ++++ libstdc++-v3/config/os/amigaos/os_defines.h +@@ -0,0 +1,43 @@ ++// Specific definitions for AmigaOS -*- C++ -*- ++ ++// Copyright (C) 2000-2015 Free Software Foundation, Inc. ++// ++// This file is part of the GNU ISO C++ Library. This library is free ++// software; you can redistribute it and/or modify it under the ++// terms of the GNU General Public License as published by the ++// Free Software Foundation; either version 3, or (at your option) ++// any later version. ++ ++// This library is distributed in the hope that it will be useful, ++// but WITHOUT ANY WARRANTY; without even the implied warranty of ++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++// GNU General Public License for more details. ++ ++// Under Section 7 of GPL version 3, you are granted additional ++// permissions described in the GCC Runtime Library Exception, version ++// 3.1, as published by the Free Software Foundation. ++ ++// You should have received a copy of the GNU General Public License and ++// a copy of the GCC Runtime Library Exception along with this program; ++// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see ++// <http://www.gnu.org/licenses/>. ++ ++/** @file bits/os_defines.h ++ * This is an internal header file, included by other library headers. ++ * Do not attempt to use it directly. @headername{iosfwd} ++ */ ++ ++#ifndef _GLIBCXX_OS_DEFINES ++#define _GLIBCXX_OS_DEFINES 1 ++ ++// System-specific #define, typedefs, corrections, etc, go here. This ++// file will come before all others. ++ ++// No ioctl() on AmigaOS ++#define _GLIBCXX_NO_IOCTL 1 ++ ++#ifdef __NEWLIB__ ++#define _GLIBCXX_USE_C99_STDINT_TR1 1 ++#endif ++ ++#endif +diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host +index 0b366eafaae8cfa0abd09128bd8ac16b9f775c7c..e54afbc0c30a4b0a40949d9ed78f64661224c253 100644 +--- libstdc++-v3/configure.host ++++ libstdc++-v3/configure.host +@@ -223,12 +223,15 @@ case "${host_os}" in + atomicity_dir="os/aix" + ;; + aix*) + os_include_dir="os/generic" + atomicity_dir="cpu/generic" + ;; ++ amigaos*) ++ os_include_dir="os/amigaos" ++ ;; + bsd*) + # Plain BSD attempts to share FreeBSD files. + os_include_dir="os/bsd/freebsd" + ;; + cygwin*) + os_include_dir="os/newlib" +-- +1.9.1 + diff --git a/ppc-amigaos/recipes/patches/gcc/0009-Added-e500-support-for-AmigaOS.p b/ppc-amigaos/recipes/patches/gcc/0009-Added-e500-support-for-AmigaOS.p new file mode 100644 index 0000000..1216f68 --- /dev/null +++ b/ppc-amigaos/recipes/patches/gcc/0009-Added-e500-support-for-AmigaOS.p @@ -0,0 +1,31 @@ +From e4c6c0e05575c8aab06e5d2a16ac183f83206cbc Mon Sep 17 00:00:00 2001 +From: Sebastian Bauer <mail@sebastianbauer.info> +Date: Mon, 30 Jan 2017 20:49:17 +0100 +Subject: [PATCH 9/9] Added e500 support for AmigaOS. + +--- + gcc/config.gcc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gcc/config.gcc b/gcc/config.gcc +index d262672083d57bd77846ba9277aeb3ef5279d11e..3699a9831cccbb6a74ed0f8b2ddf5574bee1f086 100644 +--- gcc/config.gcc ++++ gcc/config.gcc +@@ -2295,13 +2295,13 @@ nvptx-*) + ;; + pdp11-*-*) + tm_file="${tm_file} newlib-stdint.h" + use_gcc_stdint=wrap + ;; + powerpc-*-amigaos*) +- tm_file="${tm_file} dbxelf.h elfos.h rs6000/sysv4.h rs6000/amigaos.h" ++ tm_file="${tm_file} dbxelf.h elfos.h rs6000/sysv4.h rs6000/amigaos.h rs6000/e500.h" + tm_p_file="${tm_p_file} rs6000/amigaos-protos.h" + extra_options="${extra_options} rs6000/sysv4.opt rs6000/amigaos.opt" + tmake_file="rs6000/t-amigaos" + extra_objs=amigaos.o + use_collect2=no + ;; +-- +1.9.1 + diff --git a/sdk/Makefile b/sdk/Makefile index 8850224..340be7d 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -7,11 +7,13 @@ # GCCSDK_INSTALL_CROSSBIN -- /path/to/toolchain/bin # # supported targets are: +# arm-riscos-gnueabi # arm-unknown-riscos # m68k-atari-mint # m5475-atari-mint # ppc-amigaos # i686-w64-mingw32 +# x86_64-w64-mingw32 # m68k-unknown-amigaos ifeq ($(GCCSDK_INSTALL_ENV),) @@ -23,23 +25,64 @@ ifeq ($(GCCSDK_INSTALL_CROSSBIN),) endif # Upstream package versions -VERSION_ZLIB := 1.2.11 -VERSION_LIBICONV := 1.14 +# https://zlib.net/ +VERSION_ZLIB := 1.2.13 +CKSUM_ZLIB := b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30 +# https://www.gnu.org/software/libiconv/ +VERSION_LIBICONV := 1.17 +CKSUM_LIBICONV := 8f74213b56238c85a50a5329f77e06198771e70dd9a739779f4c02f65d971313 +# https://laurikari.net/tre/ VERSION_LIBTRE := 0.8.0 -VERSION_OPENSSL := 1.0.2k -VERSION_LIBPNG := 1.6.28 +CKSUM_LIBTRE := 8dc642c2cde02b2dac6802cdbe2cda201daf79c4ebcbb3ea133915edf1636658 +# https://www.openssl.org/ +VERSION_OPENSSL := 3.0.12 +CKSUM_OPENSSL := f93c9e8edde5e9166119de31755fc87b4aa34863662f67ddfcba14d0b6b69b61 +# http://www.libpng.org/pub/png/libpng.html +VERSION_LIBPNG := 1.6.40 +CKSUM_LIBPNG := 8f720b363aa08683c9bf2a563236f45313af2c55d542b5481ae17dd8d183bb42 +# http://libjpeg.sourceforge.net/ VERSION_LIBJPEG := 8d -VERSION_LIBJPEG_TURBO := 1.5.1 -VERSION_LIBCARES := 1.12.0 -VERSION_LIBCURL := 7.51.0 +CKSUM_LIBJPEG := 00029b1473f0f0ea72fbca3230e8cb25797fbb27e58ae2e46bb8bf5a806fe0b3 +# https://libjpeg-turbo.org/ +VERSION_LIBJPEG_TURBO := 3.0.1 +CKSUM_LIBJPEG_TURBO := 22429507714ae147b3acacd299e82099fce5d9f456882fc28e252e4579ba2a75 +# https://developers.google.com/speed/webp/ +VERSION_LIBWEBP := 1.3.2 +CKSUM_LIBWEBP := 2a499607df669e40258e53d0ade8035ba4ec0175244869d1025d460562aa09b4 +# https://c-ares.org/ +VERSION_LIBCARES := 1.23.0 +CKSUM_LIBCARES := cb614ecf78b477d35963ebffcf486fc9d55cc3d3216f00700e71b7d4868f79f5 +# https://curl.se/ +VERSION_LIBCURL := 8.5.0 +CKSUM_LIBCURL := ce4b6a6655431147624aaf582632a36fe1ade262d5fab385c60f78942dd8d87b +# VERSION_LIBGNURX := 2.5.1 +CKSUM_LIBGNURX := 7147b7f806ec3d007843b38e19f42a5b7c65894a57ffc297a76b0dcd5f675d76 +# http://mission-base.com/peter/source/ +# 1.7.0: https://github.com/peterGraf/pbl/releases VERSION_LIBPBL := 1_04 +CKSUM_LIBPBL := 20f0ab1af09a22a8f3cb3ce3832247a6b51d8db57211f6bb0794af9485229a67 +# Git-20170304 VERSION_LIBCF := CVS-20130415 -VERSION_LIBEXPAT := 2.2.0 -VERSION_LDG := 2.32 +CKSUM_LIBCF := 5d25c4faa2f5b7fc106bb47d093646f79d0fa72a34aaf8122110a2e4cf9eb6cc +# https://github.com/libexpat/libexpat +VERSION_LIBEXPAT := 2.5.0 +CKSUM_LIBEXPAT := 6f0e6e01f7b30025fa05c85fdad1e5d0ec7fd35d9f61b22f34998de11969ff67 +# +VERSION_LDG := SVN-20150827 +CKSUM_LDG := ca7959d31b46cb1e755005eddcc0daf6a91f7faad7d869d82e94d98d20650d94 +# VERSION_WINDOM := 2.0.1 +CKSUM_WINDOM := 2539c15c22f7b8ca48c015f0c3d33f3bd1666cc8aa56eef6f38de2cc98a3479e +# https://github.com/berkus/hermes-pixel-format/archive/refs/tags/v1.3.3.tar.gz VERSION_HERMES := 1.3.3 -VERSION_FREETYPE := 2.7 +CKSUM_HERMES := e86374606105d2a251d4406e5f9fca8d09e2fd971ebb0dfd342e40953676c46e +# https://www.freetype.org/ +VERSION_FREETYPE := 2.13.2 +CKSUM_FREETYPE := 1ac27e16c134a7f2ccea177faba19801131116fd682efc1f5737037c5db224b5 +# +VERSION_ROADSHOW := 7_64_0-amissl +CKSUM_ROADSHOW := 5af092c2319f184d49f5eda72d160231b3f3551f9884f8136c531521059a4ad2 # Path path__ := $(GCCSDK_INSTALL_CROSSBIN):$(PATH) @@ -49,6 +92,7 @@ cc__ := $(word 1,$(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)) cxx__ := $(word 1,$(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++)) ar__ := $(word 1,$(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar)) ranlib__ := $(word 1,$(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ranlib)) +windres__ := $(word 1,$(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*windres)) # Flags cflags__ := -I$(GCCSDK_INSTALL_ENV)/include @@ -59,11 +103,31 @@ pkg_config_libdir__ := $(GCCSDK_INSTALL_ENV)/lib/pkgconfig # Target TARGET := $(shell $(cc__) -dumpmachine) +ifeq ($(findstring -riscos,$(TARGET)),-riscos) + cflags__ := $(cflags__) -mpoke-function-name + ifeq ($(findstring -gnueabi,$(TARGET)),-gnueabi) + cflags__ := $(cflags__) -funwind-tables + endif +endif + # Environment # Newer autotools objects to -I appearing in CFLAGS cleanenv := PATH="$(path__)" CC="$(cc__)" CXX="$(cxx__)" AR="$(ar__)" RANLIB="$(ranlib__)" CPPFLAGS="$(cppflags__)" LDFLAGS="$(ldflags__)" PKG_CONFIG_LIBDIR="$(pkg_config_libdir__)" env := $(cleanenv) CFLAGS="$(cflags__)" +# Cross-compiling CMake invocation. +NS_SDK_CMAKE_CMD=cmake \ + -DCMAKE_INSTALL_PREFIX="$(GCCSDK_INSTALL_ENV)" \ + -DBUILD_SHARED_LIBS=OFF \ + -DCMAKE_COLOR_MAKEFILE=OFF \ + -DBUILD_DOC=OFF \ + -DBUILD_DOCS=OFF \ + -DBUILD_EXAMPLE=OFF \ + -DBUILD_EXAMPLES=OFF \ + -DBUILD_TEST=OFF \ + -DBUILD_TESTS=OFF \ + -DBUILD_TESTING=OFF \ + RECIPES := $(CURDIR)/recipes SOURCEDIR := $(CURDIR)/sources BUILDDIR := $(CURDIR)/builddir-$(TARGET) @@ -79,15 +143,26 @@ SDK_ITEMS := COMMON_SDK_ITEMS := zlib.d openssl.d libpng.d libcares.d libcurl.d libexpat.d -LIBCURL_DISABLES := $(patsubst %,--disable-%,ftp file dict ldap ldaps rtsp telnet gopher tftp pop3 imap smb smtp manual) +LIBCURL_SSL := openssl +LIBCURL_DISABLES := $(patsubst %,--disable-%,ftp file dict ldap ldaps mqtt rtsp telnet gopher tftp pop3 imap smb smtp manual) FREETYPE_ENV := LIBPNG_CFLAGS=$$($(GCCSDK_INSTALL_ENV)/bin/libpng-config --cflags) LIBPNG_LDFLAGS=$$($(GCCSDK_INSTALL_ENV)/bin/libpng-config --ldflags) # per target environments LIBJPEG_TURBO_BUILDDIR:=$(BUILDDIR)/libjpegturbo +# Openssl target has to alter for mingw +TARGET_OPENSSL:=$(TARGET) + # Target Specific setup +ifeq ($(TARGET),arm-riscos-gnueabi) + SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, $(COMMON_SDK_ITEMS) libjpeg-turbo.d libwebp.d) + EXTRAARGS_LIBCARES := --disable-shared + EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --with-random="/dev/urandom" $(LIBCURL_DISABLES) + EXTRAARGS_OPENSSL := no-asm +endif + ifeq ($(TARGET),arm-unknown-riscos) - SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, $(COMMON_SDK_ITEMS) libjpeg-turbo.d) + SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, $(COMMON_SDK_ITEMS) libjpeg-turbo.d libwebp.d) EXTRAARGS_LIBCARES := --disable-shared EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --with-random="/dev/urandom" $(LIBCURL_DISABLES) EXTRAARGS_OPENSSL := no-asm @@ -99,7 +174,6 @@ ifeq ($(TARGET),m68k-atari-mint) EXTRAARGS_LIBCURL := --enable-optimize --enable-nonblocking --enable-ares --with-random="/dev/urandom" --disable-manual --disable-curldebug --disable-thread --disable-threaded-resolver EXTRAARGS_LIBICONV := --enable-extra-encodings LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024" - EXTRAARGS_OPENSSL := no-asm endif ifeq ($(TARGET),m5475-atari-mint) @@ -114,25 +188,48 @@ endif 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_LIBCURL := --disable-ntlm-wb --without-random --enable-threaded-resolver --disable-ipv6 LIBS=-lpthread endif ifeq ($(TARGET),i686-w64-mingw32) - SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libgnurx.d $(COMMON_SDK_ITEMS) libjpeg.d) + SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libgnurx.d $(COMMON_SDK_ITEMS) libjpeg.d libwebp.d) EXTRAARGS_LIBCARES := --disable-shared EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --disable-ldap --without-random - LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32" - EXTRAARGS_OPENSSL := no-asm + LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32 -liphlpapi" + TARGET_OPENSSL := mingw + ENV_OPENSSL := WINDRES="$(windres__)" + EXTRAARGS_OPENSSL := no-asm enable-capieng +endif + +ifeq ($(TARGET),x86_64-w64-mingw32) + SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libgnurx.d $(COMMON_SDK_ITEMS) libjpeg.d libwebp.d) + EXTRAARGS_LIBCARES := --disable-shared + EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --disable-ldap --without-random + LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32 -liphlpapi" + TARGET_OPENSSL := mingw64 + EXTRAARGS_OPENSSL := no-asm enable-capieng endif ifeq ($(TARGET),m68k-unknown-amigaos) - SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS) libjpeg.d) + SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, roadshow.d libiconv.d libtre.d libpbl.d $(COMMON_SDK_ITEMS) libjpeg.d) EXTRAARGS_LIBCARES := --disable-shared --without-random - EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random --disable-threaded-resolver --with-ssl --with-zlib - LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024" + LIBCARES_ENV := LIBS="-lm" + LIBCURL_SSL := amissl + EXTRAARGS_LIBCURL := --disable-ntlm-wb --without-random --disable-threaded-resolver --with-zlib --disable-rt --disable-ipv6 + LIBICONV_ENV := CFLAGS="-DPATH_MAX=1024 -DRLIMIT_NOFILE=6" LIBJPEG_ENV := LDFLAGS="-lm" LIBJPEG_TURBO_ENV := LDFLAGS="-lm" - LIBCURL_ENV := LIBS="-lm" + # XXX: build openssl against bsdsocket.library? + # ENV_OPENSSL := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude" CPPFLAGS="-D__NO_NET_API" + ifeq ($(LIBCURL_SSL),openssl) + LIBCURL_ENV := LIBS="-lm -lnet" + else + LIBCURL_ENV := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude -D__NO_NET_API -DHAVE_IOCTLSOCKET_CAMEL_FIONBIO" LIBS="-lm" + endif + # XXX: libgcc is meant to be implied, but for some reason that + # results in ld evaluating it after libm and thus failing to find symbols. + # Hack around it by forcing the link order here. + LIBEXPAT_ENV := LDFLAGS="-lgcc -lm" endif ifeq ($(SDK_ITEMS),) @@ -174,7 +271,7 @@ endif touch $@ $(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.gz: - $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://zlib.net/$(subst $(SOURCEDIR)/,,$@)" $@ + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://zlib.net/fossils/$(subst $(SOURCEDIR)/,,$@)" $(CKSUM_ZLIB) $@ # libiconv $(BUILDSTEPS)/libiconv.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libiconv-src.d @@ -192,7 +289,7 @@ $(BUILDSTEPS)/libiconv-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/libiconv-$( touch $@ $(SOURCEDIR)/libiconv-$(VERSION_LIBICONV).tar.gz: - $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://ftp.gnu.org/pub/gnu/libiconv/$(subst $(SOURCEDIR)/,,$@)" $@ + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://ftp.gnu.org/pub/gnu/libiconv/$(subst $(SOURCEDIR)/,,$@)" $(CKSUM_LIBICONV) $@ # libgnurx $(BUILDSTEPS)/libgnurx.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libgnurx-src.d @@ -212,7 +309,7 @@ $(BUILDSTEPS)/libgnurx-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/libgnurx-$( touch $@ $(SOURCEDIR)/libgnurx-$(VERSION_LIBGNURX).tar.gz: - $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://downloads.sourceforge.net/project/mingw/Other/UserContributed/regex/mingw-regex-$(VERSION_LIBGNURX)/mingw-libgnurx-$(VERSION_LIBGNURX)-src.tar.gz" $@ + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://downloads.sourceforge.net/project/mingw/Other/UserContributed/regex/mingw-regex-$(VERSION_LIBGNURX)/mingw-libgnurx-$(VERSION_LIBGNURX)-src.tar.gz" $(CKSUM_LIBGNURX) $@ # atari cf library $(BUILDSTEPS)/libcf.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libcf-src.d @@ -230,7 +327,7 @@ $(BUILDSTEPS)/libcf-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/libcf-$(VERSIO touch $@ $(SOURCEDIR)/libcf-$(VERSION_LIBCF).tar.bz2: - $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/cflib-$(VERSION_LIBCF).tar.bz2" $@ + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/cflib-$(VERSION_LIBCF).tar.bz2" $(CKSUM_LIBCF) $@ # atari windom library $(BUILDSTEPS)/windom.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/windom-src.d @@ -248,12 +345,12 @@ $(BUILDSTEPS)/windom-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/windom-$(VERS touch $@ $(SOURCEDIR)/windom-$(VERSION_WINDOM).zip: - $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://downloads.sourceforge.net/project/windom/windom/$(VERSION_WINDOM)/windom-$(VERSION_WINDOM)-1.zip" $@ + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://downloads.sourceforge.net/project/windom/windom/$(VERSION_WINDOM)/windom-$(VERSION_WINDOM)-1.zip" $(CKSUM_WINDOM) $@ # atari ldg library $(BUILDSTEPS)/ldg.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/ldg-src.d mkdir -p $(BUILDDIR)/ldg - cd $(BUILDDIR)/ldg && unzip $(SOURCEDIR)/ldg-$(VERSION_LDG).zip + cd $(BUILDDIR)/ldg && tar xjf $(SOURCEDIR)/ldg-$(VERSION_LDG).tar.bz2 $(env) make -C $(BUILDDIR)/ldg/ldg-$(VERSION_LDG)/src/devel -f gcc.mak CROSS=yes PREFIX=$(GCCSDK_INSTALL_ENV) CC=${TARGET}-gcc AR=${TARGET}-ar cp $(BUILDDIR)/ldg/ldg-$(VERSION_LDG)/lib/gcc/libldg.a $(GCCSDK_INSTALL_ENV)/lib/ cp $(BUILDDIR)/ldg/ldg-$(VERSION_LDG)/include/ldg.h $(GCCSDK_INSTALL_ENV)/include/ldg.h @@ -261,31 +358,31 @@ $(BUILDSTEPS)/ldg.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/ldg-src.d cp $(BUILDDIR)/ldg/ldg-$(VERSION_LDG)/include/ldg/mem.h $(GCCSDK_INSTALL_ENV)/include/ldg/ touch $@ -$(BUILDSTEPS)/ldg-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/ldg-$(VERSION_LDG).zip +$(BUILDSTEPS)/ldg-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/ldg-$(VERSION_LDG).tar.bz2 touch $@ -$(SOURCEDIR)/ldg-$(VERSION_LDG).zip: - $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://ldg.org.free.fr/distrib/ldg-$(VERSION_LDG).zip" $@ +$(SOURCEDIR)/ldg-$(VERSION_LDG).tar.bz2: + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://vincent.riviere.free.fr/soft/m68k-atari-mint/archives/ldg-$(VERSION_LDG).tar.bz2" $(CKSUM_LDG) $@ # hermes bitmap lib $(BUILDSTEPS)/hermes.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/hermes-src.d - cd $(BUILDDIR)/hermes/Hermes-$(VERSION_HERMES) - for p in `ls $(RECIPES)/patches/hermes/*.p` ; do $(PATCH) -d $(BUILDDIR)/hermes/Hermes-$(VERSION_HERMES) -p0 <$$p ; done + cd $(BUILDDIR)/hermes/hermes-pixel-format-$(VERSION_HERMES) + for p in `ls $(RECIPES)/patches/hermes/*.p` ; do $(PATCH) -d $(BUILDDIR)/hermes/hermes-pixel-format-$(VERSION_HERMES) -p0 <$$p ; done ifneq ($(realpath $(RECIPES)/patches/hermes/$(TARGET)),) - for p in `ls $(RECIPES)/patches/hermes/$(TARGET)/*.p` ; do $(PATCH) -d $(BUILDDIR)/hermes/Hermes-$(VERSION_HERMES) -p0 <$$p ; done + for p in `ls $(RECIPES)/patches/hermes/$(TARGET)/*.p` ; do $(PATCH) -d $(BUILDDIR)/hermes/hermes-pixel-format-$(VERSION_HERMES) -p0 <$$p ; done endif - cd $(BUILDDIR)/hermes/Hermes-$(VERSION_HERMES) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared --disable-x86asm - cd $(BUILDDIR)/hermes/Hermes-$(VERSION_HERMES) && $(env) make CFLAGS="-D__BIG_ENDIAN__" install + cd $(BUILDDIR)/hermes/hermes-pixel-format-$(VERSION_HERMES) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared --disable-x86asm + cd $(BUILDDIR)/hermes/hermes-pixel-format-$(VERSION_HERMES) && $(env) make CFLAGS="-D__BIG_ENDIAN__" install touch $@ -$(BUILDSTEPS)/hermes-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/hermes-$(VERSION_HERMES).tar.bz2 +$(BUILDSTEPS)/hermes-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/hermes-$(VERSION_HERMES).tar.gz $(RM) -rf $(BUILDDIR)/hermes mkdir -p $(BUILDDIR)/hermes - cd $(BUILDDIR)/hermes && tar xaf $(SOURCEDIR)/hermes-$(VERSION_HERMES).tar.bz2 + cd $(BUILDDIR)/hermes && tar xaf $(SOURCEDIR)/hermes-$(VERSION_HERMES).tar.gz touch $@ -$(SOURCEDIR)/hermes-$(VERSION_HERMES).tar.bz2: - $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://clanlib.org/download/legacy/Hermes-$(VERSION_HERMES).tar.bz2" $@ +$(SOURCEDIR)/hermes-$(VERSION_HERMES).tar.gz: + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://github.com/berkus/hermes-pixel-format/archive/refs/tags/v$(VERSION_HERMES).tar.gz" $(CKSUM_HERMES) $@ # freetype font lib $(BUILDSTEPS)/freetype.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/freetype-src.d @@ -294,14 +391,31 @@ $(BUILDSTEPS)/freetype.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/freetype-src.d cd $(BUILDDIR)/freetype/freetype-$(VERSION_FREETYPE) && $(env) make install touch $@ -$(BUILDSTEPS)/freetype-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/freetype-$(VERSION_FREETYPE).tar.bz2 +$(BUILDSTEPS)/freetype-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/freetype-$(VERSION_FREETYPE).tar.gz $(RM) -rf $(BUILDDIR)/freetype mkdir -p $(BUILDDIR)/freetype - cd $(BUILDDIR)/freetype && tar xaf $(SOURCEDIR)/freetype-$(VERSION_FREETYPE).tar.bz2 + cd $(BUILDDIR)/freetype && tar xaf $(SOURCEDIR)/freetype-$(VERSION_FREETYPE).tar.gz +ifneq ($(realpath $(RECIPES)/files/freetype/$(TARGET)),) + cp -r $(RECIPES)/files/freetype/$(TARGET)/* $(BUILDDIR)/freetype/freetype-$(VERSION_FREETYPE)/ +endif + touch $@ + +$(SOURCEDIR)/freetype-$(VERSION_FREETYPE).tar.gz: + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://download.savannah.gnu.org/releases/freetype/freetype-$(VERSION_FREETYPE).tar.gz" $(CKSUM_FREETYPE) $@ + +# amiga roadshow sdk +$(BUILDSTEPS)/roadshow.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/roadshow-src.d + mkdir -p $(BUILDDIR)/Roadshow-SDK + lha xw=$(BUILDDIR)/Roadshow-SDK $(SOURCEDIR)/Roadshow-SDK-NS-$(VERSION_ROADSHOW).lha + mkdir -p $(GCCSDK_INSTALL_ENV)/netinclude + cp -r $(BUILDDIR)/Roadshow-SDK/SDK/netinclude/* $(GCCSDK_INSTALL_ENV)/netinclude/ touch $@ -$(SOURCEDIR)/freetype-$(VERSION_FREETYPE).tar.bz2: - $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://download.savannah.gnu.org/releases/freetype/freetype-$(VERSION_FREETYPE).tar.bz2" $@ +$(BUILDSTEPS)/roadshow-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/Roadshow-SDK-NS-$(VERSION_ROADSHOW).lha + touch $@ + +$(SOURCEDIR)/Roadshow-SDK-NS-$(VERSION_ROADSHOW).lha: + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://github.com/chris-y/curl/releases/download/curl-$(VERSION_ROADSHOW)/Roadshow-SDK-NS.lha" $(CKSUM_ROADSHOW) $@ # regex $(BUILDSTEPS)/libtre.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libtre-src.d @@ -316,7 +430,7 @@ $(BUILDSTEPS)/libtre-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/tre-$(VERSION touch $@ $(SOURCEDIR)/tre-$(VERSION_LIBTRE).tar.bz2: - $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://laurikari.net/tre/$(subst $(SOURCEDIR)/,,$@)" $@ + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://laurikari.net/tre/$(subst $(SOURCEDIR)/,,$@)" $(CKSUM_LIBTRE) $@ # libpbl $(BUILDSTEPS)/libpbl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libpbl-src.d @@ -333,28 +447,33 @@ $(BUILDSTEPS)/libpbl-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/pbl_$(VERSION touch $@ $(SOURCEDIR)/pbl_$(VERSION_LIBPBL).tar.gz: - $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://www.mission-base.com/peter/source/$(subst $(SOURCEDIR)/,,$@)" $@ + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://www.mission-base.com/peter/source/$(subst $(SOURCEDIR)/,,$@)" $(CKSUM_LIBPBL) $@ # OpenSSL $(BUILDSTEPS)/openssl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/openssl-src.d +ifeq ($(LIBCURL_SSL),openssl) + cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) $(ENV_OPENSSL) ./Configure --prefix=$(GCCSDK_INSTALL_ENV) $(TARGET_OPENSSL) no-shared no-threads $(EXTRAARGS_OPENSSL) + cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) make install +endif + touch $@ + +# prepare the openssl source tree +$(BUILDSTEPS)/openssl-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/openssl-$(VERSION_OPENSSL).tar.gz + $(RM) -rf $(BUILDDIR)/openssl mkdir -p $(BUILDDIR)/openssl cd $(BUILDDIR)/openssl && tar xaf $(SOURCEDIR)/openssl-$(VERSION_OPENSSL).tar.gz - for p in `ls $(RECIPES)/patches/openssl/*.p` ; do $(PATCH) -d $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) -p0 <$$p ; done + for p in `ls $(RECIPES)/patches/openssl/*.p` ; do $(PATCH) -d $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) -p0 <$$p || exit $0 ; done ifneq ($(realpath $(RECIPES)/patches/openssl/$(TARGET)),) - for p in `ls $(RECIPES)/patches/openssl/$(TARGET)/*.p` ; do $(PATCH) -d $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) -p0 <$$p ; done + for p in `ls $(RECIPES)/patches/openssl/$(TARGET)/*.p` ; do $(PATCH) -d $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) -p0 <$$p || exit $0 ; done endif ifneq ($(realpath $(RECIPES)/files/openssl/$(TARGET)),) cp -r $(RECIPES)/files/openssl/$(TARGET)/* $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) endif - cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) ./Configure --prefix=$(GCCSDK_INSTALL_ENV) $(TARGET) no-shared no-threads $(EXTRAARGS_OPENSSL) - cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) make install - touch $@ - -$(BUILDSTEPS)/openssl-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/openssl-$(VERSION_OPENSSL).tar.gz touch $@ +# get the openssl source tar $(SOURCEDIR)/openssl-$(VERSION_OPENSSL).tar.gz: - $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://www.openssl.org/source/$(subst $(SOURCEDIR)/,,$@)" $@ + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://www.openssl.org/source/$(subst $(SOURCEDIR)/,,$@)" $(CKSUM_OPENSSL) $@ # libPNG $(BUILDSTEPS)/libpng.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/libpng-src.d @@ -371,7 +490,7 @@ $(BUILDSTEPS)/libpng-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/libpng-$(VERS touch $@ $(SOURCEDIR)/libpng-$(VERSION_LIBPNG).tar.gz: - $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://downloads.sourceforge.net/libpng/$(subst $(SOURCEDIR)/,,$@)" $@ + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://downloads.sourceforge.net/libpng/$(subst $(SOURCEDIR)/,,$@)" $(CKSUM_LIBPNG) $@ # libjpeg @@ -390,8 +509,7 @@ $(BUILDSTEPS)/libjpeg-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/jpegsrc.v$(V touch $@ $(SOURCEDIR)/jpegsrc.v$(VERSION_LIBJPEG).tar.gz: - $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://ijg.org/files/$(subst $(SOURCEDIR)/,,$@)" $@ - + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://ijg.org/files/$(subst $(SOURCEDIR)/,,$@)" $(CKSUM_LIBJPEG) $@ # libjpegturbo $(BUILDSTEPS)/libjpeg-turbo.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libjpeg-turbo-src.d @@ -401,15 +519,38 @@ $(BUILDSTEPS)/libjpeg-turbo.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libjpeg-tu ifneq ($(realpath $(RECIPES)/patches/libjpegturbo/$(TARGET)),) for p in `ls $(RECIPES)/patches/libjpegturbo/$(TARGET)/*.p` ; do $(PATCH) -d $(LIBJPEG_TURBO_BUILDDIR)/libjpeg-turbo-$(VERSION_LIBJPEG_TURBO) -p0 <$$p ; done endif - cd $(LIBJPEG_TURBO_BUILDDIR)/libjpeg-turbo-$(VERSION_LIBJPEG_TURBO) && $(env) $(LIBJPEG_TURBO_ENV) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared - cd $(LIBJPEG_TURBO_BUILDDIR)/libjpeg-turbo-$(VERSION_LIBJPEG_TURBO) && $(env) make install + mkdir -p $(LIBJPEG_TURBO_BUILDDIR)/libjpeg-turbo-$(VERSION_LIBJPEG_TURBO)/ns-sdk-build + cd $(LIBJPEG_TURBO_BUILDDIR)/libjpeg-turbo-$(VERSION_LIBJPEG_TURBO)/ns-sdk-build && $(env) $(LIBJPEG_TURBO_ENV) $(NS_SDK_CMAKE_CMD) \ + -DENABLE_STATIC=ON \ + -DENABLE_SHARED=OFF \ + .. + cd $(LIBJPEG_TURBO_BUILDDIR)/libjpeg-turbo-$(VERSION_LIBJPEG_TURBO)/ns-sdk-build && $(env) make install VERBOSE=1 touch $@ $(BUILDSTEPS)/libjpeg-turbo-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/libjpeg-turbo-src-$(VERSION_LIBJPEG_TURBO).tar.gz touch $@ $(SOURCEDIR)/libjpeg-turbo-src-$(VERSION_LIBJPEG_TURBO).tar.gz: - $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://sourceforge.net/projects/libjpeg-turbo/files/$(VERSION_LIBJPEG_TURBO)/libjpeg-turbo-$(VERSION_LIBJPEG_TURBO).tar.gz/download" $@ + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$(VERSION_LIBJPEG_TURBO)/libjpeg-turbo-$(VERSION_LIBJPEG_TURBO).tar.gz" $(CKSUM_LIBJPEG_TURBO) $@ + + +# libwebp +$(BUILDSTEPS)/libwebp.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libwebp-src.d + mkdir -p $(BUILDDIR)/libwebp + cd $(BUILDDIR)/libwebp && tar xaf $(SOURCEDIR)/libwebp-$(VERSION_LIBWEBP).tar.gz + for p in `ls $(RECIPES)/patches/libwebp/*.p` ; do $(PATCH) -d $(BUILDDIR)/libwebp/libwebp-$(VERSION_LIBWEBP) -p0 <$$p ; done +ifneq ($(realpath $(RECIPES)/patches/libwebp/$(TARGET)),) + for p in `ls $(RECIPES)/patches/libwebp/$(TARGET)/*.p` ; do $(PATCH) -d $(BUILDDIR)/libwebp/libwebp-$(VERSION_LIBWEBP) -p0 <$$p ; done +endif + cd $(BUILDDIR)/libwebp/libwebp-$(VERSION_LIBWEBP) && $(env) $(LIBWEBP_ENV) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared $(EXTRAARGS_LIBWEBP) + cd $(BUILDDIR)/libwebp/libwebp-$(VERSION_LIBWEBP) && $(env) make install + touch $@ + +$(BUILDSTEPS)/libwebp-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/libwebp-$(VERSION_LIBWEBP).tar.gz + touch $@ + +$(SOURCEDIR)/libwebp-$(VERSION_LIBWEBP).tar.gz: + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$(VERSION_LIBWEBP).tar.gz" $(CKSUM_LIBWEBP) $@ # libcares @@ -420,7 +561,7 @@ $(BUILDSTEPS)/libcares.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libcares-src.d ifneq ($(realpath $(RECIPES)/patches/libcares/$(TARGET)),) for p in `ls $(RECIPES)/patches/libcares/$(TARGET)/*.p` ; do $(PATCH) -d $(BUILDDIR)/libcares/c-ares-$(VERSION_LIBCARES) -p0 <$$p ; done endif - cd $(BUILDDIR)/libcares/c-ares-$(VERSION_LIBCARES) && $(cleanenv) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) $(EXTRAARGS_LIBCARES) + cd $(BUILDDIR)/libcares/c-ares-$(VERSION_LIBCARES) && $(cleanenv) $(LIBCARES_ENV) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) $(EXTRAARGS_LIBCARES) cd $(BUILDDIR)/libcares/c-ares-$(VERSION_LIBCARES) && $(cleanenv) make install touch $@ @@ -428,12 +569,12 @@ $(BUILDSTEPS)/libcares-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/c-ares-$(VE touch $@ $(SOURCEDIR)/c-ares-$(VERSION_LIBCARES).tar.gz: - $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://c-ares.haxx.se/download/$(subst $(SOURCEDIR)/,,$@)" $@ + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://c-ares.org/download/$(subst $(SOURCEDIR)/,,$@)" $(CKSUM_LIBCARES) $@ # libcurl $(BUILDSTEPS)/libcurl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/openssl.d $(BUILDSTEPS)/libcares.d $(BUILDSTEPS)/libcurl-src.d - cd $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) && $(env) CFLAGS="" $(LIBCURL_ENV) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared --without-libidn ${EXTRAARGS_LIBCURL} + cd $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) && $(env) CFLAGS="" $(LIBCURL_ENV) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared --with-$(LIBCURL_SSL) --without-libidn2 ${EXTRAARGS_LIBCURL} cd $(BUILDDIR)/libcurl/curl-$(VERSION_LIBCURL) && $(env) make install touch $@ @@ -447,20 +588,23 @@ endif touch $@ $(SOURCEDIR)/curl-$(VERSION_LIBCURL).tar.bz2: - $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://curl.haxx.se/download/$(subst $(SOURCEDIR)/,,$@)" $@ + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://curl.se/download/$(subst $(SOURCEDIR)/,,$@)" $(CKSUM_LIBCURL) $@ # libexpat $(BUILDSTEPS)/libexpat.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/libexpat-src.d - mkdir -p $(BUILDDIR)/libexpat - cd $(BUILDDIR)/libexpat && tar xaf $(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.bz2 - cd $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared - cd $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) && $(env) make install + cd $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) && $(env) $(LIBEXPAT_ENV) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --target=$(TARGET) --host=$(TARGET) --disable-shared + cd $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) && $(env) $(LIBEXPAT_ENV) make install touch $@ $(BUILDSTEPS)/libexpat-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.bz2 + mkdir -p $(BUILDDIR)/libexpat + cd $(BUILDDIR)/libexpat && tar xaf $(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.bz2 +ifneq ($(realpath $(RECIPES)/patches/libexpat/$(TARGET)),) + for p in `ls $(RECIPES)/patches/libexpat/$(TARGET)/*.p` ; do $(PATCH) -d $(BUILDDIR)/libexpat/expat-$(VERSION_LIBEXPAT) -p0 <$$p ; done +endif touch $@ $(SOURCEDIR)/expat-$(VERSION_LIBEXPAT).tar.bz2: - $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://downloads.sourceforge.net/project/expat/expat/$(VERSION_LIBEXPAT)/expat-$(VERSION_LIBEXPAT).tar.bz2" $@ + $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "https://github.com/libexpat/libexpat/releases/download/R_$(subst .,_,$(VERSION_LIBEXPAT))/expat-$(VERSION_LIBEXPAT).tar.bz2" $(CKSUM_LIBEXPAT) $@ diff --git a/sdk/fetchsrc b/sdk/fetchsrc index 46b72b0..6a7b3b8 100755 --- a/sdk/fetchsrc +++ b/sdk/fetchsrc @@ -4,15 +4,18 @@ set -x # script to fetch toolchain source tar using ci.netsurf-browser.org as a cache -# Usage fetchsrc <target> <source> <upstream> <output> +# Usage fetchsrc <target> <source> <upstream> <sha256sum> <output> -NSSRV="http://ci.netsurf-browser.org/toolchain/" +NSSRV="https://ci.netsurf-browser.org/toolchain/" -wget -q -O ${4} ${NSSRV}/${1}/${2} +wget -q -O ${5} ${NSSRV}/${1}/${2} if [ $? -ne 0 ];then - wget -q -O ${4} ${3} + wget -q -O ${5} ${3} if [ $? -ne 0 ];then - rm ${4} + rm ${5} exit 1 fi fi + +echo "${4} *${5}" | sha256sum --strict -c - +exit $? diff --git a/sdk/recipes/files/freetype/m5475-atari-mint/builds/unix/config.sub b/sdk/recipes/files/freetype/m5475-atari-mint/builds/unix/config.sub new file mode 100755 index 0000000..ba37cf9 --- /dev/null +++ b/sdk/recipes/files/freetype/m5475-atari-mint/builds/unix/config.sub @@ -0,0 +1,1805 @@ +#! /bin/sh +# Configuration validation subroutine script. +# Copyright 1992-2018 Free Software Foundation, Inc. + +timestamp='2018-04-24' + +# This file is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, see <https://www.gnu.org/licenses/>. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that +# program. This Exception is an additional permission under section 7 +# of the GNU General Public License, version 3 ("GPLv3"). + + +# Please send patches to <config-patches@gnu.org>. +# +# Configuration subroutine to validate and canonicalize a configuration type. +# Supply the specified configuration type as an argument. +# If it is invalid, we print an error message on stderr and exit with code 1. +# Otherwise, we print the canonical config type on stdout and succeed. + +# You can get the latest version of this script from: +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub + +# This file is supposed to be the same for all GNU packages +# and recognize all the CPU types, system types and aliases +# that are meaningful with *any* GNU software. +# Each package is responsible for reporting which valid configurations +# it does not support. The user should be able to distinguish +# a failure to support a valid configuration from a meaningless +# configuration. + +# The goal of this file is to map all the various variations of a given +# machine specification into a single specification in the form: +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM +# or in some cases, the newer four-part form: +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM +# It is wrong to echo any other type of specification. + +me=`echo "$0" | sed -e 's,.*/,,'` + +usage="\ +Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS + +Canonicalize a configuration name. + +Options: + -h, --help print this help, then exit + -t, --time-stamp print date of last modification, then exit + -v, --version print version number, then exit + +Report bugs and patches to <config-patches@gnu.org>." + +version="\ +GNU config.sub ($timestamp) + +Copyright 1992-2018 Free Software Foundation, Inc. + +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." + +help=" +Try \`$me --help' for more information." + +# Parse command line +while test $# -gt 0 ; do + case $1 in + --time-stamp | --time* | -t ) + echo "$timestamp" ; exit ;; + --version | -v ) + echo "$version" ; exit ;; + --help | --h* | -h ) + echo "$usage"; exit ;; + -- ) # Stop option processing + shift; break ;; + - ) # Use stdin as input. + break ;; + -* ) + echo "$me: invalid option $1$help" + exit 1 ;; + + *local*) + # First pass through any local machine types. + echo "$1" + exit ;; + + * ) + break ;; + esac +done + +case $# in + 0) echo "$me: missing argument$help" >&2 + exit 1;; + 1) ;; + *) echo "$me: too many arguments$help" >&2 + exit 1;; +esac + +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + android-linux) + os=-linux-android + basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; + *) + basic_machine=`echo "$1" | sed 's/-[^-]*$//'` + if [ "$basic_machine" != "$1" ] + then os=`echo "$1" | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. + ;; + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; + -bluegene*) + os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco6) + os=-sco5v6 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; +esac + +# Decode aliases for certain CPU-COMPANY combinations. +case $basic_machine in + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv6m | armv[78][arm] \ + | avr | avr32 \ + | ba \ + | be32 | be64 \ + | bfin \ + | c4x | c8051 | clipper | csky \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i860 | i960 | ia16 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ + | ns16k | ns32k \ + | open8 | or1k | or1knd | or32 \ + | pdp10 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ + | pyramid \ + | riscv32 | riscv64 \ + | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ + | wasm32 \ + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown + ;; + c54x) + basic_machine=tic54x-unknown + ;; + c55x) + basic_machine=tic55x-unknown + ;; + c6x) + basic_machine=tic6x-unknown + ;; + leon|leon[3-9]) + basic_machine=sparc-$basic_machine + ;; + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) + basic_machine=$basic_machine-unknown + os=-none + ;; + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) + ;; + m9s12z | m68hcs12z | hcs12z | s12z) + basic_machine=s12z-unknown + os=-none + ;; + ms1) + basic_machine=mt-unknown + ;; + + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown + ;; + + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | ba-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c8051-* | clipper-* | craynv-* | csky-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | e2k-* | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ + | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ + | ip2k-* | iq2000-* \ + | k1om-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ + | or1k*-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ + | pyramid-* \ + | riscv32-* | riscv64-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ + | tron-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ + | visium-* \ + | wasm32-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; + # Recognize the various machine names and aliases which stand + # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-pc + os=-bsd + ;; + 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) + basic_machine=m68000-att + ;; + 3b*) + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aros) + basic_machine=i386-pc + os=-aros + ;; + asmjs) + basic_machine=asmjs-unknown + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux + ;; + bluegene*) + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec + ;; + decsystem10* | dec10*) + basic_machine=pdp10-dec + os=-tops10 + ;; + decsystem20* | dec20*) + basic_machine=pdp10-dec + os=-tops20 + ;; + delta | 3300 | motorola-3300 | motorola-delta \ + | 3300-motorola | delta-motorola) + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx + ;; + dpx2*) + basic_machine=m68k-bull + os=-sysv3 + ;; + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=$os"spe" + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon + ;; + elxsi) + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose + ;; + fx2800) + basic_machine=i860-alliant + ;; + genix) + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 + ;; + h3050r* | hiux*) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux + ;; + hp3k9[0-9][0-9] | hp9[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k2[0-9][0-9] | hp9k31[0-9]) + basic_machine=m68000-hp + ;; + hp9k3[2-9][0-9]) + basic_machine=m68k-hp + ;; + hp9k6[0-9][0-9] | hp6[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hp9k7[0-79][0-9] | hp7[0-79][0-9]) + basic_machine=hppa1.1-hp + ;; + hp9k78[0-9] | hp78[0-9]) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) + # FIXME: really hppa2.0-hp + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][13679] | hp8[0-9][13679]) + basic_machine=hppa1.1-hp + ;; + hp9k8[0-9][0-9] | hp8[0-9][0-9]) + basic_machine=hppa1.0-hp + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm + ;; + i*86v32) + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-sysv32 + ;; + i*86v4*) + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-sysv4 + ;; + i*86v) + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-sysv + ;; + i*86sol2) + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + vsta) + basic_machine=i386-unknown + os=-vsta + ;; + iris | iris4d) + basic_machine=mips-sgi + case $os in + -irix*) + ;; + *) + os=-irix4 + ;; + esac + ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` + ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + microblaze*) + basic_machine=microblaze-xilinx + ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; + mingw32) + basic_machine=i686-pc + os=-mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; + miniframe) + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mips3*-*) + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; + msdos) + basic_machine=i386-pc + os=-msdos + ;; + ms1-*) + basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` + ;; + msys) + basic_machine=i686-pc + os=-msys + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos + ;; + news-3600 | risc-news) + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv + ;; + next | m*-next) + basic_machine=m68k-next + case $os in + -nextstep* ) + ;; + -ns2*) + os=-nextstep2 + ;; + *) + os=-nextstep3 + ;; + esac + ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; + np1) + basic_machine=np1-gould + ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + nsv-tandem) + basic_machine=nsv-tandem + ;; + nsx-tandem) + basic_machine=nsx-tandem + ;; + op50n-* | op60c-*) + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k + ;; + pa-hitachi) + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux + ;; + pbd) + basic_machine=sparc-tti + ;; + pbb) + basic_machine=m68k-tti + ;; + pc532 | pc532-*) + basic_machine=ns32k-pc532 + ;; + pc98) + basic_machine=i386-pc + ;; + pc98-*) + basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc + ;; + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc + ;; + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc + ;; + pentium4) + basic_machine=i786-pc + ;; + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + pentium4-*) + basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + pn) + basic_machine=pn-gould + ;; + power) basic_machine=power-ibm + ;; + ppc | ppcbe) basic_machine=powerpc-unknown + ;; + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + ppcle | powerpclittle) + basic_machine=powerpcle-unknown + ;; + ppcle-* | powerpclittle-*) + basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + ppc64) basic_machine=powerpc64-unknown + ;; + ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + ppc64le | powerpc64little) + basic_machine=powerpc64le-unknown + ;; + ppc64le-* | powerpc64little-*) + basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + ps2) + basic_machine=i386-ibm + ;; + pw32) + basic_machine=i586-unknown + os=-pw32 + ;; + rdos | rdos64) + basic_machine=x86_64-pc + os=-rdos + ;; + rdos32) + basic_machine=i386-pc + os=-rdos + ;; + rom68k) + basic_machine=m68k-rom68k + os=-coff + ;; + rm[46]00) + basic_machine=mips-siemens + ;; + rtpc | rtpc-*) + basic_machine=romp-ibm + ;; + s390 | s390-*) + basic_machine=s390-ibm + ;; + s390x | s390x-*) + basic_machine=s390x-ibm + ;; + sa29200) + basic_machine=a29k-amd + os=-udi + ;; + sb1) + basic_machine=mipsisa64sb1-unknown + ;; + sb1el) + basic_machine=mipsisa64sb1el-unknown + ;; + sde) + basic_machine=mipsisa32-sde + os=-elf + ;; + sei) + basic_machine=mips-sei + os=-seiux + ;; + sequent) + basic_machine=i386-sequent + ;; + sh5el) + basic_machine=sh5le-unknown + ;; + simso-wrs) + basic_machine=sparclite-wrs + os=-vxworks + ;; + sps7) + basic_machine=m68k-bull + os=-sysv2 + ;; + spur) + basic_machine=spur-unknown + ;; + st2000) + basic_machine=m68k-tandem + ;; + stratus) + basic_machine=i860-stratus + os=-sysv4 + ;; + strongarm-* | thumb-*) + basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + sun2) + basic_machine=m68000-sun + ;; + sun2os3) + basic_machine=m68000-sun + os=-sunos3 + ;; + sun2os4) + basic_machine=m68000-sun + os=-sunos4 + ;; + sun3os3) + basic_machine=m68k-sun + os=-sunos3 + ;; + sun3os4) + basic_machine=m68k-sun + os=-sunos4 + ;; + sun4os3) + basic_machine=sparc-sun + os=-sunos3 + ;; + sun4os4) + basic_machine=sparc-sun + os=-sunos4 + ;; + sun4sol2) + basic_machine=sparc-sun + os=-solaris2 + ;; + sun3 | sun3-*) + basic_machine=m68k-sun + ;; + sun4) + basic_machine=sparc-sun + ;; + sun386 | sun386i | roadrunner) + basic_machine=i386-sun + ;; + sv1) + basic_machine=sv1-cray + os=-unicos + ;; + symmetry) + basic_machine=i386-sequent + os=-dynix + ;; + t3e) + basic_machine=alphaev5-cray + os=-unicos + ;; + t90) + basic_machine=t90-cray + os=-unicos + ;; + tile*) + basic_machine=$basic_machine-unknown + os=-linux-gnu + ;; + tx39) + basic_machine=mipstx39-unknown + ;; + tx39el) + basic_machine=mipstx39el-unknown + ;; + toad1) + basic_machine=pdp10-xkl + os=-tops20 + ;; + tower | tower-32) + basic_machine=m68k-ncr + ;; + tpf) + basic_machine=s390x-ibm + os=-tpf + ;; + udi29k) + basic_machine=a29k-amd + os=-udi + ;; + ultra3) + basic_machine=a29k-nyu + os=-sym1 + ;; + v810 | necv810) + basic_machine=v810-nec + os=-none + ;; + vaxv) + basic_machine=vax-dec + os=-sysv + ;; + vms) + basic_machine=vax-dec + os=-vms + ;; + vpp*|vx|vx-*) + basic_machine=f301-fujitsu + ;; + vxworks960) + basic_machine=i960-wrs + os=-vxworks + ;; + vxworks68) + basic_machine=m68k-wrs + os=-vxworks + ;; + vxworks29k) + basic_machine=a29k-wrs + os=-vxworks + ;; + w65*) + basic_machine=w65-wdc + os=-none + ;; + w89k-*) + basic_machine=hppa1.1-winbond + os=-proelf + ;; + x64) + basic_machine=x86_64-pc + ;; + xbox) + basic_machine=i686-pc + os=-mingw32 + ;; + xps | xps100) + basic_machine=xps100-honeywell + ;; + xscale-* | xscalee[bl]-*) + basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'` + ;; + ymp) + basic_machine=ymp-cray + os=-unicos + ;; + none) + basic_machine=none-none + os=-none + ;; + +# Here we handle the default manufacturer of certain CPU types. It is in +# some cases the only manufacturer, in others, it is the most popular. + w89k) + basic_machine=hppa1.1-winbond + ;; + op50n) + basic_machine=hppa1.1-oki + ;; + op60c) + basic_machine=hppa1.1-oki + ;; + romp) + basic_machine=romp-ibm + ;; + mmix) + basic_machine=mmix-knuth + ;; + rs6000) + basic_machine=rs6000-ibm + ;; + vax) + basic_machine=vax-dec + ;; + pdp11) + basic_machine=pdp11-dec + ;; + we32k) + basic_machine=we32k-att + ;; + sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) + basic_machine=sh-unknown + ;; + cydra) + basic_machine=cydra-cydrome + ;; + orion) + basic_machine=orion-highlevel + ;; + orion105) + basic_machine=clipper-highlevel + ;; + mac | mpw | mac-mpw) + basic_machine=m68k-apple + ;; + pmac | pmac-mpw) + basic_machine=powerpc-apple + ;; + *-unknown) + # Make sure to match an already-canonicalized machine name. + ;; + *) + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 + exit 1 + ;; +esac + +# Here we canonicalize certain aliases for manufacturers. +case $basic_machine in + *-digital*) + basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` + ;; + *-commodore*) + basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` + ;; + *) + ;; +esac + +# Decode manufacturer-specific aliases for certain operating systems. + +if [ x"$os" != x"" ] +then +case $os in + # First match some system type aliases that might get confused + # with valid system types. + # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux + ;; + -solaris1 | -solaris1.*) + os=`echo $os | sed -e 's|solaris1|sunos4|'` + ;; + -solaris) + os=-solaris2 + ;; + -unixware*) + os=-sysv4.2uw + ;; + -gnu/linux*) + os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` + ;; + # es1800 is here to avoid being matched by es* (a different OS) + -es1800*) + os=-ose + ;; + # Now accept the basic system types. + # The portable systems comes first. + # Each alternative MUST end in a * to match a version number. + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* | -plan9* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \ + | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ + | -midnightbsd*) + # Remember, each alternative MUST END IN *, to match a version number. + ;; + -qnx*) + case $basic_machine in + x86-* | i*86-*) + ;; + *) + os=-nto$os + ;; + esac + ;; + -nto-qnx*) + ;; + -nto*) + os=`echo $os | sed -e 's|nto|nto-qnx|'` + ;; + -sim | -xray | -os68k* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) + ;; + -mac*) + os=`echo "$os" | sed -e 's|mac|macos|'` + ;; + -linux-dietlibc) + os=-linux-dietlibc + ;; + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` + ;; + -sunos5*) + os=`echo "$os" | sed -e 's|sunos5|solaris2|'` + ;; + -sunos6*) + os=`echo "$os" | sed -e 's|sunos6|solaris3|'` + ;; + -opened*) + os=-openedition + ;; + -os400*) + os=-os400 + ;; + -wince*) + os=-wince + ;; + -utek*) + os=-bsd + ;; + -dynix*) + os=-bsd + ;; + -acis*) + os=-aos + ;; + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable + ;; + -386bsd) + os=-bsd + ;; + -ctix* | -uts*) + os=-sysv + ;; + -nova*) + os=-rtmk-nova + ;; + -ns2) + os=-nextstep2 + ;; + -nsk*) + os=-nsk + ;; + # Preserve the version number of sinix5. + -sinix5.*) + os=`echo $os | sed -e 's|sinix|sysv|'` + ;; + -sinix*) + os=-sysv4 + ;; + -tpf*) + os=-tpf + ;; + -triton*) + os=-sysv3 + ;; + -oss*) + os=-sysv3 + ;; + -svr4*) + os=-sysv4 + ;; + -svr3) + os=-sysv3 + ;; + -sysvr4) + os=-sysv4 + ;; + # This must come after -sysvr4. + -sysv*) + ;; + -ose*) + os=-ose + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint + ;; + -zvmoe) + os=-zvmoe + ;; + -dicos*) + os=-dicos + ;; + -pikeos*) + # Until real need of OS specific support for + # particular features comes up, bare metal + # configurations are quite functional. + case $basic_machine in + arm*) + os=-eabi + ;; + *) + os=-elf + ;; + esac + ;; + -nacl*) + ;; + -ios) + ;; + -none) + ;; + *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` + echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 + exit 1 + ;; +esac +else + +# Here we handle the default operating systems that come with various machines. +# The value should be what the vendor currently ships out the door with their +# machine or put another way, the most popular os provided with the machine. + +# Note that if you're going to try to match "-MANUFACTURER" here (say, +# "-sun"), then you have to tell the case statement up towards the top +# that MANUFACTURER isn't an operating system. Otherwise, code above +# will signal an error saying that MANUFACTURER isn't an operating +# system, and we'll never get to this point. + +case $basic_machine in + score-*) + os=-elf + ;; + spu-*) + os=-elf + ;; + *-acorn) + os=-riscix1.2 + ;; + arm*-rebel) + os=-linux + ;; + arm*-semi) + os=-aout + ;; + c4x-* | tic4x-*) + os=-coff + ;; + c8051-*) + os=-elf + ;; + hexagon-*) + os=-elf + ;; + tic54x-*) + os=-coff + ;; + tic55x-*) + os=-coff + ;; + tic6x-*) + os=-coff + ;; + # This must come before the *-dec entry. + pdp10-*) + os=-tops20 + ;; + pdp11-*) + os=-none + ;; + *-dec | vax-*) + os=-ultrix4.2 + ;; + m68*-apollo) + os=-domain + ;; + i386-sun) + os=-sunos4.0.2 + ;; + m68000-sun) + os=-sunos3 + ;; + m68*-cisco) + os=-aout + ;; + mep-*) + os=-elf + ;; + mips*-cisco) + os=-elf + ;; + mips*-*) + os=-elf + ;; + or32-*) + os=-coff + ;; + *-tti) # must be before sparc entry or we get the wrong os. + os=-sysv3 + ;; + sparc-* | *-sun) + os=-sunos4.1.1 + ;; + pru-*) + os=-elf + ;; + *-be) + os=-beos + ;; + *-ibm) + os=-aix + ;; + *-knuth) + os=-mmixware + ;; + *-wec) + os=-proelf + ;; + *-winbond) + os=-proelf + ;; + *-oki) + os=-proelf + ;; + *-hp) + os=-hpux + ;; + *-hitachi) + os=-hiux + ;; + i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) + os=-sysv + ;; + *-cbm) + os=-amigaos + ;; + *-dg) + os=-dgux + ;; + *-dolphin) + os=-sysv3 + ;; + m68k-ccur) + os=-rtu + ;; + m88k-omron*) + os=-luna + ;; + *-next) + os=-nextstep + ;; + *-sequent) + os=-ptx + ;; + *-crds) + os=-unos + ;; + *-ns) + os=-genix + ;; + i370-*) + os=-mvs + ;; + *-gould) + os=-sysv + ;; + *-highlevel) + os=-bsd + ;; + *-encore) + os=-bsd + ;; + *-sgi) + os=-irix + ;; + *-siemens) + os=-sysv4 + ;; + *-masscomp) + os=-rtu + ;; + f30[01]-fujitsu | f700-fujitsu) + os=-uxpv + ;; + *-rom68k) + os=-coff + ;; + *-*bug) + os=-coff + ;; + *-apple) + os=-macos + ;; + *-atari*) + os=-mint + ;; + *) + os=-none + ;; +esac +fi + +# Here we handle the case where we know the os, and the CPU type, but not the +# manufacturer. We pick the logical manufacturer. +vendor=unknown +case $basic_machine in + *-unknown) + case $os in + -riscix*) + vendor=acorn + ;; + -sunos*) + vendor=sun + ;; + -cnk*|-aix*) + vendor=ibm + ;; + -beos*) + vendor=be + ;; + -hpux*) + vendor=hp + ;; + -mpeix*) + vendor=hp + ;; + -hiux*) + vendor=hitachi + ;; + -unos*) + vendor=crds + ;; + -dgux*) + vendor=dg + ;; + -luna*) + vendor=omron + ;; + -genix*) + vendor=ns + ;; + -mvs* | -opened*) + vendor=ibm + ;; + -os400*) + vendor=ibm + ;; + -ptx*) + vendor=sequent + ;; + -tpf*) + vendor=ibm + ;; + -vxsim* | -vxworks* | -windiss*) + vendor=wrs + ;; + -aux*) + vendor=apple + ;; + -hms*) + vendor=hitachi + ;; + -mpw* | -macos*) + vendor=apple + ;; + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + vendor=atari + ;; + -vos*) + vendor=stratus + ;; + esac + basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` + ;; +esac + +echo "$basic_machine$os" +exit + +# Local variables: +# eval: (add-hook 'before-save-hook 'time-stamp) +# time-stamp-start: "timestamp='" +# time-stamp-format: "%:y-%02m-%02d" +# time-stamp-end: "'" +# End: diff --git a/sdk/recipes/files/openssl/m68k-atari-mint/crypto/bn/asm/bn_m68k.s b/sdk/recipes/files/openssl/m68k-atari-mint/crypto/bn/asm/bn_m68k.s new file mode 100644 index 0000000..effdc6a --- /dev/null +++ b/sdk/recipes/files/openssl/m68k-atari-mint/crypto/bn/asm/bn_m68k.s @@ -0,0 +1,1604 @@ +/* Copyright (C) 2002 by Howard Chu <hyc@highlandsun.com> + * + * Rights for redistribution and usage in source and binary forms are + * granted according to the OpenSSL license. Warranty of any kind is + * disclaimed. + */ + +/* This file is written for GNU as. All of the code is hand written by + * me. The code is suitable for Motorola 68020-68060 and all CPU32-based + * processors providing 64-bit multiply/divide instructions. On a 68030 + * this code is over 4 times faster than the gcc -O3 code for RSA/DSA. + * I haven't paid any attention to instruction sequencing; there may be + * room for some further improvement. + */ + +.text + .even +.globl _bn_mul_add_words +_bn_mul_add_words: + movm.l #0x3c00,-(sp) + move.l 20(sp),a0 + move.l 24(sp),a1 + clr.l d0 + move.l d0,d5 /* Keep a 0 handy for addx carry bits */ + move.l 28(sp),d4 + jble 3f + + move.l 32(sp),d3 + moveq.l #-4,d2 + and.l d4,d2 + jbeq 2f +1: + move.l d3,d1 + mulu.l (a1)+,d2:d1 + add.l d0,d1 + addx.l d5,d2 + add.l (a0),d1 + addx.l d5,d2 + move.l d1,(a0)+ + move.l d2,d0 + + move.l d3,d1 + mulu.l (a1)+,d2:d1 + add.l d0,d1 + addx.l d5,d2 + add.l (a0),d1 + addx.l d5,d2 + move.l d1,(a0)+ + move.l d2,d0 + + move.l d3,d1 + mulu.l (a1)+,d2:d1 + add.l d0,d1 + addx.l d5,d2 + add.l (a0),d1 + addx.l d5,d2 + move.l d1,(a0)+ + move.l d2,d0 + + move.l d3,d1 + mulu.l (a1)+,d2:d1 + add.l d0,d1 + addx.l d5,d2 + add.l (a0),d1 + addx.l d5,d2 + move.l d1,(a0)+ + move.l d2,d0 + + moveq.l #-4,d2 + add.l d2,d4 + and.l d4,d2 + jbne 1b +2: + tst.l d4 + jbeq 3f + + move.l d3,d1 + mulu.l (a1)+,d2:d1 + add.l d0,d1 + addx.l d5,d2 + add.l (a0),d1 + addx.l d5,d2 + move.l d1,(a0)+ + move.l d2,d0 + + subq.l #1,d4 + jbeq 3f + + move.l d3,d1 + mulu.l (a1)+,d2:d1 + add.l d0,d1 + addx.l d5,d2 + add.l (a0),d1 + addx.l d5,d2 + move.l d1,(a0)+ + move.l d2,d0 + + subq.l #1,d4 + jbeq 3f + + move.l d3,d1 + mulu.l (a1)+,d2:d1 + add.l d0,d1 + addx.l d5,d2 + add.l (a0),d1 + addx.l d5,d2 + move.l d1,(a0)+ + move.l d2,d0 +3: + movm.l (sp)+,#0x003c + rts + + .even +.globl _bn_mul_words +_bn_mul_words: + movm.l #0x3c00,-(sp) + move.l 20(sp),a0 + move.l 24(sp),a1 + clr.l d0 + move.l d0,d5 + move.l 28(sp),d4 + jble 3f + + move.l 32(sp),d3 + moveq.l #-4,d2 + and.l d4,d2 + jbeq 2f +1: + move.l d3,d1 + mulu.l (a1)+,d2:d1 + add.l d0,d1 + addx.l d5,d2 + move.l d1,(a0)+ + move.l d2,d0 + + move.l d3,d1 + mulu.l (a1)+,d2:d1 + add.l d0,d1 + addx.l d5,d2 + move.l d1,(a0)+ + move.l d2,d0 + + move.l d3,d1 + mulu.l (a1)+,d2:d1 + add.l d0,d1 + addx.l d5,d2 + move.l d1,(a0)+ + move.l d2,d0 + + move.l d3,d1 + mulu.l (a1)+,d2:d1 + add.l d0,d1 + addx.l d5,d2 + move.l d1,(a0)+ + move.l d2,d0 + + moveq.l #-4,d2 + add.l d2,d4 + and.l d4,d2 + jbne 1b +2: + tst.l d4 + jbeq 3f + + move.l d3,d1 + mulu.l (a1)+,d2:d1 + add.l d0,d1 + addx.l d5,d2 + move.l d1,(a0)+ + move.l d2,d0 + + subq.l #1,d4 + jbeq 3f + + move.l d3,d1 + mulu.l (a1)+,d2:d1 + add.l d0,d1 + addx.l d5,d2 + move.l d1,(a0)+ + move.l d2,d0 + + subq.l #1,d4 + jbeq 3f + + move.l d3,d1 + mulu.l (a1)+,d2:d1 + add.l d0,d1 + addx.l d5,d2 + move.l d1,(a0)+ + move.l d2,d0 +3: + movm.l (sp)+,#0x003c + rts + + .even +.globl _bn_sqr_words +_bn_sqr_words: + move.l d2,-(sp) + move.l 8(sp),a0 + move.l 12(sp),a1 + move.l 16(sp),d2 + jble 3f + + moveq.l #-4,d1 + and.l d2,d1 + jbeq 2f +1: + move.l (a1)+,d0 + mulu.l d0,d1:d0 + move.l d0,(a0)+ + move.l d1,(a0)+ + + move.l (a1)+,d0 + mulu.l d0,d1:d0 + move.l d0,(a0)+ + move.l d1,(a0)+ + + move.l (a1)+,d0 + mulu.l d0,d1:d0 + move.l d0,(a0)+ + move.l d1,(a0)+ + + move.l (a1)+,d0 + mulu.l d0,d1:d0 + move.l d0,(a0)+ + move.l d1,(a0)+ + + moveq.l #-4,d1 + add.l d1,d2 + and.l d2,d1 + jbne 1b +2: + tst.l d2 + jbeq 3f + + move.l (a1)+,d0 + mulu.l d0,d1:d0 + move.l d0,(a0)+ + move.l d1,(a0)+ + + subq.l #1,d2 + jbeq 3f + + move.l (a1)+,d0 + mulu.l d0,d1:d0 + move.l d0,(a0)+ + move.l d1,(a0)+ + + subq.l #1,d2 + jbeq 3f + + move.l (a1)+,d0 + mulu.l d0,d1:d0 + move.l d0,(a0)+ + move.l d1,(a0)+ +3: + move.l (sp)+,d2 + rts + + .even +.globl _bn_mul_comba8 +_bn_mul_comba8: + movm.l #0x3c20,-(sp) + movm.l 24(sp),#0x0700 + clr.l d2 + move.l d2,d3 + move.l d2,d4 + move.l d2,d5 + move.l (a1),d0 + move.l (a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d2 + addx.l d1,d3 + addx.l d5,d4 + + move.l d2,(a0) + move.l d5,d2 + move.l (a1),d0 + move.l 4(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d3 + addx.l d1,d4 + addx.l d5,d2 + + move.l 4(a1),d0 + move.l (a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d3 + addx.l d1,d4 + addx.l d5,d2 + + move.l d3,4(a0) + move.l d5,d3 + move.l 8(a1),d0 + move.l (a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d4 + addx.l d1,d2 + addx.l d5,d3 + + move.l 4(a1),d0 + move.l 4(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d4 + addx.l d1,d2 + addx.l d5,d3 + + move.l (a1),d0 + move.l 8(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d4 + addx.l d1,d2 + addx.l d5,d3 + + move.l d4,8(a0) + move.l d5,d4 + move.l (a1),d0 + move.l 12(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d2 + addx.l d1,d3 + addx.l d5,d4 + + move.l 4(a1),d0 + move.l 8(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d2 + addx.l d1,d3 + addx.l d5,d4 + + move.l 8(a1),d0 + move.l 4(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d2 + addx.l d1,d3 + addx.l d5,d4 + + move.l 12(a1),d0 + move.l (a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d2 + addx.l d1,d3 + addx.l d5,d4 + + move.l d2,12(a0) + move.l d5,d2 + move.l 16(a1),d0 + move.l (a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d3 + addx.l d1,d4 + addx.l d5,d2 + + move.l 12(a1),d0 + move.l 4(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d3 + addx.l d1,d4 + addx.l d5,d2 + + move.l 8(a1),d0 + move.l 8(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d3 + addx.l d1,d4 + addx.l d5,d2 + + move.l 4(a1),d0 + move.l 12(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d3 + addx.l d1,d4 + addx.l d5,d2 + + move.l (a1),d0 + move.l 16(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d3 + addx.l d1,d4 + addx.l d5,d2 + + move.l d3,16(a0) + move.l d5,d3 + move.l (a1),d0 + move.l 20(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d4 + addx.l d1,d2 + addx.l d5,d3 + + move.l 4(a1),d0 + move.l 16(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d4 + addx.l d1,d2 + addx.l d5,d3 + + move.l 8(a1),d0 + move.l 12(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d4 + addx.l d1,d2 + addx.l d5,d3 + + move.l 12(a1),d0 + move.l 8(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d4 + addx.l d1,d2 + addx.l d5,d3 + + move.l 16(a1),d0 + move.l 4(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d4 + addx.l d1,d2 + addx.l d5,d3 + + move.l 20(a1),d0 + move.l (a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d4 + addx.l d1,d2 + addx.l d5,d3 + + move.l d4,20(a0) + move.l d5,d4 + move.l 24(a1),d0 + move.l (a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d2 + addx.l d1,d3 + addx.l d5,d4 + + move.l 20(a1),d0 + move.l 4(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d2 + addx.l d1,d3 + addx.l d5,d4 + + move.l 16(a1),d0 + move.l 8(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d2 + addx.l d1,d3 + addx.l d5,d4 + + move.l 12(a1),d0 + move.l 12(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d2 + addx.l d1,d3 + addx.l d5,d4 + + move.l 8(a1),d0 + move.l 16(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d2 + addx.l d1,d3 + addx.l d5,d4 + + move.l 4(a1),d0 + move.l 20(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d2 + addx.l d1,d3 + addx.l d5,d4 + + move.l (a1),d0 + move.l 24(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d2 + addx.l d1,d3 + addx.l d5,d4 + + move.l d2,24(a0) + move.l d5,d2 + move.l (a1),d0 + move.l 28(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d3 + addx.l d1,d4 + addx.l d5,d2 + + move.l 4(a1),d0 + move.l 24(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d3 + addx.l d1,d4 + addx.l d5,d2 + + move.l 8(a1),d0 + move.l 20(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d3 + addx.l d1,d4 + addx.l d5,d2 + + move.l 12(a1),d0 + move.l 16(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d3 + addx.l d1,d4 + addx.l d5,d2 + + move.l 16(a1),d0 + move.l 12(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d3 + addx.l d1,d4 + addx.l d5,d2 + + move.l 20(a1),d0 + move.l 8(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d3 + addx.l d1,d4 + addx.l d5,d2 + + move.l 24(a1),d0 + move.l 4(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d3 + addx.l d1,d4 + addx.l d5,d2 + + move.l 28(a1),d0 + move.l (a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d3 + addx.l d1,d4 + addx.l d5,d2 + + move.l d3,28(a0) + move.l d5,d3 + move.l 28(a1),d0 + move.l 4(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d4 + addx.l d1,d2 + addx.l d5,d3 + + move.l 24(a1),d0 + move.l 8(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d4 + addx.l d1,d2 + addx.l d5,d3 + + move.l 20(a1),d0 + move.l 12(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d4 + addx.l d1,d2 + addx.l d5,d3 + + move.l 16(a1),d0 + move.l 16(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d4 + addx.l d1,d2 + addx.l d5,d3 + + move.l 12(a1),d0 + move.l 20(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d4 + addx.l d1,d2 + addx.l d5,d3 + + move.l 8(a1),d0 + move.l 24(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d4 + addx.l d1,d2 + addx.l d5,d3 + + move.l 4(a1),d0 + move.l 28(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d4 + addx.l d1,d2 + addx.l d5,d3 + + move.l d4,32(a0) + move.l d5,d4 + move.l 8(a1),d0 + move.l 28(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d2 + addx.l d1,d3 + addx.l d5,d4 + + move.l 12(a1),d0 + move.l 24(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d2 + addx.l d1,d3 + addx.l d5,d4 + + move.l 16(a1),d0 + move.l 20(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d2 + addx.l d1,d3 + addx.l d5,d4 + + move.l 20(a1),d0 + move.l 16(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d2 + addx.l d1,d3 + addx.l d5,d4 + + move.l 24(a1),d0 + move.l 12(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d2 + addx.l d1,d3 + addx.l d5,d4 + + move.l 28(a1),d0 + move.l 8(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d2 + addx.l d1,d3 + addx.l d5,d4 + + move.l d2,36(a0) + move.l d5,d2 + move.l 28(a1),d0 + move.l 12(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d3 + addx.l d1,d4 + addx.l d5,d2 + + move.l 24(a1),d0 + move.l 16(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d3 + addx.l d1,d4 + addx.l d5,d2 + + move.l 20(a1),d0 + move.l 20(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d3 + addx.l d1,d4 + addx.l d5,d2 + + move.l 16(a1),d0 + move.l 24(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d3 + addx.l d1,d4 + addx.l d5,d2 + + move.l 12(a1),d0 + move.l 28(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d3 + addx.l d1,d4 + addx.l d5,d2 + + move.l d3,40(a0) + move.l d5,d3 + move.l 16(a1),d0 + move.l 28(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d4 + addx.l d1,d2 + addx.l d5,d3 + + move.l 20(a1),d0 + move.l 24(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d4 + addx.l d1,d2 + addx.l d5,d3 + + move.l 24(a1),d0 + move.l 20(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d4 + addx.l d1,d2 + addx.l d5,d3 + + move.l 28(a1),d0 + move.l 16(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d4 + addx.l d1,d2 + addx.l d5,d3 + + move.l d4,44(a0) + move.l d5,d4 + move.l 28(a1),d0 + move.l 20(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d2 + addx.l d1,d3 + addx.l d5,d4 + + move.l 24(a1),d0 + move.l 24(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d2 + addx.l d1,d3 + addx.l d5,d4 + + move.l 20(a1),d0 + move.l 28(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d2 + addx.l d1,d3 + addx.l d5,d4 + + move.l d2,48(a0) + move.l d5,d2 + move.l 24(a1),d0 + move.l 28(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d3 + addx.l d1,d4 + addx.l d5,d2 + + move.l 28(a1),d0 + move.l 24(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d3 + addx.l d1,d4 + addx.l d5,d2 + + move.l d3,52(a0) + move.l d5,d3 + move.l 28(a1),d0 + move.l 28(a2),d1 + + mulu.l d1,d1:d0 + add.l d0,d4 + addx.l d1,d2 + addx.l d5,d3 + + move.l d4,56(a0) + move.l d2,60(a0) + + movm.l (sp)+,#0x043c + rts + + .even +.globl _bn_sqr_comba8 +_bn_sqr_comba8: + movm.l #0x3e00,-(sp) + move.l 24(sp),a1 + move.l 28(sp),a0 + clr.l d5 + move.l (a0),d1 + move.l d5,d3 + move.l d5,d4 + move.l d5,d6 + + mulu.l d1,d0:d1 + add.l d1,d5 + addx.l d0,d3 + addx.l d6,d4 + + move.l d5,(a1) + move.l d6,d5 + move.l 4(a0),d2 + move.l (a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d3 + addx.l d2,d4 + addx.l d6,d5 + add.l d1,d3 + addx.l d2,d4 + addx.l d6,d5 + + move.l d3,4(a1) + move.l d6,d3 + move.l 4(a0),d1 + + mulu.l d1,d0:d1 + add.l d1,d4 + addx.l d0,d5 + addx.l d6,d3 + + move.l 8(a0),d2 + move.l (a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d4 + addx.l d2,d5 + addx.l d6,d3 + add.l d1,d4 + addx.l d2,d5 + addx.l d6,d3 + + move.l d4,8(a1) + move.l d6,d4 + move.l 12(a0),d2 + move.l (a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d5 + addx.l d2,d3 + addx.l d6,d4 + add.l d1,d5 + addx.l d2,d3 + addx.l d6,d4 + + move.l 8(a0),d2 + move.l 4(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d5 + addx.l d2,d3 + addx.l d6,d4 + add.l d1,d5 + addx.l d2,d3 + addx.l d6,d4 + + move.l d5,12(a1) + move.l d6,d5 + move.l 8(a0),d1 + + mulu.l d1,d0:d1 + add.l d1,d3 + addx.l d0,d4 + addx.l d6,d5 + + move.l 12(a0),d2 + move.l 4(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d3 + addx.l d2,d4 + addx.l d6,d5 + add.l d1,d3 + addx.l d2,d4 + addx.l d6,d5 + + move.l 16(a0),d2 + move.l (a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d3 + addx.l d2,d4 + addx.l d6,d5 + add.l d1,d3 + addx.l d2,d4 + addx.l d6,d5 + + move.l d3,16(a1) + move.l d6,d3 + move.l 20(a0),d2 + move.l (a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d4 + addx.l d2,d5 + addx.l d6,d3 + add.l d1,d4 + addx.l d2,d5 + addx.l d6,d3 + + move.l 16(a0),d2 + move.l 4(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d4 + addx.l d2,d5 + addx.l d6,d3 + add.l d1,d4 + addx.l d2,d5 + addx.l d6,d3 + + move.l 12(a0),d2 + move.l 8(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d4 + addx.l d2,d5 + addx.l d6,d3 + add.l d1,d4 + addx.l d2,d5 + addx.l d6,d3 + + move.l d4,20(a1) + move.l d6,d4 + move.l 12(a0),d1 + + mulu.l d1,d0:d1 + add.l d1,d5 + addx.l d0,d3 + addx.l d6,d4 + + move.l 16(a0),d2 + move.l 8(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d5 + addx.l d2,d3 + addx.l d6,d4 + add.l d1,d5 + addx.l d2,d3 + addx.l d6,d4 + + move.l 20(a0),d2 + move.l 4(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d5 + addx.l d2,d3 + addx.l d6,d4 + add.l d1,d5 + addx.l d2,d3 + addx.l d6,d4 + + move.l 24(a0),d2 + move.l (a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d5 + addx.l d2,d3 + addx.l d6,d4 + add.l d1,d5 + addx.l d2,d3 + addx.l d6,d4 + + move.l d5,24(a1) + move.l d6,d5 + move.l 28(a0),d2 + move.l (a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d3 + addx.l d2,d4 + addx.l d6,d5 + add.l d1,d3 + addx.l d2,d4 + addx.l d6,d5 + + move.l 24(a0),d2 + move.l 4(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d3 + addx.l d2,d4 + addx.l d6,d5 + add.l d1,d3 + addx.l d2,d4 + addx.l d6,d5 + + move.l 20(a0),d2 + move.l 8(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d3 + addx.l d2,d4 + addx.l d6,d5 + add.l d1,d3 + addx.l d2,d4 + addx.l d6,d5 + + move.l 16(a0),d2 + move.l 12(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d3 + addx.l d2,d4 + addx.l d6,d5 + add.l d1,d3 + addx.l d2,d4 + addx.l d6,d5 + + move.l d3,28(a1) + move.l d6,d3 + move.l 16(a0),d1 + + mulu.l d1,d0:d1 + add.l d1,d4 + addx.l d0,d5 + addx.l d6,d3 + + move.l 20(a0),d2 + move.l 12(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d4 + addx.l d2,d5 + addx.l d6,d3 + add.l d1,d4 + addx.l d2,d5 + addx.l d6,d3 + + move.l 24(a0),d2 + move.l 8(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d4 + addx.l d2,d5 + addx.l d6,d3 + add.l d1,d4 + addx.l d2,d5 + addx.l d6,d3 + + move.l 28(a0),d2 + move.l 4(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d4 + addx.l d2,d5 + addx.l d6,d3 + add.l d1,d4 + addx.l d2,d5 + addx.l d6,d3 + + move.l d4,32(a1) + move.l d6,d4 + move.l 28(a0),d2 + move.l 8(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d5 + addx.l d2,d3 + addx.l d6,d4 + add.l d1,d5 + addx.l d2,d3 + addx.l d6,d4 + + move.l 24(a0),d2 + move.l 12(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d5 + addx.l d2,d3 + addx.l d6,d4 + add.l d1,d5 + addx.l d2,d3 + addx.l d6,d4 + + move.l 20(a0),d2 + move.l 16(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d5 + addx.l d2,d3 + addx.l d6,d4 + add.l d1,d5 + addx.l d2,d3 + addx.l d6,d4 + + move.l d5,36(a1) + move.l d6,d5 + move.l 20(a0),d1 + + mulu.l d1,d0:d1 + add.l d1,d3 + addx.l d0,d4 + addx.l d6,d5 + + move.l 24(a0),d2 + move.l 16(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d3 + addx.l d2,d4 + addx.l d6,d5 + add.l d1,d3 + addx.l d2,d4 + addx.l d6,d5 + + move.l 28(a0),d2 + move.l 12(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d3 + addx.l d2,d4 + addx.l d6,d5 + add.l d1,d3 + addx.l d2,d4 + addx.l d6,d5 + + move.l d3,40(a1) + move.l d6,d3 + move.l 28(a0),d2 + move.l 16(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d4 + addx.l d2,d5 + addx.l d6,d3 + add.l d1,d4 + addx.l d2,d5 + addx.l d6,d3 + + move.l 24(a0),d2 + move.l 20(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d4 + addx.l d2,d5 + addx.l d6,d3 + add.l d1,d4 + addx.l d2,d5 + addx.l d6,d3 + + move.l d4,44(a1) + move.l d6,d4 + move.l 24(a0),d1 + + mulu.l d1,d0:d1 + add.l d1,d5 + addx.l d0,d3 + addx.l d6,d4 + + move.l 28(a0),d2 + move.l 20(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d5 + addx.l d2,d3 + addx.l d6,d4 + add.l d1,d5 + addx.l d2,d3 + addx.l d6,d4 + + move.l d5,48(a1) + move.l d6,d5 + move.l 28(a0),d2 + move.l 24(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d3 + addx.l d2,d4 + addx.l d6,d5 + add.l d1,d3 + addx.l d2,d4 + addx.l d6,d5 + + move.l d3,52(a1) + move.l d6,d3 + move.l 28(a0),d1 + + mulu.l d1,d0:d1 + add.l d1,d4 + addx.l d0,d5 + addx.l d6,d3 + + move.l d4,56(a1) + move.l d5,60(a1) + movm.l (sp)+,#0x7c + rts + + .even +.globl _bn_sqr_comba4 +_bn_sqr_comba4: + movm.l #0x3e00,-(sp) + move.l 24(sp),a1 + move.l 28(sp),a0 + clr.l d5 + move.l (a0),d1 + move.l d5,d4 + move.l d5,d3 + move.l d5,d6 + + mulu.l d1,d0:d1 + add.l d1,d5 + addx.l d0,d4 + addx.l d6,d3 + + move.l d5,(a1) + move.l d6,d5 + move.l 4(a0),d2 + move.l (a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d4 + addx.l d2,d3 + addx.l d6,d5 + add.l d1,d4 + addx.l d2,d3 + addx.l d6,d5 + + move.l d4,4(a1) + move.l d6,d4 + move.l 4(a0),d1 + + mulu.l d1,d0:d1 + add.l d1,d3 + addx.l d0,d5 + addx.l d6,d4 + + move.l 8(a0),d2 + move.l (a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d3 + addx.l d2,d5 + addx.l d6,d4 + add.l d1,d3 + addx.l d2,d5 + addx.l d6,d4 + + move.l d3,8(a1) + move.l d6,d3 + move.l 12(a0),d2 + move.l (a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d5 + addx.l d2,d4 + addx.l d6,d3 + add.l d1,d5 + addx.l d2,d4 + addx.l d6,d3 + + move.l 8(a0),d2 + move.l 4(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d5 + addx.l d2,d4 + addx.l d6,d3 + add.l d1,d5 + addx.l d2,d4 + addx.l d6,d3 + + move.l d5,12(a1) + move.l d6,d5 + move.l 8(a0),d1 + + mulu.l d1,d0:d1 + add.l d1,d4 + addx.l d0,d3 + addx.l d6,d5 + + move.l 12(a0),d2 + move.l 4(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d4 + addx.l d2,d3 + addx.l d6,d5 + add.l d1,d4 + addx.l d2,d3 + addx.l d6,d5 + + move.l d4,16(a1) + move.l d6,d4 + move.l 12(a0),d2 + move.l 8(a0),d1 + + mulu.l d2,d2:d1 + add.l d1,d3 + addx.l d2,d5 + addx.l d6,d4 + add.l d1,d3 + addx.l d2,d5 + addx.l d6,d4 + + move.l d3,20(a1) + move.l d6,d3 + move.l 12(a0),d1 + + mulu.l d1,d0:d1 + add.l d1,d5 + addx.l d0,d4 + addx.l d6,d3 + + move.l d5,24(a1) + move.l d4,28(a1) + movm.l (sp)+,#0x7c + rts + + .even +.globl _bn_mul_comba4 +_bn_mul_comba4: + movm.l #0x3c20,-(sp) + move.l 24(sp),a2 + move.l 28(sp),a0 + move.l 32(sp),a1 + clr.l d4 + move.l (a0),d1 + move.l (a1),d0 + move.l d4,d3 + move.l d4,d2 + move.l d4,d5 + + mulu.l d1,d0:d1 + add.l d1,d4 + addx.l d0,d3 + addx.l d5,d2 + + move.l d4,(a2) + move.l d5,d4 + move.l (a0),d1 + move.l 4(a1),d0 + + mulu.l d1,d0:d1 + add.l d1,d3 + addx.l d0,d2 + addx.l d5,d4 + + move.l 4(a0),d1 + move.l (a1),d0 + + mulu.l d1,d0:d1 + add.l d1,d3 + addx.l d0,d2 + addx.l d5,d4 + + move.l d3,4(a2) + move.l d5,d3 + move.l 8(a0),d1 + move.l (a1),d0 + + mulu.l d1,d0:d1 + add.l d1,d2 + addx.l d0,d4 + addx.l d5,d3 + + move.l 4(a0),d1 + move.l 4(a1),d0 + + mulu.l d1,d0:d1 + add.l d1,d2 + addx.l d0,d4 + addx.l d5,d3 + + move.l (a0),d1 + move.l 8(a1),d0 + + mulu.l d1,d0:d1 + add.l d1,d2 + addx.l d0,d4 + addx.l d5,d3 + + move.l d2,8(a2) + move.l d5,d2 + move.l (a0),d1 + move.l 12(a1),d0 + + mulu.l d1,d0:d1 + add.l d1,d4 + addx.l d0,d3 + addx.l d5,d2 + + move.l 4(a0),d1 + move.l 8(a1),d0 + + mulu.l d1,d0:d1 + add.l d1,d4 + addx.l d0,d3 + addx.l d5,d2 + + move.l 8(a0),d1 + move.l 4(a1),d0 + + mulu.l d1,d0:d1 + add.l d1,d4 + addx.l d0,d3 + addx.l d5,d2 + + move.l 12(a0),d1 + move.l (a1),d0 + + mulu.l d1,d0:d1 + add.l d1,d4 + addx.l d0,d3 + addx.l d5,d2 + + move.l d4,12(a2) + move.l d5,d4 + move.l 12(a0),d1 + move.l 4(a1),d0 + + mulu.l d1,d0:d1 + add.l d1,d3 + addx.l d0,d2 + addx.l d5,d4 + + move.l 8(a0),d1 + move.l 8(a1),d0 + + mulu.l d1,d0:d1 + add.l d1,d3 + addx.l d0,d2 + addx.l d5,d4 + + move.l 4(a0),d1 + move.l 12(a1),d0 + + mulu.l d1,d0:d1 + add.l d1,d3 + addx.l d0,d2 + addx.l d5,d4 + + move.l d3,16(a2) + move.l d5,d3 + move.l 8(a0),d1 + move.l 12(a1),d0 + + mulu.l d1,d0:d1 + add.l d1,d2 + addx.l d0,d4 + addx.l d5,d3 + + move.l 12(a0),d1 + move.l 8(a1),d0 + + mulu.l d1,d0:d1 + add.l d1,d2 + addx.l d0,d4 + addx.l d5,d3 + + move.l d2,20(a2) + move.l d5,d2 + move.l 12(a0),d1 + move.l 12(a1),d0 + + mulu.l d1,d0:d1 + add.l d1,d4 + addx.l d0,d3 + addx.l d5,d2 + + move.l d4,24(a2) + move.l d3,28(a2) + movm.l (sp)+,#0x43c + rts + +/* bn_div_words should really just be inlined wherever it's used */ + + .even +.globl _bn_div_words +_bn_div_words: + move.l 4(sp),d1 + move.l 8(sp),d0 + divu.l 12(sp),d1:d0 + rts + + .even +.globl _bn_add_words +_bn_add_words: + movm.l #0x2030,-(sp) + movm.l 16(sp),#0x0f00 + clr.l d0 + tst.l a3 + jble 3f + +/* d0 is 0, use this shift to clear the eXtend bit */ + lsl.l #1,d0 +1: + move.l (a1)+,d1 + move.l (a2)+,d2 + addx.l d1,d2 + move.l d2,(a0)+ + subq.l #1,a3 + tst.l a3 + jble 2f + + move.l (a1)+,d1 + move.l (a2)+,d2 + addx.l d1,d2 + move.l d2,(a0)+ + subq.l #1,a3 + tst.l a3 + jble 2f + + move.l (a1)+,d1 + move.l (a2)+,d2 + addx.l d1,d2 + move.l d2,(a0)+ + subq.l #1,a3 + tst.l a3 + jble 2f + + move.l (a1)+,d1 + move.l (a2)+,d2 + addx.l d1,d2 + move.l d2,(a0)+ + subq.l #1,a3 + tst.l a3 + jgt 1b +2: + addx.l d0,d0 +3: + movm.l (sp)+,#0x0c04 + rts + + .even +.globl _bn_sub_words +_bn_sub_words: + movm.l #0x2030,-(sp) + movm.l 16(sp),#0x0f00 + clr.l d0 + tst.l a3 + jble 3f + + lsl.l #1,d0 +1: + move.l (a1)+,d2 + move.l (a2)+,d1 + subx.l d1,d2 + move.l d2,(a0)+ + subq.l #1,a3 + tst.l a3 + jble 2f + + move.l (a1)+,d2 + move.l (a2)+,d1 + subx.l d1,d2 + move.l d2,(a0)+ + subq.l #1,a3 + tst.l a3 + jble 2f + + move.l (a1)+,d2 + move.l (a2)+,d1 + subx.l d1,d2 + move.l d2,(a0)+ + subq.l #1,a3 + tst.l a3 + jble 2f + + move.l (a1)+,d2 + move.l (a2)+,d1 + subx.l d1,d2 + move.l d2,(a0)+ + subq.l #1,a3 + tst.l a3 + jgt 1b +2: + addx.l d0,d0 +3: + movm.l (sp)+,#0x0c04 + rts diff --git a/sdk/recipes/files/openssl/m68k-unknown-amigaos/providers/implementations/rands/seeding/rand_amiga.c b/sdk/recipes/files/openssl/m68k-unknown-amigaos/providers/implementations/rands/seeding/rand_amiga.c new file mode 100644 index 0000000..205d527 --- /dev/null +++ b/sdk/recipes/files/openssl/m68k-unknown-amigaos/providers/implementations/rands/seeding/rand_amiga.c @@ -0,0 +1,282 @@ +#include "internal/cryptlib.h" +#include <openssl/rand.h> +#include <openssl/sha.h> +#include "crypto/rand_pool.h" +#include "crypto/rand.h" +#include "prov/seeding.h" + +#if defined(OPENSSL_SYS_AMIGAOS3) || defined(OPENSSL_SYS_AMIGAOS4) + +# ifndef OPENSSL_RAND_SEED_OS +# error "Unsupported seeding method configured; must be os" +# endif + +#define __USE_INLINE__ 1 + +#include <sys/types.h> +#include <time.h> +#include <unistd.h> + +#include <proto/exec.h> +#include <proto/timer.h> +#include <devices/timer.h> + +/* Maximum number of attempts to get a delay of 1 microsecond that is not equal to 0 */ +#define MAX_ATTEMPTS 1000 + +#ifdef __amigaos4__ + +#ifdef CreateMsgPort +#undef CreateMsgPort +#endif +#define CreateMsgPort() AllocSysObject(ASOT_PORT,NULL) +#ifdef DeleteMsgPort +#undef DeleteMsgPort +#endif +#define DeleteMsgPort(msgPort) FreeSysObject(ASOT_PORT,msgPort) +#ifdef CreateIORequest +#undef CreateIORequest +#endif +#define CreateIORequest(ioReplyPort,size) AllocSysObjectTags(ASOT_IOREQUEST,ASOIOR_ReplyPort,ioReplyPort,ASOIOR_Size,size,TAG_DONE) +#ifdef DeleteIORequest +#undef DeleteIORequest +#endif +#define DeleteIORequest(ioReq) FreeSysObject(ASOT_IOREQUEST,ioReq) + +#else + +#define GetInterface(a, b, c, d) 1 +#define DropInterface(x) + +/* OS3 has a different but compatible TimeVal definition */ +struct TimeVal +{ + ULONG Seconds; + ULONG Microseconds; +}; + +/* ... and ditto for TimeRequest */ +struct TimeRequest +{ + struct IORequest Request; + struct TimeVal Time; +}; + +#endif /* !__amigaos4__ */ + +size_t ossl_pool_acquire_entropy(RAND_POOL *pool) +{ + unsigned char temp_buffer[SHA_DIGEST_LENGTH], data_buffer[SHA_DIGEST_LENGTH]; + struct MsgPort *port = NULL; + size_t bytes_needed; + size_t entropy_available = 0; + struct TimeRequest *time_request = NULL; +#ifdef __amigaos4__ + struct IOStdReq *entropy_request = NULL; + + bytes_needed = ossl_rand_pool_bytes_needed(pool, 1); + + if ((port = CreateMsgPort()) + && (entropy_request = (struct IOStdReq *)CreateIORequest(port, sizeof(*entropy_request)))) + { + if (OpenDevice(TIMERNAME, UNIT_ENTROPY, (struct IORequest *)entropy_request, 0) == 0) + { + while(bytes_needed > 0) + { + entropy_request->io_Command = TR_READENTROPY; + entropy_request->io_Data = &temp_buffer[0]; + entropy_request->io_Length = sizeof(temp_buffer); + + if (DoIO((struct IORequest *)entropy_request) == 0) + { + unsigned char *buffer; + size_t bytes = (bytes_needed < sizeof(data_buffer) ? bytes_needed : sizeof(data_buffer)); + + buffer = ossl_rand_pool_add_begin(pool, bytes_needed); + SHA1(&temp_buffer[0], sizeof(temp_buffer), &data_buffer[0]); + memcpy(buffer, data_buffer, bytes); + ossl_rand_pool_add_end(pool, bytes, 8 * bytes); + bytes_needed -= bytes; + } + else + break; + } + + CloseDevice((struct IORequest *)entropy_request); + } + } + + DeleteIORequest((struct IORequest *)entropy_request); + + entropy_available = ossl_rand_pool_entropy_available(pool); + if (entropy_available > 0) + return entropy_available; +#endif /* __amigaos4__ */ + + /* The following block will be used on "classic" machines. It does not generate + * a high degree of randomness, but it does the job since RAND_poll is + * called only once by OpenSSL to generate a 32 byte seed. + */ + + bytes_needed = ossl_rand_pool_bytes_needed(pool, 1); + + if (bytes_needed > 0 + && (port || (port = CreateMsgPort())) + && (time_request = (struct TimeRequest *)CreateIORequest(port, sizeof(*time_request)))) + { + if (OpenDevice(TIMERNAME, UNIT_VBLANK, (struct IORequest *)time_request, 0) == 0) + { + #if defined(__amigaos4__) + struct TimerIFace *ITimer = NULL; + #endif + struct Device *TimerBase; + + if ((TimerBase = time_request->Request.io_Device) + #if defined(__amigaos4__) + && (ITimer = (struct TimerIFace *)GetInterface((struct Library *)TimerBase, "main", 1, NULL)) + #endif + ) + { + struct EClockVal curr_eclock; + ULONG prev_ev_lo = 0; + struct TimeVal tv; + int i, attempt; + BOOL aborted; + + ReadEClock(&curr_eclock); + aborted = FALSE; + + while(!aborted && bytes_needed > 0) + { + for(i = 0; + !aborted && i < (int)sizeof(temp_buffer) - (int)sizeof(ULONG); + i++) + { + attempt = 0; + + /* Ask for a one microsecond delay and measure the time + * the delay actually took. + */ + do + { + time_request->Request.io_Command = TR_ADDREQUEST; + time_request->Time.Seconds = 0; + time_request->Time.Microseconds = 1; + + if (DoIO((struct IORequest *)time_request) == 0) + { + prev_ev_lo = curr_eclock.ev_lo; + ReadEClock(&curr_eclock); + + attempt++; + } + else + aborted = TRUE; + } while(!aborted && prev_ev_lo == 0 && attempt < MAX_ATTEMPTS); + + if (attempt >= MAX_ATTEMPTS) + aborted = TRUE; + + /* Since we are going for randomness, ev_hi is irrelevant */ + temp_buffer[i] = (unsigned char)(curr_eclock.ev_lo - prev_ev_lo); + } + + GetSysTime(&tv); + + if (sizeof(temp_buffer) > sizeof(ULONG)) + *(ULONG *)&temp_buffer[sizeof(temp_buffer) - sizeof(ULONG)] + = tv.Microseconds; + + /* Shuffle the bits around and specify that about + * one fourth of it adds to the entropy. + */ + if (!aborted) + { + unsigned char *buffer; + size_t bytes = (bytes_needed < sizeof(data_buffer) ? bytes_needed : sizeof(data_buffer)); + + SHA1(&temp_buffer[0], sizeof(temp_buffer), &data_buffer[0]); + + ossl_rand_pool_add_end(pool, bytes, (sizeof(data_buffer) / 4) * 8); + bytes_needed -= bytes; + } + } + } + + #if defined(__amigaos4__) + DropInterface((struct Interface *)ITimer); + #endif + CloseDevice((struct IORequest *)time_request); + } + } + + DeleteIORequest((struct IORequest *)time_request); + + DeleteMsgPort(port); + + return ossl_rand_pool_entropy_available(pool); +} + +int ossl_pool_add_nonce_data(RAND_POOL *pool) +{ + struct { + pid_t pid; + CRYPTO_THREAD_ID tid; + uint64_t time; + } data; + + /* Erase the entire structure including any padding */ + memset(&data, 0, sizeof(data)); + + /* + * Add process id, thread id, and a high resolution timestamp to + * ensure that the nonce is unique with high probability for + * different process instances. + */ + data.pid = getpid(); + data.tid = CRYPTO_THREAD_get_current_id(); + /*XXX: can this be improved? */ + data.time = time(NULL); + + return ossl_rand_pool_add(pool, (unsigned char *)&data, sizeof(data), 0); +} + +int ossl_rand_pool_add_additional_data(RAND_POOL *pool) +{ + struct { + int fork_id; + CRYPTO_THREAD_ID tid; + uint64_t time; + } data; + + /* Erase the entire structure including any padding */ + memset(&data, 0, sizeof(data)); + + /* + * Add some noise from the thread id and a high resolution timer. + * The fork_id adds some extra fork-safety. + * The thread id adds a little randomness if the drbg is accessed + * concurrently (which is the case for the <master> drbg). + */ + data.fork_id = openssl_get_fork_id(); + data.tid = CRYPTO_THREAD_get_current_id(); + /*XXX: can this be improved? */ + data.time = (uint64_t) time(NULL); + + return ossl_rand_pool_add(pool, (unsigned char *)&data, sizeof(data), 0); +} + +int ossl_rand_pool_init(void) +{ + return 1; +} + +void ossl_rand_pool_cleanup(void) +{ +} + +void ossl_rand_pool_keep_random_devices_open(int keep) +{ +} + +#endif /* OPENSSL_SYS_AMIGA */ diff --git a/sdk/recipes/files/openssl/ppc-amigaos/providers/implementations/rands/seeding/rand_amiga.c b/sdk/recipes/files/openssl/ppc-amigaos/providers/implementations/rands/seeding/rand_amiga.c new file mode 100644 index 0000000..ed315ed --- /dev/null +++ b/sdk/recipes/files/openssl/ppc-amigaos/providers/implementations/rands/seeding/rand_amiga.c @@ -0,0 +1,275 @@ +#include "internal/cryptlib.h" +#include <openssl/rand.h> +#include <openssl/sha.h> +#include "crypto/rand_pool.h" +#include "crypto/rand.h" +#include "prov/seeding.h" + +#if defined(OPENSSL_SYS_AMIGAOS3) || defined(OPENSSL_SYS_AMIGAOS4) + +# ifndef OPENSSL_RAND_SEED_OS +# error "Unsupported seeding method configured; must be os" +# endif + +#define __USE_INLINE__ 1 + +#include <sys/types.h> +#include <time.h> +#include <unistd.h> + +#include <proto/exec.h> +#include <proto/timer.h> +#include <devices/timer.h> + +/* Maximum number of attempts to get a delay of 1 microsecond that is not equal to 0 */ +#define MAX_ATTEMPTS 1000 + +#ifdef __amigaos4__ + +#ifdef CreateMsgPort +#undef CreateMsgPort +#endif +#define CreateMsgPort() AllocSysObject(ASOT_PORT,NULL) +#ifdef DeleteMsgPort +#undef DeleteMsgPort +#endif +#define DeleteMsgPort(msgPort) FreeSysObject(ASOT_PORT,msgPort) +#ifdef CreateIORequest +#undef CreateIORequest +#endif +#define CreateIORequest(ioReplyPort,size) AllocSysObjectTags(ASOT_IOREQUEST,ASOIOR_ReplyPort,ioReplyPort,ASOIOR_Size,size,TAG_DONE) +#ifdef DeleteIORequest +#undef DeleteIORequest +#endif +#define DeleteIORequest(ioReq) FreeSysObject(ASOT_IOREQUEST,ioReq) + +#else + +#define GetInterface(a, b, c, d) 1 +#define DropInterface(x) + +/* OS3 has a different but compatible TimeVal definition */ +struct TimeVal +{ + uint32 Seconds; + uint32 Microseconds; +}; + +#endif /* !__amigaos4__ */ + +size_t ossl_pool_acquire_entropy(RAND_POOL *pool) +{ + unsigned char temp_buffer[SHA_DIGEST_LENGTH], data_buffer[SHA_DIGEST_LENGTH]; + struct MsgPort *port = NULL; + size_t bytes_needed; + size_t entropy_available = 0; + struct TimeRequest *time_request = NULL; +#ifdef __amigaos4__ + struct IOStdReq *entropy_request = NULL; + + bytes_needed = ossl_rand_pool_bytes_needed(pool, 1); + + if ((port = CreateMsgPort()) + && (entropy_request = (struct IOStdReq *)CreateIORequest(port, sizeof(*entropy_request)))) + { + if (OpenDevice(TIMERNAME, UNIT_ENTROPY, (struct IORequest *)entropy_request, 0) == 0) + { + while(bytes_needed > 0) + { + entropy_request->io_Command = TR_READENTROPY; + entropy_request->io_Data = &temp_buffer[0]; + entropy_request->io_Length = sizeof(temp_buffer); + + if (DoIO((struct IORequest *)entropy_request) == 0) + { + unsigned char *buffer; + size_t bytes = (bytes_needed < sizeof(data_buffer) ? bytes_needed : sizeof(data_buffer)); + + buffer = ossl_rand_pool_add_begin(pool, bytes_needed); + SHA1(&temp_buffer[0], sizeof(temp_buffer), &data_buffer[0]); + memcpy(buffer, data_buffer, bytes); + ossl_rand_pool_add_end(pool, bytes, 8 * bytes); + bytes_needed -= bytes; + } + else + break; + } + + CloseDevice((struct IORequest *)entropy_request); + } + } + + DeleteIORequest((struct IORequest *)entropy_request); + + entropy_available = ossl_rand_pool_entropy_available(pool); + if (entropy_available > 0) + return entropy_available; +#endif /* __amigaos4__ */ + + /* The following block will be used on "classic" machines. It does not generate + * a high degree of randomness, but it does the job since RAND_poll is + * called only once by OpenSSL to generate a 32 byte seed. + */ + + bytes_needed = ossl_rand_pool_bytes_needed(pool, 1); + + if (bytes_needed > 0 + && (port || (port = CreateMsgPort())) + && (time_request = (struct TimeRequest *)CreateIORequest(port, sizeof(*time_request)))) + { + if (OpenDevice(TIMERNAME, UNIT_VBLANK, (struct IORequest *)time_request, 0) == 0) + { + #if defined(__amigaos4__) + struct TimerIFace *ITimer = NULL; + #endif + struct Device *TimerBase; + + if ((TimerBase = time_request->Request.io_Device) + #if defined(__amigaos4__) + && (ITimer = (struct TimerIFace *)GetInterface((struct Library *)TimerBase, "main", 1, NULL)) + #endif + ) + { + struct EClockVal curr_eclock; + ULONG prev_ev_lo = 0; + struct TimeVal tv; + int i, attempt; + BOOL aborted; + + ReadEClock(&curr_eclock); + aborted = FALSE; + + while(!aborted && bytes_needed > 0) + { + for(i = 0; + !aborted && i < (int)sizeof(temp_buffer) - (int)sizeof(ULONG); + i++) + { + attempt = 0; + + /* Ask for a one microsecond delay and measure the time + * the delay actually took. + */ + do + { + time_request->Request.io_Command = TR_ADDREQUEST; + time_request->Time.Seconds = 0; + time_request->Time.Microseconds = 1; + + if (DoIO((struct IORequest *)time_request) == 0) + { + prev_ev_lo = curr_eclock.ev_lo; + ReadEClock(&curr_eclock); + + attempt++; + } + else + aborted = TRUE; + } while(!aborted && prev_ev_lo == 0 && attempt < MAX_ATTEMPTS); + + if (attempt >= MAX_ATTEMPTS) + aborted = TRUE; + + /* Since we are going for randomness, ev_hi is irrelevant */ + temp_buffer[i] = (unsigned char)(curr_eclock.ev_lo - prev_ev_lo); + } + + GetSysTime(&tv); + + if (sizeof(temp_buffer) > sizeof(ULONG)) + *(ULONG *)&temp_buffer[sizeof(temp_buffer) - sizeof(ULONG)] + = tv.Microseconds; + + /* Shuffle the bits around and specify that about + * one fourth of it adds to the entropy. + */ + if (!aborted) + { + unsigned char *buffer; + size_t bytes = (bytes_needed < sizeof(data_buffer) ? bytes_needed : sizeof(data_buffer)); + + SHA1(&temp_buffer[0], sizeof(temp_buffer), &data_buffer[0]); + + ossl_rand_pool_add_end(pool, bytes, (sizeof(data_buffer) / 4) * 8); + bytes_needed -= bytes; + } + } + } + + #if defined(__amigaos4__) + DropInterface((struct Interface *)ITimer); + #endif + CloseDevice((struct IORequest *)time_request); + } + } + + DeleteIORequest((struct IORequest *)time_request); + + DeleteMsgPort(port); + + return ossl_rand_pool_entropy_available(pool); +} + +int ossl_pool_add_nonce_data(RAND_POOL *pool) +{ + struct { + pid_t pid; + CRYPTO_THREAD_ID tid; + uint64_t time; + } data; + + /* Erase the entire structure including any padding */ + memset(&data, 0, sizeof(data)); + + /* + * Add process id, thread id, and a high resolution timestamp to + * ensure that the nonce is unique with high probability for + * different process instances. + */ + data.pid = getpid(); + data.tid = CRYPTO_THREAD_get_current_id(); + /*XXX: can this be improved? */ + data.time = time(NULL); + + return ossl_rand_pool_add(pool, (unsigned char *)&data, sizeof(data), 0); +} + +int ossl_rand_pool_add_additional_data(RAND_POOL *pool) +{ + struct { + int fork_id; + CRYPTO_THREAD_ID tid; + uint64_t time; + } data; + + /* Erase the entire structure including any padding */ + memset(&data, 0, sizeof(data)); + + /* + * Add some noise from the thread id and a high resolution timer. + * The fork_id adds some extra fork-safety. + * The thread id adds a little randomness if the drbg is accessed + * concurrently (which is the case for the <master> drbg). + */ + data.fork_id = openssl_get_fork_id(); + data.tid = CRYPTO_THREAD_get_current_id(); + /*XXX: can this be improved? */ + data.time = (uint64_t) time(NULL); + + return ossl_rand_pool_add(pool, (unsigned char *)&data, sizeof(data), 0); +} + +int ossl_rand_pool_init(void) +{ + return 1; +} + +void ossl_rand_pool_cleanup(void) +{ +} + +void ossl_rand_pool_keep_random_devices_open(int keep) +{ +} + +#endif /* OPENSSL_SYS_AMIGA */ diff --git a/sdk/recipes/patches/libcares/m5475-atari-mint/config.sub.p b/sdk/recipes/patches/libcares/m5475-atari-mint/config.sub.p new file mode 100644 index 0000000..a681d0a --- /dev/null +++ b/sdk/recipes/patches/libcares/m5475-atari-mint/config.sub.p @@ -0,0 +1,11 @@ +--- config.sub.orig 2023-10-01 08:53:00.740777146 +0100 ++++ config.sub 2023-10-01 08:59:22.657161841 +0100 +@@ -1209,7 +1209,7 @@ + | lm32 \ + | loongarch32 | loongarch64 | loongarchx32 \ + | m32c | m32r | m32rle \ +- | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ ++ | m5200 | m5475 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ + | m88110 | m88k | maxq | mb | mcore | mep | metag \ + | microblaze | microblazeel \ diff --git a/sdk/recipes/patches/libcares/m68k-atari-mint/configure.p b/sdk/recipes/patches/libcares/m68k-atari-mint/configure.p deleted file mode 100644 index 254a483..0000000 --- a/sdk/recipes/patches/libcares/m68k-atari-mint/configure.p +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2011-03-08 23:18:37.000000000 +0000 -+++ configure 2011-03-08 23:18:59.000000000 +0000 -@@ -18503,8 +18503,6 @@ - stdbool.h \ - time.h \ - limits.h \ -- arpa/nameser.h \ -- arpa/nameser_compat.h \ - arpa/inet.h - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` diff --git a/sdk/recipes/patches/libcares/m68k-unknown-amigaos/ipv6-support.p b/sdk/recipes/patches/libcares/m68k-unknown-amigaos/ipv6-support.p new file mode 100644 index 0000000..ce60c44 --- /dev/null +++ b/sdk/recipes/patches/libcares/m68k-unknown-amigaos/ipv6-support.p @@ -0,0 +1,71 @@ +--- src/lib/ares_ipv6.h.orig 2017-10-10 15:19:45.611896396 +0100 ++++ src/lib/ares_ipv6.h 2017-10-17 15:42:25.304921197 +0100 +@@ -32,6 +32,11 @@ + #endif + ++#ifndef INET6_ADDRSTRLEN ++#define INET6_ADDRSTRLEN 46 ++#endif ++ + #ifndef HAVE_STRUCT_SOCKADDR_IN6 ++#define s6_addr _S6_un._S6_u8 + struct sockaddr_in6 { + unsigned short sin6_family; + unsigned short sin6_port; +--- src/lib/ares__sortaddrinfo.c.orig 2017-10-10 15:19:45.611896396 +0100 ++++ src/lib/ares__sortaddrinfo.c 2017-10-17 15:42:25.304921197 +0100 +@@ -73,6 +73,40 @@ + #define ARES_IN_LOOPBACK(a) \ + ((((long unsigned int)(a)) & 0xff000000) == 0x7f000000) + ++#include <inttypes.h> ++#ifndef IN6_IS_ADDR_LINKLOCAL ++#define IN6_IS_ADDR_LINKLOCAL(a) \ ++ ((((__const uint32_t *) (a))[0] & htonl (0xffc00000)) \ ++ == htonl (0xfe800000)) ++#endif ++#ifndef IN6_IS_ADDR_LOOPBACK ++#define IN6_IS_ADDR_LOOPBACK(a) \ ++ (((__const uint32_t *) (a))[0] == 0 \ ++ && ((__const uint32_t *) (a))[1] == 0 \ ++ && ((__const uint32_t *) (a))[2] == 0 \ ++ && ((__const uint32_t *) (a))[3] == htonl (1)) ++#endif ++#ifndef IN6_IS_ADDR_MULTICAST ++#define IN6_IS_ADDR_MULTICAST(a) (((__const uint8_t *) (a))[0] == 0xff) ++#endif ++#ifndef IN6_IS_ADDR_SITELOCAL ++#define IN6_IS_ADDR_SITELOCAL(a) \ ++ ((((__const uint32_t *) (a))[0] & htonl (0xffc00000)) \ ++ == htonl (0xfec00000)) ++#endif ++#ifndef IN6_IS_ADDR_V4COMPAT ++#define IN6_IS_ADDR_V4COMPAT(a) \ ++ ((((__const uint32_t *) (a))[0] == 0) \ ++ && (((__const uint32_t *) (a))[1] == 0) \ ++ && (((__const uint32_t *) (a))[2] == 0) \ ++ && (ntohl (((__const uint32_t *) (a))[3]) > 1)) ++#endif ++#ifndef IN6_IS_ADDR_V4MAPPED ++#define IN6_IS_ADDR_V4MAPPED(a) \ ++ ((((__const uint32_t *) (a))[0] == 0) \ ++ && (((__const uint32_t *) (a))[1] == 0) \ ++ && (((__const uint32_t *) (a))[2] == htonl (0xffff))) ++#endif + /* RFC 4193. */ + #define ARES_IN6_IS_ADDR_ULA(a) (((a)->s6_addr[0] & 0xfe) == 0xfc) + +@@ -205,8 +239,13 @@ + /* + * Find number of matching initial bits between the two addresses a1 and a2. + */ ++#ifndef HAVE_STRUCT_SOCKADDR_IN6 ++static size_t common_prefix_len(const struct ares_in6_addr *a1, ++ const struct ares_in6_addr *a2) ++#else + static size_t common_prefix_len(const struct in6_addr *a1, + const struct in6_addr *a2) ++#endif + { + const unsigned char *p1 = (const unsigned char *)a1; + const unsigned char *p2 = (const unsigned char *)a2; diff --git a/sdk/recipes/patches/libcares/ppc-amigaos/configure.p b/sdk/recipes/patches/libcares/ppc-amigaos/configure.p deleted file mode 100644 index 254a483..0000000 --- a/sdk/recipes/patches/libcares/ppc-amigaos/configure.p +++ /dev/null @@ -1,11 +0,0 @@ ---- configure.orig 2011-03-08 23:18:37.000000000 +0000 -+++ configure 2011-03-08 23:18:59.000000000 +0000 -@@ -18503,8 +18503,6 @@ - stdbool.h \ - time.h \ - limits.h \ -- arpa/nameser.h \ -- arpa/nameser_compat.h \ - arpa/inet.h - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` diff --git a/sdk/recipes/patches/libcares/ppc-amigaos/ipv6-support.p b/sdk/recipes/patches/libcares/ppc-amigaos/ipv6-support.p new file mode 100644 index 0000000..f34fb45 --- /dev/null +++ b/sdk/recipes/patches/libcares/ppc-amigaos/ipv6-support.p @@ -0,0 +1,70 @@ +--- src/lib/ares_ipv6.h.orig 2017-10-10 15:19:45.611896396 +0100 ++++ src/lib/ares_ipv6.h 2017-10-17 15:42:25.304921197 +0100 +@@ -32,6 +32,11 @@ + #endif + ++#ifndef INET6_ADDRSTRLEN ++#define INET6_ADDRSTRLEN 46 ++#endif ++ + #ifndef HAVE_STRUCT_SOCKADDR_IN6 ++#define s6_addr _S6_un._S6_u8 + struct sockaddr_in6 { + unsigned short sin6_family; + unsigned short sin6_port; +--- src/lib/ares__sortaddrinfo.c.orig 2017-10-10 15:19:45.611896396 +0100 ++++ src/lib/ares__sortaddrinfo.c 2017-10-17 15:42:25.304921197 +0100 +@@ -73,6 +73,39 @@ + #define ARES_IN_LOOPBACK(a) \ + ((((long unsigned int)(a)) & 0xff000000) == 0x7f000000) + ++#ifndef IN6_IS_ADDR_LINKLOCAL ++#define IN6_IS_ADDR_LINKLOCAL(a) \ ++ ((((__const uint32_t *) (a))[0] & htonl (0xffc00000)) \ ++ == htonl (0xfe800000)) ++#endif ++#ifndef IN6_IS_ADDR_LOOPBACK ++#define IN6_IS_ADDR_LOOPBACK(a) \ ++ (((__const uint32_t *) (a))[0] == 0 \ ++ && ((__const uint32_t *) (a))[1] == 0 \ ++ && ((__const uint32_t *) (a))[2] == 0 \ ++ && ((__const uint32_t *) (a))[3] == htonl (1)) ++#endif ++#ifndef IN6_IS_ADDR_MULTICAST ++#define IN6_IS_ADDR_MULTICAST(a) (((__const uint8_t *) (a))[0] == 0xff) ++#endif ++#ifndef IN6_IS_ADDR_SITELOCAL ++#define IN6_IS_ADDR_SITELOCAL(a) \ ++ ((((__const uint32_t *) (a))[0] & htonl (0xffc00000)) \ ++ == htonl (0xfec00000)) ++#endif ++#ifndef IN6_IS_ADDR_V4COMPAT ++#define IN6_IS_ADDR_V4COMPAT(a) \ ++ ((((__const uint32_t *) (a))[0] == 0) \ ++ && (((__const uint32_t *) (a))[1] == 0) \ ++ && (((__const uint32_t *) (a))[2] == 0) \ ++ && (ntohl (((__const uint32_t *) (a))[3]) > 1)) ++#endif ++#ifndef IN6_IS_ADDR_V4MAPPED ++#define IN6_IS_ADDR_V4MAPPED(a) \ ++ ((((__const uint32_t *) (a))[0] == 0) \ ++ && (((__const uint32_t *) (a))[1] == 0) \ ++ && (((__const uint32_t *) (a))[2] == htonl (0xffff))) ++#endif + /* RFC 4193. */ + #define ARES_IN6_IS_ADDR_ULA(a) (((a)->s6_addr[0] & 0xfe) == 0xfc) + +@@ -205,8 +238,13 @@ + /* + * Find number of matching initial bits between the two addresses a1 and a2. + */ ++#ifndef HAVE_STRUCT_SOCKADDR_IN6 ++static size_t common_prefix_len(const struct ares_in6_addr *a1, ++ const struct ares_in6_addr *a2) ++#else + static size_t common_prefix_len(const struct in6_addr *a1, + const struct in6_addr *a2) ++#endif + { + const unsigned char *p1 = (const unsigned char *)a1; + const unsigned char *p2 = (const unsigned char *)a2; diff --git a/sdk/recipes/patches/libcurl/m5475-atari-mint/config.sub.p b/sdk/recipes/patches/libcurl/m5475-atari-mint/config.sub.p new file mode 100644 index 0000000..a681d0a --- /dev/null +++ b/sdk/recipes/patches/libcurl/m5475-atari-mint/config.sub.p @@ -0,0 +1,11 @@ +--- config.sub.orig 2023-10-01 08:53:00.740777146 +0100 ++++ config.sub 2023-10-01 08:59:22.657161841 +0100 +@@ -1209,7 +1209,7 @@ + | lm32 \ + | loongarch32 | loongarch64 | loongarchx32 \ + | m32c | m32r | m32rle \ +- | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ ++ | m5200 | m5475 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ + | m88110 | m88k | maxq | mb | mcore | mep | metag \ + | microblaze | microblazeel \ diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.c.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.c.p deleted file mode 100644 index 5b6c913..0000000 --- a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.c.p +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/amigaos.c 2014-06-11 18:52:29.000000000 +0100 -+++ lib/amigaos.c 2014-12-20 21:34:06.686013103 +0000 -@@ -22,7 +22,7 @@ - - #include "curl_setup.h" - --#if defined(__AMIGA__) && !defined(__ixemul__) -+#if 0 - - #include <amitcp/socketbasetags.h> - diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.h.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.h.p deleted file mode 100644 index de22d82..0000000 --- a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.amigaos.h.p +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/amigaos.h 2014-06-11 18:52:29.000000000 +0100 -+++ lib/amigaos.h 2014-12-20 21:34:20.390013061 +0000 -@@ -23,7 +23,7 @@ - ***************************************************************************/ - #include "curl_setup.h" - --#if defined(__AMIGA__) && !defined(__ixemul__) -+#if 0 - - bool Curl_amiga_init(); - void Curl_amiga_cleanup(); diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p index c9b9af3..ba595ca 100644 --- a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p +++ b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/lib.curl_setup.h.p @@ -1,10 +1,10 @@ ---- lib/curl_setup.h 2014-08-25 22:45:11.000000000 +0100 -+++ lib/curl_setup.h 2014-12-20 21:35:26.494012868 +0000 -@@ -311,7 +311,6 @@ - # include <exec/execbase.h> - # include <proto/exec.h> - # include <proto/dos.h> --# define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0) - # endif +--- lib/curl_setup.h.orig 2017-10-10 15:19:45.611896396 +0100 ++++ lib/curl_setup.h 2017-10-17 15:42:25.304921197 +0100 +@@ -314,7 +314,6 @@ + * In clib2 arpa/inet.h warns that some prototypes may clash + * with bsdsocket.library. This avoids the definition of those. + */ +-# define __NO_NET_API #endif + #include <stdio.h> diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_getpass.c.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_getpass.c.p deleted file mode 100644 index 7de5cba..0000000 --- a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_getpass.c.p +++ /dev/null @@ -1,13 +0,0 @@ ---- ./tool_getpass.c 2014-06-11 18:52:29.000000000 +0100 -+++ src/tool_getpass.c 2015-01-05 21:42:31.826011647 +0000 -@@ -24,6 +24,10 @@ - #ifndef HAVE_GETPASS_R - /* this file is only for systems without getpass_r() */ - -+#ifdef __AMIGA__ -+#undef HAVE_TERMIOS_H -+#endif -+ - #ifdef HAVE_FCNTL_H - # include <fcntl.h> - #endif diff --git a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p b/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p deleted file mode 100644 index 945f8a5..0000000 --- a/sdk/recipes/patches/libcurl/m68k-unknown-amigaos/src.tool_operate.c.p +++ /dev/null @@ -1,18 +0,0 @@ ---- src/tool_operate.c.orig 2015-02-24 21:49:02.000000000 +0000 -+++ src/tool_operate.c 2015-03-19 22:13:50.477958123 +0000 -@@ -1620,15 +1620,6 @@ - } - } - --#ifdef __AMIGA__ -- if(!result && outs.s_isreg && outs.filename) { -- /* Set the url (up to 80 chars) as comment for the file */ -- if(strlen(url) > 78) -- url[79] = '\0'; -- SetComment(outs.filename, url); -- } --#endif -- - #ifdef HAVE_UTIME - /* File time can only be set _after_ the file has been closed */ - if(!result && config->remote_time && outs.s_isreg && outs.filename) { diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p index 9833c94..384bcd5 100644 --- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p +++ b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.c.p @@ -1,11 +1,12 @@ ---- lib/amigaos.c.old 2012-10-19 21:37:45.000000000 +0100 -+++ lib/amigaos.c 2012-10-19 21:38:09.000000000 +0100 -@@ -22,7 +22,7 @@ - - #include "curl_setup.h" - --#if defined(__AMIGA__) && !defined(__ixemul__) -+#if defined(__AMIGA__) && !(defined(__ixemul__) || defined(__amigaos4__)) - - #include <amitcp/socketbasetags.h> - +--- lib/amigaos.c.orig 2017-10-10 15:19:45.611896396 +0100 ++++ lib/amigaos.c 2017-10-17 15:42:25.304921197 +0100 +@@ -86,7 +86,9 @@ + ULONG enabled = 0; + + SocketBaseTags(SBTM_SETVAL(SBTC_CAN_SHARE_LIBRARY_BASES), TRUE, ++#ifdef SBTC_HAVE_GETHOSTADDR_R_API + SBTM_GETREF(SBTC_HAVE_GETHOSTADDR_R_API), (ULONG)&enabled, ++#endif + TAG_DONE); + + if(enabled) { diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p deleted file mode 100644 index 050bea7..0000000 --- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.amigaos.h.p +++ /dev/null @@ -1,11 +0,0 @@ ---- lib/amigaos.h.old 2012-10-19 21:36:23.000000000 +0100 -+++ lib/amigaos.h 2012-10-19 21:37:26.000000000 +0100 -@@ -23,7 +23,7 @@ - ***************************************************************************/ - #include "curl_setup.h" - --#if defined(__AMIGA__) && !defined(__ixemul__) -+#if defined(__AMIGA__) && !(defined(__ixemul__) || defined(__amigaos4__)) - - bool Curl_amiga_init(); - void Curl_amiga_cleanup(); diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p deleted file mode 100644 index 7e47a50..0000000 --- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.curl_setup.h.p +++ /dev/null @@ -1,23 +0,0 @@ ---- lib/curl_setup.h.old 2012-10-19 21:58:12.000000000 +0100 -+++ lib/curl_setup.h 2012-10-19 21:59:17.000000000 +0100 -@@ -323,11 +323,15 @@ - - #ifdef __AMIGA__ - # ifndef __ixemul__ --# include <exec/types.h> --# include <exec/execbase.h> --# include <proto/exec.h> --# include <proto/dos.h> --# define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0) -+# ifdef __amigaos4__ -+# include <unistd.h> -+# else -+# include <exec/types.h> -+# include <exec/execbase.h> -+# include <proto/exec.h> -+# include <proto/dos.h> -+# define select(a,b,c,d,e) WaitSelect(a,b,c,d,e,0) -+# endif - # endif - #endif - diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p deleted file mode 100644 index 9a2b590..0000000 --- a/sdk/recipes/patches/libcurl/ppc-amigaos/lib.hostip4.c.p +++ /dev/null @@ -1,61 +0,0 @@ ---- lib/hostip4.c 2013-10-23 21:55:34.000000000 +0100 -+++ lib/hostip4.c 2014-01-30 10:19:46.900018967 +0000 -@@ -122,6 +122,11 @@ Curl_addrinfo *Curl_getaddrinfo(struct c - * implying that only threadsafe code and function calls may be used. - * - */ -+#ifdef __amigaos4__ -+#include <proto/exec.h> -+#include <proto/bsdsocket.h> -+#endif -+ - Curl_addrinfo *Curl_ipv4_resolve_r(const char *hostname, - int port) - { -@@ -132,6 +137,9 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const - struct hostent *h = NULL; - struct in_addr in; - struct hostent *buf = NULL; -+#ifdef __amigaos4__ -+ struct SocketIFace *ISocket = NULL; -+#endif - - if(Curl_inet_pton(AF_INET, hostname, &in) > 0) - /* This is a dotted IP address 123.123.123.123-style */ -@@ -294,7 +302,20 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const - * gethostbyname() is the preferred one. - */ - else { -+#ifdef __amigaos4__ -+ struct Library *SocketBase = IExec->OpenLibrary("bsdsocket.library", 4); -+ if (SocketBase) -+ { -+ ISocket = (struct SocketIFace *)IExec->GetInterface(SocketBase, "main", 1, NULL); -+ } -+ -+ if (ISocket) -+ { -+ h = ISocket->gethostbyname((void*)hostname); -+ } -+#else - h = gethostbyname((void*)hostname); -+#endif - #endif /* HAVE_GETADDRINFO_THREADSAFE || HAVE_GETHOSTBYNAME_R */ - } - -@@ -304,7 +325,14 @@ Curl_addrinfo *Curl_ipv4_resolve_r(const - if(buf) /* used a *_r() function */ - free(buf); - } -- -+#ifdef __amigaos4__ -+ if (ISocket) -+ { -+ struct Library *SocketBase = ISocket->Data.LibBase; -+ IExec->DropInterface((struct Interface *)ISocket); -+ IExec->CloseLibrary(SocketBase); -+ } -+#endif - return ai; - } - #endif /* defined(CURLRES_IPV4) && !defined(CURLRES_ARES) */ diff --git a/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p b/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p deleted file mode 100644 index 945f8a5..0000000 --- a/sdk/recipes/patches/libcurl/ppc-amigaos/src.tool_operate.c.p +++ /dev/null @@ -1,18 +0,0 @@ ---- src/tool_operate.c.orig 2015-02-24 21:49:02.000000000 +0000 -+++ src/tool_operate.c 2015-03-19 22:13:50.477958123 +0000 -@@ -1620,15 +1620,6 @@ - } - } - --#ifdef __AMIGA__ -- if(!result && outs.s_isreg && outs.filename) { -- /* Set the url (up to 80 chars) as comment for the file */ -- if(strlen(url) > 78) -- url[79] = '\0'; -- SetComment(outs.filename, url); -- } --#endif -- - #ifdef HAVE_UTIME - /* File time can only be set _after_ the file has been closed */ - if(!result && config->remote_time && outs.s_isreg && outs.filename) { diff --git a/sdk/recipes/patches/libexpat/m5475-atari-mint/conftools.config.sub.p b/sdk/recipes/patches/libexpat/m5475-atari-mint/conftools.config.sub.p new file mode 100644 index 0000000..90e61b1 --- /dev/null +++ b/sdk/recipes/patches/libexpat/m5475-atari-mint/conftools.config.sub.p @@ -0,0 +1,11 @@ +--- conftools/config.sub.orig 2023-10-01 08:53:00.740777146 +0100 ++++ conftools/config.sub 2023-10-01 08:59:22.657161841 +0100 +@@ -1209,7 +1209,7 @@ + | lm32 \ + | loongarch32 | loongarch64 | loongarchx32 \ + | m32c | m32r | m32rle \ +- | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ ++ | m5200 | m5475 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ + | m88110 | m88k | maxq | mb | mcore | mep | metag \ + | microblaze | microblazeel \ diff --git a/sdk/recipes/patches/libexpat/m68k-unknown-amigaos/xmlwf.xmltchar.h.p b/sdk/recipes/patches/libexpat/m68k-unknown-amigaos/xmlwf.xmltchar.h.p new file mode 100644 index 0000000..c9da0e8 --- /dev/null +++ b/sdk/recipes/patches/libexpat/m68k-unknown-amigaos/xmlwf.xmltchar.h.p @@ -0,0 +1,9 @@ +--- xmlwf/xmltchar.h.orig 2017-10-10 15:19:45.611896396 +0100 ++++ xmlwf/xmltchar.h 2017-10-17 15:42:25.304921197 +0100 +@@ -75,5 +75,5 @@ + # define tremove remove + # define tchar char + # define tcstof strtof +-# define tcstoull strtoull ++# define tcstoull strtoul + #endif /* not XML_UNICODE */ diff --git a/sdk/recipes/patches/libiconv/libcharset.lib.localcharset.c.p b/sdk/recipes/patches/libiconv/libcharset.lib.localcharset.c.p index b456c94..3296a6e 100644 --- a/sdk/recipes/patches/libiconv/libcharset.lib.localcharset.c.p +++ b/sdk/recipes/patches/libiconv/libcharset.lib.localcharset.c.p @@ -1,6 +1,6 @@ --- libcharset/lib/localcharset.c.old 2010-12-29 19:12:21.000000000 +0000 +++ libcharset/lib/localcharset.c 2010-12-29 19:12:49.000000000 +0000 -@@ -352,9 +352,6 @@ +@@ -824,9 +824,6 @@ If the canonical name cannot be determined, the result is a non-canonical name. */ diff --git a/sdk/recipes/patches/libiconv/m5475-atari-mint/build-aux.config.sub.p b/sdk/recipes/patches/libiconv/m5475-atari-mint/build-aux.config.sub.p new file mode 100644 index 0000000..9bacbb8 --- /dev/null +++ b/sdk/recipes/patches/libiconv/m5475-atari-mint/build-aux.config.sub.p @@ -0,0 +1,11 @@ +--- build-aux/config.sub.orig 2023-10-01 08:53:00.740777146 +0100 ++++ build-aux/config.sub 2023-10-01 08:59:22.657161841 +0100 +@@ -1209,7 +1209,7 @@ + | lm32 \ + | loongarch32 | loongarch64 | loongarchx32 \ + | m32c | m32r | m32rle \ +- | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ ++ | m5200 | m5475 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ + | m88110 | m88k | maxq | mb | mcore | mep | metag \ + | microblaze | microblazeel \ diff --git a/sdk/recipes/patches/libiconv/m5475-atari-mint/libcharset.build-aux.config.sub.p b/sdk/recipes/patches/libiconv/m5475-atari-mint/libcharset.build-aux.config.sub.p new file mode 100644 index 0000000..d615e13 --- /dev/null +++ b/sdk/recipes/patches/libiconv/m5475-atari-mint/libcharset.build-aux.config.sub.p @@ -0,0 +1,11 @@ +--- libcharset/build-aux/config.sub.orig 2023-10-01 08:53:00.740777146 +0100 ++++ libcharset/build-aux/config.sub 2023-10-01 08:59:22.657161841 +0100 +@@ -1209,7 +1209,7 @@ + | lm32 \ + | loongarch32 | loongarch64 | loongarchx32 \ + | m32c | m32r | m32rle \ +- | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ ++ | m5200 | m5475 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ + | m88110 | m88k | maxq | mb | mcore | mep | metag \ + | microblaze | microblazeel \ diff --git a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p new file mode 100644 index 0000000..ac19b03 --- /dev/null +++ b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.getprogname.c.p @@ -0,0 +1,11 @@ +--- srclib/getprogname.c 2019-04-26 19:29:00.000000000 +0100 ++++ srclib/getprogname.c 2020-03-06 19:32:44.157018596 +0000 +@@ -288,7 +288,7 @@ getprogname (void) + } + return "?"; + # else +-# error "getprogname module not ported to this OS" ++ return ""; /* this is never used for anything important */ + # endif + } + diff --git a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.signal.in.h.p b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.signal.in.h.p index 93ee6a9..0102857 100644 --- a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.signal.in.h.p +++ b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.signal.in.h.p @@ -1,12 +1,12 @@ ---- srclib/signal.in.h.orig 2011-08-07 14:42:06.000000000 +0100 -+++ srclib/signal.in.h 2014-01-15 00:57:27.620548058 +0000 -@@ -168,69 +168,6 @@ - - # endif +--- srclib/signal.in.h 2017-01-01 23:02:22.000000000 +0000 ++++ srclib/signal.in.h 2017-03-26 22:56:18.360017409 +0100 +@@ -223,69 +223,6 @@ typedef int verify_NSIG_constraint[NSIG + # undef sigismember + #endif -/* Test whether a given signal is contained in a signal set. */ -# if @HAVE_POSIX_SIGNALBLOCKING@ --/* This function is defined as a macro on MacOS X. */ +-/* This function is defined as a macro on Mac OS X. */ -# if defined __cplusplus && defined GNULIB_NAMESPACE -# undef sigismember -# endif @@ -19,7 +19,7 @@ - -/* Initialize a signal set to the empty set. */ -# if @HAVE_POSIX_SIGNALBLOCKING@ --/* This function is defined as a macro on MacOS X. */ +-/* This function is defined as a macro on Mac OS X. */ -# if defined __cplusplus && defined GNULIB_NAMESPACE -# undef sigemptyset -# endif @@ -31,7 +31,7 @@ - -/* Add a signal to a signal set. */ -# if @HAVE_POSIX_SIGNALBLOCKING@ --/* This function is defined as a macro on MacOS X. */ +-/* This function is defined as a macro on Mac OS X. */ -# if defined __cplusplus && defined GNULIB_NAMESPACE -# undef sigaddset -# endif @@ -44,7 +44,7 @@ - -/* Remove a signal from a signal set. */ -# if @HAVE_POSIX_SIGNALBLOCKING@ --/* This function is defined as a macro on MacOS X. */ +-/* This function is defined as a macro on Mac OS X. */ -# if defined __cplusplus && defined GNULIB_NAMESPACE -# undef sigdelset -# endif @@ -57,7 +57,7 @@ - -/* Fill a signal set with all possible signals. */ -# if @HAVE_POSIX_SIGNALBLOCKING@ --/* This function is defined as a macro on MacOS X. */ +-/* This function is defined as a macro on Mac OS X. */ -# if defined __cplusplus && defined GNULIB_NAMESPACE -# undef sigfillset -# endif diff --git a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.sigprocmask.c.p b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.sigprocmask.c.p index a811881..fbf554a 100644 --- a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.sigprocmask.c.p +++ b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.sigprocmask.c.p @@ -1,6 +1,6 @@ --- srclib/sigprocmask.c.orig 2011-08-07 14:42:06.000000000 +0100 +++ srclib/sigprocmask.c 2014-01-15 00:59:33.130968152 +0000 -@@ -83,77 +83,6 @@ +@@ -110,77 +110,6 @@ # define signal ext_signal #endif diff --git a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.time.in.h.p b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.time.in.h.p new file mode 100644 index 0000000..0d10bce --- /dev/null +++ b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.time.in.h.p @@ -0,0 +1,11 @@ +--- srclib/time.in.h 2019-01-06 08:51:41.000000000 +0000 ++++ srclib/time.in.h 2020-03-06 19:46:37.429016156 +0000 +@@ -76,7 +76,7 @@ extern "C" { + # define timespec rpl_timespec + struct timespec + { +- time_t tv_sec; ++ time_t tv_secs; + long int tv_nsec; + }; + # define GNULIB_defined_struct_timespec 1 diff --git a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.unistd.in.h.p b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.unistd.in.h.p index eecac92..a70f0b5 100644 --- a/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.unistd.in.h.p +++ b/sdk/recipes/patches/libiconv/m68k-unknown-amigaos/srclib.unistd.in.h.p @@ -1,6 +1,6 @@ ---- srclib/unistd.in.h.orig 2014-01-15 01:06:20.525844246 +0000 -+++ srclib/unistd.in.h 2014-01-15 01:06:48.717471325 +0000 -@@ -1145,40 +1145,6 @@ +--- srclib/unistd.in.h.orig 2017-03-27 23:12:52.149619622 +0100 ++++ srclib/unistd.in.h 2017-03-27 23:13:12.582243962 +0100 +@@ -1873,44 +1873,6 @@ #endif @@ -8,25 +8,29 @@ -/* Read the contents of the symbolic link FILE and place the first BUFSIZE - bytes of it into BUF. Return the number of bytes placed into BUF if - successful, otherwise -1 and errno set. -- See the POSIX:2001 specification -- <http://www.opengroup.org/susv3xsh/readlink.html>. */ +- See the POSIX:2008 specification +- <https://pubs.opengroup.org/onlinepubs/9699919799/functions/readlink.html>. */ -# if @REPLACE_READLINK@ -# if !(defined __cplusplus && defined GNULIB_NAMESPACE) -# define readlink rpl_readlink -# endif -_GL_FUNCDECL_RPL (readlink, ssize_t, -- (const char *file, char *buf, size_t bufsize) +- (const char *restrict file, +- char *restrict buf, size_t bufsize) - _GL_ARG_NONNULL ((1, 2))); -_GL_CXXALIAS_RPL (readlink, ssize_t, -- (const char *file, char *buf, size_t bufsize)); +- (const char *restrict file, +- char *restrict buf, size_t bufsize)); -# else -# if !@HAVE_READLINK@ -_GL_FUNCDECL_SYS (readlink, ssize_t, -- (const char *file, char *buf, size_t bufsize) +- (const char *restrict file, +- char *restrict buf, size_t bufsize) - _GL_ARG_NONNULL ((1, 2))); -# endif -_GL_CXXALIAS_SYS (readlink, ssize_t, -- (const char *file, char *buf, size_t bufsize)); +- (const char *restrict file, +- char *restrict buf, size_t bufsize)); -# endif -_GL_CXXALIASWARN (readlink); -#elif defined GNULIB_POSIXCHECK @@ -39,5 +43,5 @@ - - #if @GNULIB_READLINKAT@ - # if !@HAVE_READLINKAT@ - _GL_FUNCDECL_SYS (readlinkat, ssize_t, + # if @REPLACE_READLINKAT@ + # if !(defined __cplusplus && defined GNULIB_NAMESPACE) diff --git a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.getprogname.c.p b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.getprogname.c.p new file mode 100644 index 0000000..ac19b03 --- /dev/null +++ b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.getprogname.c.p @@ -0,0 +1,11 @@ +--- srclib/getprogname.c 2019-04-26 19:29:00.000000000 +0100 ++++ srclib/getprogname.c 2020-03-06 19:32:44.157018596 +0000 +@@ -288,7 +288,7 @@ getprogname (void) + } + return "?"; + # else +-# error "getprogname module not ported to this OS" ++ return ""; /* this is never used for anything important */ + # endif + } + diff --git a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.signal.in.h.p b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.signal.in.h.p index 93ee6a9..0102857 100644 --- a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.signal.in.h.p +++ b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.signal.in.h.p @@ -1,12 +1,12 @@ ---- srclib/signal.in.h.orig 2011-08-07 14:42:06.000000000 +0100 -+++ srclib/signal.in.h 2014-01-15 00:57:27.620548058 +0000 -@@ -168,69 +168,6 @@ - - # endif +--- srclib/signal.in.h 2017-01-01 23:02:22.000000000 +0000 ++++ srclib/signal.in.h 2017-03-26 22:56:18.360017409 +0100 +@@ -223,69 +223,6 @@ typedef int verify_NSIG_constraint[NSIG + # undef sigismember + #endif -/* Test whether a given signal is contained in a signal set. */ -# if @HAVE_POSIX_SIGNALBLOCKING@ --/* This function is defined as a macro on MacOS X. */ +-/* This function is defined as a macro on Mac OS X. */ -# if defined __cplusplus && defined GNULIB_NAMESPACE -# undef sigismember -# endif @@ -19,7 +19,7 @@ - -/* Initialize a signal set to the empty set. */ -# if @HAVE_POSIX_SIGNALBLOCKING@ --/* This function is defined as a macro on MacOS X. */ +-/* This function is defined as a macro on Mac OS X. */ -# if defined __cplusplus && defined GNULIB_NAMESPACE -# undef sigemptyset -# endif @@ -31,7 +31,7 @@ - -/* Add a signal to a signal set. */ -# if @HAVE_POSIX_SIGNALBLOCKING@ --/* This function is defined as a macro on MacOS X. */ +-/* This function is defined as a macro on Mac OS X. */ -# if defined __cplusplus && defined GNULIB_NAMESPACE -# undef sigaddset -# endif @@ -44,7 +44,7 @@ - -/* Remove a signal from a signal set. */ -# if @HAVE_POSIX_SIGNALBLOCKING@ --/* This function is defined as a macro on MacOS X. */ +-/* This function is defined as a macro on Mac OS X. */ -# if defined __cplusplus && defined GNULIB_NAMESPACE -# undef sigdelset -# endif @@ -57,7 +57,7 @@ - -/* Fill a signal set with all possible signals. */ -# if @HAVE_POSIX_SIGNALBLOCKING@ --/* This function is defined as a macro on MacOS X. */ +-/* This function is defined as a macro on Mac OS X. */ -# if defined __cplusplus && defined GNULIB_NAMESPACE -# undef sigfillset -# endif diff --git a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.sigprocmask.c.p b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.sigprocmask.c.p index a811881..fbf554a 100644 --- a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.sigprocmask.c.p +++ b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.sigprocmask.c.p @@ -1,6 +1,6 @@ --- srclib/sigprocmask.c.orig 2011-08-07 14:42:06.000000000 +0100 +++ srclib/sigprocmask.c 2014-01-15 00:59:33.130968152 +0000 -@@ -83,77 +83,6 @@ +@@ -110,77 +110,6 @@ # define signal ext_signal #endif diff --git a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.unistd.in.h.p b/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.unistd.in.h.p deleted file mode 100644 index eecac92..0000000 --- a/sdk/recipes/patches/libiconv/ppc-amigaos/srclib.unistd.in.h.p +++ /dev/null @@ -1,43 +0,0 @@ ---- srclib/unistd.in.h.orig 2014-01-15 01:06:20.525844246 +0000 -+++ srclib/unistd.in.h 2014-01-15 01:06:48.717471325 +0000 -@@ -1145,40 +1145,6 @@ - #endif - - --#if @GNULIB_READLINK@ --/* Read the contents of the symbolic link FILE and place the first BUFSIZE -- bytes of it into BUF. Return the number of bytes placed into BUF if -- successful, otherwise -1 and errno set. -- See the POSIX:2001 specification -- <http://www.opengroup.org/susv3xsh/readlink.html>. */ --# if @REPLACE_READLINK@ --# if !(defined __cplusplus && defined GNULIB_NAMESPACE) --# define readlink rpl_readlink --# endif --_GL_FUNCDECL_RPL (readlink, ssize_t, -- (const char *file, char *buf, size_t bufsize) -- _GL_ARG_NONNULL ((1, 2))); --_GL_CXXALIAS_RPL (readlink, ssize_t, -- (const char *file, char *buf, size_t bufsize)); --# else --# if !@HAVE_READLINK@ --_GL_FUNCDECL_SYS (readlink, ssize_t, -- (const char *file, char *buf, size_t bufsize) -- _GL_ARG_NONNULL ((1, 2))); --# endif --_GL_CXXALIAS_SYS (readlink, ssize_t, -- (const char *file, char *buf, size_t bufsize)); --# endif --_GL_CXXALIASWARN (readlink); --#elif defined GNULIB_POSIXCHECK --# undef readlink --# if HAVE_RAW_DECL_READLINK --_GL_WARN_ON_USE (readlink, "readlink is unportable - " -- "use gnulib module readlink for portability"); --# endif --#endif -- -- - #if @GNULIB_READLINKAT@ - # if !@HAVE_READLINKAT@ - _GL_FUNCDECL_SYS (readlinkat, ssize_t, diff --git a/sdk/recipes/patches/libjpegturbo/ppc-amigaos/jmemmgr.c.p b/sdk/recipes/patches/libjpegturbo/ppc-amigaos/jmemmgr.c.p deleted file mode 100644 index f0bf615..0000000 --- a/sdk/recipes/patches/libjpegturbo/ppc-amigaos/jmemmgr.c.p +++ /dev/null @@ -1,10 +0,0 @@ ---- jmemmgr.c.old 2016-10-05 22:58:26.559475774 +0000 -+++ jmemmgr.c 2016-10-05 23:00:00.731473878 +0000 -@@ -32,6 +32,7 @@ - #include "jinclude.h" - #include "jpeglib.h" - #include "jmemsys.h" /* import the system-dependent declarations */ -+#include <limits.h> - #include <stdint.h> - - #ifndef NO_GETENV diff --git a/sdk/recipes/patches/libjpegturbo/ppc-amigaos/simd.jsimd_powerpc.c.p b/sdk/recipes/patches/libjpegturbo/ppc-amigaos/simd.jsimd_powerpc.c.p deleted file mode 100644 index 4220c5d..0000000 --- a/sdk/recipes/patches/libjpegturbo/ppc-amigaos/simd.jsimd_powerpc.c.p +++ /dev/null @@ -1,26 +0,0 @@ ---- simd/jsimd_powerpc.c -+++ simd/jsimd_powerpc.c -@@ -14,6 +14,10 @@ - * PowerPC architecture. - */ - -+#ifdef __amigaos4__ -+#include <proto/exec.h> -+#endif -+ - #define JPEG_INTERNALS - #include "../jinclude.h" - #include "../jpeglib.h" -@@ -116,6 +120,11 @@ init_simd (void) - if (bufsize > SOMEWHAT_SANE_PROC_CPUINFO_SIZE_LIMIT) - break; - } -+#elif defined(__amigaos4__) -+ uint32 altivec = 0; -+ IExec->GetCPUInfoTags(GCIT_VectorUnit, &altivec, TAG_DONE); -+ if(altivec == VECTORTYPE_ALTIVEC) -+ simd_support |= JSIMD_ALTIVEC; - #endif - - /* Force different settings through environment variables */ - diff --git a/sdk/recipes/patches/libpng/m5475-atari-mint/config.sub.p b/sdk/recipes/patches/libpng/m5475-atari-mint/config.sub.p new file mode 100644 index 0000000..a681d0a --- /dev/null +++ b/sdk/recipes/patches/libpng/m5475-atari-mint/config.sub.p @@ -0,0 +1,11 @@ +--- config.sub.orig 2023-10-01 08:53:00.740777146 +0100 ++++ config.sub 2023-10-01 08:59:22.657161841 +0100 +@@ -1209,7 +1209,7 @@ + | lm32 \ + | loongarch32 | loongarch64 | loongarchx32 \ + | m32c | m32r | m32rle \ +- | m5200 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ ++ | m5200 | m5475 | m68000 | m680[012346]0 | m68360 | m683?2 | m68k \ + | m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x \ + | m88110 | m88k | maxq | mb | mcore | mep | metag \ + | microblaze | microblazeel \ diff --git a/sdk/recipes/patches/libwebp/configure.ac.p b/sdk/recipes/patches/libwebp/configure.ac.p new file mode 100644 index 0000000..30150d1 --- /dev/null +++ b/sdk/recipes/patches/libwebp/configure.ac.p @@ -0,0 +1,11 @@ +--- configure.ac.orig 2019-07-04 20:32:37.000000000 +0100 ++++ configure.ac 2019-08-26 01:10:45.539132422 +0100 +@@ -485,7 +485,7 @@ + libpng12-config]) + if test -n "$LIBPNG_CONFIG"; then + PNG_INCLUDES=`$LIBPNG_CONFIG --cflags` +- PNG_LIBS="`$LIBPNG_CONFIG --ldflags`" ++ PNG_LIBS="`$LIBPNG_CONFIG --static --ldflags`" + fi + + WITHLIB_OPTION([png], [PNG]) diff --git a/sdk/recipes/patches/libwebp/configure.p b/sdk/recipes/patches/libwebp/configure.p new file mode 100644 index 0000000..02dc813 --- /dev/null +++ b/sdk/recipes/patches/libwebp/configure.p @@ -0,0 +1,11 @@ +--- configure.orig 2019-07-04 20:43:58.000000000 +0100 ++++ configure 2019-08-26 01:11:13.365038420 +0100 +@@ -14312,7 +14312,7 @@ + + if test -n "$LIBPNG_CONFIG"; then + PNG_INCLUDES=`$LIBPNG_CONFIG --cflags` +- PNG_LIBS="`$LIBPNG_CONFIG --ldflags`" ++ PNG_LIBS="`$LIBPNG_CONFIG --static --ldflags`" + fi + + diff --git a/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p new file mode 100644 index 0000000..26bb873 --- /dev/null +++ b/sdk/recipes/patches/openssl/Configurations-50-amigaos.conf.p @@ -0,0 +1,35 @@ +--- /dev/null 2017-10-10 15:19:45.611896396 +0100 ++++ Configurations/50-amigaos.conf 2017-10-17 15:42:25.304921197 +0100 +@@ -0,0 +1,32 @@ ++my %targets = ( ++ ++ "ppc-amigaos" => { ++ inherit_from => [ "BASE_unix" ], ++ cc => "ppc-amigaos-gcc", ++ cflags => picker(default => "-DB_ENDIAN -DTERMIOS -DNO_SYS_UN_H -DNO_SYSLOG", ++ debug => "-O0 -g", ++ release => "-O3 -fomit-frame-pointer", ++ threads("-D_REENTRANT")), ++ thread_scheme => "(unknown)", ++ asm_arch => "ppc32", ++ perlasm_scheme => "linux32", ++ sys_id => "AMIGAOS4", ++ bn_ops => "THIRTY_TWO_BIT BN_LLONG RC4_CHAR", ++ ranlib => "ppc-amigaos-ranlib", ++ }, ++ ++ "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=gnu99", ++ debug => "-O0 -g", ++ release => "-O3 -fomit-frame-pointer", ++ threads("-D_REENTRANT")), ++ thread_scheme => "(unknown)", ++ ex_libs => add("-lm -lnet"), ++ sys_id => "AMIGAOS3", ++ bn_ops => "THIRTY_TWO_BIT BN_LLONG", ++ bn_asm_src => "asm/bn_m68k.s", ++ ranlib => "m68k-unknown-amigaos-ranlib", ++ }, ++); diff --git a/sdk/recipes/patches/openssl/Configurations-50-atari.conf.p b/sdk/recipes/patches/openssl/Configurations-50-atari.conf.p new file mode 100644 index 0000000..d9c51be --- /dev/null +++ b/sdk/recipes/patches/openssl/Configurations-50-atari.conf.p @@ -0,0 +1,45 @@ +--- /dev/null 2018-06-01 10:46:49.956110101 +0200 ++++ Configurations/50-atari.conf 2018-06-03 03:10:55.000000000 +0200 +@@ -0,0 +1,42 @@ ++my %targets = ( ++ "atari-common" => { ++ inherit_from => [ "BASE_unix" ], ++ template => 1, ++ cc => "m68k-atari-mint-gcc", ++ cflags => add_before(picker(default => "-DB_ENDIAN -DTERMIOS -DNO_SYSLOG -DNO_SYS_UN_H -DOPENSSL_USE_IPV6=0 -Wall", ++ debug => "-g -O0", ++ release => "-O3 -fomit-frame-pointer")), ++ sys_id => "MINT", ++ ranlib => "m68k-atari-mint-ranlib", ++# ? bn_ops => "THIRTY_TWO_BIT BN_LLONG", ++ bn_ops => "BN_LLONG", ++# ex_libs => "-lnetwork", ++# perlasm_scheme => "elf", ++ thread_scheme => "(unknown)", ++# dso_scheme => "dlfcn", ++# shared_target => "gnu-shared", ++# shared_cflag => "-fPIC", ++# shared_ldflag => "-shared", ++# shared_extension => ".so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", ++ }, ++ ++ "m68k-atari-mint000" => { ++ inherit_from => [ "atari-common" ], ++# XXX: does it work on 68000? ++# bn_asm_src => "asm/bn_m68k.s", ++ }, ++ ++ "m68k-atari-mint" => { ++ inherit_from => [ "atari-common" ], ++ cflags => add(picker(release => "-m68020-60")), ++ bn_asm_src => "asm/bn_m68k.s", ++ }, ++ ++ "m5475-atari-mint" => { ++ inherit_from => [ "atari-common" ], ++ cc => "m5475-atari-mint-gcc", ++# bn_asm_src => "asm/bn_m68k.s", ++ bn_ops => "BN_LLONG DES_RISC1", ++ ranlib => "m5475-atari-mint-ranlib", ++ }, ++); diff --git a/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p b/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p new file mode 100644 index 0000000..c3f2fe5 --- /dev/null +++ b/sdk/recipes/patches/openssl/Configurations-50-riscos.conf.p @@ -0,0 +1,29 @@ +--- /dev/null 2017-10-10 15:19:45.611896396 +0100 ++++ Configurations/50-riscos.conf 2017-10-17 15:42:25.304921197 +0100 +@@ -0,0 +1,26 @@ ++my %targets = ( ++ ++ "arm-unknown-riscos" => { ++ inherit_from => [ "BASE_unix" ], ++ cc => "arm-unknown-riscos-gcc", ++ cflags => picker(default => "-DL_ENDIAN -DTERMIOS -DNO_SYS_UN_H", ++ debug => "-O0 -g", ++ release => "-O3 ", ++ threads("-D_REENTRANT")), ++ thread_scheme => "(unknown)", ++ sys_id => "RISCOS", ++ bn_ops => "BN_LLONG", ++ }, ++ ++ "arm-riscos-gnueabi" => { ++ inherit_from => [ "BASE_unix" ], ++ cc => "arm-riscos-gnueabi-gcc", ++ cflags => picker(default => "-DL_ENDIAN -DTERMIOS -DNO_SYS_UN_H", ++ debug => "-O0 -g", ++ release => "-O3 ", ++ threads("-D_REENTRANT")), ++ thread_scheme => "(unknown)", ++ sys_id => "RISCOS", ++ bn_ops => "BN_LLONG", ++ }, ++); diff --git a/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p b/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p new file mode 100644 index 0000000..fafa6cf --- /dev/null +++ b/sdk/recipes/patches/openssl/Configurations-50-windows.conf.p @@ -0,0 +1,29 @@ +--- /dev/null 2017-10-10 15:19:45.611896396 +0100 ++++ Configurations/50-windows.conf 2017-10-17 15:42:25.304921197 +0100 +@@ -0,0 +1,26 @@ ++my %targets = ( ++ ++ "i686-w64-mingw32" => { ++ inherit_from => [ "BASE_unix", ++ sub { $disabled{shared} ? () : "x86_uplink" } ], ++ cc => "gcc", ++ cflags => combine(picker(default => "-DL_ENDIAN -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -m32 -Wall", ++ debug => "-g -O0", ++ release => "-O3 -fomit-frame-pointer"), ++ threads("-D_MT")), ++ sys_id => "MINGW32", ++ ex_libs => add("-lws2_32 -lgdi32 -lcrypt32"), ++ bn_ops => "BN_LLONG EXPORT_VAR_AS_FN", ++ thread_scheme => "winthreads", ++ asm_arch => "x86", ++ perlasm_scheme => "coff", ++ dso_scheme => "win32", ++ shared_target => "mingw-shared", ++ shared_cflag => add("-D_WINDLL"), ++ shared_ldflag => "-static-libgcc", ++ shared_rcflag => "--target=pe-i386", ++ shared_extension => ".dll", ++ multilib => "", ++ apps_aux_src => add("win32_init.c"), ++ }, ++); diff --git a/sdk/recipes/patches/openssl/Configure.p b/sdk/recipes/patches/openssl/Configure.p index c54b734..aff7878 100644 --- a/sdk/recipes/patches/openssl/Configure.p +++ b/sdk/recipes/patches/openssl/Configure.p @@ -1,24 +1,11 @@ ---- Configure.old 2010-12-29 02:43:14.000000000 +0000 -+++ Configure 2010-12-29 02:45:29.000000000 +0000 -@@ -440,6 +440,13 @@ - "beos-x86-r5", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lnet:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC -DPIC:-shared:.so", - "beos-x86-bone", "gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -mcpu=pentium -Wall::-D_REENTRANT:BEOS:-lbe -lbind -lsocket:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:beos:beos-shared:-fPIC:-shared:.so", +--- Configure.orig 2017-10-17 14:53:18.369801491 +0100 ++++ Configure 2017-10-17 15:11:04.312242542 +0100 +@@ -1329,6 +1329,8 @@ + $target{cxxflags}//=$target{cflags} if $target{CXX}; + $target{exe_extension}=".exe" if ($config{target} eq "DJGPP"); + $target{exe_extension}=".pm" if ($config{target} =~ /vos/); ++$target{exe_extension}=",e1f" if ($config{target} eq "arm-riscos-gnueabi"); ++$target{exe_extension}=",e1f" if ($config{target} eq "arm-unknown-riscos"); -+"arm-unknown-riscos","arm-unknown-riscos-gcc:-DL_ENDIAN -DTERMIOS -DNO_SYS_UN_H -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG DES_RISC1::::::::::::::::::::echo", -+"m68k-atari-mint","m68k-atari-mint-gcc:-DB_ENDIAN -DTERMIOS -DNO_SYSLOG -DNO_SYS_UN_H -DOPENSSL_USE_IPV6=0 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG DES_RISC1::::::::::::::::::::m68k-atari-mint-ranlib", -+"m5475-atari-mint","m5475-atari-mint-gcc:-DB_ENDIAN -DTERMIOS -DNO_SYSLOG -DNO_SYS_UN_H -DOPENSSL_USE_IPV6=0 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG DES_RISC1::::::::::::::::::::m5475-atari-mint-ranlib", -+"m68k-unknown-amigaos","m68k-unknown-amigaos-gcc:-DB_ENDIAN -DOPENSSL_SYS_AMIGAOS3 -DNO_SYSLOG -DHAVE_FORK=0 -DNO_SYS_PARAM_H -DNO_SYS_UN_H -m68020 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-lnet -lm:BN_LLONG::bn_m68k.o::::::::::::::::::m68k-unknown-amigaos-ranlib", -+"ppc-amigaos","ppc-amigaos-gcc:-DB_ENDIAN -DOPENSSL_SYS_AMIGAOS4 -DNO_SYSLOG -DHAVE_FORK=0 -DNO_SYS_PARAM_H -DNO_SYS_UN_H -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG RC4_CHAR RC4_CHUNK:${ppc32_asm}:linux32::::::ppc-amigaos-ranlib", -+"i686-w64-mingw32", "gcc:-DL_ENDIAN -DWIN32_LEAN_AND_MEAN -fomit-frame-pointer -O3 -march=i486 -Wall::-D_MT:MINGW32:-lws2_32 -lgdi32 -lcrypt32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-mno-cygwin:.dll.a", -+ - #### SCO/Caldera targets. - # - # Originally we had like unixware-*, unixware-*-pentium, unixware-*-p6, etc. -@@ -1123,6 +1130,7 @@ - my $IsMK1MF=scalar grep /^$target$/,@MK1MF_Builds; - - $exe_ext=".exe" if ($target eq "Cygwin" || $target eq "DJGPP" || $target =~ /^mingw/); -+$exe_ext=",e1f" if ($target eq "arm-unknown-riscos"); - $exe_ext=".nlm" if ($target =~ /netware/); - $exe_ext=".pm" if ($target =~ /vos/); - $openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq ""); + # Fill %config with values from %user, and in case those are undefined or + # empty, use values from %target (acting as a default). diff --git a/sdk/recipes/patches/openssl/apps.speed.c.p b/sdk/recipes/patches/openssl/apps.speed.c.p new file mode 100644 index 0000000..132d473 --- /dev/null +++ b/sdk/recipes/patches/openssl/apps.speed.c.p @@ -0,0 +1,34 @@ +--- apps/speed.c.orig 2017-11-21 22:49:00.185608040 +0000 ++++ apps/speed.c 2017-11-21 22:49:21.488219518 +0000 +@@ -62,6 +62,12 @@ + #include "./testdsa.h" + #include <openssl/modes.h> + ++ ++#if defined(OPENSSL_SYS_AMIGAOS3) || defined(OPENSSL_SYS_AMIGAOS4) ++# define HAVE_FORK 0 ++# undef SIGALRM ++#endif ++ + #ifndef HAVE_FORK + # if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_VXWORKS) + # define HAVE_FORK 0 +@@ -186,6 +192,18 @@ + + return ret; + } ++#elif defined(OPENSSL_SYS_AMIGAOS3) || defined(OPENSSL_SYS_AMIGAOS4) ++static void alarm_aos(unsigned int secs) ++{ ++ (void) secs; ++} ++#define alarm alarm_aos ++ ++static double Time_F(int s) ++{ ++ double ret = app_tminterval(s, usertime); ++ return ret; ++} + #else + # error "SIGALRM not defined and the platform is not Windows" + #endif diff --git a/sdk/recipes/patches/openssl/crypto.arm_arch.h.p b/sdk/recipes/patches/openssl/crypto.arm_arch.h.p new file mode 100644 index 0000000..093e4de --- /dev/null +++ b/sdk/recipes/patches/openssl/crypto.arm_arch.h.p @@ -0,0 +1,11 @@ +--- crypto/arm_arch.h 2015-07-09 12:21:24.000000000 +0000 ++++ crypto/arm_arch.h 2015-11-13 13:47:02.386910047 +0000 +@@ -51,6 +51,8 @@ + # define __ARM_ARCH__ 5 + # elif defined(__ARM_ARCH_4__) || defined(__ARM_ARCH_4T__) + # define __ARM_ARCH__ 4 ++# elif defined(__ARM_ARCH_3__) ++# define __ARM_ARCH__ 3 + # else + # error "unsupported ARM architecture" + # endif diff --git a/sdk/recipes/patches/openssl/crypto.bio.bio_local.h.p b/sdk/recipes/patches/openssl/crypto.bio.bio_local.h.p new file mode 100644 index 0000000..e811d8b --- /dev/null +++ b/sdk/recipes/patches/openssl/crypto.bio.bio_local.h.p @@ -0,0 +1,11 @@ +--- crypto/bio/bio_local.h.orig 2017-10-17 16:19:36.908150231 +0100 ++++ crypto/bio/bio_local.h 2017-10-17 16:19:52.056631064 +0100 +@@ -36,7 +36,7 @@ + /* + * Undefine AF_UNIX on systems that define it but don't support it. + */ +-# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_VMS) ++# if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_RISCOS) || defined(OPENSSL_SYS_AMIGAOS3) || defined(OPENSSL_SYS_AMIGAOS4) + # undef AF_UNIX + # endif + diff --git a/sdk/recipes/patches/openssl/crypto.pkcs7.bio_pk7.c.p b/sdk/recipes/patches/openssl/crypto.pkcs7.bio_pk7.c.p new file mode 100644 index 0000000..ac43e2d --- /dev/null +++ b/sdk/recipes/patches/openssl/crypto.pkcs7.bio_pk7.c.p @@ -0,0 +1,15 @@ +--- crypto/pkcs7/bio_pk7.c.orig 2017-11-22 07:58:17.501346816 +0000 ++++ crypto/pkcs7/bio_pk7.c 2017-11-22 08:00:09.130073671 +0000 +@@ -12,7 +12,11 @@ + #include <openssl/bio.h> + + #if !defined(OPENSSL_SYS_VXWORKS) +-# include <memory.h> ++# if !defined(OPENSSL_SYS_AMIGAOS3) && !defined(OPENSSL_SYS_AMIGAOS4) ++# include <memory.h> ++# else ++# include <string.h> ++# endif + #endif + #include <stdio.h> + diff --git a/sdk/recipes/patches/openssl/crypto.rand.rand_unix.c.p b/sdk/recipes/patches/openssl/crypto.rand.rand_unix.c.p new file mode 100644 index 0000000..366cd19 --- /dev/null +++ b/sdk/recipes/patches/openssl/crypto.rand.rand_unix.c.p @@ -0,0 +1,12 @@ +--- providers/implementations/rands/seeding/rand_unix.c.orig 2017-11-22 11:25:03.096636507 +0000 ++++ providers/implementations/rands/seeding/rand_unix.c 2017-11-22 11:25:52.649406308 +0000 +@@ -109,7 +109,8 @@ + + #if !(defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) \ + || defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_VXWORKS) \ +- || defined(OPENSSL_SYS_UEFI)) ++ || defined(OPENSSL_SYS_UEFI) || defined(OPENSSL_SYS_AMIGAOS3) \ ++ || defined(OPENSSL_SYS_AMIGAOS4)) + + # if defined(OPENSSL_SYS_VOS) + diff --git a/sdk/recipes/patches/openssl/e_os.h.p b/sdk/recipes/patches/openssl/e_os.h.p new file mode 100644 index 0000000..07ed97e --- /dev/null +++ b/sdk/recipes/patches/openssl/e_os.h.p @@ -0,0 +1,13 @@ +--- e_os.h.orig 2019-02-13 14:25:17.725058588 +0000 ++++ e_os.h 2019-02-13 14:35:39.790029062 +0000 +@@ -399,6 +399,10 @@ + # ifndef OPENSSL_NO_SECURE_MEMORY + /* unistd.h defines _POSIX_VERSION */ + # if (defined(OPENSSL_SYS_UNIX) \ ++ && !defined(OPENSSL_SYS_RISCOS) \ ++ && !defined(OPENSSL_SYS_AMIGAOS3) \ ++ && !defined(OPENSSL_SYS_AMIGAOS4) \ ++ && !defined(OPENSSL_SYS_MINT) \ + && ( (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) \ + || defined(__sun) || defined(__hpux) || defined(__sgi) \ + || defined(__osf__) )) \ diff --git a/sdk/recipes/patches/openssl/m5475-atari-mint/apps.lib.s_socket.c.p b/sdk/recipes/patches/openssl/m5475-atari-mint/apps.lib.s_socket.c.p new file mode 100644 index 0000000..d659de7 --- /dev/null +++ b/sdk/recipes/patches/openssl/m5475-atari-mint/apps.lib.s_socket.c.p @@ -0,0 +1,12 @@ +--- apps/lib/s_socket.c.orig 2018-06-03 03:19:29.000000000 +0200 ++++ apps/lib/s_socket.c 2018-06-03 03:19:36.000000000 +0200 +@@ -179,7 +179,9 @@ + BIO_ADDRINFO_family(res) == AF_INET6 ? "IPv6 " : + #endif + BIO_ADDRINFO_family(res) == AF_INET ? "IPv4 " : ++#ifdef AF_UNIX + BIO_ADDRINFO_family(res) == AF_UNIX ? "unix " : "", ++#endif + bindhost != NULL ? bindhost : "", + bindport != NULL ? ":" : "", + bindport != NULL ? bindport : ""); diff --git a/sdk/recipes/patches/openssl/m5475-atari-mint/include.internal.sockets.h.p b/sdk/recipes/patches/openssl/m5475-atari-mint/include.internal.sockets.h.p new file mode 100644 index 0000000..5ad3a7b --- /dev/null +++ b/sdk/recipes/patches/openssl/m5475-atari-mint/include.internal.sockets.h.p @@ -0,0 +1,19 @@ +--- include/internal/sockets.h.orig 2018-06-03 03:19:29.000000000 +0200 ++++ include/internal/sockets.h 2018-06-03 03:19:36.000000000 +0200 +@@ -124,6 +124,16 @@ + # define OPENSSL_USE_IPV6 0 + # endif + # endif ++/* ++ * We mean it ++ */ ++# if (OPENSSL_USE_IPV6 == 0) ++# undef AF_INET6 ++# warning undef AF_INET6 ++# undef AF_UNIX ++# warning undef AF_UNIX ++# undef IPV6_V6ONLY ++# endif + + # define get_last_socket_error() errno + # define clear_socket_error() errno=0 diff --git a/sdk/recipes/patches/openssl/m5475-atari-mint/include.openssl.e_os2.h.p b/sdk/recipes/patches/openssl/m5475-atari-mint/include.openssl.e_os2.h.p new file mode 100644 index 0000000..8a47b6b --- /dev/null +++ b/sdk/recipes/patches/openssl/m5475-atari-mint/include.openssl.e_os2.h.p @@ -0,0 +1,14 @@ +--- include/openssl/e_os2.h.orig 2018-06-03 03:39:16.000000000 +0200 ++++ include/openssl/e_os2.h 2018-06-03 03:43:34.000000000 +0200 +@@ -212,6 +212,11 @@ + # endif + # endif + ++# ifdef __MINT__ ++# define ossl_ssize_t int ++# define OSSL_SSIZE_MAX INT_MAX ++# endif ++ + # if defined(OPENSSL_SYS_UEFI) && !defined(ossl_ssize_t) + # define ossl_ssize_t INTN + # define OSSL_SSIZE_MAX MAX_INTN diff --git a/sdk/recipes/patches/openssl/m68k-atari-mint/apps.lib.s_socket.c.p b/sdk/recipes/patches/openssl/m68k-atari-mint/apps.lib.s_socket.c.p new file mode 100644 index 0000000..d659de7 --- /dev/null +++ b/sdk/recipes/patches/openssl/m68k-atari-mint/apps.lib.s_socket.c.p @@ -0,0 +1,12 @@ +--- apps/lib/s_socket.c.orig 2018-06-03 03:19:29.000000000 +0200 ++++ apps/lib/s_socket.c 2018-06-03 03:19:36.000000000 +0200 +@@ -179,7 +179,9 @@ + BIO_ADDRINFO_family(res) == AF_INET6 ? "IPv6 " : + #endif + BIO_ADDRINFO_family(res) == AF_INET ? "IPv4 " : ++#ifdef AF_UNIX + BIO_ADDRINFO_family(res) == AF_UNIX ? "unix " : "", ++#endif + bindhost != NULL ? bindhost : "", + bindport != NULL ? ":" : "", + bindport != NULL ? bindport : ""); diff --git a/sdk/recipes/patches/openssl/m68k-atari-mint/crypto.bn.bn_div.c.p b/sdk/recipes/patches/openssl/m68k-atari-mint/crypto.bn.bn_div.c.p new file mode 100644 index 0000000..0d5492f --- /dev/null +++ b/sdk/recipes/patches/openssl/m68k-atari-mint/crypto.bn.bn_div.c.p @@ -0,0 +1,25 @@ +--- 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/include.internal.sockets.h.p b/sdk/recipes/patches/openssl/m68k-atari-mint/include.internal.sockets.h.p new file mode 100644 index 0000000..5ad3a7b --- /dev/null +++ b/sdk/recipes/patches/openssl/m68k-atari-mint/include.internal.sockets.h.p @@ -0,0 +1,19 @@ +--- include/internal/sockets.h.orig 2018-06-03 03:19:29.000000000 +0200 ++++ include/internal/sockets.h 2018-06-03 03:19:36.000000000 +0200 +@@ -124,6 +124,16 @@ + # define OPENSSL_USE_IPV6 0 + # endif + # endif ++/* ++ * We mean it ++ */ ++# if (OPENSSL_USE_IPV6 == 0) ++# undef AF_INET6 ++# warning undef AF_INET6 ++# undef AF_UNIX ++# warning undef AF_UNIX ++# undef IPV6_V6ONLY ++# endif + + # define get_last_socket_error() errno + # define clear_socket_error() errno=0 diff --git a/sdk/recipes/patches/openssl/m68k-atari-mint/include.openssl.e_os2.h.p b/sdk/recipes/patches/openssl/m68k-atari-mint/include.openssl.e_os2.h.p new file mode 100644 index 0000000..8a47b6b --- /dev/null +++ b/sdk/recipes/patches/openssl/m68k-atari-mint/include.openssl.e_os2.h.p @@ -0,0 +1,14 @@ +--- include/openssl/e_os2.h.orig 2018-06-03 03:39:16.000000000 +0200 ++++ include/openssl/e_os2.h 2018-06-03 03:43:34.000000000 +0200 +@@ -212,6 +212,11 @@ + # endif + # endif + ++# ifdef __MINT__ ++# define ossl_ssize_t int ++# define OSSL_SSIZE_MAX INT_MAX ++# endif ++ + # if defined(OPENSSL_SYS_UEFI) && !defined(ossl_ssize_t) + # define ossl_ssize_t INTN + # define OSSL_SSIZE_MAX MAX_INTN diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p index 947eeca..1e677d2 100644 --- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.apps.c.p @@ -1,6 +1,6 @@ ---- apps.c 2014-10-15 13:53:39.000000000 +0100 -+++ apps/apps.c 2015-01-05 21:02:13.650018727 +0000 -@@ -2872,10 +2872,11 @@ double app_tminterval(int stop, int user +--- apps/lib/apps.c.orig 2014-10-15 13:53:39.000000000 +0100 ++++ apps/lib/apps.c 2015-01-05 21:02:13.650018727 +0000 +@@ -2797,10 +2797,11 @@ double app_tminterval(int stop, int user struct rusage rus; struct timeval now; static struct timeval tmstart; diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.include.http_server.h.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.include.http_server.h.p new file mode 100644 index 0000000..8d9684e --- /dev/null +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/apps.include.http_server.h.p @@ -0,0 +1,11 @@ +--- apps/include/http_server.h.orig 2017-11-21 22:49:00.185608040 +0000 ++++ apps/include/http_server.h 2017-11-21 22:49:21.488219518 +0000 +@@ -27,7 +27,7 @@ + # endif + + # if !defined(NO_FORK) && !defined(OPENSSL_NO_SOCK) \ +- && !defined(OPENSSL_NO_POSIX_IO) ++ && !defined(OPENSSL_NO_POSIX_IO) && !defined(NO_SYSLOG) + # define HTTP_DAEMON + # include <sys/types.h> + # include <sys/wait.h> diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bio.b_sock2.c.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bio.b_sock2.c.p new file mode 100644 index 0000000..93db04c --- /dev/null +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bio.b_sock2.c.p @@ -0,0 +1,34 @@ +--- crypto/bio/bio_sock2.c.orig 2019-02-15 10:07:24.181612545 +0000 ++++ crypto/bio/bio_sock2.c 2019-02-15 10:07:15.637654488 +0000 +@@ -98,6 +98,7 @@ + } + } + ++#if defined(TCP_NODELAY) + if (options & BIO_SOCK_NODELAY) { + if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, + (const void *)&on, sizeof(on)) != 0) { +@@ -107,6 +108,7 @@ + return 0; + } + } ++#endif + + if (connect(sock, BIO_ADDR_sockaddr(addr), + BIO_ADDR_sockaddr_size(addr)) == -1) { +@@ -252,6 +254,7 @@ + } + } + ++#if defined(TCP_NODELAY) + if (options & BIO_SOCK_NODELAY) { + if (setsockopt(sock, IPPROTO_TCP, TCP_NODELAY, + (const void *)&on, sizeof(on)) != 0) { +@@ -261,6 +264,7 @@ + return 0; + } + } ++#endif + + /* On OpenBSD it is always ipv6 only with ipv6 sockets thus read-only */ + # if defined(IPV6_V6ONLY) && !defined(__OpenBSD__) diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.Makefile.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.Makefile.p deleted file mode 100644 index 8d3bfc6..0000000 --- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.Makefile.p +++ /dev/null @@ -1,12 +0,0 @@ ---- crypto/bn/Makefile 2017-01-26 13:22:03.000000000 +0000 -+++ crypto/bn/Makefile 2017-02-11 15:24:31.133017711 +0000 -@@ -60,6 +60,9 @@ lib: $(LIBOBJ) - $(RANLIB) $(LIB) || echo Never mind. - @touch lib - -+bn_m68k.o: asm/bn_m68k.s -+ $(CC) $(CFLAGS) -c -o $@ asm/bn_m68k.s -+ - bn-586.s: asm/bn-586.pl ../perlasm/x86asm.pl - $(PERL) asm/bn-586.pl $(PERLASM_SCHEME) $(CFLAGS) $(PROCESSOR) > $@ - co-586.s: asm/co-586.pl ../perlasm/x86asm.pl diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c.p index 0d5492f..3fa3a53 100644 --- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c.p +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.bn.bn_div.c.p @@ -1,6 +1,6 @@ --- 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 +@@ -194,6 +194,22 @@ int BN_div(BIGNUM *dv, BIGNUM *rem, cons q; \ }) # define REMAINDER_IS_ALREADY_CALCULATED diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.ui.ui_openssl.c.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.ui.ui_openssl.c.p new file mode 100644 index 0000000..3407a48 --- /dev/null +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/crypto.ui.ui_openssl.c.p @@ -0,0 +1,21 @@ +--- crypto/ui/ui_openssl.c.orig 2017-11-23 13:22:15.760078583 +0000 ++++ crypto/ui/ui_openssl.c 2017-11-23 13:21:40.534382076 +0000 +@@ -103,6 +103,18 @@ + # undef SGTTY + # endif + ++# if defined(OPENSSL_SYS_AMIGAOS3) ++# undef TERMIOS ++# undef TERMIO ++# undef SGTTY ++struct termios { int foo; }; ++# define TTY_STRUCT struct termios ++# define TTY_FLAGS foo ++# define TTY_get(tty,data) /* tcgetattr(tty,data) */ -1 ++# define TTY_set(tty,data) /* tcsetattr(tty,TCSANOW,data) */ 0 ++# define ECHO 0 ++# endif ++ + # ifdef TERMIOS + # include <termios.h> + # define TTY_STRUCT struct termios diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p deleted file mode 100644 index 890cef3..0000000 --- a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/no-term.p +++ /dev/null @@ -1,24 +0,0 @@ ---- crypto/ui/ui_openssl.c.orig 2011-03-08 22:37:51.000000000 +0000 -+++ crypto/ui/ui_openssl.c 2011-03-08 22:39:00.000000000 +0000 -@@ -218,6 +218,12 @@ - - #endif - -+#if defined(OPENSSL_SYS_AMIGAOS3) -+#undef TERMIOS -+#undef TERMIO -+#undef SGTTY -+#endif -+ - #ifdef TERMIOS - # include <termios.h> - # define TTY_STRUCT struct termios -@@ -266,7 +272,7 @@ - typedef int sig_atomic_t; - #endif - --#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(MAC_OS_GUSI_SOURCE) || defined(OPENSSL_SYS_NETWARE) -+#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(MAC_OS_GUSI_SOURCE) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_AMIGAOS3) - /* - * This one needs work. As a matter of fact the code is unoperational - * and this is only a trick to get it compiled. diff --git a/sdk/recipes/patches/openssl/m68k-unknown-amigaos/providers.implementations.rands.seeding.build.info.p b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/providers.implementations.rands.seeding.build.info.p new file mode 100644 index 0000000..c887eff --- /dev/null +++ b/sdk/recipes/patches/openssl/m68k-unknown-amigaos/providers.implementations.rands.seeding.build.info.p @@ -0,0 +1,12 @@ +--- providers/implementations/rands/seeding/build.info.orig 2017-11-21 22:49:00.185608040 +0000 ++++ providers/implementations/rands/seeding/build.info 2017-11-21 22:49:21.488219518 +0000 +@@ -5,6 +5,9 @@ + IF[{- $config{target} =~ /vms/i -}] + $COMMON=$COMMON rand_vms.c + ENDIF ++IF[{- $config{target} =~ /amiga/i -}] ++ $COMMON=$COMMON rand_amiga.c ++ENDIF + + SOURCE[../../../libdefault.a]=$COMMON + diff --git a/sdk/recipes/patches/openssl/newlib-no-strtoiumax.p b/sdk/recipes/patches/openssl/newlib-no-strtoiumax.p new file mode 100644 index 0000000..27f6a9d --- /dev/null +++ b/sdk/recipes/patches/openssl/newlib-no-strtoiumax.p @@ -0,0 +1,22 @@ +--- apps/lib/opt.c.orig 2017-10-10 15:19:45.611896396 +0100 ++++ apps/lib/opt.c 2017-10-17 15:42:25.304921197 +0100 +@@ -562,7 +562,7 @@ + + #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L && \ + defined(INTMAX_MAX) && defined(UINTMAX_MAX) && \ +- !defined(OPENSSL_NO_INTTYPES_H) ++ !defined(OPENSSL_NO_INTTYPES_H) && !defined(OPENSSL_SYS_AMIGAOS3) && !defined(OPENSSL_SYS_AMIGAOS4) + + /* Parse an intmax_t, put it into *result; return 0 on failure, else 1. */ + int opt_intmax(const char *value, ossl_intmax_t *result) +--- test/params_conversion_test.c.orig 2017-10-10 15:19:45.611896396 +0100 ++++ test/params_conversion_test.c 2017-10-17 15:42:25.304921197 +0100 +@@ -15,7 +15,7 @@ + /* On machines that dont support <inttypes.h> just disable the tests */ + #if !defined(OPENSSL_NO_INTTYPES_H) + +-# ifdef OPENSSL_SYS_VMS ++# if defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_AMIGAOS3) || defined(OPENSSL_SYS_AMIGAOS4) + # define strtoumax strtoull + # define strtoimax strtoll + # endif diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/apps.include.http_server.h.p b/sdk/recipes/patches/openssl/ppc-amigaos/apps.include.http_server.h.p new file mode 100644 index 0000000..8d9684e --- /dev/null +++ b/sdk/recipes/patches/openssl/ppc-amigaos/apps.include.http_server.h.p @@ -0,0 +1,11 @@ +--- apps/include/http_server.h.orig 2017-11-21 22:49:00.185608040 +0000 ++++ apps/include/http_server.h 2017-11-21 22:49:21.488219518 +0000 +@@ -27,7 +27,7 @@ + # endif + + # if !defined(NO_FORK) && !defined(OPENSSL_NO_SOCK) \ +- && !defined(OPENSSL_NO_POSIX_IO) ++ && !defined(OPENSSL_NO_POSIX_IO) && !defined(NO_SYSLOG) + # define HTTP_DAEMON + # include <sys/types.h> + # include <sys/wait.h> diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/atomics-are-broken.p b/sdk/recipes/patches/openssl/ppc-amigaos/atomics-are-broken.p new file mode 100644 index 0000000..c6abf48 --- /dev/null +++ b/sdk/recipes/patches/openssl/ppc-amigaos/atomics-are-broken.p @@ -0,0 +1,22 @@ +--- include/internal/tsan_assist.h.orig 2017-11-21 22:49:00.185608040 +0000 ++++ include/internal/tsan_assist.h 2017-11-21 22:49:21.488219518 +0000 +@@ -48,7 +48,7 @@ + */ + + #if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L \ +- && !defined(__STDC_NO_ATOMICS__) ++ && !defined(__STDC_NO_ATOMICS__) && !defined(__AMIGA__) + # include <stdatomic.h> + + # if defined(ATOMIC_POINTER_LOCK_FREE) \ +--- include/internal/refcount.h.orig 2017-11-21 22:49:00.185608040 +0000 ++++ include/internal/refcount.h 2017-11-21 22:49:21.488219518 +0000 +@@ -15,7 +15,7 @@ + + # if defined(OPENSSL_THREADS) && !defined(OPENSSL_DEV_NO_ATOMICS) + # if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L \ +- && !defined(__STDC_NO_ATOMICS__) ++ && !defined(__STDC_NO_ATOMICS__) && !defined(__AMIGA__) + # include <stdatomic.h> + # define HAVE_C11_ATOMICS + # endif diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.Makefile.p b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.Makefile.p deleted file mode 100644 index 3a9bf62..0000000 --- a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.Makefile.p +++ /dev/null @@ -1,11 +0,0 @@ ---- crypto/Makefile 2017-01-26 13:22:03.000000000 +0000 -+++ crypto/Makefile 2017-02-08 00:05:03.883009508 +0000 -@@ -71,7 +71,7 @@ uplink-x86.s: $(TOP)/ms/uplink-x86.pl - - x86_64cpuid.s: x86_64cpuid.pl; $(PERL) x86_64cpuid.pl $(PERLASM_SCHEME) > $@ - ia64cpuid.s: ia64cpuid.S; $(CC) $(CFLAGS) -E ia64cpuid.S > $@ --ppccpuid.s: ppccpuid.pl; $(PERL) ppccpuid.pl $(PERLASM_SCHEME) $@ -+ppccpuid.s: ppccpuid.pl; $(PERL) ppccpuid.pl $(PERLASM_SCHEME) > $@ - pariscid.s: pariscid.pl; $(PERL) pariscid.pl $(PERLASM_SCHEME) $@ - alphacpuid.s: alphacpuid.pl - (preproc=$$$$.$@.S; trap "rm $$preproc" INT; \ diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.bio_b_addr.c.p b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.bio_b_addr.c.p new file mode 100644 index 0000000..ac14e86 --- /dev/null +++ b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.bio_b_addr.c.p @@ -0,0 +1,11 @@ +--- crypto/bio/bio_addr.c.orig 2017-11-21 22:49:00.185608040 +0000 ++++ crypto/bio/bio_addr.c 2017-11-21 22:49:21.488219518 +0000 +@@ -910,7 +910,7 @@ + addrlistp++) + ; + +- for(addresses = addrlistp - he->h_addr_list; ++ for(addresses = addrlistp - (char **)he->h_addr_list; + addrlistp--, addresses-- > 0; ) { + if (!addrinfo_wrap(he->h_addrtype, socktype, + *addrlistp, he->h_length, diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.ppccap.c.p b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.ppccap.c.p index eaaab73..46d6213 100644 --- a/sdk/recipes/patches/openssl/ppc-amigaos/crypto.ppccap.c.p +++ b/sdk/recipes/patches/openssl/ppc-amigaos/crypto.ppccap.c.p @@ -1,17 +1,19 @@ ---- crypto/ppccap.c 2017-01-26 13:22:03.000000000 +0000 -+++ crypto/ppccap.c 2017-02-08 17:48:09.982015412 +0000 -@@ -73,6 +73,7 @@ void sha512_block_data_order(void *ctx, - sha512_block_ppc(ctx, inp, len); - } +--- crypto/ppccap.c.orig 2017-11-22 13:14:44.655536374 +0000 ++++ crypto/ppccap.c 2017-11-22 13:16:03.666387174 +0000 +@@ -34,6 +34,8 @@ + + static sigset_t all_masked; +#ifndef OPENSSL_SYS_AMIGAOS4 ++ static sigjmp_buf ill_jmp; static void ill_handler(int sig) { -@@ -157,3 +158,24 @@ void OPENSSL_cpuid_setup(void) +@@ -309,3 +311,29 @@ sigaction(SIGILL, &ill_oact, NULL); sigprocmask(SIG_SETMASK, &oset, NULL); } ++ +#else +#include <proto/exec.h> +void OPENSSL_cpuid_setup(void) @@ -20,7 +22,7 @@ + + IExec->GetCPUInfoTags(GCIT_Family, &family, GCIT_VectorUnit, &vec, TAG_DONE); + -+ OPENSSL_ppccap_P = 0; //PPC_FPU ++ OPENSSL_ppccap_P = PPC_FPU; + + if((family == CPUFAMILY_PA6T) || (family == CPUFAMILY_E5500)) + OPENSSL_ppccap_P |= PPC_FPU64; @@ -31,5 +33,9 @@ + OPENSSL_ppccap_P |= PPC_ALTIVEC; + } +} -+#endif + ++uint32_t OPENSSL_rdtsc(void) ++{ ++ return 0; ++} ++#endif diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p b/sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p deleted file mode 100644 index 4da5a6d..0000000 --- a/sdk/recipes/patches/openssl/ppc-amigaos/memory.h.p +++ /dev/null @@ -1,22 +0,0 @@ ---- crypto/jpake/jpake.c.orig 2011-03-08 22:19:36.000000000 +0000 -+++ crypto/jpake/jpake.c 2011-03-08 22:19:49.000000000 +0000 -@@ -3,7 +3,7 @@ - #include <openssl/crypto.h> - #include <openssl/sha.h> - #include <openssl/err.h> --#include <memory.h> -+#include <string.h> - - /* - * In the definition, (xa, xb, xc, xd) are Alice's (x1, x2, x3, x4) or ---- crypto/pkcs7/bio_pk7.c.orig 2011-03-08 22:21:16.000000000 +0000 -+++ crypto/pkcs7/bio_pk7.c 2011-03-08 22:21:23.000000000 +0000 -@@ -58,7 +58,7 @@ - #include <openssl/bio.h> - - #if !defined(OPENSSL_SYSNAME_NETWARE) && !defined(OPENSSL_SYSNAME_VXWORKS) --# include <memory.h> -+# include <string.h> - #endif - #include <stdio.h> - diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/no-alarm.p b/sdk/recipes/patches/openssl/ppc-amigaos/no-alarm.p deleted file mode 100644 index 1a287b1..0000000 --- a/sdk/recipes/patches/openssl/ppc-amigaos/no-alarm.p +++ /dev/null @@ -1,13 +0,0 @@ ---- apps/speed.c.orig 2011-03-08 22:44:56.000000000 +0000 -+++ apps/speed.c 2011-03-08 22:48:10.000000000 +0000 -@@ -225,6 +225,10 @@ - # define NO_FORK - # endif - -+# ifdef OPENSSL_SYS_AMIGAOS4 -+# undef SIGALRM -+# endif -+ - # undef BUFSIZE - # define BUFSIZE ((long)1024*8+1) - static volatile int run = 0; diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/no-term.p b/sdk/recipes/patches/openssl/ppc-amigaos/no-term.p deleted file mode 100644 index d8d4d1c..0000000 --- a/sdk/recipes/patches/openssl/ppc-amigaos/no-term.p +++ /dev/null @@ -1,24 +0,0 @@ ---- crypto/ui/ui_openssl.c.orig 2011-03-08 22:37:51.000000000 +0000 -+++ crypto/ui/ui_openssl.c 2011-03-08 22:39:00.000000000 +0000 -@@ -218,6 +218,12 @@ - - #endif - -+#if defined(OPENSSL_SYS_AMIGAOS4) -+#undef TERMIOS -+#undef TERMIO -+#undef SGTTY -+#endif -+ - #ifdef TERMIOS - # include <termios.h> - # define TTY_STRUCT struct termios -@@ -266,7 +272,7 @@ - typedef int sig_atomic_t; - #endif - --#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(MAC_OS_GUSI_SOURCE) || defined(OPENSSL_SYS_NETWARE) -+#if defined(OPENSSL_SYS_MACINTOSH_CLASSIC) || defined(MAC_OS_GUSI_SOURCE) || defined(OPENSSL_SYS_NETWARE) || defined(OPENSSL_SYS_AMIGAOS4) - /* - * This one needs work. As a matter of fact the code is unoperational - * and this is only a trick to get it compiled. diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/providers.implementations.rands.seeding.build.info.p b/sdk/recipes/patches/openssl/ppc-amigaos/providers.implementations.rands.seeding.build.info.p new file mode 100644 index 0000000..c887eff --- /dev/null +++ b/sdk/recipes/patches/openssl/ppc-amigaos/providers.implementations.rands.seeding.build.info.p @@ -0,0 +1,12 @@ +--- providers/implementations/rands/seeding/build.info.orig 2017-11-21 22:49:00.185608040 +0000 ++++ providers/implementations/rands/seeding/build.info 2017-11-21 22:49:21.488219518 +0000 +@@ -5,6 +5,9 @@ + IF[{- $config{target} =~ /vms/i -}] + $COMMON=$COMMON rand_vms.c + ENDIF ++IF[{- $config{target} =~ /amiga/i -}] ++ $COMMON=$COMMON rand_amiga.c ++ENDIF + + SOURCE[../../../libdefault.a]=$COMMON + diff --git a/sdk/recipes/patches/openssl/ppc-amigaos/test.rsa_complex.c.p b/sdk/recipes/patches/openssl/ppc-amigaos/test.rsa_complex.c.p new file mode 100644 index 0000000..969062b --- /dev/null +++ b/sdk/recipes/patches/openssl/ppc-amigaos/test.rsa_complex.c.p @@ -0,0 +1,14 @@ +--- test/rsa_complex.c.orig 2019-02-14 10:16:06.665734720 +0000 ++++ test/rsa_complex.c 2019-02-14 10:16:18.581682332 +0000 +@@ -16,11 +16,6 @@ + */ + + #if !defined(__DJGPP__) +-# if defined(__STDC_VERSION__) +-# if __STDC_VERSION__ >= 199901L +-# include <complex.h> +-# endif +-# endif + # include <openssl/rsa.h> + #endif + #include <stdlib.h> diff --git a/sdk/recipes/patches/openssl/test.drbgtest.c.p b/sdk/recipes/patches/openssl/test.drbgtest.c.p new file mode 100644 index 0000000..ecf3e81 --- /dev/null +++ b/sdk/recipes/patches/openssl/test.drbgtest.c.p @@ -0,0 +1,20 @@ +--- test/drbgtest.c.orig 2017-10-10 15:19:45.611896396 +0100 ++++ test/drbgtest.c 2017-10-17 15:42:25.304921197 +0100 +@@ -277,7 +277,7 @@ + } + + +-#if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_RAND_SEED_EGD) ++#if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_RAND_SEED_EGD) && !defined(OPENSSL_SYS_AMIGAOS3) && !defined(OPENSSL_SYS_AMIGAOS4) + /* number of children to fork */ + #define DRBG_FORK_COUNT 9 + /* two results per child, two for the parent */ +@@ -895,7 +895,7 @@ + int setup_tests(void) + { + ADD_TEST(test_rand_reseed); +-#if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_RAND_SEED_EGD) ++#if defined(OPENSSL_SYS_UNIX) && !defined(OPENSSL_RAND_SEED_EGD) && !defined(OPENSSL_SYS_AMIGAOS3) && !defined(OPENSSL_SYS_AMIGAOS4) + ADD_ALL_TESTS(test_rand_fork_safety, RANDOM_SIZE); + #endif + ADD_TEST(test_rand_prediction_resistance); diff --git a/sdk/recipes/patches/windom/src.globals.h.p b/sdk/recipes/patches/windom/src.globals.h.p new file mode 100644 index 0000000..34a7901 --- /dev/null +++ b/sdk/recipes/patches/windom/src.globals.h.p @@ -0,0 +1,19 @@ +--- src/globals.h.orig 2023-10-01 03:02:16.247962097 +0100 ++++ src/globals.h 2023-10-01 03:03:20.403979699 +0100 +@@ -806,6 +806,8 @@ + RSC header and support struct + *******************************************************************************/ + ++#ifndef __RSXHDR ++#define __RSXHDR + typedef struct { /* fichier ressource tendu */ + UWORD rsh_vrsn; /* should be 3 */ + UWORD rsh_extvrsn; /* not used, initialised to 'IN' for Interface */ +@@ -827,6 +829,7 @@ + ULONG rsh_nimages; + ULONG rsh_rssize; /* total bytes in resource */ + } RSXHDR; ++#endif + + typedef struct { + unsigned long rlen; diff --git a/sdk/recipes/patches/zlib/arm-riscos-gnueabi/configure.p b/sdk/recipes/patches/zlib/arm-riscos-gnueabi/configure.p new file mode 100644 index 0000000..24d7a7e --- /dev/null +++ b/sdk/recipes/patches/zlib/arm-riscos-gnueabi/configure.p @@ -0,0 +1,42 @@ +--- configure.orig 2012-05-02 05:17:08.000000000 +0100 ++++ configure 2012-07-17 17:57:01.000000000 +0100 +@@ -423,18 +423,18 @@ + echo >> configure.log + + # check for large file support, and if none, check for fseeko() +-cat > $test.c <<EOF +-#include <sys/types.h> +-off64_t dummy = 0; +-EOF +-if try $CC -c $CFLAGS -D_LARGEFILE64_SOURCE=1 $test.c; then +- CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE=1" +- SFLAGS="${SFLAGS} -D_LARGEFILE64_SOURCE=1" +- ALL="${ALL} all64" +- TEST="${TEST} test64" +- echo "Checking for off64_t... Yes." | tee -a configure.log +- echo "Checking for fseeko... Yes." | tee -a configure.log +-else ++#cat > $test.c <<EOF ++##include <sys/types.h> ++#off64_t dummy = 0; ++#EOF ++#if try $CC -c $CFLAGS -D_LARGEFILE64_SOURCE=1 $test.c; then ++# CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE=1" ++# SFLAGS="${SFLAGS} -D_LARGEFILE64_SOURCE=1" ++# ALL="${ALL} all64" ++# TEST="${TEST} test64" ++# echo "Checking for off64_t... Yes." | tee -a configure.log ++# echo "Checking for fseeko... Yes." | tee -a configure.log ++#else + echo "Checking for off64_t... No." | tee -a configure.log + echo >> configure.log + cat > $test.c <<EOF +@@ -451,7 +451,7 @@ + SFLAGS="${SFLAGS} -DNO_FSEEKO" + echo "Checking for fseeko... No." | tee -a configure.log + fi +-fi ++##fi + + echo >> configure.log + diff --git a/x86_64-w64-mingw32/Makefile b/x86_64-w64-mingw32/Makefile index c81cebd..154be8f 100644 --- a/x86_64-w64-mingw32/Makefile +++ b/x86_64-w64-mingw32/Makefile @@ -2,28 +2,27 @@ # mingw toolchain -UPSTREAM_GCC_VERSION := 4.8.4 -UPSTREAM_GCC_TARBALL := gcc-$(UPSTREAM_GCC_VERSION).tar.bz2 +UPSTREAM_GCC_VERSION := 12.2.0 +UPSTREAM_GCC_TARBALL := gcc-$(UPSTREAM_GCC_VERSION).tar.xz UPSTREAM_GCC_URI := http://ftpmirror.gnu.org/gcc/gcc-$(UPSTREAM_GCC_VERSION)/$(UPSTREAM_GCC_TARBALL) -UPSTREAM_BINUTILS_VERSION := 2.25 +UPSTREAM_BINUTILS_VERSION := 2.39 UPSTREAM_BINUTILS_TARBALL := binutils-$(UPSTREAM_BINUTILS_VERSION).tar.bz2 UPSTREAM_BINUTILS_URI := http://ftpmirror.gnu.org/binutils/$(UPSTREAM_BINUTILS_TARBALL) -UPSTREAM_GMP_VERSION := 4.3.2 +UPSTREAM_GMP_VERSION := 6.2.1 UPSTREAM_GMP_TARBALL := gmp-$(UPSTREAM_GMP_VERSION).tar.bz2 UPSTREAM_GMP_URI := http://ftp.gnu.org/gnu/gmp/$(UPSTREAM_GMP_TARBALL) -# Would use 3.0.0, but that dislikes in-tree gmp sources -UPSTREAM_MPFR_VERSION := 2.4.2 -UPSTREAM_MPFR_TARBALL := mpfr-$(UPSTREAM_MPFR_VERSION).tar.bz2 +UPSTREAM_MPFR_VERSION := 4.2.0 +UPSTREAM_MPFR_TARBALL := mpfr-$(UPSTREAM_MPFR_VERSION).tar.xz UPSTREAM_MPFR_URI := http://www.mpfr.org/mpfr-$(UPSTREAM_MPFR_VERSION)/$(UPSTREAM_MPFR_TARBALL) -UPSTREAM_MPC_VERSION := 0.8.2 +UPSTREAM_MPC_VERSION := 1.3.0 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_MINGW_VERSION := 3.3.0 +UPSTREAM_MINGW_VERSION := 10.0.0 UPSTREAM_MINGW_TARBALL := mingw-w64-v$(UPSTREAM_MINGW_VERSION).tar.bz2 UPSTREAM_MINGW_URI := "http://downloads.sourceforge.net/project/mingw-w64/mingw-w64/mingw-w64-release/$(UPSTREAM_MINGW_TARBALL)?r=http%3A%2F%2Fmingw-w64.sourceforge.net%2Fdownload.php&ts=1426088797&use_mirror=cznic" @@ -62,7 +61,7 @@ $(BUILDSTEPS)/gcc-core.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/binutils.d --prefix=$(PREFIX) --target=$(TARGET_NAME) \ --enable-languages=c,c++ --with-system-zlib --disable-multilib \ --enable-shared --enable-fully-dynamic-string - cd $(BUILDDIR)/gcc && PATH="$(PREFIX)/bin:$(PATH)" make all-gcc -j 4 + cd $(BUILDDIR)/gcc && PATH="$(PREFIX)/bin:$(PATH)" make all-gcc -j 8 cd $(BUILDDIR)/gcc && PATH="$(PREFIX)/bin:$(PATH)" make install-gcc touch $@ @@ -172,4 +171,4 @@ $(SOURCESDIR): mkdir -p $(SOURCESDIR) $(SRCDIR): - mkdir -p $(SRCDIR)
\ No newline at end of file + mkdir -p $(SRCDIR) |