SOURCES (DEVEL): uClibc-alpha.patch, uClibc-newsoname.patch, uClib...

sparky sparky at pld-linux.org
Sat Feb 4 00:01:29 CET 2006 

Author: sparky                       Date: Fri Feb  3 23:01:29 2006 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- updated for 20060203 snap

---- Files affected:
SOURCES:
   uClibc-alpha.patch (1.4 -> 1.4.4.1) , uClibc-newsoname.patch (1.3.2.2 -> 1.3.2.3) , uClibc-sparc.patch (1.5 -> 1.5.2.1) 

---- Diffs:

================================================================
Index: SOURCES/uClibc-alpha.patch
diff -u SOURCES/uClibc-alpha.patch:1.4 SOURCES/uClibc-alpha.patch:1.4.4.1
--- SOURCES/uClibc-alpha.patch:1.4	Sat Jan 15 23:36:50 2005
+++ SOURCES/uClibc-alpha.patch	Sat Feb  4 00:01:24 2006
@@ -1,114 +1,3 @@
---- uClibc-0.9.21/libc/sysdeps/linux/alpha/bits/mman.h.orig	1970-01-01 00:00:00.000000000 +0000
-+++ uClibc-0.9.21/libc/sysdeps/linux/alpha/bits/mman.h	2003-11-10 22:42:47.000000000 +0000
-@@ -0,0 +1,108 @@
-+/* Definitions for POSIX memory map interface.  Linux/Alpha version.
-+   Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library 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
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, write to the Free
-+   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-+   02111-1307 USA.  */
-+
-+#ifndef _SYS_MMAN_H
-+# error "Never use <bits/mman.h> directly; include <sys/mman.h> instead."
-+#endif
-+
-+/* The following definitions basically come from the kernel headers.
-+   But the kernel header is not namespace clean.  */
-+
-+
-+/* Protections are chosen from these bits, OR'd together.  The
-+   implementation does not necessarily support PROT_EXEC or PROT_WRITE
-+   without PROT_READ.  The only guarantees are that no writing will be
-+   allowed without PROT_WRITE and no access will be allowed for PROT_NONE. */
-+
-+#define PROT_READ	  0x1		/* Page can be read.  */
-+#define PROT_WRITE	  0x2		/* Page can be written.  */
-+#define PROT_EXEC	  0x4		/* Page can be executed.  */
-+#define PROT_NONE	  0x0		/* Page can not be accessed.  */
-+
-+/* Sharing types (must choose one and only one of these).  */
-+#define MAP_SHARED	  0x01		/* Share changes.  */
-+#define MAP_PRIVATE	  0x02		/* Changes are private.  */
-+#ifdef __USE_MISC
-+# define MAP_TYPE	  0x0f		/* Mask for type of mapping.  */
-+#endif
-+
-+/* Other flags.  */
-+#define MAP_FIXED	  0x100		/* Interpret addr exactly.  */
-+#ifdef __USE_MISC
-+# define MAP_FILE	  0
-+# define MAP_ANONYMOUS	  0x10		/* Don't use a file.  */
-+# define MAP_ANON	  MAP_ANONYMOUS
-+#endif
-+
-+/* Not used by Linux, but here to make sure we don't clash with
-+   OSF/1 defines.  */
-+#if 0 && defined(__USE_BSD)
-+# define MAP_HASSEMAPHORE 0x0200
-+# define MAP_INHERIT	  0x0400
-+# define MAP_UNALIGNED	  0x0800
-+#endif
-+
-+/* These are Linux-specific.  */
-+#ifdef __USE_MISC
-+# define MAP_GROWSDOWN	  0x1000	/* Stack-like segment.  */
-+# define MAP_DENYWRITE	  0x2000	/* ETXTBSY */
-+# define MAP_EXECUTABLE	  0x4000	/* Mark it as an executable.  */
-+# define MAP_LOCKED	  0x8000	/* Lock the mapping.  */
-+# define MAP_NORESERVE	  0x10000	/* Don't check for reservations.  */
-+#endif
-+
-+/* Flags to `msync'.  */
-+#define MS_ASYNC	  1		/* Sync memory asynchronously.  */
-+#define MS_SYNC		  2		/* Synchronous memory sync.  */
-+#define MS_INVALIDATE	  4		/* Invalidate the caches.  */
-+
-+/* Flags for `mlockall'.  */
-+#define MCL_CURRENT	  8192		/* Lock all currently mapped pages.  */
-+#define MCL_FUTURE	  16384		/* Lock all additions to address
-+					   space.  */
-+
-+/* Flags for `mremap'.  */
-+#ifdef __USE_GNU
-+# define MREMAP_MAYMOVE	1
-+#endif
-+
-+/* Advice to `madvise'.  */
-+#ifdef __USE_BSD
-+# define MADV_NORMAL     0	/* No further special treatment.  */
-+# define MADV_RANDOM     1	/* Expect random page references.  */
-+# define MADV_SEQUENTIAL 2	/* Expect sequential page references.  */
-+# define MADV_WILLNEED   3	/* Will need these pages.  */
-+# define MADV_DONTNEED   6	/* Don't need these pages.  */
-+#endif
-+
-+/* The POSIX people had to invent similar names for the same things.  */
-+#ifdef __USE_XOPEN2K
-+# define POSIX_MADV_NORMAL	0 /* No further special treatment.  */
-+# define POSIX_MADV_RANDOM	1 /* Expect random page references.  */
-+# define POSIX_MADV_SEQUENTIAL	2 /* Expect sequential page references.  */
-+# define POSIX_MADV_WILLNEED	3 /* Will need these pages.  */
-+# define POSIX_MADV_DONTNEED	6 /* Don't need these pages.  */
-+#endif
-+
-+/* Not used by Linux, but here to make sure we don't clash with
-+   OSF/1 defines.  */
-+#if 0 && defined(__USE_BSD)
-+# define MADV_DONTNEED_COMPAT 4	/* Old version?  */
-+# define MADV_SPACEAVAIL 5	/* Ensure resources are available.  */
-+#endif
 --- uClibc-0.9.27/libc/sysdeps/linux/alpha/brk.S.orig	2005-01-12 08:59:21.000000000 +0100
 +++ uClibc-0.9.27/libc/sysdeps/linux/alpha/brk.S	2005-01-15 20:42:48.845898024 +0100
 @@ -25,6 +25,8 @@

