diff -Nru libgc-7.2d/debian/changelog libgc-7.2d/debian/changelog --- libgc-7.2d/debian/changelog 2013-07-03 16:14:28.000000000 +0000 +++ libgc-7.2d/debian/changelog 2013-07-17 13:17:29.000000000 +0000 @@ -1,8 +1,19 @@ -libgc (1:7.2d-4ubuntu1) saucy; urgency=low +libgc (1:7.2d-5ubuntu1) saucy; urgency=low - * libgc1c2: Replaces libgc1c3. + * Backport Aarch64 changes. + * Build-depend on dh-autoreconf, use autoreconf. + * Don't build-depend on pkg-kde-tools on arm64, not yet built. + * Update symbols file for arm64. + * Link the tests with -lpthread. - -- Matthias Klose Wed, 03 Jul 2013 18:13:30 +0200 + -- Matthias Klose Wed, 17 Jul 2013 12:39:59 +0200 + +libgc (1:7.2d-5) unstable; urgency=low + + * Add Replaces: libgc1c3 for Ubuntu + * Import symbol diffs from debian-ports + + -- Christoph Egger Wed, 03 Jul 2013 22:14:42 +0200 libgc (1:7.2d-4) unstable; urgency=low diff -Nru libgc-7.2d/debian/control libgc-7.2d/debian/control --- libgc-7.2d/debian/control 2013-07-03 16:13:53.000000000 +0000 +++ libgc-7.2d/debian/control 2013-07-17 10:41:33.000000000 +0000 @@ -4,9 +4,10 @@ Priority: standard Build-Depends: debhelper (>= 9), autoconf, + dh-autoreconf, libatomic-ops-dev (>= 7.3~), pkg-config, - pkg-kde-tools + pkg-kde-tools [!arm64] Standards-Version: 3.9.4 Homepage: http://www.hpl.hp.com/personal/Hans_Boehm/gc/ Vcs-Git: git://git.debian.org/git/collab-maint/libgc.git diff -Nru libgc-7.2d/debian/libgc1c2.symbols libgc-7.2d/debian/libgc1c2.symbols --- libgc-7.2d/debian/libgc1c2.symbols 2013-07-02 15:34:17.000000000 +0000 +++ libgc-7.2d/debian/libgc1c2.symbols 2013-07-17 13:07:50.000000000 +0000 @@ -1,8 +1,8 @@ -# SymbolsHelper-Confirmed: 1:7.2d amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 mips mipsel powerpc s390 s390x sparc +# SymbolsHelper-Confirmed: 1:7.2d alpha amd64 armel armhf hurd-i386 i386 ia64 kfreebsd-amd64 kfreebsd-i386 m68k mips mipsel powerpc s390 s390x sparc sparc64 x32 libgc.so.1 libgc1c2 #MINVER# GC_FirstDLOpenedLinkMap@Base 1:7.2d (arch=kfreebsd-amd64 kfreebsd-i386)GC_FreeBSDGetDataStart@Base 1:7.2d - (arch=sparc)GC_SysVGetDataStart@Base 1:7.2d + (arch=sparc sparc64)GC_SysVGetDataStart@Base 1:7.2d GC_abort@Base 1:7.2d GC_add_ext_descriptor@Base 1:7.2d GC_add_map_entry@Base 1:7.2d @@ -84,7 +84,7 @@ GC_core_malloc@Base 1:7.2d GC_core_malloc_atomic@Base 1:7.2d GC_current_warn_proc@Base 1:7.2d - (arch=!kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !s390 !s390x !sparc)GC_data_start@Base 1:7.2d + (arch=!arm64 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !s390 !s390x !sparc !sparc64)GC_data_start@Base 1:7.2d GC_debug_change_stubborn@Base 1:7.2d GC_debug_end_stubborn_change@Base 1:7.2d GC_debug_free@Base 1:7.2d @@ -159,8 +159,8 @@ GC_ext_descriptors@Base 1:7.2d GC_extend_size_map@Base 1:7.2d GC_fail_count@Base 1:7.2d - (arch=!mips !mipsel !s390 !s390x)GC_fault_handler@Base 1:7.2d - (arch=amd64 i386 ia64)GC_fault_handler_lock@Base 1:7.2d + (arch=!arm64 !mips !mipsel !s390 !s390x)GC_fault_handler@Base 1:7.2d + (arch=alpha amd64 i386 ia64 m68k x32)GC_fault_handler_lock@Base 1:7.2d GC_finalize@Base 1:7.2d GC_finalize_all@Base 1:7.2d GC_finalize_now@Base 1:7.2d @@ -168,8 +168,8 @@ GC_finalizer_notifier@Base 1:7.2d GC_find_header@Base 1:7.2d GC_find_leak@Base 1:7.2d - (arch=!mips !mipsel !s390 !s390x)GC_find_limit@Base 1:7.2d - (arch=!mips !mipsel !s390 !s390x)GC_find_limit_with_bound@Base 1:7.2d + (arch=!arm64 !mips !mipsel !s390 !s390x)GC_find_limit@Base 1:7.2d + (arch=!arm64 !mips !mipsel !s390 !s390x)GC_find_limit_with_bound@Base 1:7.2d GC_findleak_delay_free@Base 1:7.2d GC_finish_collection@Base 1:7.2d GC_fo_entries@Base 1:7.2d @@ -265,7 +265,7 @@ GC_init_explicit_typing@Base 1:7.2d GC_init_gcj_malloc@Base 1:7.2d GC_init_headers@Base 1:7.2d - (arch=!kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !s390 !s390x !sparc)GC_init_linux_data_start@Base 1:7.2d + (arch=!arm64 !kfreebsd-amd64 !kfreebsd-i386 !mips !mipsel !s390 !s390x !sparc !sparc64)GC_init_linux_data_start@Base 1:7.2d GC_init_parallel@Base 1:7.2d GC_init_size_map@Base 1:7.2d GC_init_thread_local@Base 1:7.2d @@ -286,7 +286,7 @@ GC_is_visible@Base 1:7.2d GC_is_visible_print_proc@Base 1:7.2d GC_java_finalization@Base 1:7.2d - (arch=!mips !mipsel !s390 !s390x)GC_jmp_buf@Base 1:7.2d + (arch=!arm64 !mips !mipsel !s390 !s390x)GC_jmp_buf@Base 1:7.2d (arch=armel armhf hurd-i386)GC_key_create@Base 1:7.2d GC_large_alloc_warn_interval@Base 1:7.2d GC_large_alloc_warn_suppressed@Base 1:7.2d @@ -363,12 +363,12 @@ GC_obj_kinds@Base 1:7.2d GC_objects_are_marked@Base 1:7.2d GC_objfreelist_ptr@Base 1:7.2d - (arch=amd64 i386 ia64)GC_old_bus_handler@Base 1:7.2d - (arch=amd64 i386 ia64)GC_old_bus_handler_used_si@Base 1:7.2d + (arch=alpha amd64 i386 ia64 m68k x32)GC_old_bus_handler@Base 1:7.2d + (arch=alpha amd64 i386 ia64 m68k x32)GC_old_bus_handler_used_si@Base 1:7.2d GC_old_dl_entries@Base 1:7.2d GC_old_normal_bl@Base 1:7.2d - (arch=amd64 i386 ia64)GC_old_segv_handler@Base 1:7.2d - (arch=amd64 i386 ia64)GC_old_segv_handler_used_si@Base 1:7.2d + (arch=alpha amd64 i386 ia64 m68k x32)GC_old_segv_handler@Base 1:7.2d + (arch=alpha amd64 i386 ia64 m68k x32)GC_old_segv_handler_used_si@Base 1:7.2d GC_old_stack_bl@Base 1:7.2d GC_oom_fn@Base 1:7.2d GC_page_size@Base 1:7.2d @@ -402,7 +402,7 @@ GC_print_type@Base 1:7.2d GC_printf@Base 1:7.2d GC_promote_black_lists@Base 1:7.2d - (arch=amd64 i386 ia64)GC_protect_heap@Base 1:7.2d + (arch=alpha amd64 i386 ia64 m68k x32)GC_protect_heap@Base 1:7.2d (arch=!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386)GC_pthread_cancel@Base 1:7.2d GC_pthread_create@Base 1:7.2d GC_pthread_detach@Base 1:7.2d @@ -422,8 +422,8 @@ GC_push_finalizer_structures@Base 1:7.2d GC_push_gc_structures@Base 1:7.2d GC_push_marked1@Base 1:7.2d - GC_push_marked2@Base 1:7.2d - GC_push_marked4@Base 1:7.2d + (arch=!m68k)GC_push_marked2@Base 1:7.2d + (arch=!m68k)GC_push_marked4@Base 1:7.2d GC_push_marked@Base 1:7.2d GC_push_next_marked@Base 1:7.2d GC_push_next_marked_dirty@Base 1:7.2d @@ -477,7 +477,7 @@ (arch=armel armhf hurd-i386)GC_remove_specific@Base 1:7.2d GC_remove_tmp_roots@Base 1:7.2d (arch=!hurd-i386 !kfreebsd-amd64 !kfreebsd-i386)GC_repeat_read@Base 1:7.2d - (arch=!mips !mipsel !s390 !s390x)GC_reset_fault_handler@Base 1:7.2d + (arch=!arm64 !mips !mipsel !s390 !s390x)GC_reset_fault_handler@Base 1:7.2d GC_reset_finalizer_nested@Base 1:7.2d GC_restart_handler@Base 1:7.2d GC_retry_signals@Base 1:7.2d @@ -485,8 +485,8 @@ GC_roots_present@Base 1:7.2d GC_same_obj@Base 1:7.2d GC_same_obj_print_proc@Base 1:7.2d - (arch=ia64 sparc)GC_save_regs_in_stack@Base 1:7.2d - (arch=ia64 sparc)GC_save_regs_ret_val@Base 1:7.2d + (arch=ia64 sparc sparc64)GC_save_regs_in_stack@Base 1:7.2d + (arch=ia64 sparc sparc64)GC_save_regs_ret_val@Base 1:7.2d GC_scratch_alloc@Base 1:7.2d GC_set_all_interior_pointers@Base 1:7.2d GC_set_and_save_fault_handler@Base 1:7.2d @@ -515,7 +515,7 @@ GC_set_warn_proc@Base 1:7.2d GC_setpagesize@Base 1:7.2d (arch=armel armhf hurd-i386)GC_setspecific@Base 1:7.2d - (arch=!mips !mipsel !s390 !s390x)GC_setup_temporary_fault_handler@Base 1:7.2d + (arch=!arm64 !mips !mipsel !s390 !s390x)GC_setup_temporary_fault_handler@Base 1:7.2d GC_should_collect@Base 1:7.2d GC_should_invoke_finalizers@Base 1:7.2d GC_signal_mark_stack_overflow@Base 1:7.2d @@ -576,13 +576,13 @@ GC_world_is_stopped@Base 1:7.2d GC_world_stopped@Base 1:7.2d GC_write@Base 1:7.2d - (arch=amd64 i386 ia64)GC_write_fault_handler@Base 1:7.2d - (arch=sparc)_etext@Base 1:7.2d + (arch=alpha amd64 i386 ia64 m68k x32)GC_write_fault_handler@Base 1:7.2d + (arch=sparc sparc64)_etext@Base 1:7.2d (arch=kfreebsd-amd64 kfreebsd-i386)etext@Base 1:7.2d libgccpp.so.1 libgc1c2 #MINVER# _ZdaPv@Base 1:7.2d _ZdlPv@Base 1:7.2d - (subst)_Zna{size_t}@Base 1:7.2d - (subst)_Znw{size_t}@Base 1:7.2d - (arch=sparc)_etext@Base 1:7.2d + (arch=!arm64|subst)_Zna{size_t}@Base 1:7.2d + (arch=!arm64|subst)_Znw{size_t}@Base 1:7.2d + (arch=sparc sparc64)_etext@Base 1:7.2d (arch=kfreebsd-amd64 kfreebsd-i386)etext@Base 1:7.2d diff -Nru libgc-7.2d/debian/patches/aarch64.diff libgc-7.2d/debian/patches/aarch64.diff --- libgc-7.2d/debian/patches/aarch64.diff 1970-01-01 00:00:00.000000000 +0000 +++ libgc-7.2d/debian/patches/aarch64.diff 2013-07-17 10:37:45.000000000 +0000 @@ -0,0 +1,70 @@ +Index: b/include/private/gcconfig.h +=================================================================== +--- a/include/private/gcconfig.h ++++ b/include/private/gcconfig.h +@@ -70,6 +70,13 @@ + # define I386 + # define mach_type_known + # endif ++#if defined(__aarch64__) ++# define AARCH64 ++# if !defined(LINUX) ++# define NOSYS ++# define mach_type_known ++# endif ++# endif + # if defined(__arm) || defined(__arm__) || defined(__thumb__) + # define ARM32 + # if !defined(LINUX) && !defined(NETBSD) && !defined(OPENBSD) \ +@@ -250,6 +257,10 @@ + # define IA64 + # define mach_type_known + # endif ++# if defined(LINUX) && defined(__aarch64__) ++# define AARCH64 ++# define mach_type_known ++# endif + # if defined(LINUX) && (defined(__arm) || defined(__arm__)) + # define ARM32 + # define mach_type_known +@@ -541,6 +552,7 @@ + /* running Amdahl UTS4 */ + /* S390 ==> 390-like machine */ + /* running LINUX */ ++ /* AARCH64 ==> ARM AArch64 */ + /* ARM32 ==> Intel StrongARM */ + /* IA64 ==> Intel IPF */ + /* (e.g. Itanium) */ +@@ -1903,6 +1915,32 @@ + # endif + # endif + ++# ifdef AARCH64 ++# define CPP_WORDSZ 64 ++# define MACH_TYPE "AARCH64" ++# define ALIGNMENT 8 ++# ifndef HBLKSIZE ++# define HBLKSIZE 4096 ++# endif ++# ifdef LINUX ++# define OS_TYPE "LINUX" ++# define LINUX_STACKBOTTOM ++# define USE_GENERIC_PUSH_REGS ++# define DYNAMIC_LOADING ++ extern int __data_start[]; ++# define DATASTART ((ptr_t)__data_start) ++ extern char _end[]; ++# define DATAEND ((ptr_t)(&_end)) ++# endif ++# ifdef NOSYS ++ /* __data_start is usually defined in the target linker script. */ ++ extern int __data_start[]; ++# define DATASTART ((ptr_t)__data_start) ++ extern void *__stack_base__; ++# define STACKBOTTOM ((ptr_t)__stack_base__) ++# endif ++# endif ++ + # ifdef ARM32 + # define CPP_WORDSZ 32 + # define MACH_TYPE "ARM32" diff -Nru libgc-7.2d/debian/patches/series libgc-7.2d/debian/patches/series --- libgc-7.2d/debian/patches/series 2013-06-09 11:59:49.000000000 +0000 +++ libgc-7.2d/debian/patches/series 2013-07-17 10:30:30.000000000 +0000 @@ -5,3 +5,4 @@ #05-s390-includes.diff enable-threads.diff allow-automake-1.13 +aarch64.diff diff -Nru libgc-7.2d/debian/rules libgc-7.2d/debian/rules --- libgc-7.2d/debian/rules 2013-06-09 15:07:21.000000000 +0000 +++ libgc-7.2d/debian/rules 2013-07-17 10:49:57.000000000 +0000 @@ -7,12 +7,19 @@ LDFLAGS += -pthread +ifeq ($(DEB_HOST_MULTIARCH),aarch64-linux-gnu) + dh_args = autoreconf +else + dh_args = autoreconf,pkgkde_symbolshelper +endif + %: - dh $@ --with pkgkde_symbolshelper + dh $@ --with $(dh_args) override_dh_auto_configure: [ ! -d libatomic_ops-1.2 ] || mv libatomic_ops-1.2 libatomic_ops-1.2.bak autoconf + EXTRA_TEST_LIBS="-lpthread" \ ./configure \ $(CONFIG_OPTS) \ --enable-cplusplus \ @@ -27,9 +34,6 @@ --build=$(DEB_BUILD_GNU_TYPE) \ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) -#override_dh_autoreconf: -# dh_autoreconf ./autogen.sh - override_dh_auto_test: $(MAKE) check