- rediffed klcc patch

- removed obsolete aligned_u64 patch

diff --git a/aligned_u64.patch b/aligned_u64.patch
deleted file mode 100644 (file)
index 269138a..0000000
--- a/aligned_u64.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-* __aligned_u64 definition
-* patch from http://www.zytor.com/pipermail/klibc/2011-November/003151.html
---- a/klibc/usr/include/sys/types.h
-+++ b/klibc/usr/include/sys/types.h
-@@ -100,6 +100,10 @@ typedef uint16_t __sum16;
- typedef uint32_t __sum32;
- typedef uint64_t __sum64;
-
-+#define __aligned_u64 __u64 __attribute__((aligned(8)))
-+#define __aligned_be64 __be64 __attribute__((aligned(8)))
-+#define __aligned_le64 __le64 __attribute__((aligned(8)))
-+
- /*
-  * Some headers seem to require this...
-  */

diff --git a/klibc-klcc.patch b/klibc-klcc.patch
index 80a40f71570fcf63f3104442dae84bf4a6845a7f..5610a9b0e2f78f1acee3c93b8f95e855b893df2a 100644 (file)
--- a/klibc-klcc.patch
+++ b/klibc-klcc.patch
@@ -1,8 +1,7 @@
-diff -urN klibc-1.1.16.org/klcc/Kbuild klibc-1.1.16/klcc/Kbuild
---- klibc-1.1.16.org/klcc/Kbuild       2006-01-06 07:11:43.000000000 +0100
-+++ klibc-1.1.16/klcc/Kbuild   2006-01-06 19:31:36.327836000 +0100
-@@ -22,10 +22,10 @@
-       $(Q)echo 'EMAIN=$(KLIBCEMAIN)' >> $@
+--- klibc-2.0.9/klcc/Kbuild.orig       2021-05-09 17:11:57.600121311 +0200
++++ klibc-2.0.9/klcc/Kbuild    2021-05-09 17:12:54.373071231 +0200
+@@ -24,10 +24,10 @@ $(obj)/$(KLIBCCROSS)klibc.config: $(src)
+       $(Q)echo 'CRTSHARED=$(notdir $(KLIBCCRTSHARED))' >> $@
        $(Q)echo 'BITSIZE=$(KLIBCBITSIZE)' >> $@
        $(Q)echo 'VERSION=$(shell cat $(srctree)/usr/klibc/version)' >> $@
 -      $(Q)echo 'prefix=$(INSTALLDIR)' >> $@

diff --git a/klibc.spec b/klibc.spec
index 4b8d8a138688d075935f36a03bdbc8322c5ab7af..b1908f31d95427cb085de2c1d1f1b4060a7ff3a7 100644 (file)
--- a/klibc.spec
+++ b/klibc.spec
@@ -17,7 +17,6 @@ Group:                Libraries
 Source0:       https://www.kernel.org/pub/linux/libs/klibc/2.0/%{name}-%{version}.tar.xz
 # Source0-md5: 7554a9759ae71e9ba3729991c8ae7f63
 Patch0:                %{name}-klcc.patch
-Patch1:                aligned_u64.patch
 URL:           https://lists.zytor.com/klibc/
 # ld.bfd binary
 BuildRequires: binutils >= 2.20.51.0.6
@@ -129,7 +128,6 @@ Programy zawarte w tym pakiecie zawierają informacje dla debuggera.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p2
 
 %build
 cd usr/include