Author: adconrad Date: 2012-10-25 13:09:34 +0000 (Thu, 25 Oct 2012) New Revision: 5327
Added: glibc-package/branches/eglibc-2.16/debian/control.in/x32 glibc-package/branches/eglibc-2.16/debian/cvs-malloc-arena.diff glibc-package/branches/eglibc-2.16/debian/libc6-amd64.symbols.x32 glibc-package/branches/eglibc-2.16/debian/libc6-i386.symbols.x32 glibc-package/branches/eglibc-2.16/debian/libc6-x32.symbols.amd64 glibc-package/branches/eglibc-2.16/debian/libc6-x32.symbols.i386 glibc-package/branches/eglibc-2.16/debian/libc6.symbols.x32 glibc-package/branches/eglibc-2.16/debian/sysdeps/x32.mk glibc-package/branches/eglibc-2.16/debian/testsuite-checking/expected-results-x86_64-linux-gnux32-libc glibc-package/branches/eglibc-2.16/debian/testsuite-checking/expected-results-x86_64-linux-gnux32-x32 Log: Add missing files from Daniel Schepler's x32 support branch Added: glibc-package/branches/eglibc-2.16/debian/control.in/x32 =================================================================== --- glibc-package/branches/eglibc-2.16/debian/control.in/x32 (rev 0) +++ glibc-package/branches/eglibc-2.16/debian/control.in/x32 2012-10-25 13:09:34 UTC (rev 5327) @@ -0,0 +1,20 @@ +Package: libc6-x32 +Architecture: amd64 i386 +Section: libs +Priority: optional +Depends: libc6 (= ${binary:Version}), ${misc:Depends} +Description: Embedded GNU C Library: X32 ABI Shared libraries for AMD64 + This package includes shared versions of the standard C library and the + standard math library, as well as many others. This is the X32 ABI version + of the library, meant for AMD64 systems. + +Package: libc6-dev-x32 +Architecture: amd64 i386 +Section: libdevel +Priority: optional +Depends: libc6-x32 (= ${binary:Version}), libc6-dev-i386 (= ${binary:Version}) [amd64], libc6-dev-amd64 (= ${binary:Version}) [i386], libc6-dev (= ${binary:Version}), ${misc:Depends} +Description: Embedded GNU C Library: X32 ABI Development Libraries for AMD64 + Contains the symlinks and object files needed to compile and link programs + which use the standard C library. This is the X32 ABI version of the + library, meant for amd64 systems. + Added: glibc-package/branches/eglibc-2.16/debian/cvs-malloc-arena.diff =================================================================== --- glibc-package/branches/eglibc-2.16/debian/cvs-malloc-arena.diff (rev 0) +++ glibc-package/branches/eglibc-2.16/debian/cvs-malloc-arena.diff 2012-10-25 13:09:34 UTC (rev 5327) @@ -0,0 +1,33 @@ +2012-09-08 H.J. Lu <hongjiu...@intel.com> + + [BZ #14562] + * malloc/arena.c (heap_trim): Properly get fencepost and adjust + new chunk size with MALLOC_ALIGN_MASK. + +--- + malloc/arena.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- a/malloc/arena.c ++++ b/malloc/arena.c +@@ -652,15 +652,18 @@ + unsigned long pagesz = GLRO(dl_pagesize); + mchunkptr top_chunk = top(ar_ptr), p, bck, fwd; + heap_info *prev_heap; +- long new_size, top_size, extra; ++ long new_size, top_size, extra, misalign; + + /* Can this heap go away completely? */ + while(top_chunk == chunk_at_offset(heap, sizeof(*heap))) { + prev_heap = heap->prev; + p = chunk_at_offset(prev_heap, prev_heap->size - (MINSIZE-2*SIZE_SZ)); ++ /* fencepost must be properly aligned. */ ++ misalign = ((long) p) & MALLOC_ALIGN_MASK; ++ p = (mchunkptr)(((unsigned long) p) & ~MALLOC_ALIGN_MASK); + assert(p->size == (0|PREV_INUSE)); /* must be fencepost */ + p = prev_chunk(p); +- new_size = chunksize(p) + (MINSIZE-2*SIZE_SZ); ++ new_size = chunksize(p) + (MINSIZE-2*SIZE_SZ) + misalign; + assert(new_size>0 && new_size<(long)(2*MINSIZE)); + if(!prev_inuse(p)) + new_size += p->prev_size; Added: glibc-package/branches/eglibc-2.16/debian/libc6-amd64.symbols.x32 =================================================================== --- glibc-package/branches/eglibc-2.16/debian/libc6-amd64.symbols.x32 (rev 0) +++ glibc-package/branches/eglibc-2.16/debian/libc6-amd64.symbols.x32 2012-10-25 13:09:34 UTC (rev 5327) @@ -0,0 +1,5 @@ +#include "libc6.symbols.common" +ld-linux-x86-64.so.2 #PACKAGE# #MINVER# +#include "symbols.wildcards" +libc.so.6 #PACKAGE# #MINVER# +#include "symbols.wildcards" Added: glibc-package/branches/eglibc-2.16/debian/libc6-i386.symbols.x32 =================================================================== --- glibc-package/branches/eglibc-2.16/debian/libc6-i386.symbols.x32 (rev 0) +++ glibc-package/branches/eglibc-2.16/debian/libc6-i386.symbols.x32 2012-10-25 13:09:34 UTC (rev 5327) @@ -0,0 +1,12 @@ +#include "libc6.symbols.common" +ld-linux.so.2 #PACKAGE# #MINVER# +#include "symbols.wildcards" +### TLS support enabled with Debian upload 2.3.6-6 + __tls_get_addr@GLIBC_2.3 2.3.6-6~ +libc.so.6 #PACKAGE# #MINVER# +#include "symbols.wildcards" +### +### Override headers already defined in libc6.symbols.common +### +libpthread.so.0 #PACKAGE# (>= 2.3.6-6~), #PACKAGE# #MINVER# +#include "symbols.wildcards" Added: glibc-package/branches/eglibc-2.16/debian/libc6-x32.symbols.amd64 =================================================================== --- glibc-package/branches/eglibc-2.16/debian/libc6-x32.symbols.amd64 (rev 0) +++ glibc-package/branches/eglibc-2.16/debian/libc6-x32.symbols.amd64 2012-10-25 13:09:34 UTC (rev 5327) @@ -0,0 +1,5 @@ +#include "libc6.symbols.common" +ld-linux-x32.so.2 #PACKAGE# #MINVER# +#include "symbols.wildcards" +libc.so.6 #PACKAGE# #MINVER# +#include "symbols.wildcards" Added: glibc-package/branches/eglibc-2.16/debian/libc6-x32.symbols.i386 =================================================================== --- glibc-package/branches/eglibc-2.16/debian/libc6-x32.symbols.i386 (rev 0) +++ glibc-package/branches/eglibc-2.16/debian/libc6-x32.symbols.i386 2012-10-25 13:09:34 UTC (rev 5327) @@ -0,0 +1,5 @@ +#include "libc6.symbols.common" +ld-linux-x32.so.2 #PACKAGE# #MINVER# +#include "symbols.wildcards" +libc.so.6 #PACKAGE# #MINVER# +#include "symbols.wildcards" Added: glibc-package/branches/eglibc-2.16/debian/libc6.symbols.x32 =================================================================== --- glibc-package/branches/eglibc-2.16/debian/libc6.symbols.x32 (rev 0) +++ glibc-package/branches/eglibc-2.16/debian/libc6.symbols.x32 2012-10-25 13:09:34 UTC (rev 5327) @@ -0,0 +1,5 @@ +#include "libc6.symbols.common" +ld-linux-x32.so.2 #PACKAGE# #MINVER# +#include "symbols.wildcards" +libc.so.6 #PACKAGE# #MINVER# +#include "symbols.wildcards" Added: glibc-package/branches/eglibc-2.16/debian/sysdeps/x32.mk =================================================================== --- glibc-package/branches/eglibc-2.16/debian/sysdeps/x32.mk (rev 0) +++ glibc-package/branches/eglibc-2.16/debian/sysdeps/x32.mk 2012-10-25 13:09:34 UTC (rev 5327) @@ -0,0 +1,65 @@ +libc_MIN_KERNEL_SUPPORTED = 3.4.0 +libc_rtlddir = /libx32 +extra_config_options = --enable-multi-arch + +ifeq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH)) +CC = gcc-4.7 +CXX = g++-4.7 +endif + +# build 64-bit (amd64) alternative library +EGLIBC_PASSES += amd64 +DEB_ARCH_REGULAR_PACKAGES += libc6-amd64 libc6-dev-amd64 +libc6-amd64_shlib_dep = libc6-amd64 (>= $(shlib_dep_ver)) +amd64_add-ons = nptl $(add-ons) +amd64_configure_target = x86_64-linux-gnu +amd64_CC = $(CC) -m64 +amd64_CXX = $(CXX) -m64 +amd64_extra_config_options = $(extra_config_options) --disable-profile +amd64_rtlddir = /lib64 +amd64_slibdir = /lib64 +amd64_libdir = /usr/lib64 + +define libc6-dev-amd64_extra_pkg_install + +mkdir -p debian/libc6-dev-amd64/usr/include +ln -s x86_64-linux-gnux32/bits debian/libc6-dev-amd64/usr/include/ +ln -s x86_64-linux-gnux32/gnu debian/libc6-dev-amd64/usr/include/ +ln -s x86_64-linux-gnux32/fpu_control.h debian/libc6-dev-amd64/usr/include/ + +mkdir -p debian/libc6-dev-amd64/usr/include/x86_64-linux-gnux32/gnu +cp -a debian/tmp-amd64/usr/include/gnu/stubs-64.h \ + debian/libc6-dev-amd64/usr/include/x86_64-linux-gnux32/gnu + +mkdir -p debian/libc6-dev-amd64/usr/include/sys +for i in `ls debian/tmp-libc/usr/include/x86_64-linux-gnux32/sys`; do \ + ln -s ../x86_64-linux-gnux32/sys/$$i debian/libc6-dev-amd64/usr/include/sys/$$i ; \ +done + +endef + +# build 32-bit (i386) alternative library +EGLIBC_PASSES += i386 +DEB_ARCH_REGULAR_PACKAGES += libc6-i386 libc6-dev-i386 +libc6-i386_shlib_dep = libc6-i386 (>= $(shlib_dep_ver)) +i386_add-ons = nptl $(add-ons) +i386_configure_target = i686-linux-gnu +i386_CC = $(CC) -m32 +i386_CXX = $(CC) -m32 +i386_extra_cflags = -march=pentium4 -mtune=generic +i386_extra_config_options = $(extra_config_options) --disable-profile +i386_slibdir = /lib32 +i386_libdir = /usr/lib32 + +define libc6-dev-i386_extra_pkg_install + +mkdir -p debian/libc6-dev-i386/usr/include/x86_64-linux-gnux32/gnu +cp -a debian/tmp-i386/usr/include/gnu/stubs-32.h \ + debian/libc6-dev-i386/usr/include/x86_64-linux-gnux32/gnu + +endef + +define libc6-i386_extra_pkg_install +mkdir -p debian/libc6-i386/lib +ln -sf /lib32/ld-linux.so.2 debian/libc6-i386/lib +endef Added: glibc-package/branches/eglibc-2.16/debian/testsuite-checking/expected-results-x86_64-linux-gnux32-libc =================================================================== --- glibc-package/branches/eglibc-2.16/debian/testsuite-checking/expected-results-x86_64-linux-gnux32-libc (rev 0) +++ glibc-package/branches/eglibc-2.16/debian/testsuite-checking/expected-results-x86_64-linux-gnux32-libc 2012-10-25 13:09:34 UTC (rev 5327) @@ -0,0 +1,16 @@ +# +# Allowed failures for x86_64-linux-gnux32-libc and the returned make +# failure number, indicating the signal the process died with. +# Format: <Failed test>, Error <Make error code> [(ignored)] +# +annexc.out, Error 1 (ignored) +ifuncmain1staticpie.out, Error 134 +ifuncmain6pie.out, Error 134 +ifuncmain7pie.out, Error 134 +run-conformtest.out, Error 1 (ignored) +tst-backtrace6.out, Error 1 +tst-cpuclock2.out, Error 1 +tst-mqueue5.out, Error 1 +tst-timer.out, Error 139 +tst-waitid.out, Error 1 +tst-writev.out, Error 1 Added: glibc-package/branches/eglibc-2.16/debian/testsuite-checking/expected-results-x86_64-linux-gnux32-x32 =================================================================== --- glibc-package/branches/eglibc-2.16/debian/testsuite-checking/expected-results-x86_64-linux-gnux32-x32 (rev 0) +++ glibc-package/branches/eglibc-2.16/debian/testsuite-checking/expected-results-x86_64-linux-gnux32-x32 2012-10-25 13:09:34 UTC (rev 5327) @@ -0,0 +1,16 @@ +# +# Allowed failures for x86_64-linux-gnux32-x32 and the returned make +# failure number, indicating the signal the process died with. +# Format: <Failed test>, Error <Make error code> [(ignored)] +# +annexc.out, Error 1 (ignored) +ifuncmain1staticpie.out, Error 134 +ifuncmain6pie.out, Error 134 +ifuncmain7pie.out, Error 134 +run-conformtest.out, Error 1 (ignored) +tst-backtrace6.out, Error 1 +tst-cpuclock2.out, Error 1 +tst-mqueue5.out, Error 1 +tst-timer.out, Error 139 +tst-waitid.out, Error 1 +tst-writev.out, Error 1 -- To UNSUBSCRIBE, email to debian-glibc-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1trnbn-0007n4...@vasks.debian.org