================================================================
Index: SOURCES/uClibc-newsoname.patch
diff -u SOURCES/uClibc-newsoname.patch:1.3.2.2 SOURCES/uClibc-newsoname.patch:1.3.2.3
--- SOURCES/uClibc-newsoname.patch:1.3.2.2	Wed Jan  4 18:32:30 2006
+++ SOURCES/uClibc-newsoname.patch	Sat Feb  4 00:01:24 2006
@@ -1,28 +1,31 @@
-diff -ru uClibc/libpthread/linuxthreads.old/Makefile.in uClibc.newsoname/libpthread/linuxthreads.old/Makefile.in
---- uClibc/libpthread/linuxthreads.old/Makefile.in	2006-01-03 09:12:10.000000000 +0100
-+++ uClibc.newsoname/libpthread/linuxthreads.old/Makefile.in	2006-01-04 17:36:29.000000000 +0100
+--- uClibc/libpthread/linuxthreads.old/Makefile.in.orig	2006-02-03 09:11:29.000000000 +0100
++++ uClibc/libpthread/linuxthreads.old/Makefile.in	2006-02-03 23:42:12.000000000 +0100
 @@ -21,7 +21,7 @@
  LDFLAGS-libpthread.so := $(LDFLAGS)
  endif
  
--LIBS-libpthread.so := $(LIBS)
-+LIBS-libpthread-uclibc.so := $(LIBS)
+-LIBS-libpthread.so := $(LIBS) $(ldso)
++LIBS-libpthread-uclibc.so := $(LIBS) $(ldso)
  
  START_FILE-libpthread.so := $(SHARED_START_FILES)
  END_FILE-libpthread.so := $(SHARED_END_FILES)
