- updated to 2.0.10

[packages/klibc.git] / klibc-klcc.patch

diff --git a/klibc-klcc.patch b/klibc-klcc.patch
index 599a2e368f2d69e9f5151e61410dded85e0cbbfd..5610a9b0e2f78f1acee3c93b8f95e855b893df2a 100644 (file)
--- a/klibc-klcc.patch
+++ b/klibc-klcc.patch
@@ -1,10 +1,9 @@
-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)/version)' >> $@
+       $(Q)echo 'VERSION=$(shell cat $(srctree)/usr/klibc/version)' >> $@
 -      $(Q)echo 'prefix=$(INSTALLDIR)' >> $@
 -      $(Q)echo 'bindir=$(INSTALLDIR)/$(KCROSS)bin' >> $@
 -      $(Q)echo 'libdir=$(INSTALLDIR)/$(KCROSS)lib' >> $@
@@ -16,19 +15,18 @@ diff -urN klibc-1.1.16.org/klcc/Kbuild klibc-1.1.16/klcc/Kbuild
  
  
  # Generate klcc
-diff -urN klibc-1.1.16.org/klcc/klcc.in klibc-1.1.16/klcc/klcc.in
---- klibc-1.1.16.org/klcc/klcc.in      2006-01-06 07:11:43.000000000 +0100
-+++ klibc-1.1.16/klcc/klcc.in  2006-01-06 19:22:31.481785250 +0100
+--- klibc-2.0.9/klcc/klcc.in.orig      2021-04-29 16:03:19.000000000 +0200
++++ klibc-2.0.9/klcc/klcc.in   2021-05-08 18:55:05.039418288 +0200
 @@ -3,22 +3,22 @@
  use IPC::Open3;
  
  # Standard includes
--@includes = ("-I${prefix}/${KCROSS}include/arch/${ARCH}",
+-@includes = ("-I${prefix}/${KCROSS}include/arch/${ARCHDIR}",
 -           "-I${prefix}/${KCROSS}include/bits${BITSIZE}",
 -           "-I${prefix}/${KCROSS}include");
-+@includes = ("-I${includedir}/arch/${ARCH}",
-+           "-I${includedir}/bits${BITSIZE}",
-+           "-I${includedir}");
++@includes = ("-idirafter", "${includedir}/arch/${ARCH}",
++           "-idirafter", "${includedir}/bits${BITSIZE}",
++           "-idirafter", "${includedir}");
  
  # Default optimization options (for compiles without -g)
  @optopt =  @OPTFLAGS;
@@ -41,11 +39,11 @@ diff -urN klibc-1.1.16.org/klcc/klcc.in klibc-1.1.16/klcc/klcc.in
  # Options and libraries to pass to ld; shared versus static
 -@staticopt = ("${prefix}/${KCROSS}lib/crt0.o");
 -@staticlib = ("${prefix}/${KCROSS}lib/libc.a");
--@sharedopt = (@EMAIN, "${prefix}/${KCROSS}lib/interp.o");
+-@sharedopt = (@EMAIN, map { "${prefix}/${KCROSS}lib/$_" } @CRTSHARED);
 -@sharedlib = ('-R', "${prefix}/${KCROSS}lib/libc.so");
 +@staticopt = ("${libdir}/klibc/crt0.o");
 +@staticlib = ("${libdir}/klibc/libc.a");
-+@sharedopt = (@EMAIN, "${libdir}/klibc/interp.o");
++@sharedopt = (@EMAIN, map { "${libdir}/klibc/$_" } @CRTSHARED);
 +@sharedlib = ('-R', "${libdir}/klibc/libc.so");
  
  # Returns the language (-x option string) for a specific extension.
@@ -59,7 +57,7 @@ diff -urN klibc-1.1.16.org/klcc/klcc.in klibc-1.1.16/klcc/klcc.in
  $debugging = 0;                       # -g or -p option present?
  $strip = 0;                   # -s option present?
  undef $output;                        # -o option present?
-@@ -175,6 +175,7 @@
+@@ -186,6 +186,7 @@
      } elsif ( $a eq '-shared' ) {
        $shared = 1;
      } elsif ( $a eq '-static' ) {