iiiypuk/buildroot
1
0
Fork 0
mirror of https://github.com/MiyooCFW/buildroot.git synced 2025-09-27 22:24:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge from bittboy/buildroot@a449d16

Browse Source
This commit is contained in:
TriForceX
2021-10-07 19:21:30 -03:00
parent b3ecc6e32d
commit 5ce34ced3d
21 changed files with 1394 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

424
.config
View File

@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
# Buildroot 2020.08-853-g06eb11e03f-dirty Configuration
# Buildroot -g26c91a9790-dirty Configuration
#
BR2_HAVE_DOT_CONFIG=y
BR2_HOST_GCC_AT_LEAST_4_9=y
@@ -183,9 +183,7 @@ BR2_STRIP_EXCLUDE_DIRS=""
# BR2_OPTIMIZE_1 is not set
# BR2_OPTIMIZE_2 is not set
# BR2_OPTIMIZE_3 is not set
# BR2_OPTIMIZE_G is not set
# BR2_OPTIMIZE_S is not set
BR2_OPTIMIZE_FAST=y
BR2_OPTIMIZE_S=y
BR2_STATIC_LIBS=y
# BR2_SHARED_LIBS is not set
# BR2_SHARED_STATIC_LIBS is not set
@@ -197,7 +195,6 @@ BR2_GLOBAL_PATCH_DIR=""
#
BR2_COMPILER_PARANOID_UNSAFE_PATH=y
# BR2_FORCE_HOST_BUILD is not set
# BR2_REPRODUCIBLE is not set
# BR2_PER_PACKAGE_DIRECTORIES is not set
#
@@ -205,7 +202,6 @@ BR2_COMPILER_PARANOID_UNSAFE_PATH=y
#
BR2_SSP_NONE=y
# BR2_SSP_REGULAR is not set
# BR2_SSP_STRONG is not set
# BR2_SSP_ALL is not set
#
@@ -270,14 +266,19 @@ BR2_BINUTILS_EXTRA_CONFIG_OPTIONS=""
#
# BR2_GCC_VERSION_8_X is not set
# BR2_GCC_VERSION_9_X is not set
BR2_GCC_VERSION_10_X=y
BR2_GCC_VERSION="10.2.0"
# BR2_GCC_VERSION_10_X is not set
BR2_GCC_VERSION_11_X=y
BR2_GCC_SUPPORTS_LIBCILKRTS=y
BR2_GCC_VERSION="11.2.0"
BR2_EXTRA_GCC_CONFIG_OPTIONS=""
BR2_TOOLCHAIN_BUILDROOT_CXX=y
# BR2_TOOLCHAIN_BUILDROOT_FORTRAN is not set
BR2_GCC_ENABLE_LTO=y
# BR2_GCC_ENABLE_OPENMP is not set
# BR2_GCC_ENABLE_GRAPHITE is not set
#
# graphite support needs gcc >= 5.x
#
BR2_PACKAGE_HOST_GDB_ARCH_SUPPORTS=y
#
@@ -289,6 +290,7 @@ BR2_PACKAGE_HOST_GDB_ARCH_SUPPORTS=y
# Toolchain Generic Options
#
BR2_TOOLCHAIN_SUPPORTS_VARIADIC_MI_THUNK=y
BR2_TOOLCHAIN_HAS_GCC_BUG_64735=y
BR2_USE_WCHAR=y
BR2_ENABLE_LOCALE=y
BR2_INSTALL_LIBSTDCPP=y
@@ -296,7 +298,6 @@ BR2_TOOLCHAIN_HAS_THREADS=y
BR2_TOOLCHAIN_HAS_THREADS_DEBUG=y
BR2_TOOLCHAIN_HAS_THREADS_NPTL=y
BR2_TOOLCHAIN_HAS_SSP=y
BR2_TOOLCHAIN_HAS_SSP_STRONG=y
BR2_TOOLCHAIN_HAS_UCONTEXT=y
BR2_USE_MMU=y
BR2_TARGET_OPTIMIZATION="-fno-PIC -march=armv5te -mtune=arm926ej-s"
@@ -338,26 +339,9 @@ BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_12=y
BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_13=y
BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_14=y
BR2_TOOLCHAIN_HEADERS_AT_LEAST="4.14"
BR2_TOOLCHAIN_GCC_AT_LEAST_4_3=y
BR2_TOOLCHAIN_GCC_AT_LEAST_4_4=y
BR2_TOOLCHAIN_GCC_AT_LEAST_4_5=y
BR2_TOOLCHAIN_GCC_AT_LEAST_4_6=y
BR2_TOOLCHAIN_GCC_AT_LEAST_4_7=y
BR2_TOOLCHAIN_GCC_AT_LEAST_4_8=y
BR2_TOOLCHAIN_GCC_AT_LEAST_4_9=y
BR2_TOOLCHAIN_GCC_AT_LEAST_5=y
BR2_TOOLCHAIN_GCC_AT_LEAST_6=y
BR2_TOOLCHAIN_GCC_AT_LEAST_7=y
BR2_TOOLCHAIN_GCC_AT_LEAST_8=y
BR2_TOOLCHAIN_GCC_AT_LEAST_9=y
BR2_TOOLCHAIN_GCC_AT_LEAST_10=y
BR2_TOOLCHAIN_GCC_AT_LEAST="10"
BR2_TOOLCHAIN_HAS_MNAN_OPTION=y
BR2_TOOLCHAIN_HAS_SYNC_1=y
BR2_TOOLCHAIN_HAS_SYNC_2=y
BR2_TOOLCHAIN_HAS_SYNC_4=y
BR2_TOOLCHAIN_HAS_LIBATOMIC=y
BR2_TOOLCHAIN_HAS_ATOMIC=y
#
# System configuration
@@ -548,13 +532,18 @@ BR2_PACKAGE_KODI_ARCH_SUPPORTS=y
# BR2_PACKAGE_MJPEGTOOLS is not set
# BR2_PACKAGE_MODPLUGTOOLS is not set
# BR2_PACKAGE_MOTION is not set
# BR2_PACKAGE_MPD is not set
#
# mpd needs a toolchain not affected by GCC bug 64735
#
# BR2_PACKAGE_MPD_MPC is not set
BR2_PACKAGE_MPG123=y
# BR2_PACKAGE_MPV is not set
# BR2_PACKAGE_MULTICAT is not set
# BR2_PACKAGE_MUSEPACK is not set
# BR2_PACKAGE_NCMPC is not set
#
# ncmpc needs a toolchain w/ C++, wchar, threads, gcc >= 7
#
#
# omxplayer needs rpi-userland and a toolchain w/ C++, threads, wchar, dynamic library
@@ -580,7 +569,10 @@ BR2_PACKAGE_PULSEAUDIO_HAS_ATOMIC=y
#
# BR2_PACKAGE_TWOLAME is not set
# BR2_PACKAGE_UDPXY is not set
# BR2_PACKAGE_UPMPDCLI is not set
#
# upmpdcli needs a toolchain w/ C++, NPTL, gcc >= 4.9
#
#
# v4l2grab needs a toolchain w/ threads, dynamic library, C++ and headers >= 3.0
@@ -653,7 +645,10 @@ BR2_PACKAGE_BZIP2=y
# fio needs a toolchain w/ dynamic library, threads
#
BR2_PACKAGE_GDB_ARCH_SUPPORTS=y
# BR2_PACKAGE_GDB is not set
#
# gdb/gdbserver >= 8.x needs a toolchain w/ C++, gcc >= 4.8
#
BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS=y
#
@@ -748,7 +743,14 @@ BR2_PACKAGE_CMAKE_ARCH_SUPPORTS=y
# BR2_PACKAGE_GETTEXT is not set
BR2_PACKAGE_PROVIDES_HOST_GETTEXT="host-gettext-tiny"
# BR2_PACKAGE_GIT is not set
# BR2_PACKAGE_GIT_CRYPT is not set
#
# git-crypt needs a toolchain w/ C++, gcc >= 4.9
#
#
# git-crypt needs a toolchain not affected by GCC bug 64735
#
# BR2_PACKAGE_GPERF is not set
# BR2_PACKAGE_JO is not set
# BR2_PACKAGE_JQ is not set
@@ -888,7 +890,7 @@ BR2_PACKAGE_PROVIDES_HOST_GETTEXT="host-gettext-tiny"
# BR2_PACKAGE_LTRIS is not set
#
# minetest needs X11 and an OpenGL provider
# minetest needs a toolchain w/ C++, gcc >= 4.9, threads
#
# BR2_PACKAGE_OPENTYRIAN is not set
# BR2_PACKAGE_PRBOOM is not set
@@ -902,6 +904,10 @@ BR2_PACKAGE_PROVIDES_HOST_GETTEXT="host-gettext-tiny"
# stella needs a toolchain w/ dynamic library, C++, threads, gcc >= 6
#
#
# stella needs a toolchain not affected by GCC bug 64735
#
#
# Graphic libraries and applications (graphic/text)
#
@@ -928,7 +934,7 @@ BR2_PACKAGE_PROVIDES_HOST_GETTEXT="host-gettext-tiny"
# BR2_PACKAGE_GHOSTSCRIPT is not set
#
# glmark2 needs an OpenGL or an openGL ES and EGL backend
# glmark2 needs a toolchain w/ C++, gcc >= 4.9
#
#
@@ -1061,6 +1067,10 @@ BR2_PACKAGE_QT5_JSCORE_AVAILABLE=y
# rdesktop needs a toolchain w/ wchar, dynamic library
#
#
# vte needs a toolchain w/ wchar, threads, C++, gcc >= 4.8
#
#
# vte needs an OpenGL or an OpenGL-EGL/wayland backend
#
@@ -1148,7 +1158,6 @@ BR2_PACKAGE_QT5_JSCORE_AVAILABLE=y
# BR2_PACKAGE_DUMP1090 is not set
# BR2_PACKAGE_DVB_APPS is not set
# BR2_PACKAGE_DVBSNOOP is not set
# BR2_PACKAGE_EDID_DECODE is not set
#
# edid-decode needs a toolchain w/ C++, gcc >= 4.7
@@ -1193,7 +1202,10 @@ BR2_PACKAGE_FLASHROM_ARCH_SUPPORTS=y
# BR2_PACKAGE_IOSTAT is not set
# BR2_PACKAGE_IPMITOOL is not set
# BR2_PACKAGE_IRDA_UTILS is not set
# BR2_PACKAGE_KBD is not set
#
# kbd needs a toolchain w/ gcc >= 4.9
#
#
# lcdproc needs a toolchain w/ dynamic library
@@ -1307,7 +1319,10 @@ BR2_PACKAGE_FLASHROM_ARCH_SUPPORTS=y
#
# BR2_PACKAGE_SDPARM is not set
BR2_PACKAGE_SEDUTIL_ARCH_SUPPORTS=y
# BR2_PACKAGE_SEDUTIL is not set
#
# sedutil needs a toolchain w/ C++, gcc >= 4.8, headers >= 3.12
#
# BR2_PACKAGE_SETSERIAL is not set
# BR2_PACKAGE_SG3_UTILS is not set
@@ -1497,7 +1512,14 @@ BR2_PACKAGE_ALSA_LIB_SEQ=y
BR2_PACKAGE_ALSA_LIB_UCM=y
BR2_PACKAGE_ALSA_LIB_ALISP=y
BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS=y
# BR2_PACKAGE_ALURE is not set
#
# alure needs a toolchain w/ C++, gcc >= 4.9, NPTL, wchar
#
#
# alure needs a toolchain not affected by GCC bug 64735
#
#
# aubio needs a toolchain w/ threads, dynamic library
@@ -1549,9 +1571,8 @@ BR2_PACKAGE_LIBVORBIS=y
BR2_PACKAGE_OPENAL_ARCH_SUPPORTS=y
BR2_PACKAGE_OPENAL=y
# BR2_PACKAGE_OPENCORE_AMR is not set
BR2_PACKAGE_OPUS=y
BR2_PACKAGE_OPUS_FIXED_POINT=y
BR2_PACKAGE_OPUSFILE=y
# BR2_PACKAGE_OPUS is not set
# BR2_PACKAGE_OPUSFILE is not set
BR2_PACKAGE_PORTAUDIO=y
BR2_PACKAGE_PORTAUDIO_ALSA=y
# BR2_PACKAGE_PORTAUDIO_OSS is not set
@@ -1568,7 +1589,10 @@ BR2_PACKAGE_PORTAUDIO_ALSA=y
BR2_PACKAGE_TREMOR=y
# BR2_PACKAGE_VO_AACENC is not set
BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING_ARCH_SUPPORTS=y
# BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING is not set
#
# webrtc-audio-processing needs a toolchain w/ C++, NPTL, gcc >= 4.8
#
#
# Compression and decompression
@@ -1600,7 +1624,14 @@ BR2_PACKAGE_PROVIDES_HOST_ZLIB="host-libzlib"
# BR2_PACKAGE_BEARSSL is not set
# BR2_PACKAGE_BEECRYPT is not set
BR2_PACKAGE_BOTAN_ARCH_SUPPORTS=y
# BR2_PACKAGE_BOTAN is not set
#
# botan needs a toolchain w/ C++, threads, gcc >= 4.8
#
#
# botan needs a toolchain not affected by GCC bug 64735
#
# BR2_PACKAGE_CA_CERTIFICATES is not set
#
@@ -1632,7 +1663,10 @@ BR2_PACKAGE_LIBGPG_ERROR_SYSCFG="arm-unknown-linux-gnueabi"
#
# libnss needs a toolchain w/ threads, dynamic library
#
# BR2_PACKAGE_LIBOLM is not set
#
# libolm needs a toolchain w/ C++, gcc >= 4.8
#
#
# libp11 needs a toolchain w/ dynamic library
@@ -1688,7 +1722,10 @@ BR2_PACKAGE_PROVIDES_HOST_OPENSSL="host-libopenssl"
#
# kompexsqlite needs a toolchain w/ C++, wchar, threads, dynamic library
#
# BR2_PACKAGE_LEVELDB is not set
#
# leveldb needs a toolchain w/ C++, threads, gcc >= 4.8
#
#
# libgit2 needs a toolchain w/ dynamic library
@@ -1701,9 +1738,12 @@ BR2_PACKAGE_PROVIDES_HOST_OPENSSL="host-libopenssl"
#
#
# redis needs a toolchain w/ gcc>=4.9, dynamic library, nptl
# rocksdb needs a toolchain w/ C++, threads, wchar, gcc >= 4.8
#
#
# rocksdb needs a toolchain not affected by GCC bug 64735
#
# BR2_PACKAGE_ROCKSDB is not set
# BR2_PACKAGE_SQLCIPHER is not set
# BR2_PACKAGE_SQLITE is not set
@@ -1745,10 +1785,16 @@ BR2_PACKAGE_PROVIDES_HOST_OPENSSL="host-libopenssl"
#
# BR2_PACKAGE_ATK is not set
BR2_PACKAGE_AGG=y
# BR2_PACKAGE_ATKMM is not set
#
# atkmm needs a toolchain w/ C++, wchar, threads, gcc >= 4.9
#
# BR2_PACKAGE_BULLET is not set
# BR2_PACKAGE_CAIRO is not set
# BR2_PACKAGE_CAIROMM is not set
#
# cairomm needs a toolchain w/ C++, wchar, threads, gcc >= 4.8
#
#
# chipmunk needs an OpenGL backend
@@ -1779,7 +1825,10 @@ BR2_PACKAGE_FREETYPE=y
#
# gtkmm3 needs libgtk3 and a toolchain w/ C++, wchar, threads, gcc >= 4.9
#
# BR2_PACKAGE_HARFBUZZ is not set
#
# harfbuzz needs a toolchain w/ C++, gcc => 4.8
#
# BR2_PACKAGE_IJS is not set
#
@@ -1800,7 +1849,10 @@ BR2_PACKAGE_LIBJPEG=y
# BR2_PACKAGE_JPEG_TURBO is not set
BR2_PACKAGE_HAS_JPEG=y
BR2_PACKAGE_PROVIDES_JPEG="libjpeg"
# BR2_PACKAGE_KMSXX is not set
#
# kms++ needs a toolchain w/ threads, C++, gcc >= 4.8, headers >= 3.8
#
# BR2_PACKAGE_LCMS2 is not set
# BR2_PACKAGE_LENSFUN is not set
# BR2_PACKAGE_LEPTONICA is not set
@@ -1825,7 +1877,10 @@ BR2_PACKAGE_PROVIDES_JPEG="libjpeg"
#
# libfreeimage needs a toolchain w/ C++, dynamic library, wchar
#
# BR2_PACKAGE_LIBGEOTIFF is not set
#
# libgeotiff needs a toolchain w/ C++, gcc >= 4.7, threads, wchar
#
#
# libglew depends on X.org and needs an OpenGL backend
@@ -1840,6 +1895,10 @@ BR2_PACKAGE_PROVIDES_JPEG="libjpeg"
#
# BR2_PACKAGE_LIBGTA is not set
#
# libgtk3 needs a toolchain w/ wchar, threads, C++, gcc >= 4.8
#
#
# libgtk3 needs an OpenGL or an OpenGL-EGL/wayland backend
#
@@ -1866,13 +1925,15 @@ BR2_PACKAGE_LIBPNG=y
#
# BR2_PACKAGE_MENU_CACHE is not set
# BR2_PACKAGE_OPENCV is not set
# BR2_PACKAGE_OPENJPEG is not set
#
# opencv3 needs a toolchain w/ C++, NPTL, wchar, dynamic library
# pango needs a toolchain w/ wchar, threads, C++, gcc >= 4.8
#
#
# pangomm needs a toolchain w/ C++, wchar, threads, gcc >= 4.9
#
# BR2_PACKAGE_OPENJPEG is not set
# BR2_PACKAGE_PANGO is not set
# BR2_PACKAGE_PANGOMM is not set
#
# pipewire needs udev and a toolchain w/ threads
@@ -1994,7 +2055,10 @@ BR2_PACKAGE_GNU_EFI_ARCH_SUPPORTS=y
# BR2_PACKAGE_LIBQMI is not set
# BR2_PACKAGE_LIBRAW1394 is not set
# BR2_PACKAGE_LIBRTLSDR is not set
# BR2_PACKAGE_LIBSERIAL is not set
#
# libserial needs a toolchain w/ C++, gcc >= 5, threads, wchar
#
# BR2_PACKAGE_LIBSERIALPORT is not set
#
@@ -2030,6 +2094,10 @@ BR2_PACKAGE_MRAA_ARCH_SUPPORTS=y
#
# uhd needs a toolchain w/ C++, NPTL, wchar, dynamic library
#
#
# uhd needs a toolchain not affected by GCC bug 64735
#
# BR2_PACKAGE_URG is not set
#
@@ -2066,16 +2134,25 @@ BR2_PACKAGE_EXPAT=y
# BR2_PACKAGE_JOSE is not set
# BR2_PACKAGE_JSMN is not set
# BR2_PACKAGE_JSON_C is not set
# BR2_PACKAGE_JSON_FOR_MODERN_CPP is not set
#
# json-for-modern-cpp needs a toolchain w/ C++, gcc >= 4.9
#
# BR2_PACKAGE_JSON_GLIB is not set
# BR2_PACKAGE_JSONCPP is not set
#
# jsoncpp needs a toolchain w/ C++, gcc >= 4.7
#
# BR2_PACKAGE_LIBBSON is not set
# BR2_PACKAGE_LIBFASTJSON is not set
# BR2_PACKAGE_LIBJSON is not set
# BR2_PACKAGE_LIBROXML is not set
# BR2_PACKAGE_LIBUCL is not set
# BR2_PACKAGE_LIBXML2 is not set
# BR2_PACKAGE_LIBXMLPP is not set
#
# libxml++ needs a toolchain w/ C++, wchar, threads, gcc >= 4.9
#
# BR2_PACKAGE_LIBXMLRPC is not set
# BR2_PACKAGE_LIBXSLT is not set
# BR2_PACKAGE_LIBYAML is not set
@@ -2089,7 +2166,10 @@ BR2_PACKAGE_EXPAT=y
# BR2_PACKAGE_VALIJSON is not set
# BR2_PACKAGE_XERCES is not set
# BR2_PACKAGE_YAJL is not set
# BR2_PACKAGE_YAML_CPP is not set
#
# yaml-cpp needs a toolchain w/ C++, gcc >= 4.7
#
#
# Logging
@@ -2097,7 +2177,14 @@ BR2_PACKAGE_EXPAT=y
# BR2_PACKAGE_GLOG is not set
# BR2_PACKAGE_LIBLOG4C_LOCALTIME is not set
# BR2_PACKAGE_LIBLOGGING is not set
# BR2_PACKAGE_LOG4CPLUS is not set
#
# log4cplus needs a toolchain w/ C++, wchar, threads, gcc >= 4.8
#
#
# log4cplus needs a toolchain not affected by GCC bug 64735
#
# BR2_PACKAGE_LOG4CPP is not set
#
@@ -2107,6 +2194,10 @@ BR2_PACKAGE_EXPAT=y
#
# opentracing-cpp needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8
#
#
# opentracing-cpp needs exception_ptr
#
# BR2_PACKAGE_SPDLOG is not set
#
@@ -2173,6 +2264,10 @@ BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS=y
#
# mediastreamer needs a toolchain w/ threads, C++, dynamic library
#
#
# mediastreamer needs a toolchain not affected by GCC bug 64735
#
# BR2_PACKAGE_X264 is not set
#
@@ -2186,7 +2281,14 @@ BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS=y
#
# agent++ needs a toolchain w/ threads, C++, dynamic library
#
# BR2_PACKAGE_AZMQ is not set
#
# azmq needs a toolchain w/ C++11, wchar and NPTL
#
#
# azmq needs exception_ptr
#
# BR2_PACKAGE_AZURE_IOT_SDK_C is not set
#
@@ -2196,6 +2298,10 @@ BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS=y
#
# belle-sip needs a toolchain w/ threads, C++, dynamic library, wchar
#
#
# belle-sip needs a toolchain not affected by GCC bug 64735
#
# BR2_PACKAGE_C_ARES is not set
BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS=y
@@ -2213,10 +2319,6 @@ BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS=y
#
# daq needs a toolchain w/ dynamic library
#
#
# davici needs a toolchain w/ threads, dynamic library
#
# BR2_PACKAGE_ENET is not set
# BR2_PACKAGE_FILEMQ is not set
# BR2_PACKAGE_FLICKCURL is not set
@@ -2240,7 +2342,10 @@ BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS=y
# BR2_PACKAGE_LIBCGI is not set
# BR2_PACKAGE_LIBCGICC is not set
# BR2_PACKAGE_LIBCOAP is not set
# BR2_PACKAGE_LIBCPPRESTSDK is not set
#
# libcpprestsdk needs exception_ptr
#
# BR2_PACKAGE_LIBCURL is not set
# BR2_PACKAGE_LIBDNET is not set
# BR2_PACKAGE_LIBEXOSIP2 is not set
@@ -2251,7 +2356,10 @@ BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS=y
#
# libhttpparser needs a toolchain w/ dynamic library
#
# BR2_PACKAGE_LIBHTTPSERVER is not set
#
# libhttpserver needs a toolchain w/ C++, threads, gcc >= 5
#
# BR2_PACKAGE_LIBIDN is not set
# BR2_PACKAGE_LIBIDN2 is not set
# BR2_PACKAGE_LIBISCSI is not set
@@ -2298,7 +2406,10 @@ BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS=y
#
# BR2_PACKAGE_LIBNIDS is not set
# BR2_PACKAGE_LIBNL is not set
# BR2_PACKAGE_LIBNPUPNP is not set
#
# libnpupnp needs a toolchain w/ C++, threads, gcc >= 4.9
#
# BR2_PACKAGE_LIBOAUTH is not set
# BR2_PACKAGE_LIBOPING is not set
# BR2_PACKAGE_LIBOSIP2 is not set
@@ -2319,12 +2430,18 @@ BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS=y
# BR2_PACKAGE_LIBTELNET is not set
# BR2_PACKAGE_LIBTIRPC is not set
# BR2_PACKAGE_LIBTORRENT is not set
# BR2_PACKAGE_LIBTORRENT_RASTERBAR is not set
#
# libtorrent-rasterbar needs exception_ptr
#
# BR2_PACKAGE_LIBUEV is not set
# BR2_PACKAGE_LIBUHTTPD is not set
# BR2_PACKAGE_LIBUPNP is not set
# BR2_PACKAGE_LIBUPNP18 is not set
# BR2_PACKAGE_LIBUPNPP is not set
#
# libupnpp needs a toolchain w/ C++, threads, gcc >= 4.9
#
# BR2_PACKAGE_LIBURIPARSER is not set
# BR2_PACKAGE_LIBUWSC is not set
@@ -2376,10 +2493,19 @@ BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS=y
#
# openzwave needs a toolchain w/ C++, dynamic library, NPTL, wchar
#
# BR2_PACKAGE_ORTP is not set
#
# ortp needs a toolchain not affected by GCC bug 64735
#
# BR2_PACKAGE_PAHO_MQTT_C is not set
# BR2_PACKAGE_PAHO_MQTT_CPP is not set
# BR2_PACKAGE_PISTACHE is not set
#
# paho-mqtt-cpp needs a toolchain not affected by GCC bug 64735
#
#
# pistache needs a glibc toolchain w/ C++, gcc >= 4.9, threads, wchar
#
#
# qpid-proton needs a toolchain w/ dynamic library
@@ -2389,7 +2515,10 @@ BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS=y
# rabbitmq-c needs a toolchain w/ dynamic library, threads
#
# BR2_PACKAGE_RESIPROCATE is not set
# BR2_PACKAGE_RESTCLIENT_CPP is not set
#
# restclient-cpp needs a toolchain w/ C++, gcc >= 4.8
#
# BR2_PACKAGE_RTMPDUMP is not set
# BR2_PACKAGE_SLIRP is not set
@@ -2405,11 +2534,17 @@ BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS=y
# BR2_PACKAGE_USBREDIR is not set
#
# wampcc needs a toolchain w/ C++, NPTL, dynamic library
# websocketpp needs a toolchain w/ C++ and gcc >= 4.8
#
# BR2_PACKAGE_WEBSOCKETPP is not set
# BR2_PACKAGE_ZEROMQ is not set
# BR2_PACKAGE_ZMQPP is not set
#
# zmqpp needs a toolchain w/ C++, threads, gcc >= 4.7
#
#
# zmqpp needs exception_ptr
#
# BR2_PACKAGE_ZYRE is not set
#
@@ -2430,18 +2565,40 @@ BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS=y
#
# avro-c needs a toolchain w/ dynamic library
#
# BR2_PACKAGE_BCTOOLBOX is not set
#
# bctoolbox needs a toolchain not affected by GCC bug 64735
#
# BR2_PACKAGE_BDWGC is not set
# BR2_PACKAGE_BELR is not set
#
# belr needs a toolchain not affected by GCC bug 64735
#
# BR2_PACKAGE_BOOST is not set
# BR2_PACKAGE_C_CAPNPROTO is not set
# BR2_PACKAGE_CAPNPROTO is not set
# BR2_PACKAGE_CCTZ is not set
# BR2_PACKAGE_CEREAL is not set
#
# c-capnproto needs host and target gcc >= 5 w/ C++14, threads, atomic, ucontext and not gcc bug 64735
#
#
# capnproto needs host and target gcc >= 5 w/ C++14, threads, atomic, ucontext and not gcc bug 64735
#
#
# cctz needs a toolchain w/ C++, threads, gcc >= 4.8
#
#
# cereal needs a toolchain w/ C++, gcc >= 4.7, threads, wchar
#
#
# clang needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, dynamic library
#
#
# clang needs a toolchain not affected by GCC bug 64735
#
# BR2_PACKAGE_CLAPACK is not set
#
@@ -2452,7 +2609,10 @@ BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS=y
# cppcms needs a toolchain w/ C++, NPTL, wchar, dynamic library
#
# BR2_PACKAGE_CRACKLIB is not set
# BR2_PACKAGE_DAWGDIC is not set
#
# dawgdic needs a toolchain w/ C++, gcc >= 4.6
#
# BR2_PACKAGE_DING_LIBS is not set
# BR2_PACKAGE_EIGEN is not set
@@ -2468,7 +2628,10 @@ BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS=y
#
# flann needs a toolchain w/ C++, dynamic library
#
# BR2_PACKAGE_FLATBUFFERS is not set
#
# flatbuffers needs a toolchain w/ C++, gcc >= 4.7
#
# BR2_PACKAGE_FLATCC is not set
#
@@ -2476,7 +2639,10 @@ BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS=y
#
# BR2_PACKAGE_GFLAGS is not set
# BR2_PACKAGE_GLI is not set
# BR2_PACKAGE_GLIBMM is not set
#
# glibmm needs a toolchain w/ C++, wchar, threads, gcc >= 4.9
#
# BR2_PACKAGE_GLM is not set
# BR2_PACKAGE_GMP is not set
BR2_PACKAGE_GOBJECT_INTROSPECTION_ARCH_SUPPORTS=y
@@ -2529,7 +2695,10 @@ BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS=y
# libcorrect needs a toolchain w/ dynamic library
#
# BR2_PACKAGE_LIBCROCO is not set
# BR2_PACKAGE_LIBCROSSGUID is not set
#
# libcrossguid needs a toolchain w/ C++, gcc >= 4.7
#
# BR2_PACKAGE_LIBCSV is not set
# BR2_PACKAGE_LIBDAEMON is not set
# BR2_PACKAGE_LIBEE is not set
@@ -2560,10 +2729,16 @@ BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT=y
# BR2_PACKAGE_LIBPWQUALITY is not set
BR2_PACKAGE_LIBSECCOMP_ARCH_SUPPORTS=y
# BR2_PACKAGE_LIBSECCOMP is not set
# BR2_PACKAGE_LIBSIGC is not set
#
# libsigc++ needs a toolchain w/ C++, gcc >= 4.8
#
BR2_PACKAGE_LIBSIGSEGV_ARCH_SUPPORTS=y
# BR2_PACKAGE_LIBSIGSEGV is not set
# BR2_PACKAGE_LIBSPATIALINDEX is not set
#
# libspatialindex needs a toolchain w/ C++, gcc >= 4.7
#
# BR2_PACKAGE_LIBTASN1 is not set
# BR2_PACKAGE_LIBTOMMATH is not set
# BR2_PACKAGE_LIBTPL is not set
@@ -2605,6 +2780,10 @@ BR2_PACKAGE_LLVM_TARGET_ARCH="ARM"
# llvm needs a toolchain w/ wchar, threads, C++, gcc >= 4.8, dynamic library
#
#
# llvm needs a toolchain not affected by GCC bug 64735
#
#
# lttng-libust needs a toolchain w/ dynamic library, wchar, threads
#
@@ -2676,8 +2855,10 @@ BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS=y
# BR2_PACKAGE_ENCHANT is not set
BR2_PACKAGE_FMT=y
# BR2_PACKAGE_FSTRCMP is not set
BR2_PACKAGE_ICU=y
BR2_PACKAGE_ICU_CUSTOM_DATA_PATH=""
#
# icu needs a toolchain w/ C++, wchar, threads, gcc >= 4.9, host gcc >= 4.9
#
# BR2_PACKAGE_LIBCLI is not set
# BR2_PACKAGE_LIBEDIT is not set
# BR2_PACKAGE_LIBENCA is not set
@@ -2697,7 +2878,10 @@ BR2_PACKAGE_NCURSES_ADDITIONAL_TERMINFO=""
# BR2_PACKAGE_PCRE is not set
# BR2_PACKAGE_PCRE2 is not set
# BR2_PACKAGE_POPT is not set
# BR2_PACKAGE_RE2 is not set
#
# re2 needs a toolchain w/ C++, threads, gcc >= 4.8
#
# BR2_PACKAGE_READLINE is not set
# BR2_PACKAGE_SLANG is not set
# BR2_PACKAGE_TCLAP is not set
@@ -2728,8 +2912,6 @@ BR2_PACKAGE_NCURSES_ADDITIONAL_TERMINFO=""
#
# BR2_PACKAGE_AESPIPE is not set
# BR2_PACKAGE_BC is not set
BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS=y
# BR2_PACKAGE_BITCOIN is not set
#
# clamav needs a toolchain w/ C++, dynamic library, threads, wchar
@@ -2743,16 +2925,28 @@ BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS=y
#
# domoticz needs lua 5.3 and a toolchain w/ C++, gcc >= 4.8, NPTL, wchar, dynamic library
#
#
# domoticz needs exception_ptr
#
# BR2_PACKAGE_EMPTY is not set
#
# gnuradio needs a toolchain w/ C++, NPTL, wchar, dynamic library
#
#
# gnuradio needs a toolchain not affected by GCC bug 64735
#
# BR2_PACKAGE_GOOGLEFONTDIRECTORY is not set
#
# gqrx needs qt5
#
#
# gqrx needs a toolchain not affected by GCC bug 64735
#
# BR2_PACKAGE_GSETTINGS_DESKTOP_SCHEMAS is not set
# BR2_PACKAGE_HAVEGED is not set
# BR2_PACKAGE_LINUX_SYSCALL_SUPPORT is not set
@@ -2762,10 +2956,16 @@ BR2_PACKAGE_BITCOIN_ARCH_SUPPORTS=y
#
# netdata needs a toolchain w/ NPTL, dynamic library
#
# BR2_PACKAGE_PROJ is not set
#
# proj needs a toolchain w/ C++, gcc >= 4.7, threads, wchar
#
BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET=y
# BR2_PACKAGE_QEMU is not set
# BR2_PACKAGE_QPDF is not set
#
# qpdf needs a toolchain w/ C++, wchar, gcc >= 4.7
#
# BR2_PACKAGE_SHARED_MIME_INFO is not set
# BR2_PACKAGE_SUNWAIT is not set
@@ -2884,7 +3084,6 @@ BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET=y
#
# frr needs a toolchain w/ threads, dynamic library
#
# BR2_PACKAGE_GERBERA is not set
# BR2_PACKAGE_GESFTPSERVER is not set
# BR2_PACKAGE_GLOOX is not set
# BR2_PACKAGE_GLORYTUN is not set
@@ -2902,7 +3101,6 @@ BR2_PACKAGE_HAPROXY_ARCH_SUPPORTS=y
# BR2_PACKAGE_HOSTAPD is not set
# BR2_PACKAGE_HTPDATE is not set
# BR2_PACKAGE_HTTPING is not set
# BR2_PACKAGE_I2PD is not set
# BR2_PACKAGE_IBRDTN_TOOLS is not set
# BR2_PACKAGE_IBRDTND is not set
# BR2_PACKAGE_IFMETRIC is not set
@@ -2958,6 +3156,10 @@ BR2_PACKAGE_IFUPDOWN_SCRIPTS=y
#
# linphone needs a toolchain w/ threads, C++, dynamic library, wchar
#
#
# linphone needs a toolchain not affected by GCC bug 64735
#
# BR2_PACKAGE_LINUX_ZIGBEE is not set
# BR2_PACKAGE_LINUXPTP is not set
# BR2_PACKAGE_LLDPD is not set
@@ -3001,7 +3203,10 @@ BR2_PACKAGE_IFUPDOWN_SCRIPTS=y
# BR2_PACKAGE_MTR is not set
# BR2_PACKAGE_NBD is not set
# BR2_PACKAGE_NCFTP is not set
# BR2_PACKAGE_NDISC6 is not set
#
# ndisc6 needs a toolchain w/ gcc >= 4.7
#
#
# netatalk needs a toolchain w/ threads, dynamic library
@@ -3091,7 +3296,10 @@ BR2_PACKAGE_IFUPDOWN_SCRIPTS=y
# BR2_PACKAGE_RPCBIND is not set
# BR2_PACKAGE_RSH_REDONE is not set
# BR2_PACKAGE_RSYNC is not set
# BR2_PACKAGE_RTORRENT is not set
#
# rtorrent needs a toolchain w/ C++, threads, wchar, gcc >= 4.9
#
# BR2_PACKAGE_RTPTOOLS is not set
# BR2_PACKAGE_RYGEL is not set
# BR2_PACKAGE_S6_DNS is not set
@@ -3122,14 +3330,9 @@ BR2_PACKAGE_IFUPDOWN_SCRIPTS=y
# BR2_PACKAGE_SOFTETHER is not set
# BR2_PACKAGE_SPAWN_FCGI is not set
# BR2_PACKAGE_SPICE_PROTOCOL is not set
# BR2_PACKAGE_SQUID is not set
# BR2_PACKAGE_SSHGUARD is not set
# BR2_PACKAGE_SSHPASS is not set
# BR2_PACKAGE_SSLH is not set
#
# strongswan needs a toolchain w/ threads, dynamic library
#
# BR2_PACKAGE_STUNNEL is not set
# BR2_PACKAGE_SURICATA is not set
# BR2_PACKAGE_TCPDUMP is not set
@@ -3515,7 +3718,10 @@ BR2_PACKAGE_SYSTEMD_BOOTCHART_ARCH_SUPPORTS=y
# BR2_PACKAGE_WATCHDOG is not set
# BR2_PACKAGE_XDG_DBUS_PROXY is not set
BR2_PACKAGE_XVISOR_ARCH_SUPPORTS=y
# BR2_PACKAGE_XVISOR is not set
#
# xvisor needs a toolchain w/ gcc >= 4.9
#
#
# Text editors and viewers

