From 402ca1bf327b9fa82076b98e881edd31c4ea7c38 Mon Sep 17 00:00:00 2001 From: Christopher Larson Date: Fri, 16 Jun 2017 10:05:56 +0500 Subject: [PATCH] Drop recipes/appends specific to the Sourcery toolchain Signed-off-by: Christopher Larson --- .../packagegroup-core-tools-profile.bbappend | 1 - .../libffi/libffi_3.2.1.bbappend | 3 - .../libffi/n32_eh_frame_fix.patch | 138 ---------------- .../libffi/o32_eh_frame_fix.patch | 150 ------------------ .../libunwind/libunwind_%.bbappend | 3 - recipes-devtools/perl/perl_%.bbappend | 1 - recipes-external/glibc/glibc-sourcery.bb | 106 ------------- ...egroup-core-standalone-sdk-target.bbappend | 5 - 8 files changed, 407 deletions(-) delete mode 100644 core/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend delete mode 100644 core/recipes-gnome/libffi/libffi_3.2.1.bbappend delete mode 100644 core/recipes-gnome/libffi/n32_eh_frame_fix.patch delete mode 100644 core/recipes-gnome/libffi/o32_eh_frame_fix.patch delete mode 100644 core/recipes-support/libunwind/libunwind_%.bbappend delete mode 100644 recipes-devtools/perl/perl_%.bbappend delete mode 100644 recipes-external/glibc/glibc-sourcery.bb delete mode 100644 xilinx-mel/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend diff --git a/core/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend b/core/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend deleted file mode 100644 index 96b32cf..0000000 --- a/core/recipes-core/packagegroups/packagegroup-core-tools-profile.bbappend +++ /dev/null @@ -1 +0,0 @@ -LTTNGMODULES_arm = "lttng-modules" diff --git a/core/recipes-gnome/libffi/libffi_3.2.1.bbappend b/core/recipes-gnome/libffi/libffi_3.2.1.bbappend deleted file mode 100644 index afeae00..0000000 --- a/core/recipes-gnome/libffi/libffi_3.2.1.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -SRC_URI += "file://o32_eh_frame_fix.patch \ - file://n32_eh_frame_fix.patch" -FILESEXTRAPATHS_prepend := "${THISDIR}:" diff --git a/core/recipes-gnome/libffi/n32_eh_frame_fix.patch b/core/recipes-gnome/libffi/n32_eh_frame_fix.patch deleted file mode 100644 index e39db74..0000000 --- a/core/recipes-gnome/libffi/n32_eh_frame_fix.patch +++ /dev/null @@ -1,138 +0,0 @@ ---- libffi-3.0.10/src/mips/n32.S 2011-07-29 00:45:45.000000000 +0500 -+++ libffi-3.0.10/src/mips/n32_update.S 2012-08-24 17:38:12.148588677 +0500 -@@ -31,6 +31,9 @@ - /* Only build this code if we are compiling for n32 */ - - #if defined(FFI_MIPS_N32) -+#if defined(__GNU_COMPACT_EH__) -+ .cfi_sections .eh_frame_entry -+#endif - - #define callback a0 - #define bytes a2 -@@ -48,6 +51,7 @@ - .globl ffi_call_N32 - .ent ffi_call_N32 - ffi_call_N32: -+ .cfi_startproc - .LFB3: - .frame $fp, SIZEOF_FRAME, ra - .mask 0xc0000000,-FFI_SIZEOF_ARG -@@ -55,11 +59,15 @@ ffi_call_N32: - - # Prologue - SUBU $sp, SIZEOF_FRAME # Frame size -+ .cfi_def_cfa_offset SIZEOF_FRAME - .LCFI0: - REG_S $fp, SIZEOF_FRAME - 2*FFI_SIZEOF_ARG($sp) # Save frame pointer -+ .cfi_offset $fp,- 2*FFI_SIZEOF_ARG - REG_S ra, SIZEOF_FRAME - 1*FFI_SIZEOF_ARG($sp) # Save return address -+ .cfi_offset ra,- 1*FFI_SIZEOF_ARG - .LCFI1: - move $fp, $sp -+ .cfi_def_cfa_register $fp - .LCFI3: - move t9, callback # callback function pointer - REG_S bytes, 2*FFI_SIZEOF_ARG($fp) # bytes -@@ -355,7 +363,7 @@ noretval: - - # Epilogue - epilogue: -- move $sp, $fp -+ move $sp, $fp - REG_L $fp, SIZEOF_FRAME - 2*FFI_SIZEOF_ARG($sp) # Restore frame pointer - REG_L ra, SIZEOF_FRAME - 1*FFI_SIZEOF_ARG($sp) # Restore return address - ADDU $sp, SIZEOF_FRAME # Fix stack pointer -@@ -363,6 +371,7 @@ epilogue: - - .LFE3: - .end ffi_call_N32 -+ .cfi_endproc - - /* ffi_closure_N32. Expects address of the passed-in ffi_closure in t0 - ($12). Stores any arguments passed in registers onto the stack, -@@ -424,14 +433,18 @@ epilogue: - .globl ffi_closure_N32 - .ent ffi_closure_N32 - ffi_closure_N32: -+ .cfi_startproc - .LFB2: - .frame $sp, SIZEOF_FRAME2, ra - .mask 0x90000000,-(SIZEOF_FRAME2 - RA_OFF2) - .fmask 0x00000000,0 - SUBU $sp, SIZEOF_FRAME2 -+ .cfi_def_cfa_offset SIZEOF_FRAME2 - .LCFI5: - .cpsetup t9, GP_OFF2, ffi_closure_N32 -+ .cfi_offset $gp,GP_OFF2 - SIZEOF_FRAME2 - REG_S ra, RA_OFF2($sp) # Save return address -+ .cfi_offset ra,RA_OFF2 - SIZEOF_FRAME2 - .LCFI6: - # Store all possible argument registers. If there are more than - # fit in registers, then they were stored on the stack. -@@ -528,64 +541,5 @@ cls_epilogue: - j ra - .LFE2: - .end ffi_closure_N32 -- --#ifdef __GNUC__ -- .section .eh_frame,"aw",@progbits --.Lframe1: -- .4byte .LECIE1-.LSCIE1 # length --.LSCIE1: -- .4byte 0x0 # CIE -- .byte 0x1 # Version 1 -- .ascii "\000" # Augmentation -- .uleb128 0x1 # Code alignment 1 -- .sleb128 -4 # Data alignment -4 -- .byte 0x1f # Return Address $31 -- .byte 0xc # DW_CFA_def_cfa -- .uleb128 0x1d # in $sp -- .uleb128 0x0 # offset 0 -- .align EH_FRAME_ALIGN --.LECIE1: -- --.LSFDE1: -- .4byte .LEFDE1-.LASFDE1 # length. --.LASFDE1: -- .4byte .LASFDE1-.Lframe1 # CIE_pointer. -- FDE_ADDR_BYTES .LFB3 # initial_location. -- FDE_ADDR_BYTES .LFE3-.LFB3 # address_range. -- .byte 0x4 # DW_CFA_advance_loc4 -- .4byte .LCFI0-.LFB3 # to .LCFI0 -- .byte 0xe # DW_CFA_def_cfa_offset -- .uleb128 SIZEOF_FRAME # adjust stack.by SIZEOF_FRAME -- .byte 0x4 # DW_CFA_advance_loc4 -- .4byte .LCFI1-.LCFI0 # to .LCFI1 -- .byte 0x9e # DW_CFA_offset of $fp -- .uleb128 2*FFI_SIZEOF_ARG/4 # -- .byte 0x9f # DW_CFA_offset of ra -- .uleb128 1*FFI_SIZEOF_ARG/4 # -- .byte 0x4 # DW_CFA_advance_loc4 -- .4byte .LCFI3-.LCFI1 # to .LCFI3 -- .byte 0xd # DW_CFA_def_cfa_register -- .uleb128 0x1e # in $fp -- .align EH_FRAME_ALIGN --.LEFDE1: --.LSFDE3: -- .4byte .LEFDE3-.LASFDE3 # length --.LASFDE3: -- .4byte .LASFDE3-.Lframe1 # CIE_pointer. -- FDE_ADDR_BYTES .LFB2 # initial_location. -- FDE_ADDR_BYTES .LFE2-.LFB2 # address_range. -- .byte 0x4 # DW_CFA_advance_loc4 -- .4byte .LCFI5-.LFB2 # to .LCFI5 -- .byte 0xe # DW_CFA_def_cfa_offset -- .uleb128 SIZEOF_FRAME2 # adjust stack.by SIZEOF_FRAME -- .byte 0x4 # DW_CFA_advance_loc4 -- .4byte .LCFI6-.LCFI5 # to .LCFI6 -- .byte 0x9c # DW_CFA_offset of $gp ($28) -- .uleb128 (SIZEOF_FRAME2 - GP_OFF2)/4 -- .byte 0x9f # DW_CFA_offset of ra ($31) -- .uleb128 (SIZEOF_FRAME2 - RA_OFF2)/4 -- .align EH_FRAME_ALIGN --.LEFDE3: --#endif /* __GNUC__ */ -- -+ .cfi_endproc - #endif diff --git a/core/recipes-gnome/libffi/o32_eh_frame_fix.patch b/core/recipes-gnome/libffi/o32_eh_frame_fix.patch deleted file mode 100644 index 2549e33..0000000 --- a/core/recipes-gnome/libffi/o32_eh_frame_fix.patch +++ /dev/null @@ -1,150 +0,0 @@ ---- libffi-3.0.10/src/mips/o32.S 2011-07-29 00:45:45.000000000 +0500 -+++ libffi-3.0.10/src/mips/o32_updated.S 2012-08-24 17:36:33.980592720 +0500 -@@ -41,21 +41,29 @@ - #define FP_OFF (SIZEOF_FRAME - 2 * FFI_SIZEOF_ARG) - #define RA_OFF (SIZEOF_FRAME - 1 * FFI_SIZEOF_ARG) - -+#if defined(__GNU_COMPACT_EH__) -+ .cfi_sections .eh_frame_entry -+#endif - .abicalls - .text - .align 2 - .globl ffi_call_O32 - .ent ffi_call_O32 --ffi_call_O32: -+ffi_call_O32: -+ .cfi_startproc - $LFB0: - # Prologue - SUBU $sp, SIZEOF_FRAME # Frame size -+ .cfi_def_cfa_offset SIZEOF_FRAME - $LCFI0: - REG_S $fp, FP_OFF($sp) # Save frame pointer -+ .cfi_offset $fp,FP_OFF - SIZEOF_FRAME - $LCFI1: - REG_S ra, RA_OFF($sp) # Save return address -+ .cfi_offset ra,RA_OFF - SIZEOF_FRAME - $LCFI2: - move $fp, $sp -+ .cfi_def_cfa_register $fp - - $LCFI3: - move t9, callback # callback function pointer -@@ -181,6 +189,7 @@ epilogue: - - $LFE0: - .end ffi_call_O32 -+ .cfi_endproc - - - /* ffi_closure_O32. Expects address of the passed-in ffi_closure -@@ -231,6 +240,7 @@ $LFE0: - .globl ffi_closure_O32 - .ent ffi_closure_O32 - ffi_closure_O32: -+ .cfi_startproc - $LFB1: - # Prologue - .frame $fp, SIZEOF_FRAME2, ra -@@ -238,13 +248,18 @@ $LFB1: - .cpload t9 - .set reorder - SUBU $sp, SIZEOF_FRAME2 -+ .cfi_def_cfa_offset SIZEOF_FRAME2 - .cprestore GP_OFF2 - $LCFI4: - REG_S $16, S0_OFF2($sp) # Save s0 -+ .cfi_offset 16,S0_OFF2 - SIZEOF_FRAME2 - REG_S $fp, FP_OFF2($sp) # Save frame pointer -+ .cfi_offset $fp,FP_OFF2 - SIZEOF_FRAME2 - REG_S ra, RA_OFF2($sp) # Save return address -+ .cfi_offset ra,RA_OFF2 - SIZEOF_FRAME2 - $LCFI6: - move $fp, $sp -+ .cfi_def_cfa_register $fp - - $LCFI7: - # Store all possible argument registers. If there are more than -@@ -302,80 +317,6 @@ closure_done: - j ra - $LFE1: - .end ffi_closure_O32 -- --/* DWARF-2 unwind info. */ -- -- .section .eh_frame,"a",@progbits --$Lframe0: -- .4byte $LECIE0-$LSCIE0 # Length of Common Information Entry --$LSCIE0: -- .4byte 0x0 # CIE Identifier Tag -- .byte 0x1 # CIE Version -- .ascii "zR\0" # CIE Augmentation -- .uleb128 0x1 # CIE Code Alignment Factor -- .sleb128 4 # CIE Data Alignment Factor -- .byte 0x1f # CIE RA Column -- .uleb128 0x1 # Augmentation size -- .byte 0x00 # FDE Encoding (absptr) -- .byte 0xc # DW_CFA_def_cfa -- .uleb128 0x1d -- .uleb128 0x0 -- .align 2 --$LECIE0: --$LSFDE0: -- .4byte $LEFDE0-$LASFDE0 # FDE Length --$LASFDE0: -- .4byte $LASFDE0-$Lframe0 # FDE CIE offset -- .4byte $LFB0 # FDE initial location -- .4byte $LFE0-$LFB0 # FDE address range -- .uleb128 0x0 # Augmentation size -- .byte 0x4 # DW_CFA_advance_loc4 -- .4byte $LCFI0-$LFB0 -- .byte 0xe # DW_CFA_def_cfa_offset -- .uleb128 0x18 -- .byte 0x4 # DW_CFA_advance_loc4 -- .4byte $LCFI2-$LCFI0 -- .byte 0x11 # DW_CFA_offset_extended_sf -- .uleb128 0x1e # $fp -- .sleb128 -2 # SIZEOF_FRAME2 - 2*FFI_SIZEOF_ARG($sp) -- .byte 0x11 # DW_CFA_offset_extended_sf -- .uleb128 0x1f # $ra -- .sleb128 -1 # SIZEOF_FRAME2 - 1*FFI_SIZEOF_ARG($sp) -- .byte 0x4 # DW_CFA_advance_loc4 -- .4byte $LCFI3-$LCFI2 -- .byte 0xc # DW_CFA_def_cfa -- .uleb128 0x1e -- .uleb128 0x18 -- .align 2 --$LEFDE0: --$LSFDE1: -- .4byte $LEFDE1-$LASFDE1 # FDE Length --$LASFDE1: -- .4byte $LASFDE1-$Lframe0 # FDE CIE offset -- .4byte $LFB1 # FDE initial location -- .4byte $LFE1-$LFB1 # FDE address range -- .uleb128 0x0 # Augmentation size -- .byte 0x4 # DW_CFA_advance_loc4 -- .4byte $LCFI4-$LFB1 -- .byte 0xe # DW_CFA_def_cfa_offset -- .uleb128 0x38 -- .byte 0x4 # DW_CFA_advance_loc4 -- .4byte $LCFI6-$LCFI4 -- .byte 0x11 # DW_CFA_offset_extended_sf -- .uleb128 0x10 # $16 -- .sleb128 -3 # SIZEOF_FRAME2 - 3*FFI_SIZEOF_ARG($sp) -- .byte 0x11 # DW_CFA_offset_extended_sf -- .uleb128 0x1e # $fp -- .sleb128 -2 # SIZEOF_FRAME2 - 2*FFI_SIZEOF_ARG($sp) -- .byte 0x11 # DW_CFA_offset_extended_sf -- .uleb128 0x1f # $ra -- .sleb128 -1 # SIZEOF_FRAME2 - 1*FFI_SIZEOF_ARG($sp) -- .byte 0x4 # DW_CFA_advance_loc4 -- .4byte $LCFI7-$LCFI6 -- .byte 0xc # DW_CFA_def_cfa -- .uleb128 0x1e -- .uleb128 0x38 -- .align 2 --$LEFDE1: -+ .cfi_endproc - - #endif diff --git a/core/recipes-support/libunwind/libunwind_%.bbappend b/core/recipes-support/libunwind/libunwind_%.bbappend deleted file mode 100644 index 9920e7e..0000000 --- a/core/recipes-support/libunwind/libunwind_%.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -# For now, Sourcery G++ doesn't seem to have the gcc version which breaks the -# libunwind build, and it doesn't ship gold, we don't want to try to use it. -LDFLAGS_remove = "-fuse-ld=gold" diff --git a/recipes-devtools/perl/perl_%.bbappend b/recipes-devtools/perl/perl_%.bbappend deleted file mode 100644 index c287928..0000000 --- a/recipes-devtools/perl/perl_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -RDEPENDS_${PN}-ptest_remove = "${@bb.utils.contains("MACHINE_FEATURES", "x86", "", "libssp", d)}" diff --git a/recipes-external/glibc/glibc-sourcery.bb b/recipes-external/glibc/glibc-sourcery.bb deleted file mode 100644 index 082a78c..0000000 --- a/recipes-external/glibc/glibc-sourcery.bb +++ /dev/null @@ -1,106 +0,0 @@ -require recipes-core/glibc/glibc.inc -require recipes-external/glibc/glibc-external-version.inc - - -EXTERNAL_TOOLCHAIN_SYSROOT ?= "${@oe.external.run(d, 'gcc', *(TARGET_CC_ARCH.split() + ['-print-sysroot'])).rstrip()}" - -LICENSE = "CLOSED" -LIC_FILES_CHKSUM = "" - -EXTERNAL_PV_PREFIX ?= "" -EXTERNAL_PV_SUFFIX ?= "" -PV_prepend = "${@'${EXTERNAL_PV_PREFIX}' if '${EXTERNAL_PV_PREFIX}' else ''}" -PV_append = "${@'${EXTERNAL_PV_SUFFIX}' if '${EXTERNAL_PV_SUFFIX}' else ''}" - -SRC_PV = "${@'-'.join('${PV}'.split('-')[:-1])}" - -INHIBIT_DEFAULT_DEPS = "1" -DEPENDS = "\ - virtual/${TARGET_PREFIX}gcc \ - linux-libc-headers \ -" -DEPENDS_remove = "libtool-cross make-native" - -PROVIDES += "glibc \ - virtual/${TARGET_PREFIX}libc-for-gcc \ - virtual/${TARGET_PREFIX}libc-initial \ - virtual/libc \ - virtual/libintl \ - virtual/libiconv" - -TOOLCHAIN_OPTIONS = "" - -SOURCERY_SRC_URI ?= "" -SRC_URI = "${SOURCERY_SRC_URI} \ - file://etc/ld.so.conf \ - file://generate-supported.mk" - -S = "${WORKDIR}/glibc-${SRC_PV}" -B = "${WORKDIR}/build-${TARGET_SYS}" - -do_unpack[vardeps] += "unpack_libc" -do_unpack[postfuncs] += "unpack_libc" - -unpack_libc () { - rm -rf ${S} - tar jxf */glibc-*.tar.bz2 - if tar jxf */glibc_ports-*.tar.bz2 2>/dev/null; then - mv glibc-ports-${SRC_PV}/ ${S}/ports - fi - - # Ensure that we can build with make 4.0 even with older glibc - #sed -i -e '/critic_missing make/s/\(\[3\.79\*[^,]*\)\],/[\1 | 4\.0],/' ${S}/configure.in - if [ -e "${S}/configure" ]; then - sed -i -e 's/\(^ *3.79\*[^)]*\))/\1 | 4.0)/' ${S}/configure - fi -} -unpack_libc[dirs] = "${WORKDIR}" - -TUNE_CCARGS_mips := "${@oe_filter_out('-march=mips32', '${TUNE_CCARGS}', d)}" -CPPFLAGS[unexport] = "1" -LDFLAGS[unexport] = "1" -BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}" -TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${layout_includedir}" - -export libc_cv_slibdir = "${base_libdir}" -EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \ - --without-cvs --disable-profile --disable-debug --without-gd \ - --enable-clocale=gnu \ - --enable-add-ons \ - --enable-obsolete-rpc \ - --with-headers=${STAGING_INCDIR} \ - --without-selinux \ - ${GLIBC_EXTRA_OECONF}" - -EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}" - -oe_runmake () { - if [ "$1" = "config" ]; then - return - else - ${MAKE} ${EXTRA_OEMAKE} "$@" - fi -} - -do_configure () { - CPPFLAGS="" oe_runconf -} - -linux_include_subdirs = "asm asm-generic bits drm linux mtd rdma sound sys video" - -do_install_append () { - for dir in ${linux_include_subdirs}; do - rm -rf "${D}${includedir}/$dir" - done -} - -require recipes-external/glibc/glibc-sysroot-setup.inc -require recipes-external/glibc/glibc-package-adjusted.inc - -python () { - if not d.getVar("EXTERNAL_TOOLCHAIN", True): - raise bb.parse.SkipPackage("External toolchain not configured (EXTERNAL_TOOLCHAIN not set).") - - if not d.getVar("SOURCERY_SRC_URI", True): - raise bb.parse.SkipPackage("glibc-sourcery requires that SOURCERY_SRC_URI point to the sourcery source tarball") -} diff --git a/xilinx-mel/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend b/xilinx-mel/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend deleted file mode 100644 index 20e1c63..0000000 --- a/xilinx-mel/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bbappend +++ /dev/null @@ -1,5 +0,0 @@ -# Remove libatomic and libatomic-dev packages as they are not available in codebench toolchain -# for aarch64 architecture -UNSUPPORTED_AARCH64_LIBS = "libatomic libatomic-dev" - -RDEPENDS_packagegroup-core-standalone-sdk-target_remove_aarch64 = "${UNSUPPORTED_AARCH64_LIBS}"