-@@ -71,9 +71,14 @@
- headers-$(UCLIBC_HAS_THREADS) += linuxthreads_headers
+@@ -80,13 +80,17 @@
  headers_clean-y += linuxthreads_headers_clean
  
+ ifeq ($(DOMULTI),n)
 -$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc)
 +$(top_builddir)lib/libpthread-uclibc.so: $(libpthread_OUT)/libpthread_so.a $(libc)
-+	@# link.so takes info about soname from $@
  	$(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
+ else
+-$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS $(libc)
++$(top_builddir)lib/libpthread-uclibc.so: $(libpthread_OUT)/libpthread.oS $(libc)
+ 	$(call linkm.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
+ endif
  
 +$(top_builddir)lib/libpthread.so: $(top_builddir)lib/libpthread-uclibc.so
 +	$(LN) -sf $(firstword $^) $@.$(MAJOR_VERSION)
 +	$(LN) -sf $(firstword $^) $@
-+	
++
  $(libpthread_OUT)/libpthread_so.a: $(libpthread-so-y)
  	$(Q)$(RM) $@
  ifeq ($(PTHREADS_DEBUG_SUPPORT),y)

================================================================
Index: SOURCES/uClibc-sparc.patch
diff -u SOURCES/uClibc-sparc.patch:1.5 SOURCES/uClibc-sparc.patch:1.5.2.1
--- SOURCES/uClibc-sparc.patch:1.5	Sun Aug 28 09:20:16 2005
+++ SOURCES/uClibc-sparc.patch	Sat Feb  4 00:01:24 2006
@@ -1,26 +1,3 @@
---- uClibc-0.9.28/ldso/ldso/sparc/elfinterp.c.orig	2005-08-18 00:49:41.000000000 +0200
-+++ uClibc-0.9.28/ldso/ldso/sparc/elfinterp.c	2005-08-28 00:19:02.940783736 +0200
-@@ -81,7 +81,7 @@
- 
- 
-   if (unlikely(reloc_type != R_SPARC_JMP_SLOT)) {
--    _dl_dprintf(2, "%s: incorrect relocation type in jump relocations (%d)\n",
-+    _dl_dprintf(2, "%s: incorrect relocation type in jump relocations (%x)\n",
- 		  _dl_progname, reloc_type);
-     _dl_exit(30);
-   };
-@@ -128,8 +128,10 @@
- 	got_addr[2] = (char *) (0x81c06000 | ((unsigned int) new_addr & 0x3ff));
- #endif
- 
-+#if defined (__SUPPORT_LD_DEBUG__)
-+  if (_dl_debug_bindings)
- 	_dl_dprintf(2, "Address = %x\n",new_addr);
--	_dl_exit(32);
-+#endif
- 
-   return (unsigned int) new_addr;
- }
 --- uClibc-0.9.28/ldso/ldso/ldso.c.orig	2005-08-18 00:49:41.000000000 +0200
 +++ uClibc-0.9.28/ldso/ldso/ldso.c	2005-08-28 00:19:31.295473168 +0200
 @@ -597,7 +597,7 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/uClibc-alpha.patch?r1=1.4&r2=1.4.4.1&f=u
    http://cvs.pld-linux.org/SOURCES/uClibc-newsoname.patch?r1=1.3.2.2&r2=1.3.2.3&f=u
    http://cvs.pld-linux.org/SOURCES/uClibc-sparc.patch?r1=1.5&r2=1.5.2.1&f=u

More information about the pld-cvs-commit mailing list