36
configs/bittboy_defconfig Normal file
View File

@@ -0,0 +1,36 @@
BR2_arm=y
BR2_STATIC_LIBS=y
BR2_TOOLCHAIN_BUILDROOT_MUSL=y
BR2_KERNEL_HEADERS_4_14=y
BR2_BINUTILS_VERSION_2_35_X=y
BR2_GCC_VERSION_11_X=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_GCC_ENABLE_LTO=y
BR2_TARGET_OPTIMIZATION="-fno-PIC -march=armv5te -mtune=arm926ej-s"
BR2_TARGET_LDFLAGS="-lc -no-pie"
BR2_PACKAGE_ALSA_UTILS=y
BR2_PACKAGE_FFMPEG=y
BR2_PACKAGE_FLUIDLITE=y
BR2_PACKAGE_MPG123=y
BR2_PACKAGE_BZIP2=y
BR2_PACKAGE_SDL_GFX=y
BR2_PACKAGE_SDL_IMAGE=y
BR2_PACKAGE_SDL_IMAGE_GIF=y
BR2_PACKAGE_SDL_IMAGE_JPEG=y
BR2_PACKAGE_SDL_IMAGE_PCX=y
BR2_PACKAGE_SDL_IMAGE_PNG=y
BR2_PACKAGE_SDL_MIXER=y
BR2_PACKAGE_SDL_NET=y
BR2_PACKAGE_SDL_SOUND=y
BR2_PACKAGE_SDL_TTF=y
BR2_PACKAGE_LIBMIKMOD=y
BR2_PACKAGE_LIBSAMPLERATE=y
BR2_PACKAGE_LIBSNDFILE=y
BR2_PACKAGE_LIBVORBIS=y
BR2_PACKAGE_OPENAL=y
BR2_PACKAGE_PORTAUDIO=y
BR2_PACKAGE_TREMOR=y
BR2_PACKAGE_AGG=y
BR2_PACKAGE_PIXMAN=y
BR2_PACKAGE_EXPAT=y
BR2_PACKAGE_FMT=y

