+++ /dev/null
-diff -Naurp klibc-1.1.orig/MCONFIG klibc-1.1/MCONFIG
---- klibc-1.1.orig/MCONFIG 2005-09-20 02:16:17 -0400
-+++ klibc-1.1/MCONFIG 2005-09-20 02:16:57 -0400
-@@ -33,7 +33,7 @@ KRNLOBJ = $(SRCROOT)/linux
- KLIBCVER = -D__KLIBC__=$(shell cut -d. -f1 < $(SRCROOT)/version) \
- -D__KLIBC_MINOR__=$(shell cut -d. -f2 < $(SRCROOT)/version)
-
--ARCH = $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/parisc.*/parisc/)
-+ARCH = $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/parisc.*/parisc/ -e s/mips64/mips/)
- CC = $(CROSS)gcc
- LD = $(CROSS)ld
- KLIBSRC = $(SRCROOT)/klibc
+++ /dev/null
---- a/scripts/Kbuild.install 2007-03-04 02:52:10.000000000 +0100
-+++ b/scripts/Kbuild.install 2007-11-04 15:43:28.000000000 +0100
-@@ -84,6 +84,13 @@
- # 1) Create directories, install headers and man pages
- # 2) Tell that we now install binaries
- # 3) Install binaries by descending
-+
-+# Arch specific definitions for klibc
-+include $(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG
-+
-+# include/asm-* architecture
-+KLIBCASMARCH ?= $(KLIBCARCH)
-+
- .PHONY: header footer descend
- header:
- $(Q)echo " INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)"
-@@ -95,7 +102,7 @@
- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
-- $(Q)set -e ; for d in linux scsi asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \
-+ $(Q)set -e ; for d in linux scsi asm-$(KLIBCASMARCH) asm-generic $(ASMKLIBCARCH); do \
- mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)include/$$d ; \
- for r in $(KLIBCKERNELSRC)/include $(KLIBCKERNELOBJ)/include \
- $(KLIBCKERNELOBJ)/include2 ; do \
+++ /dev/null
----
- usr/include/arch/ppc/klibc/archsignal.h | 6 ++++++
- usr/include/arch/sparc/klibc/archsignal.h | 7 -------
- 2 files changed, 6 insertions(+), 7 deletions(-)
-
---- a/usr/include/arch/ppc/klibc/archsignal.h
-+++ b/usr/include/arch/ppc/klibc/archsignal.h
-@@ -8,7 +8,13 @@
- #ifndef _KLIBC_ARCHSIGNAL_H
- #define _KLIBC_ARCHSIGNAL_H
-
-+#ifdef _SIGNAL_H
-+#undef _SIGNAL_H
- #include <asm/signal.h>
-+#define _SIGNAL_H
-+#else
-+#include <asm/signal.h>
-+#endif
- /* No special stuff for this architecture */
-
- #endif
---- a/usr/include/arch/sparc/klibc/archsignal.h
-+++ b/usr/include/arch/sparc/klibc/archsignal.h
-@@ -11,13 +11,6 @@
- #define __WANT_POSIX1B_SIGNALS__
- #include <asm/signal.h>
-
--struct sigaction {
-- __sighandler_t sa_handler;
-- unsigned long sa_flags;
-- void (*sa_restorer)(void); /* Not used by Linux/SPARC */
-- sigset_t sa_mask;
--};
--
- /* Not actually used by the kernel... */
- #define SA_RESTORER 0x80000000
-
+++ /dev/null
-diff -Nuar --exclude '*.orig' --exclude '*.rej' klibc-1.5.11.orig/scripts/Kbuild.install klibc-1.5.11/scripts/Kbuild.install
---- klibc-1.5.11.orig/scripts/Kbuild.install 2008-06-15 17:28:23.000000000 -0700
-+++ klibc-1.5.11/scripts/Kbuild.install 2008-06-26 10:14:05.365949576 -0700
-@@ -84,6 +84,13 @@
- # 1) Create directories, install headers and man pages
- # 2) Tell that we now install binaries
- # 3) Install binaries by descending
-+
-+# Arch specific definitions for klibc
-+include $(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG
-+
-+# include/asm-* architecture
-+KLIBCASMARCH ?= $(KLIBCARCH)
-+
- .PHONY: header footer descend
- header:
- $(Q)echo " INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)"
-@@ -95,7 +102,7 @@
- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
-- $(Q)set -e ; for d in linux asm asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \
-+ $(Q)set -e ; for d in linux scsi asm-$(KLIBCASMARCH) asm-generic $(ASMKLIBCARCH); do \
- for r in $(KLIBCKERNELSRC)/include $(KLIBCKERNELOBJ)/include \
- $(KLIBCKERNELOBJ)/include2 ; do \
- [ ! -d $$r/$$d ] && continue; \
+++ /dev/null
-diff -Naur klibc-1.5.8.orig/usr/include/arch/x86_64/sys/io.h klibc-1.5.8/usr/include/arch/x86_64/sys/io.h
---- klibc-1.5.8.orig/usr/include/arch/x86_64/sys/io.h 2007-12-11 18:20:29.000000000 +0100
-+++ klibc-1.5.8/usr/include/arch/x86_64/sys/io.h 2008-06-26 12:04:22.760046895 +0200
-@@ -60,21 +60,21 @@
- {
- unsigned char __v;
- asm volatile ("inb %1,%0" : "=a" (__v) : "dN"(__p));
-- return v;
-+ return __v;
- }
-
- static __inline__ unsigned short inw(unsigned short __p)
- {
- unsigned short __v;
- asm volatile ("inw %1,%0" : "=a" (__v) : "dN"(__p));
-- return v;
-+ return __v;
- }
-
- static __inline__ unsigned int inl(unsigned short __p)
- {
- unsigned int __v;
- asm volatile ("inl %1,%0" : "=a" (__v) : "dN"(__p));
-- return v;
-+ return __v;
- }
-
- /* String I/O macros */
+++ /dev/null
-diff -urN klibc-1.5.20.orig/usr/klibc/socketcalls/Kbuild klibc-1.5.20/usr/klibc/socketcalls/Kbuild
---- klibc-1.5.20.orig/usr/klibc/socketcalls/Kbuild 2010-08-25 14:40:28.000000000 -0400
-+++ klibc-1.5.20/usr/klibc/socketcalls/Kbuild 2010-11-23 15:40:25.000000000 -0500
-@@ -48,3 +48,6 @@
- $(obj)/SOCKETCALLS.i \
- $(src)/socketcommon.h
- $(call cmd,socketcalls)
-+
-+PHONY += FORCE
-+
-diff -urN klibc-1.5.20.orig/usr/klibc/syscalls/Kbuild klibc-1.5.20/usr/klibc/syscalls/Kbuild
---- klibc-1.5.20.orig/usr/klibc/syscalls/Kbuild 2010-08-25 14:40:28.000000000 -0400
-+++ klibc-1.5.20/usr/klibc/syscalls/Kbuild 2010-11-23 15:40:49.000000000 -0500
-@@ -95,3 +95,6 @@
- $(src)/syscommon.h $(obj)/syscalls.nrs \
- $(obj)/typesize.bin FORCE
- $(call if_changed,syscalls)
-+
-+PHONY += FORCE
-+
+++ /dev/null
---- scripts/Kbuild.install.orig 2013-03-14 09:33:32.429919267 -0400
-+++ scripts/Kbuild.install 2013-03-14 09:33:55.443820061 -0400
-@@ -95,7 +95,7 @@ header:
- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
-- $(Q)make -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
-+ $(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
- $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
- $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
- $(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)
+++ /dev/null
---- klibc-1.5.23/scripts/Kbuild.install.orig
-+++ klibc-1.5.23/scripts/Kbuild.install
-@@ -95,7 +95,7 @@
- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
- $(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
-- $(Q)make -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
-+ $(Q)$(MAKE) -C $(KLIBCKERNELSRC) ARCH=$(KLIBCARCH) INSTALL_HDR_PATH=$(INSTALLROOT)$(INSTALLDIR)/$(KCROSS) headers_install
- $(Q)cp -rf usr/include/. $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/.
- $(Q)$(install-data) $(srctree)/klcc/klcc.1 $(INSTALLROOT)$(mandir)/man1/$(KCROSS)klcc.1
- $(Q)$(install-bin) $(objtree)/klcc/$(KCROSS)klcc $(INSTALLROOT)$(bindir)
+++ /dev/null
-From 8f6c59829bb84edc66ce0edb0a4d5b7335a941c6 Mon Sep 17 00:00:00 2001
-From: Josef Fruehwirth <fruehwirth@gmail.com>
-Date: Sat, 18 Aug 2012 14:07:04 +0200
-Subject: [PATCH] Retry m_port->Read(..) if an EINTR errror occurs instead of
- closing the connection.
-
----
- src/lib/adapter/Pulse-Eight/USBCECAdapterCommunication.cpp | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/src/lib/adapter/Pulse-Eight/USBCECAdapterCommunication.cpp b/src/lib/adapter/Pulse-Eight/USBCECAdapterCommunication.cpp
-index 70e45ac..3fc05eb 100644
---- a/src/lib/adapter/Pulse-Eight/USBCECAdapterCommunication.cpp
-+++ b/src/lib/adapter/Pulse-Eight/USBCECAdapterCommunication.cpp
-@@ -393,7 +393,11 @@ bool CUSBCECAdapterCommunication::ReadFromDevice(uint32_t iTimeout, size_t iSize
- if (!IsOpen())
- return false;
-
-- iBytesRead = m_port->Read(buff, sizeof(uint8_t) * iSize, iTimeout);
-+ do {
-+ /* retry Read() if it was interrupted */
-+ iBytesRead = m_port->Read(buff, sizeof(uint8_t) * iSize, iTimeout);
-+ } while(m_port->GetErrorNumber() == EINTR);
-+
-
- if (m_port->GetErrorNumber())
- {
---
-1.7.10
-
+++ /dev/null
-diff -Naur libe-0.2.7/benchmarks/lockfree_hash_map.cc libe-0.2.7-new/benchmarks/lockfree_hash_map.cc
---- libe-0.2.7/benchmarks/lockfree_hash_map.cc 2011-10-12 04:02:24.000000000 +0200
-+++ libe-0.2.7-new/benchmarks/lockfree_hash_map.cc 2012-08-20 14:59:39.135789923 +0200
-@@ -30,6 +30,7 @@
- // C includes
- #include <cstdlib>
- #include <stdint.h>
-+#include <unistd.h>
-
- // C++
- #include <iostream>
-diff -Naur libe-0.2.7/benchmarks/lockfree_hash_set.cc libe-0.2.7-new/benchmarks/lockfree_hash_set.cc
---- libe-0.2.7/benchmarks/lockfree_hash_set.cc 2011-08-26 16:24:54.000000000 +0200
-+++ libe-0.2.7-new/benchmarks/lockfree_hash_set.cc 2012-08-20 15:00:37.877793998 +0200
-@@ -30,6 +30,7 @@
- // C includes
- #include <cstdlib>
- #include <stdint.h>
-+#include <unistd.h>
-
- // C++
- #include <iostream>
-
+++ /dev/null
---- lib/encode.c
-+++ lib/encode.c
-@@ -30,7 +30,7 @@
- int i, sum = 0;
-
- if (t->options & TAR_GNU)
-- strncpy(t->th_buf.magic, "ustar ", 8);
-+ strncpy(t->th_buf.magic, "ustar", 6);
- else
- {
- strncpy(t->th_buf.version, TVERSION, TVERSLEN);
+++ /dev/null
-This patch fixes memory errors
-
-Author: David Sugar
-
---- commoncpp/address.cpp
-+++ commoncpp/address.cpp
-@@ -360,7 +360,7 @@
- if(ipaddr)
- delete[] ipaddr;
- ipaddr = new struct in_addr[1];
-- memset((void *)&ipaddr[0], 0, sizeof(ipaddr));
-+ memset((void *)&ipaddr[0], 0, sizeof(struct in_addr));
- return;
- }
-
-@@ -498,7 +498,7 @@
- : validator(_validator), hostname(NULL) {
- addr_count = 1;
- ipaddr = new struct in6_addr[1];
-- memcpy(ipaddr, &in6addr_any, sizeof(in6_addr));
-+ memcpy(ipaddr, &in6addr_any, sizeof(struct in6_addr));
- }
-
- IPV6Address::IPV6Address(const char *address, const IPV6Validator *_validator) :
-@@ -716,7 +716,7 @@
- if(ipaddr)
- delete[] ipaddr;
- ipaddr = new struct in6_addr[1];
-- memset((void *)&ipaddr[0], 0, sizeof(ipaddr));
-+ memset((void *)&ipaddr[0], 0, sizeof(struct in6_addr));
- return;
- }
-
-@@ -796,7 +796,7 @@
- if(ipaddr)
- delete[] ipaddr;
- ipaddr = new struct in6_addr[1];
-- memset((void *)&ipaddr[0], 0, sizeof(ipaddr));
-+ memset((void *)&ipaddr[0], 0, sizeof(struct in6_addr));
- return;
- }
-
+++ /dev/null
-From 98272c1fc5c8451dcc43be70cdfb1070e3d72f3a Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <sebastian@pipping.org>
-Date: Tue, 14 Jun 2011 20:28:43 +0200
-Subject: [PATCH] No longer copy Doxygen .gif files
-
----
- doc/Makefile.am | 2 +-
- doc/release.sh.in | 1 -
- 2 files changed, 1 insertions(+), 2 deletions(-)
-
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 4e63062..d29b77c 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -27,7 +27,7 @@ distclean-local:
- ## Install doc files
- install-data-local:
- $(MKDIR_P) "$(DESTDIR)$(docdir)/html" ## Didn't work with installdirs-local
-- $(INSTALL_DATA) html/*.{css,gif,html,png} "$(DESTDIR)$(docdir)/html/"
-+ $(INSTALL_DATA) html/*.{css,html,png} "$(DESTDIR)$(docdir)/html/"
-
-
- ## Uninstall doc files
-diff --git a/doc/release.sh.in b/doc/release.sh.in
-index 59afb70..a930e64 100755
---- a/doc/release.sh.in
-+++ b/doc/release.sh.in
-@@ -15,7 +15,6 @@ rm -Rf "${distdir}" "${distdir}.zip"
- mkdir -p "${distdir}/html"
- cp \
- html/*.css \
-- html/*.gif \
- html/*.html \
- html/*.png \
- \
---
-1.7.5.3
-
projects / gentoo.git / commitdiff