From 883ecbebb642c88a11a78e8f2e8c30ad72813b9a Mon Sep 17 00:00:00 2001
From: "Guillermo E. Martinez" <guillermo.e.martinez@oracle.com>
Date: Tue, 31 May 2022 21:23:38 -0500
Subject: Restore Oracle products to crosstool-ng using gcc-oracle

This commit restore the support for the following products
in Oracle Linux 7.9:

Binutils 2.27-44.base.0.400
GCC      4.8.5-44.0.5
glibc    2.17-317.0.3
UEK5/u4  4.14.35-2025.400.8

Sample configurations were updated to use such versions,
and be compiled in host machine using recent GCC versions.

Signed-off-by: Guillermo E. Martinez <guillermo.e.martinez@oracle.com>
---
 packages/glibc-oracle/2.17-317.0.3/version.desc    |  2 --
 packages/glibc-oracle/2.17/version.desc            | 14 +++++++++
 .../0000-backport-missing-header-file.patch        | 34 ++++++++++++++++++++++
 3 files changed, 48 insertions(+), 2 deletions(-)
 delete mode 100644 packages/glibc-oracle/2.17-317.0.3/version.desc
 create mode 100644 packages/glibc-oracle/2.17/version.desc
 create mode 100644 packages/glibc-oracle/git-ea029c9b/0000-backport-missing-header-file.patch

(limited to 'packages/glibc-oracle')

diff --git a/packages/glibc-oracle/2.17-317.0.3/version.desc b/packages/glibc-oracle/2.17-317.0.3/version.desc
deleted file mode 100644
index f818679c..00000000
--- a/packages/glibc-oracle/2.17-317.0.3/version.desc
+++ /dev/null
@@ -1,2 +0,0 @@
-repository_branch='oracle/glibc/ol7-u9'
-version_number='2.17'
diff --git a/packages/glibc-oracle/2.17/version.desc b/packages/glibc-oracle/2.17/version.desc
new file mode 100644
index 00000000..23e5c926
--- /dev/null
+++ b/packages/glibc-oracle/2.17/version.desc
@@ -0,0 +1,14 @@
+# Since Oracle provides different branches for binutils
+# depending of the architecture:
+#
+#    ARM64: 'oracle/glibc/ol7-u9-aarch64'
+#    ARM32: 'oracle/glibc/ol7-u9'
+#
+# branch name is adjusted in:
+#   samples/{aarch64,arm}*ol7u9-*
+#
+# using CT_GLIBC_ORACLE_DEVEL_BRANCH
+#
+# EoS date for this package in OL7: Jul 2024.
+version_number='2.17-317.0.3'
+obsolete='yes'
diff --git a/packages/glibc-oracle/git-ea029c9b/0000-backport-missing-header-file.patch b/packages/glibc-oracle/git-ea029c9b/0000-backport-missing-header-file.patch
new file mode 100644
index 00000000..563c98bb
--- /dev/null
+++ b/packages/glibc-oracle/git-ea029c9b/0000-backport-missing-header-file.patch
@@ -0,0 +1,34 @@
+This patch is a backport from glibc commits:
+0b8dedd38f: Add-sys-auxv.h-wrapper-to-include-sys
+d6bd839b9a: Add-a-way-to-bypass-the-PLT-when-calling-getauxval
+
+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 -Nur glibc/include/sys/auxv.h glibc-oracle/include/sys/auxv.h
+--- glibc/include/sys/auxv.h	1969-12-31 18:00:00.000000000 -0600
++++ glibc-oracle/include/sys/auxv.h	2022-06-16 12:25:09.112414961 -0500
+@@ -0,0 +1,8 @@
++#include <misc/sys/auxv.h>
++
++#ifndef _ISOMAC
++
++extern __typeof (getauxval) __getauxval;
++libc_hidden_proto (__getauxval)
++
++#endif  /* !_ISOMAC */
+diff -Nur glibc/misc/getauxval.c glibc-oracle/misc/getauxval.c
+--- glibc/misc/getauxval.c	2022-06-16 11:52:08.728852269 -0500
++++ glibc-oracle/misc/getauxval.c	2022-06-16 12:25:09.112414961 -0500
+@@ -36,3 +36,4 @@
+ }
+ 
+ weak_alias (__getauxval, getauxval)
++libc_hidden_def (__getauxval)
-- 
cgit v1.2.3