328
package/gcc/10.3.0/0001-Revert-re-PR-target-92095-internal-error-with-O1-mcp.patch Normal file
View File

@@ -0,0 +1,328 @@
From 0824d6819857f306583592bce96315893f91bd84 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Wed, 20 Jan 2021 23:26:29 +0100
Subject: [PATCH] Revert "re PR target/92095 (internal error with -O1
-mcpu=niagara2 -fPIE)"
This reverts commit 0a83f1a441d7aaadecb368c237b6ee70bd7b91d6.
Building the Buildroot defconfig qemu_sparc_ss10_defconfig using
gcc 8.4, 9.3 and 10 produce a broken rootfs that trigger illegal
instruction messages.
gcc 8.3, 9.2 are the latest working gcc version.
git bisect between gcc 8.4 and 8.4 allowed to identify
the commit that introcuce the regression.
Reverting this patch allowed to produce a working rootfs.
Reported to gcc:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98784
Signed-off-by: Romain Naour <romain.naour@gmail.com>
Cc: Eric Botcazou <ebotcazou@gcc.gnu.org>
---
gcc/config/sparc/sparc-protos.h | 1 -
gcc/config/sparc/sparc.c | 121 +++++++-----------
gcc/config/sparc/sparc.md | 5 +-
.../gcc.c-torture/compile/20191108-1.c | 14 --
gcc/testsuite/gcc.target/sparc/overflow-3.c | 2 +-
gcc/testsuite/gcc.target/sparc/overflow-4.c | 2 +-
gcc/testsuite/gcc.target/sparc/overflow-5.c | 2 +-
7 files changed, 53 insertions(+), 94 deletions(-)
delete mode 100644 gcc/testsuite/gcc.c-torture/compile/20191108-1.c
diff --git a/gcc/config/sparc/sparc-protos.h b/gcc/config/sparc/sparc-protos.h
index 5f9999a669c..37452b06415 100644
--- a/gcc/config/sparc/sparc-protos.h
+++ b/gcc/config/sparc/sparc-protos.h
@@ -69,7 +69,6 @@ extern void sparc_split_reg_mem (rtx, rtx, machine_mode);
extern void sparc_split_mem_reg (rtx, rtx, machine_mode);
extern int sparc_split_reg_reg_legitimate (rtx, rtx);
extern void sparc_split_reg_reg (rtx, rtx, machine_mode);
-extern const char *output_load_pcrel_sym (rtx *);
extern const char *output_ubranch (rtx, rtx_insn *);
extern const char *output_cbranch (rtx, rtx, int, int, int, rtx_insn *);
extern const char *output_return (rtx_insn *);
diff --git a/gcc/config/sparc/sparc.c b/gcc/config/sparc/sparc.c
index d0843102148..14d112d8ca8 100644
--- a/gcc/config/sparc/sparc.c
+++ b/gcc/config/sparc/sparc.c
@@ -4157,6 +4157,13 @@ eligible_for_sibcall_delay (rtx_insn *trial)
static bool
sparc_cannot_force_const_mem (machine_mode mode, rtx x)
{
+ /* After IRA has run in PIC mode, it is too late to put anything into the
+ constant pool if the PIC register hasn't already been initialized. */
+ if ((lra_in_progress || reload_in_progress)
+ && flag_pic
+ && !crtl->uses_pic_offset_table)
+ return true;
+
switch (GET_CODE (x))
{
case CONST_INT:
@@ -4192,11 +4199,9 @@ sparc_cannot_force_const_mem (machine_mode mode, rtx x)
}
/* Global Offset Table support. */
-static GTY(()) rtx got_symbol_rtx = NULL_RTX;
-static GTY(()) rtx got_register_rtx = NULL_RTX;
static GTY(()) rtx got_helper_rtx = NULL_RTX;
-
-static GTY(()) bool got_helper_needed = false;
+static GTY(()) rtx got_register_rtx = NULL_RTX;
+static GTY(()) rtx got_symbol_rtx = NULL_RTX;
/* Return the SYMBOL_REF for the Global Offset Table. */
@@ -4209,6 +4214,27 @@ sparc_got (void)
return got_symbol_rtx;
}
+#ifdef HAVE_GAS_HIDDEN
+# define USE_HIDDEN_LINKONCE 1
+#else
+# define USE_HIDDEN_LINKONCE 0
+#endif
+
+static void
+get_pc_thunk_name (char name[32], unsigned int regno)
+{
+ const char *reg_name = reg_names[regno];
+
+ /* Skip the leading '%' as that cannot be used in a
+ symbol name. */
+ reg_name += 1;
+
+ if (USE_HIDDEN_LINKONCE)
+ sprintf (name, "__sparc_get_pc_thunk.%s", reg_name);
+ else
+ ASM_GENERATE_INTERNAL_LABEL (name, "LADDPC", regno);
+}
+
/* Wrapper around the load_pcrel_sym{si,di} patterns. */
static rtx
@@ -4228,78 +4254,30 @@ gen_load_pcrel_sym (rtx op0, rtx op1, rtx op2)
return insn;
}
-/* Output the load_pcrel_sym{si,di} patterns. */
-
-const char *
-output_load_pcrel_sym (rtx *operands)
-{
- if (flag_delayed_branch)
- {
- output_asm_insn ("sethi\t%%hi(%a1-4), %0", operands);
- output_asm_insn ("call\t%a2", operands);
- output_asm_insn (" add\t%0, %%lo(%a1+4), %0", operands);
- }
- else
- {
- output_asm_insn ("sethi\t%%hi(%a1-8), %0", operands);
- output_asm_insn ("add\t%0, %%lo(%a1-4), %0", operands);
- output_asm_insn ("call\t%a2", operands);
- output_asm_insn (" nop", NULL);
- }
-
- if (operands[2] == got_helper_rtx)
- got_helper_needed = true;
-
- return "";
-}
-
-#ifdef HAVE_GAS_HIDDEN
-# define USE_HIDDEN_LINKONCE 1
-#else
-# define USE_HIDDEN_LINKONCE 0
-#endif
-
/* Emit code to load the GOT register. */
void
load_got_register (void)
{
- rtx insn;
+ if (!got_register_rtx)
+ got_register_rtx = gen_rtx_REG (Pmode, GLOBAL_OFFSET_TABLE_REGNUM);
if (TARGET_VXWORKS_RTP)
- {
- if (!got_register_rtx)
- got_register_rtx = pic_offset_table_rtx;
-
- insn = gen_vxworks_load_got ();
- }
+ emit_insn (gen_vxworks_load_got ());
else
{
- if (!got_register_rtx)
- got_register_rtx = gen_rtx_REG (Pmode, GLOBAL_OFFSET_TABLE_REGNUM);
-
/* The GOT symbol is subject to a PC-relative relocation so we need a
helper function to add the PC value and thus get the final value. */
if (!got_helper_rtx)
{
char name[32];
-
- /* Skip the leading '%' as that cannot be used in a symbol name. */
- if (USE_HIDDEN_LINKONCE)
- sprintf (name, "__sparc_get_pc_thunk.%s",
- reg_names[REGNO (got_register_rtx)] + 1);
- else
- ASM_GENERATE_INTERNAL_LABEL (name, "LADDPC",
- REGNO (got_register_rtx));
-
+ get_pc_thunk_name (name, GLOBAL_OFFSET_TABLE_REGNUM);
got_helper_rtx = gen_rtx_SYMBOL_REF (Pmode, ggc_strdup (name));
}
- insn
- = gen_load_pcrel_sym (got_register_rtx, sparc_got (), got_helper_rtx);
+ emit_insn (gen_load_pcrel_sym (got_register_rtx, sparc_got (),
+ got_helper_rtx));
}
-
- emit_insn (insn);
}
/* Ensure that we are not using patterns that are not OK with PIC. */
@@ -5464,7 +5442,7 @@ save_local_or_in_reg_p (unsigned int regno, int leaf_function)
return true;
/* GOT register (%l7) if needed. */
- if (got_register_rtx && regno == REGNO (got_register_rtx))
+ if (regno == GLOBAL_OFFSET_TABLE_REGNUM && got_register_rtx)
return true;
/* If the function accesses prior frames, the frame pointer and the return
@@ -12507,9 +12485,10 @@ static void
sparc_file_end (void)
{
/* If we need to emit the special GOT helper function, do so now. */
- if (got_helper_needed)
+ if (got_helper_rtx)
{
const char *name = XSTR (got_helper_rtx, 0);
+ const char *reg_name = reg_names[GLOBAL_OFFSET_TABLE_REGNUM];
#ifdef DWARF2_UNWIND_INFO
bool do_cfi;
#endif
@@ -12546,22 +12525,17 @@ sparc_file_end (void)
#ifdef DWARF2_UNWIND_INFO
do_cfi = dwarf2out_do_cfi_asm ();
if (do_cfi)
- output_asm_insn (".cfi_startproc", NULL);
+ fprintf (asm_out_file, "\t.cfi_startproc\n");
#endif
if (flag_delayed_branch)
- {
- output_asm_insn ("jmp\t%%o7+8", NULL);
- output_asm_insn (" add\t%%o7, %0, %0", &got_register_rtx);
- }
+ fprintf (asm_out_file, "\tjmp\t%%o7+8\n\t add\t%%o7, %s, %s\n",
+ reg_name, reg_name);
else
- {
- output_asm_insn ("add\t%%o7, %0, %0", &got_register_rtx);
- output_asm_insn ("jmp\t%%o7+8", NULL);
- output_asm_insn (" nop", NULL);
- }
+ fprintf (asm_out_file, "\tadd\t%%o7, %s, %s\n\tjmp\t%%o7+8\n\t nop\n",
+ reg_name, reg_name);
#ifdef DWARF2_UNWIND_INFO
if (do_cfi)
- output_asm_insn (".cfi_endproc", NULL);
+ fprintf (asm_out_file, "\t.cfi_endproc\n");
#endif
}
@@ -13056,10 +13030,7 @@ sparc_init_pic_reg (void)
edge entry_edge;
rtx_insn *seq;
- /* In PIC mode, we need to always initialize the PIC register if optimization
- is enabled, because we are called from IRA and LRA may later force things
- to the constant pool for optimization purposes. */
- if (!flag_pic || (!crtl->uses_pic_offset_table && !optimize))
+ if (!crtl->uses_pic_offset_table)
return;
start_sequence ();
diff --git a/gcc/config/sparc/sparc.md b/gcc/config/sparc/sparc.md
index 6e9ccb4ecfd..8fb0fa11aed 100644
--- a/gcc/config/sparc/sparc.md
+++ b/gcc/config/sparc/sparc.md
@@ -1601,7 +1601,10 @@
(clobber (reg:P O7_REG))]
"REGNO (operands[0]) == INTVAL (operands[3])"
{
- return output_load_pcrel_sym (operands);
+ if (flag_delayed_branch)
+ return "sethi\t%%hi(%a1-4), %0\n\tcall\t%a2\n\t add\t%0, %%lo(%a1+4), %0";
+ else
+ return "sethi\t%%hi(%a1-8), %0\n\tadd\t%0, %%lo(%a1-4), %0\n\tcall\t%a2\n\t nop";
}
[(set (attr "type") (const_string "multi"))
(set (attr "length")
diff --git a/gcc/testsuite/gcc.c-torture/compile/20191108-1.c b/gcc/testsuite/gcc.c-torture/compile/20191108-1.c
deleted file mode 100644
index 7929751bb06..00000000000
--- a/gcc/testsuite/gcc.c-torture/compile/20191108-1.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/* PR target/92095 */
-/* Testcase by Sergei Trofimovich <slyfox@inbox.ru> */
-
-typedef union {
- double a;
- int b[2];
-} c;
-
-double d(int e)
-{
- c f;
- (&f)->b[0] = 15728640;
- return e ? -(&f)->a : (&f)->a;
-}
diff --git a/gcc/testsuite/gcc.target/sparc/overflow-3.c b/gcc/testsuite/gcc.target/sparc/overflow-3.c
index 52d6ab2b688..86dddfb09e6 100644
--- a/gcc/testsuite/gcc.target/sparc/overflow-3.c
+++ b/gcc/testsuite/gcc.target/sparc/overflow-3.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target lp64 } */
-/* { dg-options "-O -fno-pie" } */
+/* { dg-options "-O" } */
#include <stdbool.h>
#include <stdint.h>
diff --git a/gcc/testsuite/gcc.target/sparc/overflow-4.c b/gcc/testsuite/gcc.target/sparc/overflow-4.c
index c6121b958c3..019feee335c 100644
--- a/gcc/testsuite/gcc.target/sparc/overflow-4.c
+++ b/gcc/testsuite/gcc.target/sparc/overflow-4.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target lp64 } */
-/* { dg-options "-O -fno-pie -mno-vis3 -mno-vis4" } */
+/* { dg-options "-O -mno-vis3 -mno-vis4" } */
#include <stdbool.h>
#include <stdint.h>
diff --git a/gcc/testsuite/gcc.target/sparc/overflow-5.c b/gcc/testsuite/gcc.target/sparc/overflow-5.c
index f00283f6e7b..67d4ac38095 100644
--- a/gcc/testsuite/gcc.target/sparc/overflow-5.c
+++ b/gcc/testsuite/gcc.target/sparc/overflow-5.c
@@ -1,6 +1,6 @@
/* { dg-do compile } */
/* { dg-require-effective-target lp64 } */
-/* { dg-options "-O -fno-pie -mvis3" } */
+/* { dg-options "-O -mvis3" } */
#include <stdbool.h>
#include <stdint.h>
--
2.30.2

200
package/gcc/10.3.0/0002-or1k-Add-mcmodel-option-to-handle-large-GOTs.patch Normal file
View File

@@ -0,0 +1,200 @@
From 1dad3f95ffcd1871ca670a13a06fbedb1c3ce509 Mon Sep 17 00:00:00 2001
From: Stafford Horne <shorne@gmail.com>
Date: Sun, 2 May 2021 06:11:44 +0900
Subject: [PATCH] or1k: Add mcmodel option to handle large GOTs
When building libgeos we get an error with:
linux-uclibc/9.3.0/crtbeginS.o: in function `__do_global_dtors_aux':
crtstuff.c:(.text+0x118): relocation truncated to fit: R_OR1K_GOT16 against symbol `__cxa_finalize' defined in .text section in
/home/shorne/work/openrisc/3eb9f9d0f6d8274b2d19753c006bd83f7d536e3c/output/host/or1k-buildroot-linux-uclibc/sysroot/lib/libc.so.
This is caused by GOT code having a limit of 64k. In OpenRISC this
looks to be the only relocation code pattern to be limited to 64k.
This patch allows specifying a new option -mcmodel=large which can be
used to generate 2 more instructions to construct 32-bit addresses for
up to 4G GOTs.
gcc/ChangeLog:
PR 99783
* config/or1k/or1k-opts.h: New file.
* config/or1k/or1k.c (or1k_legitimize_address_1, print_reloc):
Support generating gotha relocations if -mcmodel=large is
specified.
* config/or1k/or1k.h (TARGET_CMODEL_SMALL, TARGET_CMODEL_LARGE):
New macros.
* config/or1k/or1k.opt (mcmodel=): New option.
* doc/invoke.text (OpenRISC Options): Document mcmodel.
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
gcc/config/or1k/or1k-opts.h | 30 ++++++++++++++++++++++++++++++
gcc/config/or1k/or1k.c | 11 +++++++++--
gcc/config/or1k/or1k.h | 7 +++++++
gcc/config/or1k/or1k.opt | 19 +++++++++++++++++++
gcc/doc/invoke.texi | 12 +++++++++++-
5 files changed, 76 insertions(+), 3 deletions(-)
create mode 100644 gcc/config/or1k/or1k-opts.h
diff --git a/gcc/config/or1k/or1k-opts.h b/gcc/config/or1k/or1k-opts.h
new file mode 100644
index 00000000000..f791b894fdd
--- /dev/null
+++ b/gcc/config/or1k/or1k-opts.h
@@ -0,0 +1,30 @@
+/* Definitions for option handling for OpenRISC.
+ Copyright (C) 2021 Free Software Foundation, Inc.
+ Contributed by Stafford Horne.
+
+ 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/>. */
+
+#ifndef GCC_OR1K_OPTS_H
+#define GCC_OR1K_OPTS_H
+
+/* The OpenRISC code generation models available. */
+enum or1k_cmodel_type {
+ CMODEL_SMALL,
+ CMODEL_LARGE
+};
+
+#endif /* GCC_OR1K_OPTS_H */
diff --git a/gcc/config/or1k/or1k.c b/gcc/config/or1k/or1k.c
index 5fa5425aa2b..88613f9596b 100644
--- a/gcc/config/or1k/or1k.c
+++ b/gcc/config/or1k/or1k.c
@@ -750,7 +750,14 @@ or1k_legitimize_address_1 (rtx x, rtx scratch)
{
base = gen_sym_unspec (base, UNSPEC_GOT);
crtl->uses_pic_offset_table = 1;
- t2 = gen_rtx_LO_SUM (Pmode, pic_offset_table_rtx, base);
+ if (TARGET_CMODEL_LARGE)
+ {
+ emit_insn (gen_rtx_SET (t1, gen_rtx_HIGH (Pmode, base)));
+ emit_insn (gen_add3_insn (t1, t1, pic_offset_table_rtx));
+ t2 = gen_rtx_LO_SUM (Pmode, t1, base);
+ }
+ else
+ t2 = gen_rtx_LO_SUM (Pmode, pic_offset_table_rtx, base);
t2 = gen_const_mem (Pmode, t2);
emit_insn (gen_rtx_SET (t1, t2));
base = t1;
@@ -1089,7 +1096,7 @@ print_reloc (FILE *stream, rtx x, HOST_WIDE_INT add, reloc_kind kind)
no special markup. */
static const char * const relocs[RKIND_MAX][RTYPE_MAX] = {
{ "lo", "got", "gotofflo", "tpofflo", "gottpofflo", "tlsgdlo" },
- { "ha", NULL, "gotoffha", "tpoffha", "gottpoffha", "tlsgdhi" },
+ { "ha", "gotha", "gotoffha", "tpoffha", "gottpoffha", "tlsgdhi" },
};
reloc_type type = RTYPE_DIRECT;
diff --git a/gcc/config/or1k/or1k.h b/gcc/config/or1k/or1k.h
index 23db771d8fb..f1646d16dfd 100644
--- a/gcc/config/or1k/or1k.h
+++ b/gcc/config/or1k/or1k.h
@@ -21,6 +21,8 @@
#ifndef GCC_OR1K_H
#define GCC_OR1K_H
+#include "config/or1k/or1k-opts.h"
+
/* Names to predefine in the preprocessor for this target machine. */
#define TARGET_CPU_CPP_BUILTINS() \
do \
@@ -35,6 +37,11 @@
} \
while (0)
+#define TARGET_CMODEL_SMALL \
+ (or1k_code_model == CMODEL_SMALL)
+#define TARGET_CMODEL_LARGE \
+ (or1k_code_model == CMODEL_LARGE)
+
/* Storage layout. */
#define DEFAULT_SIGNED_CHAR 1
diff --git a/gcc/config/or1k/or1k.opt b/gcc/config/or1k/or1k.opt
index 03c9b8d0bba..8e035075f8a 100644
--- a/gcc/config/or1k/or1k.opt
+++ b/gcc/config/or1k/or1k.opt
@@ -21,6 +21,9 @@
; See the GCC internals manual (options.texi) for a description of
; this file's format.
+HeaderInclude
+config/or1k/or1k-opts.h
+
mhard-div
Target RejectNegative InverseMask(SOFT_DIV)
Enable generation of hardware divide (l.div, l.divu) instructions. This is the
@@ -63,6 +66,22 @@ When -mhard-float is selected, enables generation of unordered floating point
compare and set flag (lf.sfun*) instructions. By default functions from libgcc
are used to perform unordered floating point compare and set flag operations.
+mcmodel=
+Target RejectNegative Joined Enum(or1k_cmodel_type) Var(or1k_code_model) Init(CMODEL_SMALL)
+Specify the code model used for accessing memory addresses. Specifying large
+enables generating binaries with large global offset tables. By default the
+value is small.
+
+Enum
+Name(or1k_cmodel_type) Type(enum or1k_cmodel_type)
+Known code model types (for use with the -mcmodel= option):
+
+EnumValue
+Enum(or1k_cmodel_type) String(small) Value(CMODEL_SMALL)
+
+EnumValue
+Enum(or1k_cmodel_type) String(large) Value(CMODEL_LARGE)
+
mcmov
Target RejectNegative Mask(CMOV)
Enable generation of conditional move (l.cmov) instructions. By default the
diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi
index eabeec944e7..eda350c99ec 100644
--- a/gcc/doc/invoke.texi
+++ b/gcc/doc/invoke.texi
@@ -1102,7 +1102,8 @@ Objective-C and Objective-C++ Dialects}.
@gccoptlist{-mboard=@var{name} -mnewlib -mhard-mul -mhard-div @gol
-msoft-mul -msoft-div @gol
-msoft-float -mhard-float -mdouble-float -munordered-float @gol
--mcmov -mror -mrori -msext -msfimm -mshftimm}
+-mcmov -mror -mrori -msext -msfimm -mshftimm @gol
+-mcmodel=@var{code-model}}
@emph{PDP-11 Options}
@gccoptlist{-mfpu -msoft-float -mac0 -mno-ac0 -m40 -m45 -m10 @gol
@@ -25111,6 +25112,15 @@ Enable generation of shift with immediate (@code{l.srai}, @code{l.srli},
@code{l.slli}) instructions. By default extra instructions will be generated
to store the immediate to a register first.
+@item -mcmodel=small
+@opindex mcmodel=small
+Generate OpenRISC code for the small model: The GOT is limited to 64k. This is
+the default model.
+
+@item -mcmodel=large
+@opindex mcmodel=large
+Generate OpenRISC code for the large model: The GOT may grow up to 4G in size.
+
@end table
--
2.25.1

60
package/gcc/10.3.0/0003-or1k-Use-cmodel-large-when-building-crtstuff.patch Normal file
View File

@@ -0,0 +1,60 @@
From 0354e007a6235df81e208fa89cbf1571a8b56975 Mon Sep 17 00:00:00 2001
From: Stafford Horne <shorne@gmail.com>
Date: Sun, 2 May 2021 06:11:45 +0900
Subject: [PATCH] or1k: Use cmodel=large when building crtstuff
When linking gcc runtime objects into large binaries the link may fail
with the below errors. This will happen even if we are building with
-mcmodel=large.
/home/shorne/work/openrisc/output/host/lib/gcc/or1k-buildroot-linux-uclibc/10.3.0/crtbeginS.o: in function `deregister_tm_clones':
crtstuff.c:(.text+0x3c): relocation truncated to fit: R_OR1K_GOT16 against undefined symbol `_ITM_deregisterTMCloneTable'
/home/shorne/work/openrisc/output/host/lib/gcc/or1k-buildroot-linux-uclibc/10.3.0/crtbeginS.o: in function `register_tm_clones':
crtstuff.c:(.text+0xc0): relocation truncated to fit: R_OR1K_GOT16 against undefined symbol `_ITM_registerTMCloneTable'
This patch builds the gcc crtstuff binaries always with the
-mcmodel=large option to ensure they can be linked into large binaries.
libgcc/ChangeLog:
PR 99783
* config.host (or1k-*, tmake_file): Add or1k/t-crtstuff.
* config/or1k/t-crtstuff: New file.
Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
---
libgcc/config.host | 4 ++--
libgcc/config/or1k/t-crtstuff | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
create mode 100644 libgcc/config/or1k/t-crtstuff
diff --git a/libgcc/config.host b/libgcc/config.host
index c529cc40f0c..ddf0033e28c 100644
--- a/libgcc/config.host
+++ b/libgcc/config.host
@@ -1127,12 +1127,12 @@ nios2-*-*)
extra_parts="$extra_parts crti.o crtn.o"
;;
or1k-*-linux*)
- tmake_file="$tmake_file or1k/t-or1k"
+ tmake_file="$tmake_file or1k/t-or1k or1k/t-crtstuff"
tmake_file="$tmake_file t-softfp-sfdf t-softfp"
md_unwind_header=or1k/linux-unwind.h
;;
or1k-*-*)
- tmake_file="$tmake_file or1k/t-or1k"
+ tmake_file="$tmake_file or1k/t-or1k or1k/t-crtstuff"
tmake_file="$tmake_file t-softfp-sfdf t-softfp"
;;
pdp11-*-*)
diff --git a/libgcc/config/or1k/t-crtstuff b/libgcc/config/or1k/t-crtstuff
new file mode 100644
index 00000000000..dcae7f3498e
--- /dev/null
+++ b/libgcc/config/or1k/t-crtstuff
@@ -0,0 +1,2 @@
+# Compile crtbeginS.o and crtendS.o with -mcmodel=large
+CRTSTUFF_T_CFLAGS_S += -mcmodel=large
--
2.25.1

