[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

r1786 - in glibc-package/branches/glibc-2.4/debian: . patches/any



Author: aurel32
Date: 2006-08-27 12:10:01 +0000 (Sun, 27 Aug 2006)
New Revision: 1786

Modified:
   glibc-package/branches/glibc-2.4/debian/changelog
   glibc-package/branches/glibc-2.4/debian/patches/any/local-libgcc-compat-ports.diff
Log:
Move mips/libgcc-compat.c to mips/mips32/libgcc-compat.c as it is only needed 
for the o32 ABI, and not needed for n32 and n64 ABIs.



Modified: glibc-package/branches/glibc-2.4/debian/changelog
===================================================================
--- glibc-package/branches/glibc-2.4/debian/changelog	2006-08-27 11:48:08 UTC (rev 1785)
+++ glibc-package/branches/glibc-2.4/debian/changelog	2006-08-27 12:10:01 UTC (rev 1786)
@@ -115,7 +115,9 @@
   * Update mips/submitted-msq.diff to reflect the new port add-on.
   * Remove powerpc/cvs-gcc41-initfini.diff (merged upstream).
   * Update any/local-libgcc-compat-{all,others}.diff and split them into
-    any/local-libgcc-compat-{main,ports}.diff.
+    any/local-libgcc-compat-{main,ports}.diff. Move mips/libgcc-compat.c to
+    mips/mips32/libgcc-compat.c as it is only needed for the o32 ABI, and not
+    needed for n32 and n64 ABIs.
   * Add sparc/local-fork.diff (use fork.c instead of fork.S).
   * Add any/local-__thread.diff (make glibc buildable without __thread support)
     from Michael Banck.  (Closes: #361064)

Modified: glibc-package/branches/glibc-2.4/debian/patches/any/local-libgcc-compat-ports.diff
===================================================================
--- glibc-package/branches/glibc-2.4/debian/patches/any/local-libgcc-compat-ports.diff	2006-08-27 11:48:08 UTC (rev 1785)
+++ glibc-package/branches/glibc-2.4/debian/patches/any/local-libgcc-compat-ports.diff	2006-08-27 12:10:01 UTC (rev 1786)
@@ -1,12 +1,12 @@
 # DP: Description: libgcc-compat symbols for mips, arm, m68k
 # DP: Author: Guido Guenther, GOTO Masanori
 # DP: Upstream status: Not submitted
-# DP: Date: 2002-10-13, updated 2006-05-28
+# DP: Date: 2002-10-13, updated 2006-08-27
 
-Index: ports/sysdeps/mips/libgcc-compat.c
+Index: ports/sysdeps/mips/mips32/libgcc-compat.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ports/sysdeps/mips/libgcc-compat.c	2006-08-05 13:41:56.000000000 -0400
++++ ports/sysdeps/mips/mips32/libgcc-compat.c	2006-08-05 13:41:56.000000000 -0400
 @@ -0,0 +1,66 @@
 +/* pre-.hidden libgcc compatibility
 +   Copyright (C) 2002 Free Software Foundation, Inc.
@@ -77,7 +77,7 @@
 Index: ports/sysdeps/mips/Versions
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ ports/sysdeps/mips/Versions	2006-08-05 13:41:56.000000000 -0400
++++ ports/sysdeps/mips/mips32/Versions	2006-08-05 13:41:56.000000000 -0400
 @@ -0,0 +1,8 @@
 +libc {
 +  GLIBC_2.0 {
@@ -365,13 +365,13 @@
 +symbol_version (__floatdisf_internal, __floatdisf, GLIBC_2.0);
 +
 +#endif
-Index: ports/sysdeps/mips/Makefile
+Index: ports/sysdeps/mips/mips32/Makefile
 ===================================================================
---- ports/sysdeps/mips/Makefile.orig	2006-08-05 13:42:10.000000000 -0400
-+++ ports/sysdeps/mips/Makefile	2006-08-05 13:42:24.000000000 -0400
-@@ -10,3 +10,11 @@
- ifeq ($(subdir),rt)
- librt-sysdep_routines += rt-sysdep
+--- ports/sysdeps/mips/mips32/Makefile.orig	2006-08-05 13:42:10.000000000 -0400
++++ ports/sysdeps/mips/mips32/Makefile	2006-08-05 13:42:24.000000000 -0400
+@@ -1,3 +1,11 @@
+ ifeq ($(filter -mabi=32,$(CC)),)
+ CC += -mabi=32
  endif
 +
 +ifeq ($(subdir),csu)



Reply to: