diff options
| -rw-r--r-- | package/gcc/Config.in.host | 8 | ||||
| -rw-r--r-- | package/gcc/gcc-final/gcc-final.mk | 10 | ||||
| -rw-r--r-- | package/gcc/gcc.mk | 2 |
3 files changed, 2 insertions, 18 deletions
diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 1b191282d..0836f9f64 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -105,14 +105,6 @@ config BR2_INSTALL_FORTRAN Note that it is highly recommended NOT to use gfortran from gcc older than 4.2.0 -config BR2_GCC_SHARED_LIBGCC - bool "Build/install a shared libgcc?" - depends on !BR2_PREFER_STATIC_LIB - default y - depends on !BR2_sparc - help - Build/install a shared libgcc library - config BR2_GCC_ENABLE_TLS bool "Enable compiler tls support" if BR2_TOOLCHAIN_BUILDROOT_UCLIBC default y diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index f99f1a378..0db2eaa6d 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -49,12 +49,6 @@ else HOST_GCC_FINAL_CONF_OPT += --disable-libgomp endif -ifeq ($(BR2_GCC_SHARED_LIBGCC),y) -HOST_GCC_FINAL_CONF_OPT += --enable-shared -else -HOST_GCC_FINAL_CONF_OPT += --disable-shared -endif - # End with user-provided options, so that they can override previously # defined options. HOST_GCC_FINAL_CONF_OPT += \ @@ -99,7 +93,6 @@ HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_CREATE_SIMPLE_SYMLINKS # Cannot use the HOST_GCC_FINAL_USR_LIBS mechanism below, because we want # libgcc_s to be installed in /lib and not /usr/lib. We add +x on # libgcc_s to ensure it will be stripped. -ifeq ($(BR2_GCC_SHARED_LIBGCC),y) define HOST_GCC_FINAL_INSTALL_LIBGCC -cp -dpf $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib*/libgcc_s* \ $(STAGING_DIR)/lib/ @@ -109,12 +102,11 @@ define HOST_GCC_FINAL_INSTALL_LIBGCC endef HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_INSTALL_LIBGCC -endif # Handle the installation of libraries in /usr/lib HOST_GCC_FINAL_USR_LIBS = -ifeq ($(BR2_GCC_SHARED_LIBGCC)$(BR2_INSTALL_LIBSTDCPP),yy) +ifeq ($(BR2_INSTALL_LIBSTDCPP),y) HOST_GCC_FINAL_USR_LIBS += libstdc++ endif diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index d38629d15..8bd65fcd5 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -40,7 +40,7 @@ endef # Apply patches # -ifeq ($(ARCH)-$(BR2_GCC_SHARED_LIBGCC),powerpc-y) +ifeq ($(ARCH),powerpc) ifneq ($(BR2_SOFT_FLOAT),) define HOST_GCC_APPLY_POWERPC_PATCH support/scripts/apply-patches.sh $(@D) package/gcc/$(GCC_VERSION) powerpc-link-with-math-lib.patch.conditional |