125
package/gcc/10.3.0/0004-Remove-cyclades-from-libsanitizer.patch Normal file
View File

@@ -0,0 +1,125 @@
From 745dae5923aba02982563481d75a21595df22ff8 Mon Sep 17 00:00:00 2001
From: Tamar Christina <tamar.christina@arm.com>
Date: Fri, 21 May 2021 10:30:59 +0100
Subject: [PATCH] libsanitizer: Remove cyclades from libsanitizer
The Linux kernel has removed the interface to cyclades from
the latest kernel headers[1] due to them being orphaned for the
past 13 years.
libsanitizer uses this header when compiling against glibc, but
glibcs itself doesn't seem to have any references to cyclades.
Further more it seems that the driver is broken in the kernel and
the firmware doesn't seem to be available anymore.
As such since this is breaking the build of libsanitizer (and so the
GCC bootstrap[2]) I propose to remove this.
[1] https://lkml.org/lkml/2021/3/2/153
[2] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=100379
(cherry picked from commit f7c5351552387bd43f6ca3631016d7f0dfe0f135)
libsanitizer/ChangeLog:
PR sanitizer/100379
* sanitizer_common/sanitizer_common_interceptors_ioctl.inc: Cherry-pick
llvm-project revision f7c5351552387bd43f6ca3631016d7f0dfe0f135.
* sanitizer_common/sanitizer_platform_limits_posix.cpp: Likewise.
* sanitizer_common/sanitizer_platform_limits_posix.h: Likewise.
Signed-off-by: Maxim Kochetkov <fido_max@inbox.ru>
---
.../sanitizer_common_interceptors_ioctl.inc | 9 ---------
.../sanitizer_platform_limits_posix.cpp | 11 -----------
.../sanitizer_platform_limits_posix.h | 10 ----------
3 files changed, 30 deletions(-)
diff --git a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
index 7f181258eab..b7da6598755 100644
--- a/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+++ b/libsanitizer/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
@@ -370,15 +370,6 @@ static void ioctl_table_fill() {
#if SANITIZER_GLIBC
// _(SIOCDEVPLIP, WRITE, struct_ifreq_sz); // the same as EQL_ENSLAVE
- _(CYGETDEFTHRESH, WRITE, sizeof(int));
- _(CYGETDEFTIMEOUT, WRITE, sizeof(int));
- _(CYGETMON, WRITE, struct_cyclades_monitor_sz);
- _(CYGETTHRESH, WRITE, sizeof(int));
- _(CYGETTIMEOUT, WRITE, sizeof(int));
- _(CYSETDEFTHRESH, NONE, 0);
- _(CYSETDEFTIMEOUT, NONE, 0);
- _(CYSETTHRESH, NONE, 0);
- _(CYSETTIMEOUT, NONE, 0);
_(EQL_EMANCIPATE, WRITE, struct_ifreq_sz);
_(EQL_ENSLAVE, WRITE, struct_ifreq_sz);
_(EQL_GETMASTRCFG, WRITE, struct_ifreq_sz);
diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
index 35a690cba5c..6e5c330b98e 100644
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp
@@ -143,7 +143,6 @@ typedef struct user_fpregs elf_fpregset_t;
# include <sys/procfs.h>
#endif
#include <sys/user.h>
-#include <linux/cyclades.h>
#include <linux/if_eql.h>
#include <linux/if_plip.h>
#include <linux/lp.h>
@@ -460,7 +459,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
#if SANITIZER_GLIBC
unsigned struct_ax25_parms_struct_sz = sizeof(struct ax25_parms_struct);
- unsigned struct_cyclades_monitor_sz = sizeof(struct cyclades_monitor);
#if EV_VERSION > (0x010000)
unsigned struct_input_keymap_entry_sz = sizeof(struct input_keymap_entry);
#else
@@ -824,15 +822,6 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
#endif // SANITIZER_LINUX
#if SANITIZER_LINUX && !SANITIZER_ANDROID
- unsigned IOCTL_CYGETDEFTHRESH = CYGETDEFTHRESH;
- unsigned IOCTL_CYGETDEFTIMEOUT = CYGETDEFTIMEOUT;
- unsigned IOCTL_CYGETMON = CYGETMON;
- unsigned IOCTL_CYGETTHRESH = CYGETTHRESH;
- unsigned IOCTL_CYGETTIMEOUT = CYGETTIMEOUT;
- unsigned IOCTL_CYSETDEFTHRESH = CYSETDEFTHRESH;
- unsigned IOCTL_CYSETDEFTIMEOUT = CYSETDEFTIMEOUT;
- unsigned IOCTL_CYSETTHRESH = CYSETTHRESH;
- unsigned IOCTL_CYSETTIMEOUT = CYSETTIMEOUT;
unsigned IOCTL_EQL_EMANCIPATE = EQL_EMANCIPATE;
unsigned IOCTL_EQL_ENSLAVE = EQL_ENSLAVE;
unsigned IOCTL_EQL_GETMASTRCFG = EQL_GETMASTRCFG;
diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
index ad358eef8b7..cba41ba5494 100644
--- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -983,7 +983,6 @@ extern unsigned struct_vt_mode_sz;
#if SANITIZER_LINUX && !SANITIZER_ANDROID
extern unsigned struct_ax25_parms_struct_sz;
-extern unsigned struct_cyclades_monitor_sz;
extern unsigned struct_input_keymap_entry_sz;
extern unsigned struct_ipx_config_data_sz;
extern unsigned struct_kbdiacrs_sz;
@@ -1328,15 +1327,6 @@ extern unsigned IOCTL_VT_WAITACTIVE;
#endif // SANITIZER_LINUX
#if SANITIZER_LINUX && !SANITIZER_ANDROID
-extern unsigned IOCTL_CYGETDEFTHRESH;
-extern unsigned IOCTL_CYGETDEFTIMEOUT;
-extern unsigned IOCTL_CYGETMON;
-extern unsigned IOCTL_CYGETTHRESH;
-extern unsigned IOCTL_CYGETTIMEOUT;
-extern unsigned IOCTL_CYSETDEFTHRESH;
-extern unsigned IOCTL_CYSETDEFTIMEOUT;
-extern unsigned IOCTL_CYSETTHRESH;
-extern unsigned IOCTL_CYSETTIMEOUT;
extern unsigned IOCTL_EQL_EMANCIPATE;
extern unsigned IOCTL_EQL_ENSLAVE;
extern unsigned IOCTL_EQL_GETMASTRCFG;
--
2.27.0

0
package/gcc/10.2.0/0006-noPIC-picflagm4.patch → package/gcc/10.3.0/0006-noPIC-picflagm4.patch
View File

0
package/gcc/10.2.0/Disable-fPIC-libgcc-Makefile.patch → package/gcc/10.3.0/Disable-fPIC-libgcc-Makefile.patch
View File

0
package/gcc/10.2.0/Force-NoPIC-libgcc-configfile.patch → package/gcc/10.3.0/Force-NoPIC-libgcc-configfile.patch
View File

58
package/gcc/11.2.0/0006-noPIC-picflagm4.patch Normal file
View File

@@ -0,0 +1,58 @@
diff --git a/config/picflag.m4 b/config/picflag.m4
--- a/config/picflag.m4
+++ b/config/picflag.m4
@@ -34,7 +22,7 @@
i[[34567]]86-*-nto-qnx*)
# QNX uses GNU C++, but need to define -shared option too, otherwise
# it will coredump.
- $1='-fPIC -shared'
+ $1='-fno-PIC'
;;
i[[34567]]86-pc-msdosdjgpp*)
# DJGPP does not support shared libraries at all.
@@ -42,7 +30,7 @@
ia64*-*-hpux*)
# On IA64 HP-UX, PIC is the default but the pic flag
# sets the default TLS model and affects inlining.
- $1=-fPIC
+ $1=-fno-PIC
;;
mips-sgi-irix6*)
# PIC is the default.
@@ -54,30 +42,30 @@
# Some targets support both -fPIC and -fpic, but prefer the latter.
# FIXME: Why?
i[[34567]]86-*-* | x86_64-*-*)
- $1=-fpic
+ $1=-fno-PIC
;;
# FIXME: Override -fPIC default in libgcc only?
sh-*-linux* | sh[[2346lbe]]*-*-linux*)
- $1=-fpic
+ $1=-fno-PIC
;;
# FIXME: Simplify to sh*-*-netbsd*?
sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \
sh64-*-netbsd* | sh64l*-*-netbsd*)
- $1=-fpic
+ $1=-fno-PIC
;;
# Default to -fPIC unless specified otherwise.
*)
- $1=-fPIC
+ $1=-fno-PIC
;;
esac
# If the user explicitly uses -fpic/-fPIC, keep that.
case "${m4_bpatsubsts($1, PICFLAG, CFLAGS)}" in
*-fpic*)
- $1=-fpic
+ $1=-fno-PIC
;;
*-fPIC*)
- $1=-fPIC
+ $1=-fno-PIC
;;
esac
])

