From 939ea40aa4afc3c519955bda1f1a8295b9a2c894 Mon Sep 17 00:00:00 2001 From: "Guillermo E. Martinez" Date: Mon, 27 Jun 2022 08:13:36 -0500 Subject: binutils-oracle: Update source patch location for ol8 Due to a new commit oracle binutils branch an update location for patches is required. This patch disabled debug information for glibc too. --- packages/binutils-oracle/2.30-113.0.1/version.desc | 2 - packages/binutils-oracle/2.30/version.desc | 2 + .../0001-binutils-gdb-oracle-backport.patch | 87 ++++++++++++++++++++++ .../0001-binutils-gdb-oracle-backport.patch | 87 ---------------------- samples/aarch64-ol8u6-linux-gnu/crosstool.config | 3 +- samples/i686-ol8u6-linux-gnu/crosstool.config | 3 +- samples/x86_64-ol8u6-linux-gnu/crosstool.config | 3 +- 7 files changed, 95 insertions(+), 92 deletions(-) delete mode 100644 packages/binutils-oracle/2.30-113.0.1/version.desc create mode 100644 packages/binutils-oracle/2.30/version.desc create mode 100644 packages/binutils-oracle/git-53d90e19/0001-binutils-gdb-oracle-backport.patch delete mode 100644 packages/binutils-oracle/git-728f1495/0001-binutils-gdb-oracle-backport.patch diff --git a/packages/binutils-oracle/2.30-113.0.1/version.desc b/packages/binutils-oracle/2.30-113.0.1/version.desc deleted file mode 100644 index 49aa6ed2..00000000 --- a/packages/binutils-oracle/2.30-113.0.1/version.desc +++ /dev/null @@ -1,2 +0,0 @@ -repository_branch='oracle/binutils/ol8-u6' -version_number='2.30-113.0.1' diff --git a/packages/binutils-oracle/2.30/version.desc b/packages/binutils-oracle/2.30/version.desc new file mode 100644 index 00000000..49aa6ed2 --- /dev/null +++ b/packages/binutils-oracle/2.30/version.desc @@ -0,0 +1,2 @@ +repository_branch='oracle/binutils/ol8-u6' +version_number='2.30-113.0.1' diff --git a/packages/binutils-oracle/git-53d90e19/0001-binutils-gdb-oracle-backport.patch b/packages/binutils-oracle/git-53d90e19/0001-binutils-gdb-oracle-backport.patch new file mode 100644 index 00000000..57c05dd2 --- /dev/null +++ b/packages/binutils-oracle/git-53d90e19/0001-binutils-gdb-oracle-backport.patch @@ -0,0 +1,87 @@ +This patch is a backport from binutils-gdb. + +This code is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 3, or (at your option) any +later version. + +This code 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. + +diff -urN binutils-gdb/bfd/elf.c binutils-gdb-oracle/bfd/elf.c +--- binutils-gdb/bfd/elf.c 2022-05-19 12:47:05.117663521 -0500 ++++ binutils-gdb-oracle/bfd/elf.c 2022-05-19 12:49:00.128035105 -0500 +@@ -11705,7 +11705,7 @@ + bfd_vma (*r_sym) (bfd_vma); + + +-#ifdef BFD64 ++#if BFD_DEFAULT_TARGET_SIZE > 32 + if (bfd_arch_bits_per_address (abfd) != 32) + r_sym = elf64_r_sym; + else +@@ -11897,7 +11897,7 @@ + asection * relsec; + bfd_vma (*r_info) (bfd_vma, bfd_vma); + +-#ifdef BFD64 ++#if BFD_DEFAULT_TARGET_SIZE > 32 + if (bfd_arch_bits_per_address (abfd) != 32) + r_info = elf64_r_info; + else +diff -urN binutils-gdb/gold/errors.h binutils-gdb-oracle/gold/errors.h +--- binutils-gdb/gold/errors.h 2022-05-19 12:47:05.549657405 -0500 ++++ binutils-gdb-oracle/gold/errors.h 2022-05-19 12:49:04.931967084 -0500 +@@ -24,6 +24,7 @@ + #define GOLD_ERRORS_H + + #include ++#include + + #include "gold-threads.h" + +diff -urN binutils-gdb/gold/i386.cc binutils-gdb-oracle/gold/i386.cc +--- binutils-gdb/gold/i386.cc 2022-05-19 12:47:05.549657405 -0500 ++++ binutils-gdb-oracle/gold/i386.cc 2022-05-19 12:49:08.803912259 -0500 +@@ -865,7 +865,7 @@ + // Record a target-specific program property in the .note.gnu.property + // section. + void +- record_gnu_property(int, int, size_t, ++ record_gnu_property(unsigned int, unsigned int, size_t, + const unsigned char*, const Object*); + + // Merge the target-specific program properties from the current object. +@@ -1075,7 +1075,7 @@ + // section. + void + Target_i386::record_gnu_property( +- int, int pr_type, ++ unsigned int, unsigned int pr_type, + size_t pr_datasz, const unsigned char* pr_data, + const Object* object) + { +diff -urN binutils-gdb/gold/x86_64.cc binutils-gdb-oracle/gold/x86_64.cc +--- binutils-gdb/gold/x86_64.cc 2022-05-19 12:47:05.549657405 -0500 ++++ binutils-gdb-oracle/gold/x86_64.cc 2022-05-19 12:49:08.803912259 -0500 +@@ -1192,7 +1192,8 @@ + // Record a target-specific program property in the .note.gnu.property + // section. + void +- record_gnu_property(int, int, size_t, const unsigned char*, const Object*); ++ record_gnu_property(unsigned int, unsigned int, size_t, ++ const unsigned char*, const Object*); + + // Merge the target-specific program properties from the current object. + void +@@ -1462,7 +1463,7 @@ + template + void + Target_x86_64::record_gnu_property( +- int, int pr_type, ++ unsigned int, unsigned int pr_type, + size_t pr_datasz, const unsigned char* pr_data, + const Object* object) + { diff --git a/packages/binutils-oracle/git-728f1495/0001-binutils-gdb-oracle-backport.patch b/packages/binutils-oracle/git-728f1495/0001-binutils-gdb-oracle-backport.patch deleted file mode 100644 index 57c05dd2..00000000 --- a/packages/binutils-oracle/git-728f1495/0001-binutils-gdb-oracle-backport.patch +++ /dev/null @@ -1,87 +0,0 @@ -This patch is a backport from binutils-gdb. - -This code is free software; you can redistribute it and/or modify it -under the terms of the GNU General Public License as published by the -Free Software Foundation; either version 3, or (at your option) any -later version. - -This code 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. - -diff -urN binutils-gdb/bfd/elf.c binutils-gdb-oracle/bfd/elf.c ---- binutils-gdb/bfd/elf.c 2022-05-19 12:47:05.117663521 -0500 -+++ binutils-gdb-oracle/bfd/elf.c 2022-05-19 12:49:00.128035105 -0500 -@@ -11705,7 +11705,7 @@ - bfd_vma (*r_sym) (bfd_vma); - - --#ifdef BFD64 -+#if BFD_DEFAULT_TARGET_SIZE > 32 - if (bfd_arch_bits_per_address (abfd) != 32) - r_sym = elf64_r_sym; - else -@@ -11897,7 +11897,7 @@ - asection * relsec; - bfd_vma (*r_info) (bfd_vma, bfd_vma); - --#ifdef BFD64 -+#if BFD_DEFAULT_TARGET_SIZE > 32 - if (bfd_arch_bits_per_address (abfd) != 32) - r_info = elf64_r_info; - else -diff -urN binutils-gdb/gold/errors.h binutils-gdb-oracle/gold/errors.h ---- binutils-gdb/gold/errors.h 2022-05-19 12:47:05.549657405 -0500 -+++ binutils-gdb-oracle/gold/errors.h 2022-05-19 12:49:04.931967084 -0500 -@@ -24,6 +24,7 @@ - #define GOLD_ERRORS_H - - #include -+#include - - #include "gold-threads.h" - -diff -urN binutils-gdb/gold/i386.cc binutils-gdb-oracle/gold/i386.cc ---- binutils-gdb/gold/i386.cc 2022-05-19 12:47:05.549657405 -0500 -+++ binutils-gdb-oracle/gold/i386.cc 2022-05-19 12:49:08.803912259 -0500 -@@ -865,7 +865,7 @@ - // Record a target-specific program property in the .note.gnu.property - // section. - void -- record_gnu_property(int, int, size_t, -+ record_gnu_property(unsigned int, unsigned int, size_t, - const unsigned char*, const Object*); - - // Merge the target-specific program properties from the current object. -@@ -1075,7 +1075,7 @@ - // section. - void - Target_i386::record_gnu_property( -- int, int pr_type, -+ unsigned int, unsigned int pr_type, - size_t pr_datasz, const unsigned char* pr_data, - const Object* object) - { -diff -urN binutils-gdb/gold/x86_64.cc binutils-gdb-oracle/gold/x86_64.cc ---- binutils-gdb/gold/x86_64.cc 2022-05-19 12:47:05.549657405 -0500 -+++ binutils-gdb-oracle/gold/x86_64.cc 2022-05-19 12:49:08.803912259 -0500 -@@ -1192,7 +1192,8 @@ - // Record a target-specific program property in the .note.gnu.property - // section. - void -- record_gnu_property(int, int, size_t, const unsigned char*, const Object*); -+ record_gnu_property(unsigned int, unsigned int, size_t, -+ const unsigned char*, const Object*); - - // Merge the target-specific program properties from the current object. - void -@@ -1462,7 +1463,7 @@ - template - void - Target_x86_64::record_gnu_property( -- int, int pr_type, -+ unsigned int, unsigned int pr_type, - size_t pr_datasz, const unsigned char* pr_data, - const Object* object) - { diff --git a/samples/aarch64-ol8u6-linux-gnu/crosstool.config b/samples/aarch64-ol8u6-linux-gnu/crosstool.config index 17b0219a..0599d6ba 100644 --- a/samples/aarch64-ol8u6-linux-gnu/crosstool.config +++ b/samples/aarch64-ol8u6-linux-gnu/crosstool.config @@ -5,7 +5,7 @@ CT_TARGET_VENDOR="ol8u6" CT_KERNEL_LINUX=y CT_LINUX_USE_ORACLE=y CT_BINUTILS_USE_ORACLE=y -CT_BINUTILS_ORACLE_V_2_30_113=y +CT_BINUTILS_ORACLE_V_2_30=y CT_BINUTILS_LINKER_LD_GOLD=y CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y @@ -13,6 +13,7 @@ CT_BINUTILS_PLUGINS=y CT_GLIBC_USE_ORACLE=y CT_GLIBC_EXTRA_CFLAGS="-Wno-missing-attributes -Wno-array-bounds -Wno-array-parameter -Wno-stringop-overflow -Wno-maybe-uninitialized" CT_GLIBC_ENABLE_COMMON_FLAG=y +CT_GLIBC_ENABLE_DEBUG=n CT_CC_LANG_CXX=y CT_GCC_USE_ORACLE=y CT_ISL_V_0_16=y diff --git a/samples/i686-ol8u6-linux-gnu/crosstool.config b/samples/i686-ol8u6-linux-gnu/crosstool.config index 3a0eb7fb..7f937cd0 100644 --- a/samples/i686-ol8u6-linux-gnu/crosstool.config +++ b/samples/i686-ol8u6-linux-gnu/crosstool.config @@ -5,7 +5,7 @@ CT_TARGET_VENDOR="ol8u6" CT_KERNEL_LINUX=y CT_LINUX_USE_ORACLE=y CT_BINUTILS_USE_ORACLE=y -CT_BINUTILS_ORACLE_V_2_30_113=y +CT_BINUTILS_ORACLE_V_2_30=y CT_BINUTILS_LINKER_LD_GOLD=y CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y @@ -13,6 +13,7 @@ CT_BINUTILS_PLUGINS=y CT_GLIBC_USE_ORACLE=y CT_GLIBC_EXTRA_CFLAGS="-Wno-missing-attributes -Wno-array-bounds -Wno-array-parameter -Wno-stringop-overflow -Wno-maybe-uninitialized" CT_GLIBC_ENABLE_COMMON_FLAG=y +CT_GLIBC_ENABLE_DEBUG=n CT_CC_LANG_CXX=y CT_GCC_USE_ORACLE=y CT_ISL_V_0_16=y diff --git a/samples/x86_64-ol8u6-linux-gnu/crosstool.config b/samples/x86_64-ol8u6-linux-gnu/crosstool.config index e8828adc..ddb41447 100644 --- a/samples/x86_64-ol8u6-linux-gnu/crosstool.config +++ b/samples/x86_64-ol8u6-linux-gnu/crosstool.config @@ -5,7 +5,7 @@ CT_TARGET_VENDOR="ol8u6" CT_KERNEL_LINUX=y CT_LINUX_USE_ORACLE=y CT_BINUTILS_USE_ORACLE=y -CT_BINUTILS_ORACLE_V_2_30_113=y +CT_BINUTILS_ORACLE_V_2_30=y CT_BINUTILS_LINKER_LD_GOLD=y CT_BINUTILS_GOLD_THREADS=y CT_BINUTILS_LD_WRAPPER=y @@ -13,6 +13,7 @@ CT_BINUTILS_PLUGINS=y CT_GLIBC_USE_ORACLE=y CT_GLIBC_EXTRA_CFLAGS="-Wno-missing-attributes -Wno-array-bounds -Wno-array-parameter -Wno-stringop-overflow -Wno-maybe-uninitialized" CT_GLIBC_ENABLE_COMMON_FLAG=y +CT_GLIBC_ENABLE_DEBUG=n CT_CC_LANG_CXX=y CT_GCC_USE_ORACLE=y CT_ISL_V_0_16=y -- cgit v1.2.3