Browse Source
Merge pull request #194 from bk138/gcc-signed-off
gcc package refinedlilik-openwrt-22.03
sbyx
11 years ago
19 changed files with 1031 additions and 0 deletions
Split View
Diff Options
-
+115 -0devel/gcc/Makefile
-
+8 -0devel/gcc/README
-
+15 -0devel/gcc/patches/002-dont-choke-when-building-32bit-on-64bit.patch
-
+38 -0devel/gcc/patches/003-mpfr-longlong-mips.patch
-
+23 -0devel/gcc/patches/010-documentation.patch
-
+33 -0devel/gcc/patches/100-uclibc-conf.patch
-
+321 -0devel/gcc/patches/200-musl.patch
-
+11 -0devel/gcc/patches/800-arm_v5te_no_ldrd_strd.patch
-
+25 -0devel/gcc/patches/810-arm-softfloat-libgcc.patch
-
+36 -0devel/gcc/patches/820-libgcc_pic.patch
-
+13 -0devel/gcc/patches/830-arm_unbreak_armv4t.patch
-
+19 -0devel/gcc/patches/840-armv4_pass_fix-v4bx_to_ld.patch
-
+47 -0devel/gcc/patches/850-use_shared_libgcc.patch
-
+29 -0devel/gcc/patches/860-uclibc_use_eh_frame.patch
-
+11 -0devel/gcc/patches/870-ppc_no_crtsavres.patch
-
+11 -0devel/gcc/patches/880-no_java_section.patch
-
+9 -0devel/gcc/patches/900-bad-mips16-crt.patch
-
+253 -0devel/gcc/patches/910-mbsd_multi.patch
-
+14 -0devel/gcc/patches/920-specs_nonfatal_getenv.patch
+ 115
- 0
devel/gcc/Makefile
View File
| @ -0,0 +1,115 @@ | |||
| # | |||
| # Copyright (C) 2008 OpenWrt.org | |||
| # | |||
| # This is free software, licensed under the GNU General Public License v2. | |||
| # See /LICENSE for more information. | |||
| # | |||
| # | |||
| include $(TOPDIR)/rules.mk | |||
| PKG_NAME:=gcc | |||
| PKG_VERSION:=4.8.3 | |||
| PKG_RELEASE:=1 | |||
| PKG_SOURCE_URL:=ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-$(PKG_VERSION) \ | |||
| http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(PKG_VERSION) \ | |||
| ftp://ftp.gnu.org/gnu/gcc/releases/gcc-$(PKG_VERSION) | |||
| PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 | |||
| PKG_MD5SUM:=7c60f24fab389f77af203d2516ee110f | |||
| PKG_INSTALL:=1 | |||
| PKG_FIXUP:=libtool | |||
| PKG_BUILD_PARALLEL:=1 | |||
| include $(INCLUDE_DIR)/package.mk | |||
| TARGET_LANGUAGES:="c,c++" | |||
| BUGURL=https://dev.openwrt.org/ | |||
| PKGVERSION=OpenWrt GCC $(PKG_VERSION) | |||
| # not using sstrip here as this fucks up the .so's somehow | |||
| STRIP:=$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)strip | |||
| RSTRIP:= \ | |||
| NM="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)nm" \ | |||
| STRIP="$(STRIP)" \ | |||
| STRIP_KMOD="$(STRIP) --strip-debug" \ | |||
| $(SCRIPT_DIR)/rstrip.sh | |||
| define Package/gcc | |||
| SECTION:=devel | |||
| CATEGORY:=Development | |||
| TITLE:=gcc | |||
| MAINTAINER:=Christian Beier <cb@shoutrlabs.com> | |||
| DEPENDS:= +binutils +libstdcpp | |||
| endef | |||
| define Package/gcc/description | |||
| build a native toolchain for compiling on target | |||
| endef | |||
| define Build/Prepare | |||
| $(PKG_UNPACK) | |||
| # we have to download additional stuff before patching | |||
| (cd $(PKG_BUILD_DIR) && ./contrib/download_prerequisites) | |||
| $(Build/Patch) | |||
| endef | |||
| define Build/Configure | |||
| (cd $(PKG_BUILD_DIR); rm -f config.cache; \ | |||
| SHELL="$(BASH)" \ | |||
| $(TARGET_CONFIGURE_OPTS) \ | |||
| $(PKG_BUILD_DIR)/configure \ | |||
| $(CONFIGURE_ARGS) \ | |||
| --build=$(GNU_HOST_NAME) \ | |||
| --host=$(REAL_GNU_TARGET_NAME) \ | |||
| --target=$(REAL_GNU_TARGET_NAME) \ | |||
| --enable-languages=$(TARGET_LANGUAGES) \ | |||
| --with-bugurl=$(BUGURL) \ | |||
| --with-pkgversion="$(PKGVERSION)" \ | |||
| --enable-shared \ | |||
| --disable-__cxa_atexit \ | |||
| --enable-target-optspace \ | |||
| --with-gnu-ld \ | |||
| --disable-nls \ | |||
| --disable-libmudflap \ | |||
| --disable-multilib \ | |||
| --disable-libgomp \ | |||
| --disable-libquadmath \ | |||
| --disable-libssp \ | |||
| --disable-decimal-float \ | |||
| --disable-libstdcxx-pch \ | |||
| --with-host-libstdcxx=-lstdc++ \ | |||
| --prefix=/usr \ | |||
| --libexecdir=/usr/lib \ | |||
| $(SOFT_FLOAT_CONFIG_OPTION) \ | |||
| $(call qstrip,$(CONFIG_EXTRA_GCC_CONFIG_OPTIONS)) \ | |||
| $(if $(CONFIG_mips64)$(CONFIG_mips64el),--with-arch=mips64 \ | |||
| --with-abi=$(subst ",,$(CONFIG_MIPS64_ABI))) \ | |||
| ); | |||
| endef | |||
| define Build/Compile | |||
| export SHELL="$(BASH)"; $(MAKE_VARS) $(MAKE) -C $(PKG_BUILD_DIR) \ | |||
| DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE_ARGS) all install | |||
| endef | |||
| define Package/gcc/install | |||
| $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) | |||
| cp -ar $(PKG_INSTALL_DIR)/usr/include $(1)/usr | |||
| cp -a $(PKG_INSTALL_DIR)/usr/bin/{$(REAL_GNU_TARGET_NAME)-{g++,gcc},cpp,gcov} $(1)/usr/bin | |||
| ln -s $(REAL_GNU_TARGET_NAME)-g++ $(1)/usr/bin/c++ | |||
| ln -s $(REAL_GNU_TARGET_NAME)-g++ $(1)/usr/bin/g++ | |||
| ln -s $(REAL_GNU_TARGET_NAME)-g++ $(1)/usr/bin/$(REAL_GNU_TARGET_NAME)-c++ | |||
| ln -s $(REAL_GNU_TARGET_NAME)-gcc $(1)/usr/bin/gcc | |||
| ln -s $(REAL_GNU_TARGET_NAME)-gcc $(1)/usr/bin/$(REAL_GNU_TARGET_NAME)-gcc-$(PKG_VERSION) | |||
| cp -ar $(PKG_INSTALL_DIR)/usr/lib/gcc $(1)/usr/lib | |||
| $(RM) $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION)/*.a | |||
| cp -ar $(TOOLCHAIN_DIR)/include $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) | |||
| cp -a $(TOOLCHAIN_DIR)/lib/*.{o,so*} $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) | |||
| cp -a $(TOOLCHAIN_DIR)/lib/*nonshared*.a $(1)/usr/lib/$(PKG_NAME)/$(REAL_GNU_TARGET_NAME)/$(PKG_VERSION) | |||
| endef | |||
| $(eval $(call BuildPackage,gcc)) | |||
+ 8
- 0
devel/gcc/README
View File
| @ -0,0 +1,8 @@ | |||
| Native GCC that runs on target. | |||
| To save disk space, this GCC only supports dynamic linking on the target box, | |||
| there are no static libraries shipped. | |||
| For now, this was only tested on a mips target. Others to be done... | |||
| Christian Beier <cb@shoutrlabs.com> | |||
+ 15
- 0
devel/gcc/patches/002-dont-choke-when-building-32bit-on-64bit.patch
View File
| @ -0,0 +1,15 @@ | |||
| diff --git a/gcc/real.h b/gcc/real.h | |||
| index 2ff84f6..fbb4b0e 100644 | |||
| --- a/gcc/real.h | |||
| +++ b/gcc/real.h | |||
| @@ -72,8 +72,10 @@ struct GTY(()) real_value { | |||
| + (REAL_VALUE_TYPE_SIZE%HOST_BITS_PER_WIDE_INT ? 1 : 0)) /* round up */ | |||
| /* Verify the guess. */ | |||
| +#ifndef __LP64__ | |||
| extern char test_real_width | |||
| [sizeof(REAL_VALUE_TYPE) <= REAL_WIDTH*sizeof(HOST_WIDE_INT) ? 1 : -1]; | |||
| +#endif | |||
| /* Calculate the format for CONST_DOUBLE. We need as many slots as | |||
| are necessary to overlay a REAL_VALUE_TYPE on them. This could be | |||
+ 38
- 0
devel/gcc/patches/003-mpfr-longlong-mips.patch
View File
| @ -0,0 +1,38 @@ | |||
| diff -Naurd mpfr-2.4.2-a/mpfr-longlong.h mpfr-2.4.2-b/mpfr-longlong.h | |||
| --- -a/mpfr-2.4.2/mpfr-longlong.h 2009-11-30 02:43:08.000000000 +0000 | |||
| +++ -b/mpfr-2.4.2/mpfr-longlong.h 2009-12-18 12:04:29.000000000 +0000 | |||
| @@ -1011,7 +1011,15 @@ | |||
| #endif /* __m88000__ */ | |||
| #if defined (__mips) && W_TYPE_SIZE == 32 | |||
| -#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 | |||
| +#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4) | |||
| +#define umul_ppmm(w1, w0, u, v) \ | |||
| + do { \ | |||
| + UDItype _r; \ | |||
| + _r = (UDItype) u * v; \ | |||
| + (w1) = _r >> 32; \ | |||
| + (w0) = (USItype) _r; \ | |||
| + } while (0) | |||
| +#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7 | |||
| #define umul_ppmm(w1, w0, u, v) \ | |||
| __asm__ ("multu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v)) | |||
| #else | |||
| @@ -1024,7 +1032,16 @@ | |||
| #endif /* __mips */ | |||
| #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 | |||
| -#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 | |||
| +#if (__GNUC__ >= 5) || (__GNUC__ >= 4 && __GNUC_MINOR__ >= 4) | |||
| +typedef unsigned int UTItype __attribute__ ((mode (TI))); | |||
| +#define umul_ppmm(w1, w0, u, v) \ | |||
| + do { \ | |||
| + UTItype _r; \ | |||
| + _r = (UTItype) u * v; \ | |||
| + (w1) = _r >> 64; \ | |||
| + (w0) = (UDItype) _r; \ | |||
| + } while (0) | |||
| +#elif __GNUC__ > 2 || __GNUC_MINOR__ >= 7 | |||
| #define umul_ppmm(w1, w0, u, v) \ | |||
| __asm__ ("dmultu %2,%3" : "=l" (w0), "=h" (w1) : "d" (u), "d" (v)) | |||
| #else | |||
+ 23
- 0
devel/gcc/patches/010-documentation.patch
View File
| @ -0,0 +1,23 @@ | |||
| --- a/gcc/Makefile.in | |||
| +++ b/gcc/Makefile.in | |||
| @@ -4326,18 +4326,10 @@ doc/gcc.info: $(TEXI_GCC_FILES) | |||
| doc/gccint.info: $(TEXI_GCCINT_FILES) | |||
| doc/cppinternals.info: $(TEXI_CPPINT_FILES) | |||
| -doc/%.info: %.texi | |||
| - if [ x$(BUILD_INFO) = xinfo ]; then \ | |||
| - $(MAKEINFO) $(MAKEINFOFLAGS) -I . -I $(gcc_docdir) \ | |||
| - -I $(gcc_docdir)/include -o $@ $<; \ | |||
| - fi | |||
| +doc/%.info: | |||
| # Duplicate entry to handle renaming of gccinstall.info | |||
| -doc/gccinstall.info: $(TEXI_GCCINSTALL_FILES) | |||
| - if [ x$(BUILD_INFO) = xinfo ]; then \ | |||
| - $(MAKEINFO) $(MAKEINFOFLAGS) -I $(gcc_docdir) \ | |||
| - -I $(gcc_docdir)/include -o $@ $<; \ | |||
| - fi | |||
| +doc/gccinstall.info: | |||
| doc/cpp.dvi: $(TEXI_CPP_FILES) | |||
| doc/gcc.dvi: $(TEXI_GCC_FILES) | |||
+ 33
- 0
devel/gcc/patches/100-uclibc-conf.patch
View File
| @ -0,0 +1,33 @@ | |||
| --- a/contrib/regression/objs-gcc.sh | |||
| +++ b/contrib/regression/objs-gcc.sh | |||
| @@ -106,6 +106,10 @@ if [ $H_REAL_TARGET = $H_REAL_HOST -a $H | |||
| then | |||
| make all-gdb all-dejagnu all-ld || exit 1 | |||
| make install-gdb install-dejagnu install-ld || exit 1 | |||
| +elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] | |||
| + then | |||
| + make all-gdb all-dejagnu all-ld || exit 1 | |||
| + make install-gdb install-dejagnu install-ld || exit 1 | |||
| elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then | |||
| make bootstrap || exit 1 | |||
| make install || exit 1 | |||
| --- a/libjava/classpath/ltconfig | |||
| +++ b/libjava/classpath/ltconfig | |||
| @@ -603,7 +603,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)- | |||
| # Transform linux* to *-*-linux-gnu*, to support old configure scripts. | |||
| case $host_os in | |||
| -linux-gnu*) ;; | |||
| +linux-gnu*|linux-uclibc*) ;; | |||
| linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'` | |||
| esac | |||
| @@ -1247,7 +1247,7 @@ linux-gnuoldld* | linux-gnuaout* | linux | |||
| ;; | |||
| # This must be Linux ELF. | |||
| -linux-gnu*) | |||
| +linux*) | |||
| version_type=linux | |||
| need_lib_prefix=no | |||
| need_version=no | |||
+ 321
- 0
devel/gcc/patches/200-musl.patch
View File
| @ -0,0 +1,321 @@ | |||
| --- a/gcc/config.gcc | |||
| +++ b/gcc/config.gcc | |||
| @@ -549,7 +549,7 @@ case ${target} in | |||
| esac | |||
| # Common C libraries. | |||
| -tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3" | |||
| +tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4" | |||
| # Common parts for widely ported systems. | |||
| case ${target} in | |||
| @@ -652,6 +652,9 @@ case ${target} in | |||
| *-*-*uclibc*) | |||
| tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" | |||
| ;; | |||
| + *-*-*musl*) | |||
| + tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL" | |||
| + ;; | |||
| *) | |||
| tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" | |||
| ;; | |||
| --- a/gcc/config/arm/linux-eabi.h | |||
| +++ b/gcc/config/arm/linux-eabi.h | |||
| @@ -77,6 +77,10 @@ | |||
| %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \ | |||
| %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}" | |||
| +/* musl has no "classic" (i.e. broken) mode */ | |||
| +#undef MUSL_DYNAMIC_LINKER | |||
| +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-arm.so.1" | |||
| + | |||
| /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to | |||
| use the GNU/Linux version, not the generic BPABI version. */ | |||
| #undef LINK_SPEC | |||
| --- a/gcc/config/i386/linux.h | |||
| +++ b/gcc/config/i386/linux.h | |||
| @@ -21,3 +21,4 @@ along with GCC; see the file COPYING3. | |||
| #define GNU_USER_LINK_EMULATION "elf_i386" | |||
| #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | |||
| +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" | |||
| --- a/gcc/config/i386/linux64.h | |||
| +++ b/gcc/config/i386/linux64.h | |||
| @@ -30,3 +30,7 @@ see the files COPYING3 and COPYING.RUNTI | |||
| #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" | |||
| #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" | |||
| #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" | |||
| + | |||
| +#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" | |||
| +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1" | |||
| +#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" | |||
| --- a/gcc/config/linux.h | |||
| +++ b/gcc/config/linux.h | |||
| @@ -32,10 +32,12 @@ see the files COPYING3 and COPYING.RUNTI | |||
| #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) | |||
| #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) | |||
| #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) | |||
| +#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) | |||
| #else | |||
| #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) | |||
| #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) | |||
| #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) | |||
| +#define OPTION_MUSL (linux_libc == LIBC_MUSL) | |||
| #endif | |||
| #define GNU_USER_TARGET_OS_CPP_BUILTINS() \ | |||
| @@ -53,18 +55,21 @@ see the files COPYING3 and COPYING.RUNTI | |||
| uClibc or Bionic is the default C library and whether | |||
| -muclibc or -mglibc or -mbionic has been passed to change the default. */ | |||
| -#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \ | |||
| - "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}" | |||
| +#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \ | |||
| + "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}" | |||
| #if DEFAULT_LIBC == LIBC_GLIBC | |||
| -#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ | |||
| - CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B) | |||
| +#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ | |||
| + CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M) | |||
| #elif DEFAULT_LIBC == LIBC_UCLIBC | |||
| -#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ | |||
| - CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B) | |||
| +#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ | |||
| + CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M) | |||
| #elif DEFAULT_LIBC == LIBC_BIONIC | |||
| -#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ | |||
| - CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U) | |||
| +#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ | |||
| + CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M) | |||
| +#elif DEFAULT_LIBC == LIBC_MUSL | |||
| +#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ | |||
| + CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B) | |||
| #else | |||
| #error "Unsupported DEFAULT_LIBC" | |||
| #endif /* DEFAULT_LIBC */ | |||
| @@ -84,16 +89,16 @@ see the files COPYING3 and COPYING.RUNTI | |||
| #define GNU_USER_DYNAMIC_LINKER \ | |||
| CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \ | |||
| - BIONIC_DYNAMIC_LINKER) | |||
| + BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) | |||
| #define GNU_USER_DYNAMIC_LINKER32 \ | |||
| CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \ | |||
| - BIONIC_DYNAMIC_LINKER32) | |||
| + BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) | |||
| #define GNU_USER_DYNAMIC_LINKER64 \ | |||
| CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \ | |||
| - BIONIC_DYNAMIC_LINKER64) | |||
| + BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) | |||
| #define GNU_USER_DYNAMIC_LINKERX32 \ | |||
| CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \ | |||
| - BIONIC_DYNAMIC_LINKERX32) | |||
| + BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32) | |||
| /* Determine whether the entire c99 runtime | |||
| is present in the runtime library. */ | |||
| --- a/gcc/config/linux.opt | |||
| +++ b/gcc/config/linux.opt | |||
| @@ -30,3 +30,7 @@ Use GNU C library | |||
| muclibc | |||
| Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic) | |||
| Use uClibc C library | |||
| + | |||
| +mmusl | |||
| +Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc) | |||
| +Use musl C library | |||
| --- a/gcc/config/mips/linux.h | |||
| +++ b/gcc/config/mips/linux.h | |||
| @@ -18,3 +18,5 @@ along with GCC; see the file COPYING3. | |||
| <http://www.gnu.org/licenses/>. */ | |||
| #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" | |||
| + | |||
| +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips.so.1" | |||
| --- a/gcc/config/rs6000/linux64.h | |||
| +++ b/gcc/config/rs6000/linux64.h | |||
| @@ -364,17 +364,21 @@ extern int dot_symbols; | |||
| #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld64.so.1" | |||
| #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" | |||
| #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" | |||
| +#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1" | |||
| +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1" | |||
| #if DEFAULT_LIBC == LIBC_UCLIBC | |||
| -#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" | |||
| +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" | |||
| #elif DEFAULT_LIBC == LIBC_GLIBC | |||
| -#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" | |||
| +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" | |||
| +#elif DEFAULT_LIBC == LIBC_MUSL | |||
| +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" | |||
| #else | |||
| #error "Unsupported DEFAULT_LIBC" | |||
| #endif | |||
| #define GNU_USER_DYNAMIC_LINKER32 \ | |||
| - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32) | |||
| + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) | |||
| #define GNU_USER_DYNAMIC_LINKER64 \ | |||
| - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) | |||
| + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) | |||
| #define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ | |||
| --- a/gcc/config/rs6000/sysv4.h | |||
| +++ b/gcc/config/rs6000/sysv4.h | |||
| @@ -789,15 +789,18 @@ extern int fixuplabelno; | |||
| #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" | |||
| #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" | |||
| +#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1" | |||
| #if DEFAULT_LIBC == LIBC_UCLIBC | |||
| -#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" | |||
| +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" | |||
| +#elif DEFAULT_LIBC == LIBC_MUSL | |||
| +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" | |||
| #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC | |||
| -#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" | |||
| +#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" | |||
| #else | |||
| #error "Unsupported DEFAULT_LIBC" | |||
| #endif | |||
| #define GNU_USER_DYNAMIC_LINKER \ | |||
| - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) | |||
| + CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) | |||
| #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ | |||
| %{rdynamic:-export-dynamic} \ | |||
| --- a/gcc/ginclude/stddef.h | |||
| +++ b/gcc/ginclude/stddef.h | |||
| @@ -181,6 +181,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t; | |||
| #ifndef _GCC_SIZE_T | |||
| #ifndef _SIZET_ | |||
| #ifndef __size_t | |||
| +#ifndef __DEFINED_size_t /* musl */ | |||
| #define __size_t__ /* BeOS */ | |||
| #define __SIZE_T__ /* Cray Unicos/Mk */ | |||
| #define _SIZE_T | |||
| @@ -197,6 +198,7 @@ typedef __PTRDIFF_TYPE__ ptrdiff_t; | |||
| #define ___int_size_t_h | |||
| #define _GCC_SIZE_T | |||
| #define _SIZET_ | |||
| +#define __DEFINED_size_t /* musl */ | |||
| #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \ | |||
| || defined(__FreeBSD_kernel__) | |||
| /* __size_t is a typedef on FreeBSD 5, must not trash it. */ | |||
| @@ -214,6 +216,7 @@ typedef __SIZE_TYPE__ size_t; | |||
| typedef long ssize_t; | |||
| #endif /* __BEOS__ */ | |||
| #endif /* !(defined (__GNUG__) && defined (size_t)) */ | |||
| +#endif /* __DEFINED_size_t */ | |||
| #endif /* __size_t */ | |||
| #endif /* _SIZET_ */ | |||
| #endif /* _GCC_SIZE_T */ | |||
| --- a/libgomp/config/posix/time.c | |||
| +++ b/libgomp/config/posix/time.c | |||
| @@ -28,6 +28,8 @@ | |||
| The following implementation uses the most simple POSIX routines. | |||
| If present, POSIX 4 clocks should be used instead. */ | |||
| +#define _POSIX_C_SOURCE 199309L /* for clocks */ | |||
| + | |||
| #include "libgomp.h" | |||
| #include <unistd.h> | |||
| #if TIME_WITH_SYS_TIME | |||
| --- a/libitm/config/arm/hwcap.cc | |||
| +++ b/libitm/config/arm/hwcap.cc | |||
| @@ -40,7 +40,11 @@ int GTM_hwcap HIDDEN = 0 | |||
| #ifdef __linux__ | |||
| #include <unistd.h> | |||
| +#ifdef __GLIBC__ | |||
| #include <sys/fcntl.h> | |||
| +#else | |||
| +#include <fcntl.h> | |||
| +#endif | |||
| #include <elf.h> | |||
| static void __attribute__((constructor)) | |||
| --- a/libitm/config/linux/x86/tls.h | |||
| +++ b/libitm/config/linux/x86/tls.h | |||
| @@ -25,16 +25,19 @@ | |||
| #ifndef LIBITM_X86_TLS_H | |||
| #define LIBITM_X86_TLS_H 1 | |||
| -#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) | |||
| +#if defined(__GLIBC_PREREQ) | |||
| +#if __GLIBC_PREREQ(2, 10) | |||
| /* Use slots in the TCB head rather than __thread lookups. | |||
| GLIBC has reserved words 10 through 13 for TM. */ | |||
| #define HAVE_ARCH_GTM_THREAD 1 | |||
| #define HAVE_ARCH_GTM_THREAD_DISP 1 | |||
| #endif | |||
| +#endif | |||
| #include "config/generic/tls.h" | |||
| -#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) | |||
| +#if defined(__GLIBC_PREREQ) | |||
| +#if __GLIBC_PREREQ(2, 10) | |||
| namespace GTM HIDDEN { | |||
| #ifdef __x86_64__ | |||
| @@ -101,5 +104,6 @@ static inline void set_abi_disp(struct a | |||
| } // namespace GTM | |||
| #endif /* >= GLIBC 2.10 */ | |||
| +#endif | |||
| #endif // LIBITM_X86_TLS_H | |||
| --- a/libstdc++-v3/configure.host | |||
| +++ b/libstdc++-v3/configure.host | |||
| @@ -264,6 +264,13 @@ case "${host_os}" in | |||
| os_include_dir="os/bsd/freebsd" | |||
| ;; | |||
| gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) | |||
| + # check for musl by target | |||
| + case "${host_os}" in | |||
| + *-musl*) | |||
| + os_include_dir="os/generic" | |||
| + ;; | |||
| + *) | |||
| + | |||
| if [ "$uclibc" = "yes" ]; then | |||
| os_include_dir="os/uclibc" | |||
| elif [ "$bionic" = "yes" ]; then | |||
| @@ -272,6 +279,9 @@ case "${host_os}" in | |||
| os_include_dir="os/gnu-linux" | |||
| fi | |||
| ;; | |||
| + | |||
| + esac | |||
| + ;; | |||
| hpux*) | |||
| os_include_dir="os/hpux" | |||
| ;; | |||
| --- a/gcc/config/mips/linux64.h | |||
| +++ b/gcc/config/mips/linux64.h | |||
| @@ -27,6 +27,9 @@ along with GCC; see the file COPYING3. | |||
| #define GLIBC_DYNAMIC_LINKERN32 "/lib32/ld.so.1" | |||
| #define UCLIBC_DYNAMIC_LINKERN32 "/lib32/ld-uClibc.so.0" | |||
| #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" | |||
| +#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mips.so.1" | |||
| +#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips.so.1" | |||
| +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips.so.1" | |||
| #define GNU_USER_DYNAMIC_LINKERN32 \ | |||
| CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ | |||
| - BIONIC_DYNAMIC_LINKERN32) | |||
| + BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32) | |||
| --- a/gcc/config/sparc/linux64.h 2013-09-10 10:02:45.663973856 +0100 | |||
| +++ b/gcc/config/sparc/linux64.h 2013-09-10 10:03:17.871972435 +0100 | |||
| @@ -104,6 +104,9 @@ | |||
| #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" | |||
| #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux.so.2" | |||
| +#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-sparc.so.1" | |||
| +#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-sparc.so.1" | |||
| + | |||
| #ifdef SPARC_BI_ARCH | |||
| #undef SUBTARGET_EXTRA_SPECS | |||
+ 11
- 0
devel/gcc/patches/800-arm_v5te_no_ldrd_strd.patch
View File
| @ -0,0 +1,11 @@ | |||
| --- a/gcc/config/arm/arm.h | |||
| +++ b/gcc/config/arm/arm.h | |||
| @@ -271,7 +271,7 @@ extern void (*arm_lang_output_object_att | |||
| /* Thumb-1 only. */ | |||
| #define TARGET_THUMB1_ONLY (TARGET_THUMB1 && !arm_arch_notm) | |||
| -#define TARGET_LDRD (arm_arch5e && ARM_DOUBLEWORD_ALIGN \ | |||
| +#define TARGET_LDRD (arm_arch6 && ARM_DOUBLEWORD_ALIGN \ | |||
| && !TARGET_THUMB1) | |||
| /* The following two macros concern the ability to execute coprocessor | |||
+ 25
- 0
devel/gcc/patches/810-arm-softfloat-libgcc.patch
View File
| @ -0,0 +1,25 @@ | |||
| --- a/libgcc/config/arm/t-linux | |||
| +++ b/libgcc/config/arm/t-linux | |||
| @@ -1,6 +1,10 @@ | |||
| LIB1ASMSRC = arm/lib1funcs.S | |||
| LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \ | |||
| - _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 | |||
| + _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \ | |||
| + _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \ | |||
| + _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \ | |||
| + _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \ | |||
| + _arm_fixsfsi _arm_fixunssfsi | |||
| # Just for these, we omit the frame pointer since it makes such a big | |||
| # difference. | |||
| --- a/gcc/config/arm/linux-elf.h | |||
| +++ b/gcc/config/arm/linux-elf.h | |||
| @@ -55,8 +55,6 @@ | |||
| %{shared:-lc} \ | |||
| %{!shared:%{profile:-lc_p}%{!profile:-lc}}" | |||
| -#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" | |||
| - | |||
| #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" | |||
| #define LINUX_TARGET_LINK_SPEC "%{h*} \ | |||
+ 36
- 0
devel/gcc/patches/820-libgcc_pic.patch
View File
| @ -0,0 +1,36 @@ | |||
| --- a/libgcc/Makefile.in | |||
| +++ b/libgcc/Makefile.in | |||
| @@ -865,11 +865,12 @@ $(libgcov-objects): %$(objext): $(srcdir | |||
| # Static libraries. | |||
| libgcc.a: $(libgcc-objects) | |||
| +libgcc_pic.a: $(libgcc-s-objects) | |||
| libgcov.a: $(libgcov-objects) | |||
| libunwind.a: $(libunwind-objects) | |||
| libgcc_eh.a: $(libgcc-eh-objects) | |||
| -libgcc.a libgcov.a libunwind.a libgcc_eh.a: | |||
| +libgcc.a libgcov.a libunwind.a libgcc_eh.a libgcc_pic.a: | |||
| -rm -f $@ | |||
| objects="$(objects)"; \ | |||
| @@ -891,7 +892,7 @@ libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_E | |||
| endif | |||
| ifeq ($(enable_shared),yes) | |||
| -all: libgcc_eh.a libgcc_s$(SHLIB_EXT) | |||
| +all: libgcc_eh.a libgcc_pic.a libgcc_s$(SHLIB_EXT) | |||
| ifneq ($(LIBUNWIND),) | |||
| all: libunwind$(SHLIB_EXT) | |||
| endif | |||
| @@ -1058,6 +1059,10 @@ install-shared: | |||
| chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_eh.a | |||
| $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_eh.a | |||
| + $(INSTALL_DATA) libgcc_pic.a $(mapfile) $(DESTDIR)$(inst_libdir)/ | |||
| + chmod 644 $(DESTDIR)$(inst_libdir)/libgcc_pic.a | |||
| + $(RANLIB) $(DESTDIR)$(inst_libdir)/libgcc_pic.a | |||
| + | |||
| $(subst @multilib_dir@,$(MULTIDIR),$(subst \ | |||
| @shlib_base_name@,libgcc_s,$(subst \ | |||
| @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(SHLIB_INSTALL)))) | |||
+ 13
- 0
devel/gcc/patches/830-arm_unbreak_armv4t.patch
View File
| @ -0,0 +1,13 @@ | |||
| http://sourceware.org/ml/crossgcc/2008-05/msg00009.html | |||
| --- a/gcc/config/arm/linux-eabi.h | |||
| +++ b/gcc/config/arm/linux-eabi.h | |||
| @@ -45,7 +45,7 @@ | |||
| The ARM10TDMI core is the default for armv5t, so set | |||
| SUBTARGET_CPU_DEFAULT to achieve this. */ | |||
| #undef SUBTARGET_CPU_DEFAULT | |||
| -#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi | |||
| +#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi | |||
| /* TARGET_BIG_ENDIAN_DEFAULT is set in | |||
| config.gcc for big endian configurations. */ | |||
+ 19
- 0
devel/gcc/patches/840-armv4_pass_fix-v4bx_to_ld.patch
View File
| @ -0,0 +1,19 @@ | |||
| --- a/gcc/config/arm/linux-eabi.h | |||
| +++ b/gcc/config/arm/linux-eabi.h | |||
| @@ -81,10 +81,15 @@ | |||
| #undef MUSL_DYNAMIC_LINKER | |||
| #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-arm.so.1" | |||
| +/* For armv4 we pass --fix-v4bx to linker to support EABI */ | |||
| +#undef TARGET_FIX_V4BX_SPEC | |||
| +#define TARGET_FIX_V4BX_SPEC " %{mcpu=arm8|mcpu=arm810|mcpu=strongarm*"\ | |||
| + "|march=armv4|mcpu=fa526|mcpu=fa626:--fix-v4bx}" | |||
| + | |||
| /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to | |||
| use the GNU/Linux version, not the generic BPABI version. */ | |||
| #undef LINK_SPEC | |||
| -#define LINK_SPEC BE8_LINK_SPEC \ | |||
| +#define LINK_SPEC BE8_LINK_SPEC TARGET_FIX_V4BX_SPEC \ | |||
| LINUX_OR_ANDROID_LD (LINUX_TARGET_LINK_SPEC, \ | |||
| LINUX_TARGET_LINK_SPEC " " ANDROID_LINK_SPEC) | |||
+ 47
- 0
devel/gcc/patches/850-use_shared_libgcc.patch
View File
| @ -0,0 +1,47 @@ | |||
| --- a/gcc/config/arm/linux-eabi.h | |||
| +++ b/gcc/config/arm/linux-eabi.h | |||
| @@ -114,10 +114,6 @@ | |||
| #define ENDFILE_SPEC \ | |||
| LINUX_OR_ANDROID_LD (GNU_USER_TARGET_ENDFILE_SPEC, ANDROID_ENDFILE_SPEC) | |||
| -/* Use the default LIBGCC_SPEC, not the version in linux-elf.h, as we | |||
| - do not use -lfloat. */ | |||
| -#undef LIBGCC_SPEC | |||
| - | |||
| /* Clear the instruction cache from `beg' to `end'. This is | |||
| implemented in lib1funcs.S, so ensure an error if this definition | |||
| is used. */ | |||
| --- a/gcc/config/linux.h | |||
| +++ b/gcc/config/linux.h | |||
| @@ -51,6 +51,10 @@ see the files COPYING3 and COPYING.RUNTI | |||
| builtin_assert ("system=posix"); \ | |||
| } while (0) | |||
| +#ifndef LIBGCC_SPEC | |||
| +#define LIBGCC_SPEC "%{static|static-libgcc:-lgcc}%{!static:%{!static-libgcc:-lgcc_s}}" | |||
| +#endif | |||
| + | |||
| /* Determine which dynamic linker to use depending on whether GLIBC or | |||
| uClibc or Bionic is the default C library and whether | |||
| -muclibc or -mglibc or -mbionic has been passed to change the default. */ | |||
| --- a/libgcc/mkmap-symver.awk | |||
| +++ b/libgcc/mkmap-symver.awk | |||
| @@ -132,5 +132,5 @@ function output(lib) { | |||
| else if (inherit[lib]) | |||
| printf("} %s;\n", inherit[lib]); | |||
| else | |||
| - printf ("\n local:\n\t*;\n};\n"); | |||
| + printf ("\n\t*;\n};\n"); | |||
| } | |||
| --- a/gcc/config/rs6000/linux.h | |||
| +++ b/gcc/config/rs6000/linux.h | |||
| @@ -61,6 +61,9 @@ | |||
| #undef CPLUSPLUS_CPP_SPEC | |||
| #define CPLUSPLUS_CPP_SPEC "-D_GNU_SOURCE %(cpp)" | |||
| +#undef LIBGCC_SPEC | |||
| +#define LIBGCC_SPEC "%{!static:%{!static-libgcc:-lgcc_s}} -lgcc" | |||
| + | |||
| #undef LINK_SHLIB_SPEC | |||
| #define LINK_SHLIB_SPEC "%{shared:-shared} %{!shared: %{static:-static}}" | |||
+ 29
- 0
devel/gcc/patches/860-uclibc_use_eh_frame.patch
View File
| @ -0,0 +1,29 @@ | |||
| --- a/libgcc/crtstuff.c | |||
| +++ b/libgcc/crtstuff.c | |||
| @@ -100,15 +100,20 @@ call_ ## FUNC (void) \ | |||
| #if defined(OBJECT_FORMAT_ELF) \ | |||
| && !defined(OBJECT_FORMAT_FLAT) \ | |||
| && defined(HAVE_LD_EH_FRAME_HDR) \ | |||
| - && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \ | |||
| - && defined(__GLIBC__) && __GLIBC__ >= 2 | |||
| + && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) | |||
| #include <link.h> | |||
| /* uClibc pretends to be glibc 2.2 and DT_CONFIG is defined in its link.h. | |||
| But it doesn't use PT_GNU_EH_FRAME ELF segment currently. */ | |||
| -# if !defined(__UCLIBC__) \ | |||
| - && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \ | |||
| - || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) | |||
| -# define USE_PT_GNU_EH_FRAME | |||
| +# if defined(__UCLIBC__) | |||
| +# if (__UCLIBC_MAJOR__ > 0 || __UCLIBC_MINOR__ > 9 || \ | |||
| + (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ >= 33)) | |||
| +# define USE_PT_GNU_EH_FRAME | |||
| +# endif | |||
| +# elif defined(__GLIBC__) | |||
| +# if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \ | |||
| + || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG))) | |||
| +# define USE_PT_GNU_EH_FRAME | |||
| +# endif | |||
| # endif | |||
| #endif | |||
+ 11
- 0
devel/gcc/patches/870-ppc_no_crtsavres.patch
View File
| @ -0,0 +1,11 @@ | |||
| --- a/gcc/config/rs6000/rs6000.c | |||
| +++ b/gcc/config/rs6000/rs6000.c | |||
| @@ -17653,7 +17653,7 @@ rs6000_savres_strategy (rs6000_stack_t * | |||
| /* Define cutoff for using out-of-line functions to save registers. */ | |||
| if (DEFAULT_ABI == ABI_V4 || TARGET_ELF) | |||
| { | |||
| - if (!optimize_size) | |||
| + if (1) | |||
| { | |||
| strategy |= SAVE_INLINE_FPRS | REST_INLINE_FPRS; | |||
| strategy |= SAVE_INLINE_GPRS | REST_INLINE_GPRS; | |||
+ 11
- 0
devel/gcc/patches/880-no_java_section.patch
View File
| @ -0,0 +1,11 @@ | |||
| --- a/gcc/defaults.h | |||
| +++ b/gcc/defaults.h | |||
| @@ -380,7 +380,7 @@ see the files COPYING3 and COPYING.RUNTI | |||
| /* If we have named section and we support weak symbols, then use the | |||
| .jcr section for recording java classes which need to be registered | |||
| at program start-up time. */ | |||
| -#if defined (TARGET_ASM_NAMED_SECTION) && SUPPORTS_WEAK | |||
| +#if 0 && defined (TARGET_ASM_NAMED_SECTION) && SUPPORTS_WEAK | |||
| #ifndef JCR_SECTION_NAME | |||
| #define JCR_SECTION_NAME ".jcr" | |||
| #endif | |||
+ 9
- 0
devel/gcc/patches/900-bad-mips16-crt.patch
View File
| @ -0,0 +1,9 @@ | |||
| --- a/libgcc/config/mips/t-mips16 | |||
| +++ b/libgcc/config/mips/t-mips16 | |||
| @@ -43,3 +43,6 @@ SYNC_CFLAGS = -mno-mips16 | |||
| # Version these symbols if building libgcc.so. | |||
| SHLIB_MAPFILES += $(srcdir)/config/mips/libgcc-mips16.ver | |||
| + | |||
| +CRTSTUFF_T_CFLAGS += -mno-mips16 | |||
| +CRTSTUFF_T_CFLAGS_S += -mno-mips16 | |||
+ 253
- 0
devel/gcc/patches/910-mbsd_multi.patch
View File
| @ -0,0 +1,253 @@ | |||
| This patch brings over a few features from MirBSD: | |||
| * -fhonour-copts | |||
| If this option is not given, it's warned (depending | |||
| on environment variables). This is to catch errors | |||
| of misbuilt packages which override CFLAGS themselves. | |||
| * -Werror-maybe-reset | |||
| Has the effect of -Wno-error if GCC_NO_WERROR is | |||
| set and not '0', a no-operation otherwise. This is | |||
| to be able to use -Werror in "make" but prevent | |||
| GNU autoconf generated configure scripts from | |||
| freaking out. | |||
| * Make -fno-strict-aliasing and -fno-delete-null-pointer-checks | |||
| the default for -O2/-Os, because they trigger gcc bugs | |||
| and can delete code with security implications. | |||
| This patch was authored by Thorsten Glaser <tg at mirbsd.de> | |||
| with copyright assignment to the FSF in effect. | |||
| --- a/gcc/c-family/c-opts.c | |||
| +++ b/gcc/c-family/c-opts.c | |||
| @@ -104,6 +104,9 @@ static size_t include_cursor; | |||
| /* Whether any standard preincluded header has been preincluded. */ | |||
| static bool done_preinclude; | |||
| +/* Check if a port honours COPTS. */ | |||
| +static int honour_copts = 0; | |||
| + | |||
| static void handle_OPT_d (const char *); | |||
| static void set_std_cxx98 (int); | |||
| static void set_std_cxx11 (int); | |||
| @@ -383,6 +386,9 @@ c_common_handle_option (size_t scode, co | |||
| cpp_opts->warn_endif_labels = value; | |||
| break; | |||
| + case OPT_Werror_maybe_reset: | |||
| + break; | |||
| + | |||
| case OPT_Winvalid_pch: | |||
| cpp_opts->warn_invalid_pch = value; | |||
| break; | |||
| @@ -491,6 +497,12 @@ c_common_handle_option (size_t scode, co | |||
| flag_no_builtin = !value; | |||
| break; | |||
| + case OPT_fhonour_copts: | |||
| + if (c_language == clk_c) { | |||
| + honour_copts++; | |||
| + } | |||
| + break; | |||
| + | |||
| case OPT_fconstant_string_class_: | |||
| constant_string_class_name = arg; | |||
| break; | |||
| @@ -1027,6 +1039,47 @@ c_common_init (void) | |||
| return false; | |||
| } | |||
| + if (c_language == clk_c) { | |||
| + char *ev = getenv ("GCC_HONOUR_COPTS"); | |||
| + int evv; | |||
| + if (ev == NULL) | |||
| + evv = -1; | |||
| + else if ((*ev == '0') || (*ev == '\0')) | |||
| + evv = 0; | |||
| + else if (*ev == '1') | |||
| + evv = 1; | |||
| + else if (*ev == '2') | |||
| + evv = 2; | |||
| + else if (*ev == 's') | |||
| + evv = -1; | |||
| + else { | |||
| + warning (0, "unknown GCC_HONOUR_COPTS value, assuming 1"); | |||
| + evv = 1; /* maybe depend this on something like MIRBSD_NATIVE? */ | |||
| + } | |||
| + if (evv == 1) { | |||
| + if (honour_copts == 0) { | |||
| + error ("someone does not honour COPTS at all in lenient mode"); | |||
| + return false; | |||
| + } else if (honour_copts != 1) { | |||
| + warning (0, "someone does not honour COPTS correctly, passed %d times", | |||
| + honour_copts); | |||
| + } | |||
| + } else if (evv == 2) { | |||
| + if (honour_copts == 0) { | |||
| + error ("someone does not honour COPTS at all in strict mode"); | |||
| + return false; | |||
| + } else if (honour_copts != 1) { | |||
| + error ("someone does not honour COPTS correctly, passed %d times", | |||
| + honour_copts); | |||
| + return false; | |||
| + } | |||
| + } else if (evv == 0) { | |||
| + if (honour_copts != 1) | |||
| + inform (0, "someone does not honour COPTS correctly, passed %d times", | |||
| + honour_copts); | |||
| + } | |||
| + } | |||
| + | |||
| return true; | |||
| } | |||
| --- a/gcc/c-family/c.opt | |||
| +++ b/gcc/c-family/c.opt | |||
| @@ -379,6 +379,10 @@ Werror-implicit-function-declaration | |||
| C ObjC RejectNegative Warning Alias(Werror=, implicit-function-declaration) | |||
| This switch is deprecated; use -Werror=implicit-function-declaration instead | |||
| +Werror-maybe-reset | |||
| +C ObjC C++ ObjC++ | |||
| +; Documented in common.opt | |||
| + | |||
| Wfloat-equal | |||
| C ObjC C++ ObjC++ Var(warn_float_equal) Warning | |||
| Warn if testing floating point numbers for equality | |||
| @@ -949,6 +953,9 @@ C++ ObjC++ Optimization Alias(fexception | |||
| fhonor-std | |||
| C++ ObjC++ Ignore Warn(switch %qs is no longer supported) | |||
| +fhonour-copts | |||
| +C ObjC C++ ObjC++ RejectNegative | |||
| + | |||
| fhosted | |||
| C ObjC | |||
| Assume normal C execution environment | |||
| --- a/gcc/common.opt | |||
| +++ b/gcc/common.opt | |||
| @@ -541,6 +541,10 @@ Werror= | |||
| Common Joined | |||
| Treat specified warning as error | |||
| +Werror-maybe-reset | |||
| +Common | |||
| +If environment variable GCC_NO_WERROR is set, act as -Wno-error | |||
| + | |||
| Wextra | |||
| Common Var(extra_warnings) Warning | |||
| Print extra (possibly unwanted) warnings | |||
| @@ -1242,6 +1246,9 @@ fguess-branch-probability | |||
| Common Report Var(flag_guess_branch_prob) Optimization | |||
| Enable guessing of branch probabilities | |||
| +fhonour-copts | |||
| +Common RejectNegative | |||
| + | |||
| ; Nonzero means ignore `#ident' directives. 0 means handle them. | |||
| ; Generate position-independent code for executables if possible | |||
| ; On SVR4 targets, it also controls whether or not to emit a | |||
| --- a/gcc/opts.c | |||
| +++ b/gcc/opts.c | |||
| @@ -468,8 +468,6 @@ static const struct default_options defa | |||
| { OPT_LEVELS_2_PLUS, OPT_fschedule_insns2, NULL, 1 }, | |||
| #endif | |||
| { OPT_LEVELS_2_PLUS, OPT_fregmove, NULL, 1 }, | |||
| - { OPT_LEVELS_2_PLUS, OPT_fstrict_aliasing, NULL, 1 }, | |||
| - { OPT_LEVELS_2_PLUS, OPT_fstrict_overflow, NULL, 1 }, | |||
| { OPT_LEVELS_2_PLUS, OPT_freorder_blocks, NULL, 1 }, | |||
| { OPT_LEVELS_2_PLUS, OPT_freorder_functions, NULL, 1 }, | |||
| { OPT_LEVELS_2_PLUS, OPT_ftree_vrp, NULL, 1 }, | |||
| @@ -488,6 +486,8 @@ static const struct default_options defa | |||
| { OPT_LEVELS_2_PLUS, OPT_fhoist_adjacent_loads, NULL, 1 }, | |||
| /* -O3 optimizations. */ | |||
| + { OPT_LEVELS_3_PLUS, OPT_fstrict_aliasing, NULL, 1 }, | |||
| + { OPT_LEVELS_3_PLUS, OPT_fstrict_overflow, NULL, 1 }, | |||
| { OPT_LEVELS_3_PLUS, OPT_ftree_loop_distribute_patterns, NULL, 1 }, | |||
| { OPT_LEVELS_3_PLUS, OPT_fpredictive_commoning, NULL, 1 }, | |||
| /* Inlining of functions reducing size is a good idea with -Os | |||
| @@ -1423,6 +1423,17 @@ common_handle_option (struct gcc_options | |||
| opts, opts_set, loc, dc); | |||
| break; | |||
| + case OPT_Werror_maybe_reset: | |||
| + { | |||
| + char *ev = getenv ("GCC_NO_WERROR"); | |||
| + if ((ev != NULL) && (*ev != '0')) | |||
| + warnings_are_errors = 0; | |||
| + } | |||
| + break; | |||
| + | |||
| + case OPT_fhonour_copts: | |||
| + break; | |||
| + | |||
| case OPT_Wlarger_than_: | |||
| opts->x_larger_than_size = value; | |||
| opts->x_warn_larger_than = value != -1; | |||
| --- a/gcc/doc/cppopts.texi | |||
| +++ b/gcc/doc/cppopts.texi | |||
| @@ -163,6 +163,11 @@ in older programs. This warning is on b | |||
| Make all warnings into hard errors. Source code which triggers warnings | |||
| will be rejected. | |||
| + at item -Werror-maybe-reset | |||
| + at opindex Werror-maybe-reset | |||
| +Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment | |||
| +variable is set to anything other than 0 or empty. | |||
| + | |||
| @item -Wsystem-headers | |||
| @opindex Wsystem-headers | |||
| Issue warnings for code in system headers. These are normally unhelpful | |||
| --- a/gcc/doc/invoke.texi | |||
| +++ b/gcc/doc/invoke.texi | |||
| @@ -240,7 +240,7 @@ Objective-C and Objective-C++ Dialects}. | |||
| -Wconversion -Wcoverage-mismatch -Wno-cpp -Wno-deprecated @gol | |||
| -Wno-deprecated-declarations -Wdisabled-optimization @gol | |||
| -Wno-div-by-zero -Wdouble-promotion -Wempty-body -Wenum-compare @gol | |||
| --Wno-endif-labels -Werror -Werror=* @gol | |||
| +-Wno-endif-labels -Werror -Werror=* -Werror-maybe-reset @gol | |||
| -Wfatal-errors -Wfloat-equal -Wformat -Wformat=2 @gol | |||
| -Wno-format-contains-nul -Wno-format-extra-args -Wformat-nonliteral @gol | |||
| -Wformat-security -Wformat-y2k @gol | |||
| @@ -4808,6 +4808,22 @@ This option is only supported for C and | |||
| @option{-Wall} and by @option{-Wpedantic}, which can be disabled with | |||
| @option{-Wno-pointer-sign}. | |||
| + at item -Werror-maybe-reset | |||
| + at opindex Werror-maybe-reset | |||
| +Act like @samp{-Wno-error} if the @env{GCC_NO_WERROR} environment | |||
| +variable is set to anything other than 0 or empty. | |||
| + | |||
| + at item -fhonour-copts | |||
| + at opindex fhonour-copts | |||
| +If @env{GCC_HONOUR_COPTS} is set to 1, abort if this option is not | |||
| +given at least once, and warn if it is given more than once. | |||
| +If @env{GCC_HONOUR_COPTS} is set to 2, abort if this option is not | |||
| +given exactly once. | |||
| +If @env{GCC_HONOUR_COPTS} is set to 0 or unset, warn if this option | |||
| +is not given exactly once. | |||
| +The warning is quelled if @env{GCC_HONOUR_COPTS} is set to @samp{s}. | |||
| +This flag and environment variable only affect the C language. | |||
| + | |||
| @item -Wstack-protector | |||
| @opindex Wstack-protector | |||
| @opindex Wno-stack-protector | |||
| @@ -6919,7 +6935,7 @@ so, the first branch is redirected to ei | |||
| second branch or a point immediately following it, depending on whether | |||
| the condition is known to be true or false. | |||
| -Enabled at levels @option{-O2}, @option{-O3}, @option{-Os}. | |||
| +Enabled at levels @option{-O3}. | |||
| @item -fsplit-wide-types | |||
| @opindex fsplit-wide-types | |||
| --- a/gcc/java/jvspec.c | |||
| +++ b/gcc/java/jvspec.c | |||
| @@ -626,6 +626,7 @@ lang_specific_pre_link (void) | |||
| class name. Append dummy `.c' that can be stripped by set_input so %b | |||
| is correct. */ | |||
| set_input (concat (main_class_name, "main.c", NULL)); | |||
| + putenv ("GCC_HONOUR_COPTS=s"); /* XXX hack! */ | |||
| err = do_spec (jvgenmain_spec); | |||
| if (err == 0) | |||
| { | |||
+ 14
- 0
devel/gcc/patches/920-specs_nonfatal_getenv.patch
View File
| @ -0,0 +1,14 @@ | |||
| --- a/gcc/gcc.c | |||
| +++ b/gcc/gcc.c | |||
| @@ -8003,7 +8003,10 @@ getenv_spec_function (int argc, const ch | |||
| value = getenv (argv[0]); | |||
| if (!value) | |||
| - fatal_error ("environment variable %qs not defined", argv[0]); | |||
| + { | |||
| + warning (0, "environment variable %qs not defined", argv[0]); | |||
| + value = ""; | |||
| + } | |||
| /* We have to escape every character of the environment variable so | |||
| they are not interpreted as active spec characters. A | |||