11
package/gcc/11.2.0/Disable-fPIC-libgcc-Makefile.patch Normal file
View File

@@ -0,0 +1,11 @@
--- a/libgcc/Makefile.in
+++ n/libgcc/Makefile.in
@@ -253,7 +253,7 @@
# Additional target-dependent options for compiling libgcc2.a.
HOST_LIBGCC2_CFLAGS =
-PICFLAG = @PICFLAG@
+PICFLAG =
CET_FLAGS = @CET_FLAGS@

6
package/gcc/11.2.0/Force-NoPIC-libgcc-configfile.patch Normal file
View File

@@ -0,0 +1,6 @@
--- a/libgcc/config/t-libgcc-pic
+++ b/libgcc/config/t-libgcc-pic
@@ -1,2 +1,2 @@
# Compile libgcc2.a with pic.
-HOST_LIBGCC2_CFLAGS += $(PICFLAG)
+HOST_LIBGCC2_CFLAGS +=

18
package/gcc/Config.in.host
View File

@@ -53,6 +53,21 @@ config BR2_GCC_VERSION_10_X
depends on !BR2_csky
select BR2_TOOLCHAIN_GCC_AT_LEAST_10
config BR2_GCC_VERSION_11_X
bool "gcc 11.x"
# powerpc spe support has been deprecated since gcc 8.x.
# https://gcc.gnu.org/ml/gcc/2018-04/msg00102.html
depends on !BR2_powerpc_SPE
# C-SKY sk610 needs abiv1, which is not supported in
# upstream gcc. C-SKY gcc upstream support not tested
# with upstream binutils and glibc.
depends on !BR2_csky
# uClibc-ng broken on sparc due to recent gcc changes
# that need to be reverted since gcc 8.4, 9.3 and 10.1.
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=98784
depends on !BR2_sparc
select BR2_TOOLCHAIN_GCC_AT_LEAST_11
endchoice
# libcilkrts was introduced in gcc 4.9 and removed in gcc 8.x
@@ -77,7 +92,8 @@ config BR2_GCC_VERSION
string
default "8.4.0" if BR2_GCC_VERSION_8_X
default "9.3.0" if BR2_GCC_VERSION_9_X
default "10.2.0" if BR2_GCC_VERSION_10_X
default "10.3.0" if BR2_GCC_VERSION_10_X
default "11.2.0" if BR2_GCC_VERSION_11_X
default "arc-2020.03-release" if BR2_GCC_VERSION_ARC
default "48152afb96c59733d5bc79e3399bb7b3d4b44266" if BR2_GCC_VERSION_CSKY

4
package/gcc/gcc.hash
View File

@@ -3,7 +3,9 @@ sha512 6de904f552a02de33b11ef52312bb664396efd7e1ce3bbe37bfad5ef617f133095b3767b
# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-9.3.0/sha512.sum
sha512 4b9e3639eef6e623747a22c37a904b4750c93b6da77cf3958d5047e9b5ebddb7eebe091cc16ca0a227c0ecbd2bf3b984b221130f269a97ee4cc18f9cf6c444de gcc-9.3.0.tar.xz
# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-10.2.0/sha512.sum
sha512 42ae38928bd2e8183af445da34220964eb690b675b1892bbeb7cd5bb62be499011ec9a93397dba5e2fb681afadfc6f2767d03b9035b44ba9be807187ae6dc65e gcc-10.2.0.tar.xz
sha512 2b2dd7453d48a398c29eaebd1422b70341001b8c90a62aee51e83344e7fdd8a8e45f82a4a9165bd7edc76dada912c932f4b6632c5636760fec4c5d7e402b3f86 gcc-10.3.0.tar.xz
# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-11.2.0/sha512.sum
sha512 d53a0a966230895c54f01aea38696f818817b505f1e2bfa65e508753fcd01b2aedb4a61434f41f3a2ddbbd9f41384b96153c684ded3f0fa97c82758d9de5c7cf gcc-11.2.0.tar.xz
# Locally calculated (fetched from Github)
sha512 09ad77fce757d77f2db49cd049b78861abfa5c1c6c3be76228815ec2b15810c1985525c48b0300e83e88f3fa33dee0062f34790cc8b6bc2fa6b0301595acf42b gcc-arc-2020.03-release.tar.gz

8
package/mpg123/mpg123.hash
View File

@@ -1,7 +1,7 @@
# From https://sourceforge.net/projects/mpg123/files/mpg123/1.25.13/
sha1 2b6428dc563c56fb1374191d1244c8ac928e4d89 mpg123-1.25.13.tar.bz2
md5 294a6c30546504ec3d0deac2b2ea22be mpg123-1.25.13.tar.bz2
# From https://sourceforge.net/projects/mpg123/files/mpg123/1.25.15/
sha1 286fcb83afad3ecbfea60434d3ee1b6d7f41bb7c mpg123-1.25.15.tar.bz2
md5 9a050d4b3573661c606f8095a3f34ca3 mpg123-1.25.15.tar.bz2
# Locally calculated
sha256 90306848359c793fd43b9906e52201df18775742dc3c81c06ab67a806509890a mpg123-1.25.13.tar.bz2
sha256 503a76d82d97f1a6513bbeb284e460a99fb17ef80f23a661d8fc026ce6adcbbc mpg123-1.25.15.tar.bz2
# License file
sha256 f40e0dd86b27b52e429b693a87b3ca63ae0a98a4d142e77207aa6bdf1db7a295 COPYING

4
package/mpg123/mpg123.mk
View File

@@ -4,13 +4,13 @@
#
################################################################################
MPG123_VERSION = 1.25.13
MPG123_VERSION = 1.25.15
MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2
MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION)
MPG123_CONF_OPTS =
MPG123_INSTALL_STAGING = YES
MPG123_LICENSE = LGPL-2.1
MPG123_LICENSE_FILES = COPYING
MPG123_CPE_ID_VENDOR = mpg123
MPG123_DEPENDENCIES = host-pkgconf
MPG123_CPU = $(if $(BR2_SOFT_FLOAT),generic_nofpu,generic_fpu)

2
package/musl/musl.hash
View File

@@ -1,4 +1,4 @@
# Locally calculated after checking pgp signature from
# https://musl.libc.org/releases/musl-1.2.1.tar.gz.asc
sha256 68af6e18539f646f9c41a3a2bb25be4a5cfa5a8f65f0bb647fd2bbfdf877e84b musl-1.2.1.tar.gz
sha256 9b969322012d796dc23dda27a35866034fa67d8fb67e0e2c45c913c3d43219dd musl-1.2.2.tar.gz
sha256 f9bc4423732350eb0b3f7ed7e91d530298476f8fec0c6c427a1c04ade22655af COPYRIGHT

2
package/musl/musl.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
MUSL_VERSION = 1.2.1
MUSL_VERSION = 1.2.2
MUSL_SITE = http://www.musl-libc.org/releases
MUSL_LICENSE = MIT
MUSL_LICENSE_FILES = COPYRIGHT

77
package/sdl_mixer/0005-Fixwontbuildontremor.patch
View File

