[Glibc-bsd-commits] r5379 - in trunk/freebsd-libs/debian: . patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-24 21:24:14 +0000 (Fri, 24 Jan 2014)
New Revision: 5379

Added:
   trunk/freebsd-libs/debian/patches/libdwarf_off64_t.diff
Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/patches/series
Log:
Fix Dwarf_Off size on i386-linux-gnu.

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2014-01-24 21:11:37 UTC (rev 5378)
+++ trunk/freebsd-libs/debian/changelog	2014-01-24 21:24:14 UTC (rev 5379)
@@ -3,6 +3,7 @@
   * Improve detection of FTBFS problems on foreign platforms by passing
     __FREEBSD_GLUE_USE_EMBEDDED_HEADERS flag to freebsd-glue.
   * Switch to bmake to follow upstream.
+  * Fix Dwarf_Off size on i386-linux-gnu.
 
  -- Robert Millan <rmh at debian.org>  Sat, 18 Jan 2014 01:18:08 +0100
 

Added: trunk/freebsd-libs/debian/patches/libdwarf_off64_t.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/libdwarf_off64_t.diff	                        (rev 0)
+++ trunk/freebsd-libs/debian/patches/libdwarf_off64_t.diff	2014-01-24 21:24:14 UTC (rev 5379)
@@ -0,0 +1,15 @@
+
+We can't use -D_FILE_OFFSET_BITS=64 here, as
+libdwarf.h is a public header.
+
+--- a/lib/libdwarf/libdwarf.h
++++ b/lib/libdwarf/libdwarf.h
+@@ -32,7 +32,7 @@
+ #include <libelf.h>
+ 
+ typedef int		Dwarf_Bool;
+-typedef off_t		Dwarf_Off;
++typedef __off64_t	Dwarf_Off;
+ typedef uint64_t	Dwarf_Unsigned;
+ typedef uint16_t	Dwarf_Half;
+ typedef uint8_t		Dwarf_Small;

Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series	2014-01-24 21:11:37 UTC (rev 5378)
+++ trunk/freebsd-libs/debian/patches/series	2014-01-24 21:24:14 UTC (rev 5379)
@@ -27,4 +27,5 @@
 libbsd_nlist.diff
 assume_default_login_class.diff
 rlimit.diff
+libdwarf_off64_t.diff
 makefiles.diff