@@ -1,77 +0,0 @@
--- a/configure.ac
+++ a/configure.ac
--- <unnamed>
+++ <unnamed>
@@ -448,15 +448,21 @@
echo "-- dynamic libvorbisidec -> $ogg_lib"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
else
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec -lvorbis"
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec"
fi
else
- AC_MSG_WARN([*** Unable to find Ogg Vorbis Tremor library (http://www.xiph.org/)])
- AC_MSG_WARN([Ogg Vorbis support disabled])
+ SOURCES="$SOURCES $srcdir/*_ogg.c"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_MUSIC -DOGG_USE_TREMOR"
+ if test x$enable_music_ogg_shared = xyes && test x$ogg_lib != x; then
+ echo "-- dynamic libvorbisidec -> $ogg_lib"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
+ else
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec"
+ fi
fi
else
AC_CHECK_HEADER([vorbis/vorbisfile.h], [have_ogg_hdr=yes])
- AC_CHECK_LIB([vorbisfile], [ov_open_callbacks], [have_ogg_lib=yes], [], [-lvorbis -logg -lm])
+ AC_CHECK_LIB([vorbisfile], [ov_open_callbacks], [have_ogg_lib=yes], [], [ -logg -lm])
if test x$have_ogg_hdr = xyes -a x$have_ogg_lib = xyes; then
case "$host" in
*-*-darwin*)
@@ -478,11 +484,17 @@
echo "-- dynamic libvorbisfile -> $ogg_lib"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
else
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisfile -lvorbis -logg -lm"
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisfile -logg -lm"
fi
else
- AC_MSG_WARN([*** Unable to find Ogg Vorbis library (http://www.xiph.org/)])
- AC_MSG_WARN([Ogg Vorbis support disabled])
+ SOURCES="$SOURCES $srcdir/*_ogg.c"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_MUSIC"
+ if test x$enable_music_ogg_shared = xyes && test x$ogg_lib != x; then
+ echo "-- dynamic libvorbisfile -> $ogg_lib"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
+ else
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisfile -logg -lm"
+ fi
fi
fi
LIBS="$LIBS_SAVED"
--- a/configure
+++ b/configure
@@ -12216,13 +12216,17 @@
echo "-- dynamic libvorbisidec -> $ogg_lib"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
else
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec -lvorbis"
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec"
fi
else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Unable to find Ogg Vorbis Tremor library (http://www.xiph.org/)" >&5
-$as_echo "$as_me: WARNING: *** Unable to find Ogg Vorbis Tremor library (http://www.xiph.org/)" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ogg Vorbis support disabled" >&5
-$as_echo "$as_me: WARNING: Ogg Vorbis support disabled" >&2;}
+ SOURCES="$SOURCES $srcdir/*_ogg.c"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_MUSIC -DOGG_USE_TREMOR"
+ if test x$enable_music_ogg_shared = xyes && test x$ogg_lib != x; then
+ echo "-- dynamic libvorbisidec -> $ogg_lib"
+ EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
+ else
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec"
+ fi
fi
else
ac_fn_c_check_header_mongrel "$LINENO" "vorbis/vorbisfile.h" "ac_cv_header_vorbis_vorbisfile_h" "$ac_includes_default"

230
package/sdl_mixer/0006-staticerrorhack.patch
View File

@@ -1,3 +1,84 @@
--- a/configure.ac
+++ b/configure.ac
@@ -429,7 +429,6 @@
if test x$enable_music_ogg_tremor = xyes; then
AC_CHECK_HEADER([tremor/ivorbisfile.h], [have_tremor_hdr=yes])
AC_CHECK_LIB([vorbisidec], [ov_open_callbacks], [have_tremor_lib=yes], [], [-logg])
- if test x$have_tremor_hdr = xyes -a x$have_tremor_lib = xyes; then
case "$host" in
*-*-darwin*)
ogg_lib=[`find_lib libvorbisidec.dylib`]
@@ -449,20 +448,10 @@
esac
SOURCES="$SOURCES $srcdir/*_ogg.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_MUSIC -DOGG_USE_TREMOR"
- if test x$enable_music_ogg_shared = xyes && test x$ogg_lib != x; then
- echo "-- dynamic libvorbisidec -> $ogg_lib"
- EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
- else
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec"
- fi
- else
- AC_MSG_WARN([*** Unable to find Ogg Vorbis Tremor library (http://www.xiph.org/)])
- AC_MSG_WARN([Ogg Vorbis support disabled])
- fi
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec"
else
AC_CHECK_HEADER([vorbis/vorbisfile.h], [have_ogg_hdr=yes])
AC_CHECK_LIB([vorbisfile], [ov_open_callbacks], [have_ogg_lib=yes], [], [-lvorbis -logg -lm])
- if test x$have_ogg_hdr = xyes -a x$have_ogg_lib = xyes; then
case "$host" in
*-*-darwin*)
ogg_lib=[`find_lib libvorbisfile.dylib`]
@@ -479,16 +468,7 @@
esac
SOURCES="$SOURCES $srcdir/*_ogg.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_MUSIC"
- if test x$enable_music_ogg_shared = xyes && test x$ogg_lib != x; then
- echo "-- dynamic libvorbisfile -> $ogg_lib"
- EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
- else
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisfile -lvorbis -logg -lm"
- fi
- else
- AC_MSG_WARN([*** Unable to find Ogg Vorbis library (http://www.xiph.org/)])
- AC_MSG_WARN([Ogg Vorbis support disabled])
- fi
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisfile -lvorbis -logg -lm"
fi
LIBS="$LIBS_SAVED"
fi
@@ -562,11 +542,10 @@
AC_ARG_ENABLE([music-mp3-shared],
[AS_HELP_STRING([--enable-music-mp3-shared], [dynamically load MP3 support [default=yes]])],
[], [enable_music_mp3_shared=yes])
-have_mpg123=no
+have_mpg123=yes
if test x$enable_music_mp3 = xyes; then
AC_CHECK_HEADER([mpg123.h], [have_mpg123_hdr=yes])
AC_CHECK_LIB([mpg123], [mpg123_replace_reader_handle], [have_mpg123_lib=yes])
- if test x$have_mpg123_hdr = xyes -a x$have_mpg123_lib = xyes; then
have_mpg123=yes
case "$host" in
*-*-darwin*)
@@ -581,15 +560,7 @@
esac
SOURCES="$SOURCES $srcdir/*_mp3.c $srcdir/*_mpg.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MUSIC"
- if test x$enable_music_mp3_shared = xyes && test x$mpg123_lib != x; then
- echo "-- dynamic libmpg123 -> $mpg123_lib"
- EXTRA_CFLAGS="$EXTRA_CFLAGS -DMPG123_DYNAMIC=\\\"$mpg123_lib\\\""
- else
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmpg123"
- fi
- else
- AC_MSG_WARN([*** Unable to find mpg123 library (https://www.mpg123.de)])
- fi
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmpg123"
fi
AC_ARG_ENABLE(music-mp3-mad-gpl,
--- a/dynamic_mod.c
+++ b/dynamic_mod.c
@@ -28,6 +28,8 @@
@@ -12,15 +93,47 @@
--- a/Makefile.in
+++ b/Makefile.in
@@ -47,7 +47,7 @@
@@ -48,7 +48,7 @@
LT_REVISION = @LT_REVISION@
LT_LDFLAGS = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/playwave$(EXE) $(objects)/playmus$(EXE)
+all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET)
-all: $(srcdir)/configure Makefile $(objects)/$(TARGET) $(objects)/playwave$(EXE) $(objects)/playmus$(EXE)
+all: $(srcdir)/configure Makefile $(objects)/$(TARGET)
$(srcdir)/configure: $(srcdir)/configure.in
@echo "Warning, configure.in is out of date"
$(srcdir)/configure: $(srcdir)/configure.ac
@echo "Warning, configure is out of date, please re-run autogen.sh"
@@ -65,12 +65,6 @@
$(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS)
$(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS)
-$(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET)
- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(LDFLAGS) $(objects)/$(TARGET)
-
-$(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET)
- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(LDFLAGS) $(objects)/$(TARGET)
-
install: all install-hdrs install-lib #install-bin
install-hdrs:
$(SHELL) $(auxdir)/mkinstalldirs $(includedir)/SDL
@@ -85,8 +79,6 @@
$(LIBTOOL) --mode=install $(INSTALL) $(objects)/$(TARGET) $(libdir)/$(TARGET)
install-bin:
$(SHELL) $(auxdir)/mkinstalldirs $(bindir)
- $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(objects)/playwave$(EXE) $(bindir)/playwave$(EXE)
- $(LIBTOOL) --mode=install $(INSTALL) -m 755 $(objects)/playmus$(EXE) $(bindir)/playmus$(EXE)
uninstall: uninstall-hdrs uninstall-lib uninstall-bin
uninstall-hdrs:
@@ -100,8 +92,7 @@
uninstall-lib:
$(LIBTOOL) --mode=uninstall rm -f $(libdir)/$(TARGET)
uninstall-bin:
- rm -f $(bindir)/playwave$(EXE)
- rm -f $(bindir)/playmus$(EXE)
+
clean:
rm -rf $(objects)
--- a/playmus.c
+++ b/playmus.c
@@ -779,3 +892,110 @@
-/* end of playwave.c ... */
-
+int main(){}
--- a/configure
+++ b/configure
@@ -12197,7 +12197,6 @@
have_tremor_lib=yes
fi
- if test x$have_tremor_hdr = xyes -a x$have_tremor_lib = xyes; then
case "$host" in
*-*-darwin*)
ogg_lib=`find_lib libvorbisidec.dylib`
@@ -12217,18 +12216,7 @@
esac
SOURCES="$SOURCES $srcdir/*_ogg.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_MUSIC -DOGG_USE_TREMOR"
- if test x$enable_music_ogg_shared = xyes && test x$ogg_lib != x; then
- echo "-- dynamic libvorbisidec -> $ogg_lib"
- EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
- else
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec"
- fi
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Unable to find Ogg Vorbis Tremor library (http://www.xiph.org/)" >&5
-$as_echo "$as_me: WARNING: *** Unable to find Ogg Vorbis Tremor library (http://www.xiph.org/)" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ogg Vorbis support disabled" >&5
-$as_echo "$as_me: WARNING: Ogg Vorbis support disabled" >&2;}
- fi
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisidec"
else
ac_fn_c_check_header_mongrel "$LINENO" "vorbis/vorbisfile.h" "ac_cv_header_vorbis_vorbisfile_h" "$ac_includes_default"
if test "x$ac_cv_header_vorbis_vorbisfile_h" = xyes; then :
@@ -12276,7 +12264,6 @@
have_ogg_lib=yes
fi
- if test x$have_ogg_hdr = xyes -a x$have_ogg_lib = xyes; then
case "$host" in
*-*-darwin*)
ogg_lib=`find_lib libvorbisfile.dylib`
@@ -12293,18 +12280,7 @@
esac
SOURCES="$SOURCES $srcdir/*_ogg.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_MUSIC"
- if test x$enable_music_ogg_shared = xyes && test x$ogg_lib != x; then
- echo "-- dynamic libvorbisfile -> $ogg_lib"
- EXTRA_CFLAGS="$EXTRA_CFLAGS -DOGG_DYNAMIC=\\\"$ogg_lib\\\""
- else
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisfile -lvorbis -logg -lm"
- fi
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Unable to find Ogg Vorbis library (http://www.xiph.org/)" >&5
-$as_echo "$as_me: WARNING: *** Unable to find Ogg Vorbis library (http://www.xiph.org/)" >&2;}
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ogg Vorbis support disabled" >&5
-$as_echo "$as_me: WARNING: Ogg Vorbis support disabled" >&2;}
- fi
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvorbisfile -lvorbis -logg -lm"
fi
LIBS="$LIBS_SAVED"
fi
@@ -12483,7 +12459,7 @@
enable_music_mp3_shared=yes
fi
-have_mpg123=no
+have_mpg123=yes
if test x$enable_music_mp3 = xyes; then
ac_fn_c_check_header_mongrel "$LINENO" "mpg123.h" "ac_cv_header_mpg123_h" "$ac_includes_default"
if test "x$ac_cv_header_mpg123_h" = xyes; then :
@@ -12531,7 +12507,6 @@
have_mpg123_lib=yes
fi
- if test x$have_mpg123_hdr = xyes -a x$have_mpg123_lib = xyes; then
have_mpg123=yes
case "$host" in
*-*-darwin*)
@@ -12546,16 +12521,7 @@
esac
SOURCES="$SOURCES $srcdir/*_mp3.c $srcdir/*_mpg.c"
EXTRA_CFLAGS="$EXTRA_CFLAGS -DMP3_MUSIC"
- if test x$enable_music_mp3_shared = xyes && test x$mpg123_lib != x; then
- echo "-- dynamic libmpg123 -> $mpg123_lib"
- EXTRA_CFLAGS="$EXTRA_CFLAGS -DMPG123_DYNAMIC=\\\"$mpg123_lib\\\""
- else
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmpg123"
- fi
- else
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: *** Unable to find mpg123 library (https://www.mpg123.de)" >&5
-$as_echo "$as_me: WARNING: *** Unable to find mpg123 library (https://www.mpg123.de)" >&2;}
- fi
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lmpg123"
fi
# Check whether --enable-music-mp3-mad-gpl was given.
@@ -12601,12 +12567,7 @@
fi
fi
-if test x$have_mpg123 != xyes -a x$have_libmad != xyes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: MP3 support disabled" >&5
-$as_echo "$as_me: WARNING: MP3 support disabled" >&2;}
-else
- SOURCES="$SOURCES $srcdir/mp3utils.c"
-fi
+SOURCES="$SOURCES $srcdir/mp3utils.c"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LIBM"

5
package/sdl_mixer/sdl_mixer.mk
View File

@@ -4,9 +4,8 @@
#
################################################################################
SDL_MIXER_VERSION = 1.2.13
SDL_MIXER_SOURCE = SDL-1.2.tar.gz
SDL_MIXER_SITE = https://github.com/SDL-mirror/SDL_mixer/archive
SDL_MIXER_VERSION = b38fd5e9b93b65684fbf49323ee42a6f167eff96
SDL_MIXER_SITE = $(call github,libsdl-org,SDL_mixer,$(SDL_MIXER_VERSION))
SDL_MIXER_LICENSE = zlib
SDL_MIXER_LICENSE_FILES = COPYING