[Lsb-messages] /var/www/bzr/lsb/devel/build_env r1999: more fixes from bug 3548

Mats Wichmann mats at linuxfoundation.org
Thu Oct 25 21:20:29 UTC 2012


------------------------------------------------------------
revno: 1999
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Thu 2012-10-25 15:20:29 -0600
message:
  more fixes from bug 3548
modified:
  headers/All/5.0/ffi.h.defs
  headers/All/5.0/ffitarget.h.defs
  headers/All/5.0/glib-2.0/glib.h.defs
  headers/ffi.h
  headers/ffitarget.h
  headers/glib-2.0/glib.h
  headers/x86-64/5.0/ffitarget.h.defs
  package/Makefile
  stub_libs/5.0/IA32/LibNameMap.txt
  stub_libs/5.0/IA32/libglib-2.0.c
  stub_libs/5.0/IA64/LibNameMap.txt
  stub_libs/5.0/IA64/libglib-2.0.c
  stub_libs/5.0/PPC32/LibNameMap.txt
  stub_libs/5.0/PPC32/libglib-2.0.c
  stub_libs/5.0/PPC64/LibNameMap.txt
  stub_libs/5.0/PPC64/libglib-2.0.c
  stub_libs/5.0/S390/LibNameMap.txt
  stub_libs/5.0/S390/libglib-2.0.c
  stub_libs/5.0/S390X/LibNameMap.txt
  stub_libs/5.0/S390X/libglib-2.0.c
  stub_libs/5.0/x86-64/LibNameMap.txt
  stub_libs/5.0/x86-64/libglib-2.0.c
-------------- next part --------------
=== modified file 'headers/All/5.0/ffi.h.defs'
--- a/headers/All/5.0/ffi.h.defs	2012-10-19 18:13:40 +0000
+++ b/headers/All/5.0/ffi.h.defs	2012-10-25 21:20:29 +0000
@@ -1,4 +1,12 @@
 
+#define FFI_64_BIT_MAX	9223372036854775807
+#if LONG_MAX == 2147483647
+#  define FFI_SIZEOF_ARG        4
+#elif LONG_MAX == FFI_64_BIT_MAX
+#  define FFI_SIZEOF_ARG        8
+#endif
+#define FFI_SIZEOF_JAVA_RAW	FFI_SIZEOF_ARG
+
 typedef struct _ffi_type {
     size_t size;
     unsigned short alignment;
@@ -35,23 +43,23 @@
 struct ffi_closure {
     char tramp[FFI_TRAMPOLINE_SIZE];
     struct ffi_cif *cif;
-    void (*fun) (void);
+    void (*fun) (struct ffi_cif *, void *, void **, void *);
     void *user_data;
 };
 struct ffi_raw_closure {
     char tramp[FFI_TRAMPOLINE_SIZE];
     struct ffi_cif *cif;
-    void (*translate_args) (void);
+    void (*translate_args) (struct ffi_cif *, void *, void **, void *);
     void *this_closure;
-    void (*fun) (void);
+    void (*fun) (struct ffi_cif *, void *, union ffi_raw *, void *);
     void *user_data;
 };
 struct ffi_java_raw_closure {
     char tramp[FFI_TRAMPOLINE_SIZE];
     struct ffi_cif *cif;
-    void (*translate_args) (void);
+    void (*translate_args) (struct ffi_cif *, void *, void **, void *);
     void *this_closure;
-    void (*fun) (void);
+    void (*fun) (struct ffi_cif *, void *, ffi_java_raw *, void *);
     void *user_data;
 };
 extern void ffi_call(struct ffi_cif *cif, void (*fn) (void), void *rvalue,
@@ -73,27 +81,43 @@
 				   unsigned int ntotalargs,
 				   ffi_type * rtype, ffi_type * *atypes);
 extern ffi_status ffi_prep_closure(struct ffi_closure *, struct ffi_cif *,
-				   void (*fun) (void), void *user_data);
+				   void (*fun) (struct ffi_cif *, void *,
+						void **, void *),
+				   void *user_data);
 extern ffi_status ffi_prep_closure_loc(struct ffi_closure *,
 				       struct ffi_cif *,
-				       void (*fun) (void), void *user_data,
-				       void *codeloc);
+				       void (*fun) (struct ffi_cif *,
+						    void *, void **,
+						    void *),
+				       void *user_data, void *codeloc);
 extern ffi_status ffi_prep_java_raw_closure(struct ffi_java_raw_closure *,
 					    struct ffi_cif *cif,
-					    void (*fun) (void),
+					    void (*fun) (struct ffi_cif *,
+							 void *,
+							 ffi_java_raw *,
+							 void *),
 					    void *user_data);
 extern ffi_status ffi_prep_java_raw_closure_loc(struct ffi_java_raw_closure
 						*, struct ffi_cif *cif,
-						void (*fun) (void),
+						void (*fun) (struct ffi_cif
+							     *, void *,
+							     ffi_java_raw
+							     *, void *),
 						void *user_data,
 						void *codeloc);
 extern ffi_status ffi_prep_raw_closure(struct ffi_raw_closure *,
 				       struct ffi_cif *cif,
-				       void (*fun) (void),
+				       void (*fun) (struct ffi_cif *,
+						    void *,
+						    union ffi_raw *,
+						    void *),
 				       void *user_data);
 extern ffi_status ffi_prep_raw_closure_loc(struct ffi_raw_closure *,
 					   struct ffi_cif *cif,
-					   void (*fun) (void),
+					   void (*fun) (struct ffi_cif *,
+							void *,
+							union ffi_raw *,
+							void *),
 					   void *user_data, void *codeloc);
 extern void ffi_ptrarray_to_raw(struct ffi_cif *cif, void **args,
 				union ffi_raw *raw);

=== modified file 'headers/All/5.0/ffitarget.h.defs'
--- a/headers/All/5.0/ffitarget.h.defs	2012-10-19 18:13:40 +0000
+++ b/headers/All/5.0/ffitarget.h.defs	2012-10-25 21:20:29 +0000
@@ -1,4 +1,6 @@
 
+#define FFI_TRAMPOLINE_SIZE	10
+
 typedef unsigned long int ffi_arg;
 typedef long int ffi_sarg;
 typedef enum ffi_abi {

=== modified file 'headers/All/5.0/glib-2.0/glib.h.defs'
--- a/headers/All/5.0/glib-2.0/glib.h.defs	2012-10-24 14:43:14 +0000
+++ b/headers/All/5.0/glib-2.0/glib.h.defs	2012-10-25 21:20:29 +0000
@@ -3495,7 +3495,6 @@
 extern void g_strfreev(gchar * *str_array);
 extern GString *g_string_append(GString * string, const gchar * val);
 extern GString *g_string_append_c(GString * string, gchar c);
-extern GString *g_string_append_c_inline(GString * gstring, gchar c);
 extern GString *g_string_append_len(GString * string, const gchar * val,
 				    gssize len);
 extern void g_string_append_printf(GString * string, const gchar * format,
@@ -3918,8 +3917,7 @@
 extern guint32 g_variant_get_uint32(GVariant * value);
 extern guint64 g_variant_get_uint64(GVariant * value);
 extern void g_variant_get_va(GVariant * value, const gchar * format_string,
-			     const gchar * *endptr,
-			     struct __va_list_tag *app[]);
+			     const gchar * *endptr, va_list * app);
 extern GVariant *g_variant_get_variant(GVariant * value);
 extern guint g_variant_hash(gconstpointer value);
 extern gboolean g_variant_is_container(GVariant * value);
@@ -3979,7 +3977,7 @@
 				    gssize length);
 extern GVariant *g_variant_new_parsed(const gchar * format, ...);
 extern GVariant *g_variant_new_parsed_va(const gchar * format,
-					 struct __va_list_tag *app[]);
+					 va_list * app);
 extern GVariant *g_variant_new_signature(const gchar * signature);
 extern GVariant *g_variant_new_string(const gchar * string);
 extern GVariant *g_variant_new_strv(const gchar * const *strv,
@@ -3990,8 +3988,7 @@
 extern GVariant *g_variant_new_uint32(guint32 value);
 extern GVariant *g_variant_new_uint64(guint64 value);
 extern GVariant *g_variant_new_va(const gchar * format_string,
-				  const gchar * *endptr,
-				  struct __va_list_tag *app[]);
+				  const gchar * *endptr, va_list * app);
 extern GVariant *g_variant_new_variant(GVariant * value);
 extern GVariant *g_variant_parse(const GVariantType * type,
 				 const char *text, const char *limit,

=== modified file 'headers/ffi.h'
--- a/headers/ffi.h	2012-10-19 18:13:40 +0000
+++ b/headers/ffi.h	2012-10-25 21:20:29 +0000
@@ -2,6 +2,7 @@
 #ifndef _FFI_H_
 #define _FFI_H_
 
+#include <limits.h>
 #include <stddef.h>
 #include <ffitarget.h>
 
@@ -10,6 +11,15 @@
 #endif
 
 
+#define FFI_64_BIT_MAX	9223372036854775807
+#if LONG_MAX == 2147483647
+#  define FFI_SIZEOF_ARG        4
+#elif LONG_MAX == FFI_64_BIT_MAX
+#  define FFI_SIZEOF_ARG        8
+#endif
+#define FFI_SIZEOF_JAVA_RAW	FFI_SIZEOF_ARG
+
+
     typedef struct _ffi_type ffi_type;
 
     typedef enum {
@@ -40,25 +50,25 @@
     struct ffi_closure {
 	char tramp[FFI_TRAMPOLINE_SIZE];
 	struct ffi_cif *cif;
-	void (*fun) (void);
+	void (*fun) (struct ffi_cif *, void *, void **, void *);
 	void *user_data;
     };
 
     struct ffi_raw_closure {
 	char tramp[FFI_TRAMPOLINE_SIZE];
 	struct ffi_cif *cif;
-	void (*translate_args) (void);
+	void (*translate_args) (struct ffi_cif *, void *, void **, void *);
 	void *this_closure;
-	void (*fun) (void);
+	void (*fun) (struct ffi_cif *, void *, union ffi_raw *, void *);
 	void *user_data;
     };
 
     struct ffi_java_raw_closure {
 	char tramp[FFI_TRAMPOLINE_SIZE];
 	struct ffi_cif *cif;
-	void (*translate_args) (void);
+	void (*translate_args) (struct ffi_cif *, void *, void **, void *);
 	void *this_closure;
-	void (*fun) (void);
+	void (*fun) (struct ffi_cif *, void *, ffi_java_raw *, void *);
 	void *user_data;
     };
 
@@ -93,29 +103,47 @@
 				       ffi_type * *atypes);
     extern ffi_status ffi_prep_closure(struct ffi_closure *,
 				       struct ffi_cif *,
-				       void (*fun) (void),
+				       void (*fun) (struct ffi_cif *,
+						    void *, void **,
+						    void *),
 				       void *user_data);
     extern ffi_status ffi_prep_closure_loc(struct ffi_closure *,
 					   struct ffi_cif *,
-					   void (*fun) (void),
+					   void (*fun) (struct ffi_cif *,
+							void *, void **,
+							void *),
 					   void *user_data, void *codeloc);
     extern ffi_status ffi_prep_java_raw_closure(struct ffi_java_raw_closure
 						*, struct ffi_cif *cif,
-						void (*fun) (void),
+						void (*fun) (struct ffi_cif
+							     *, void *,
+							     ffi_java_raw
+							     *, void *),
 						void *user_data);
     extern ffi_status ffi_prep_java_raw_closure_loc(struct
 						    ffi_java_raw_closure *,
 						    struct ffi_cif *cif,
-						    void (*fun) (void),
+						    void (*fun) (struct
+								 ffi_cif *,
+								 void *,
+								 ffi_java_raw
+								 *,
+								 void *),
 						    void *user_data,
 						    void *codeloc);
     extern ffi_status ffi_prep_raw_closure(struct ffi_raw_closure *,
 					   struct ffi_cif *cif,
-					   void (*fun) (void),
+					   void (*fun) (struct ffi_cif *,
+							void *,
+							union ffi_raw *,
+							void *),
 					   void *user_data);
     extern ffi_status ffi_prep_raw_closure_loc(struct ffi_raw_closure *,
 					       struct ffi_cif *cif,
-					       void (*fun) (void),
+					       void (*fun) (struct ffi_cif
+							    *, void *,
+							    union ffi_raw
+							    *, void *),
 					       void *user_data,
 					       void *codeloc);
     extern void ffi_ptrarray_to_raw(struct ffi_cif *cif, void **args,

=== modified file 'headers/ffitarget.h'
--- a/headers/ffitarget.h	2012-10-19 18:13:40 +0000
+++ b/headers/ffitarget.h	2012-10-25 21:20:29 +0000
@@ -8,6 +8,12 @@
 #endif
 
 
+#define FFI_TRAMPOLINE_SIZE	10
+#if defined __x86_64__
+#define FFI_TRAMPOLINE_SIZE	24
+#endif
+
+
     typedef unsigned long int ffi_arg;
 
     typedef long int ffi_sarg;

=== modified file 'headers/glib-2.0/glib.h'
--- a/headers/glib-2.0/glib.h	2012-10-24 14:43:14 +0000
+++ b/headers/glib-2.0/glib.h	2012-10-25 21:20:29 +0000
@@ -5367,7 +5367,6 @@
     extern int g_strcmp0(const char *str1, const char *str2);
     /* g_strdown is deprecated and should not be used in newly-written code. This function is broken if your string is guaranteed to be ASCII, since it's locale-sensitive, and it's broken if your string is localized, since it doesn't work on many encodings at all, including UTF-8, EUC-JP, etc. There are therefore two replacement functions: g_ascii_strdown and g_utf8_strdown. */
     extern gchar *g_strdown(gchar * string) LSB_DECL_DEPRECATED;
-    extern GString *g_string_append_c_inline(GString * gstring, gchar c);
     extern GString *g_string_append_uri_escaped(GString * string,
 						const gchar * unescaped,
 						const gchar *
@@ -5594,8 +5593,7 @@
     extern guint64 g_variant_get_uint64(GVariant * value);
     extern void g_variant_get_va(GVariant * value,
 				 const gchar * format_string,
-				 const gchar * *endptr,
-				 struct __va_list_tag *app[]);
+				 const gchar * *endptr, va_list * app);
     extern GVariant *g_variant_get_variant(GVariant * value);
     extern guint g_variant_hash(gconstpointer value);
     extern gboolean g_variant_is_container(GVariant * value);
@@ -5658,7 +5656,7 @@
 					gssize length);
     extern GVariant *g_variant_new_parsed(const gchar * format, ...);
     extern GVariant *g_variant_new_parsed_va(const gchar * format,
-					     struct __va_list_tag *app[]);
+					     va_list * app);
     extern GVariant *g_variant_new_signature(const gchar * signature);
     extern GVariant *g_variant_new_string(const gchar * string);
     extern GVariant *g_variant_new_strv(const gchar * const *strv,
@@ -5670,7 +5668,7 @@
     extern GVariant *g_variant_new_uint64(guint64 value);
     extern GVariant *g_variant_new_va(const gchar * format_string,
 				      const gchar * *endptr,
-				      struct __va_list_tag *app[]);
+				      va_list * app);
     extern GVariant *g_variant_new_variant(GVariant * value);
     extern GVariant *g_variant_parse(const GVariantType * type,
 				     const char *text, const char *limit,

=== modified file 'headers/x86-64/5.0/ffitarget.h.defs'
--- a/headers/x86-64/5.0/ffitarget.h.defs	2012-10-19 18:13:40 +0000
+++ b/headers/x86-64/5.0/ffitarget.h.defs	2012-10-25 21:20:29 +0000
@@ -1,5 +1,2 @@
 
-/*
- * This header is architecture neutral
- * Please refer to the generic specification for details
- */
+#define FFI_TRAMPOLINE_SIZE	24

=== modified file 'package/Makefile'
--- a/package/Makefile	2012-10-24 14:43:14 +0000
+++ b/package/Makefile	2012-10-25 21:20:29 +0000
@@ -46,7 +46,7 @@
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=3
+RPM_PACKAGE_RELEASE=4
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)

=== modified file 'stub_libs/5.0/IA32/LibNameMap.txt'
--- a/stub_libs/5.0/IA32/LibNameMap.txt	2012-10-19 18:13:40 +0000
+++ b/stub_libs/5.0/IA32/LibNameMap.txt	2012-10-25 21:20:29 +0000
@@ -24,7 +24,7 @@
 libcups libcups.so.2
 libcupsimage libcupsimage.so.2
 libdl libdl.so.2
-libffi libffi.so.6
+libffi libffi.so.5
 libfontconfig libfontconfig.so.1
 libfreetype libfreetype.so.6
 libgcc_s libgcc_s.so.1

=== modified file 'stub_libs/5.0/IA32/libglib-2.0.c'
--- a/stub_libs/5.0/IA32/libglib-2.0.c	2012-10-19 18:13:40 +0000
+++ b/stub_libs/5.0/IA32/libglib-2.0.c	2012-10-25 21:20:29 +0000
@@ -1093,7 +1093,6 @@
 void g_strfreev() {} ;
 void g_string_append() {} ;
 void g_string_append_c() {} ;
-void g_string_append_c_inline() {} ;
 void g_string_append_len() {} ;
 void g_string_append_printf() {} ;
 void g_string_append_unichar() {} ;
@@ -1192,6 +1191,7 @@
 void g_thread_exit() {} ;
 void g_thread_foreach() {} ;
 void g_thread_get_initialized() {} ;
+void g_thread_gettime() {} ;
 void g_thread_join() {} ;
 void g_thread_new() {} ;
 void g_thread_pool_free() {} ;
@@ -1486,7 +1486,6 @@
 __asm__(".globl g_mem_gc_friendly; .pushsection .data; .type g_mem_gc_friendly, at object; .size g_mem_gc_friendly, 4; g_mem_gc_friendly: .long 0; .popsection");
 __asm__(".globl g_test_config_vars; .pushsection .data; .type g_test_config_vars, at object; .size g_test_config_vars, 4; g_test_config_vars: .long 0; .popsection");
 __asm__(".globl g_thread_functions_for_glib_use; .pushsection .data; .type g_thread_functions_for_glib_use, at object; .size g_thread_functions_for_glib_use, 84; g_thread_functions_for_glib_use: .long 0; .popsection");
-__asm__(".globl g_thread_gettime; .pushsection .data; .type g_thread_gettime, at object; .size g_thread_gettime, 4; g_thread_gettime: .long 0; .popsection");
 __asm__(".globl g_thread_use_default_impl; .pushsection .data; .type g_thread_use_default_impl, at object; .size g_thread_use_default_impl, 4; g_thread_use_default_impl: .long 0; .popsection");
 __asm__(".globl g_threads_got_initialized; .pushsection .data; .type g_threads_got_initialized, at object; .size g_threads_got_initialized, 4; g_threads_got_initialized: .long 0; .popsection");
 __asm__(".globl g_timeout_funcs; .pushsection .data; .type g_timeout_funcs, at object; .size g_timeout_funcs, 24; g_timeout_funcs: .long 0; .popsection");

=== modified file 'stub_libs/5.0/IA64/LibNameMap.txt'
--- a/stub_libs/5.0/IA64/LibNameMap.txt	2012-10-19 18:13:40 +0000
+++ b/stub_libs/5.0/IA64/LibNameMap.txt	2012-10-25 21:20:29 +0000
@@ -24,7 +24,7 @@
 libcups libcups.so.2
 libcupsimage libcupsimage.so.2
 libdl libdl.so.2
-libffi libffi.so.6
+libffi libffi.so.5
 libfontconfig libfontconfig.so.1
 libfreetype libfreetype.so.6
 libgcc_s libgcc_s.so.1

=== modified file 'stub_libs/5.0/IA64/libglib-2.0.c'
--- a/stub_libs/5.0/IA64/libglib-2.0.c	2012-10-19 18:13:40 +0000
+++ b/stub_libs/5.0/IA64/libglib-2.0.c	2012-10-25 21:20:29 +0000
@@ -1093,7 +1093,6 @@
 void g_strfreev() {} ;
 void g_string_append() {} ;
 void g_string_append_c() {} ;
-void g_string_append_c_inline() {} ;
 void g_string_append_len() {} ;
 void g_string_append_printf() {} ;
 void g_string_append_unichar() {} ;
@@ -1192,6 +1191,7 @@
 void g_thread_exit() {} ;
 void g_thread_foreach() {} ;
 void g_thread_get_initialized() {} ;
+void g_thread_gettime() {} ;
 void g_thread_join() {} ;
 void g_thread_new() {} ;
 void g_thread_pool_free() {} ;
@@ -1486,7 +1486,6 @@
 __asm__(".globl g_mem_gc_friendly; .pushsection .data; .type g_mem_gc_friendly, at object; .size g_mem_gc_friendly, 4; g_mem_gc_friendly: .long 0; .popsection");
 __asm__(".globl g_test_config_vars; .pushsection .data; .type g_test_config_vars, at object; .size g_test_config_vars, 4; g_test_config_vars: .long 0; .popsection");
 __asm__(".globl g_thread_functions_for_glib_use; .pushsection .data; .type g_thread_functions_for_glib_use, at object; .size g_thread_functions_for_glib_use, 168; g_thread_functions_for_glib_use: .long 0; .popsection");
-__asm__(".globl g_thread_gettime; .pushsection .data; .type g_thread_gettime, at object; .size g_thread_gettime, 4; g_thread_gettime: .long 0; .popsection");
 __asm__(".globl g_thread_use_default_impl; .pushsection .data; .type g_thread_use_default_impl, at object; .size g_thread_use_default_impl, 4; g_thread_use_default_impl: .long 0; .popsection");
 __asm__(".globl g_threads_got_initialized; .pushsection .data; .type g_threads_got_initialized, at object; .size g_threads_got_initialized, 4; g_threads_got_initialized: .long 0; .popsection");
 __asm__(".globl g_timeout_funcs; .pushsection .data; .type g_timeout_funcs, at object; .size g_timeout_funcs, 48; g_timeout_funcs: .long 0; .popsection");

=== modified file 'stub_libs/5.0/PPC32/LibNameMap.txt'
--- a/stub_libs/5.0/PPC32/LibNameMap.txt	2012-10-19 18:13:40 +0000
+++ b/stub_libs/5.0/PPC32/LibNameMap.txt	2012-10-25 21:20:29 +0000
@@ -24,7 +24,7 @@
 libcups libcups.so.2
 libcupsimage libcupsimage.so.2
 libdl libdl.so.2
-libffi libffi.so.6
+libffi libffi.so.5
 libfontconfig libfontconfig.so.1
 libfreetype libfreetype.so.6
 libgcc_s libgcc_s.so.1

=== modified file 'stub_libs/5.0/PPC32/libglib-2.0.c'
--- a/stub_libs/5.0/PPC32/libglib-2.0.c	2012-10-19 18:13:40 +0000
+++ b/stub_libs/5.0/PPC32/libglib-2.0.c	2012-10-25 21:20:29 +0000
@@ -1093,7 +1093,6 @@
 void g_strfreev() {} ;
 void g_string_append() {} ;
 void g_string_append_c() {} ;
-void g_string_append_c_inline() {} ;
 void g_string_append_len() {} ;
 void g_string_append_printf() {} ;
 void g_string_append_unichar() {} ;
@@ -1192,6 +1191,7 @@
 void g_thread_exit() {} ;
 void g_thread_foreach() {} ;
 void g_thread_get_initialized() {} ;
+void g_thread_gettime() {} ;
 void g_thread_join() {} ;
 void g_thread_new() {} ;
 void g_thread_pool_free() {} ;
@@ -1486,7 +1486,6 @@
 __asm__(".globl g_mem_gc_friendly; .pushsection .data; .type g_mem_gc_friendly, at object; .size g_mem_gc_friendly, 4; g_mem_gc_friendly: .long 0; .popsection");
 __asm__(".globl g_test_config_vars; .pushsection .data; .type g_test_config_vars, at object; .size g_test_config_vars, 4; g_test_config_vars: .long 0; .popsection");
 __asm__(".globl g_thread_functions_for_glib_use; .pushsection .data; .type g_thread_functions_for_glib_use, at object; .size g_thread_functions_for_glib_use, 84; g_thread_functions_for_glib_use: .long 0; .popsection");
-__asm__(".globl g_thread_gettime; .pushsection .data; .type g_thread_gettime, at object; .size g_thread_gettime, 4; g_thread_gettime: .long 0; .popsection");
 __asm__(".globl g_thread_use_default_impl; .pushsection .data; .type g_thread_use_default_impl, at object; .size g_thread_use_default_impl, 4; g_thread_use_default_impl: .long 0; .popsection");
 __asm__(".globl g_threads_got_initialized; .pushsection .data; .type g_threads_got_initialized, at object; .size g_threads_got_initialized, 4; g_threads_got_initialized: .long 0; .popsection");
 __asm__(".globl g_timeout_funcs; .pushsection .data; .type g_timeout_funcs, at object; .size g_timeout_funcs, 24; g_timeout_funcs: .long 0; .popsection");

=== modified file 'stub_libs/5.0/PPC64/LibNameMap.txt'
--- a/stub_libs/5.0/PPC64/LibNameMap.txt	2012-10-19 18:13:40 +0000
+++ b/stub_libs/5.0/PPC64/LibNameMap.txt	2012-10-25 21:20:29 +0000
@@ -24,7 +24,7 @@
 libcups libcups.so.2
 libcupsimage libcupsimage.so.2
 libdl libdl.so.2
-libffi libffi.so.6
+libffi libffi.so.5
 libfontconfig libfontconfig.so.1
 libfreetype libfreetype.so.6
 libgcc_s libgcc_s.so.1

=== modified file 'stub_libs/5.0/PPC64/libglib-2.0.c'
--- a/stub_libs/5.0/PPC64/libglib-2.0.c	2012-10-19 18:13:40 +0000
+++ b/stub_libs/5.0/PPC64/libglib-2.0.c	2012-10-25 21:20:29 +0000
@@ -1093,7 +1093,6 @@
 void g_strfreev() {} ;
 void g_string_append() {} ;
 void g_string_append_c() {} ;
-void g_string_append_c_inline() {} ;
 void g_string_append_len() {} ;
 void g_string_append_printf() {} ;
 void g_string_append_unichar() {} ;
@@ -1192,6 +1191,7 @@
 void g_thread_exit() {} ;
 void g_thread_foreach() {} ;
 void g_thread_get_initialized() {} ;
+void g_thread_gettime() {} ;
 void g_thread_join() {} ;
 void g_thread_new() {} ;
 void g_thread_pool_free() {} ;
@@ -1486,7 +1486,6 @@
 __asm__(".globl g_mem_gc_friendly; .pushsection .data; .type g_mem_gc_friendly, at object; .size g_mem_gc_friendly, 4; g_mem_gc_friendly: .long 0; .popsection");
 __asm__(".globl g_test_config_vars; .pushsection .data; .type g_test_config_vars, at object; .size g_test_config_vars, 4; g_test_config_vars: .long 0; .popsection");
 __asm__(".globl g_thread_functions_for_glib_use; .pushsection .data; .type g_thread_functions_for_glib_use, at object; .size g_thread_functions_for_glib_use, 168; g_thread_functions_for_glib_use: .long 0; .popsection");
-__asm__(".globl g_thread_gettime; .pushsection .data; .type g_thread_gettime, at object; .size g_thread_gettime, 4; g_thread_gettime: .long 0; .popsection");
 __asm__(".globl g_thread_use_default_impl; .pushsection .data; .type g_thread_use_default_impl, at object; .size g_thread_use_default_impl, 4; g_thread_use_default_impl: .long 0; .popsection");
 __asm__(".globl g_threads_got_initialized; .pushsection .data; .type g_threads_got_initialized, at object; .size g_threads_got_initialized, 4; g_threads_got_initialized: .long 0; .popsection");
 __asm__(".globl g_timeout_funcs; .pushsection .data; .type g_timeout_funcs, at object; .size g_timeout_funcs, 48; g_timeout_funcs: .long 0; .popsection");

=== modified file 'stub_libs/5.0/S390/LibNameMap.txt'
--- a/stub_libs/5.0/S390/LibNameMap.txt	2012-10-19 18:13:40 +0000
+++ b/stub_libs/5.0/S390/LibNameMap.txt	2012-10-25 21:20:29 +0000
@@ -24,7 +24,7 @@
 libcups libcups.so.2
 libcupsimage libcupsimage.so.2
 libdl libdl.so.2
-libffi libffi.so.6
+libffi libffi.so.5
 libfontconfig libfontconfig.so.1
 libfreetype libfreetype.so.6
 libgcc_s libgcc_s.so.1

=== modified file 'stub_libs/5.0/S390/libglib-2.0.c'
--- a/stub_libs/5.0/S390/libglib-2.0.c	2012-10-19 18:13:40 +0000
+++ b/stub_libs/5.0/S390/libglib-2.0.c	2012-10-25 21:20:29 +0000
@@ -1093,7 +1093,6 @@
 void g_strfreev() {} ;
 void g_string_append() {} ;
 void g_string_append_c() {} ;
-void g_string_append_c_inline() {} ;
 void g_string_append_len() {} ;
 void g_string_append_printf() {} ;
 void g_string_append_unichar() {} ;
@@ -1192,6 +1191,7 @@
 void g_thread_exit() {} ;
 void g_thread_foreach() {} ;
 void g_thread_get_initialized() {} ;
+void g_thread_gettime() {} ;
 void g_thread_join() {} ;
 void g_thread_new() {} ;
 void g_thread_pool_free() {} ;
@@ -1486,7 +1486,6 @@
 __asm__(".globl g_mem_gc_friendly; .pushsection .data; .type g_mem_gc_friendly, at object; .size g_mem_gc_friendly, 4; g_mem_gc_friendly: .long 0; .popsection");
 __asm__(".globl g_test_config_vars; .pushsection .data; .type g_test_config_vars, at object; .size g_test_config_vars, 4; g_test_config_vars: .long 0; .popsection");
 __asm__(".globl g_thread_functions_for_glib_use; .pushsection .data; .type g_thread_functions_for_glib_use, at object; .size g_thread_functions_for_glib_use, 84; g_thread_functions_for_glib_use: .long 0; .popsection");
-__asm__(".globl g_thread_gettime; .pushsection .data; .type g_thread_gettime, at object; .size g_thread_gettime, 4; g_thread_gettime: .long 0; .popsection");
 __asm__(".globl g_thread_use_default_impl; .pushsection .data; .type g_thread_use_default_impl, at object; .size g_thread_use_default_impl, 4; g_thread_use_default_impl: .long 0; .popsection");
 __asm__(".globl g_threads_got_initialized; .pushsection .data; .type g_threads_got_initialized, at object; .size g_threads_got_initialized, 4; g_threads_got_initialized: .long 0; .popsection");
 __asm__(".globl g_timeout_funcs; .pushsection .data; .type g_timeout_funcs, at object; .size g_timeout_funcs, 24; g_timeout_funcs: .long 0; .popsection");

=== modified file 'stub_libs/5.0/S390X/LibNameMap.txt'
--- a/stub_libs/5.0/S390X/LibNameMap.txt	2012-10-19 18:13:40 +0000
+++ b/stub_libs/5.0/S390X/LibNameMap.txt	2012-10-25 21:20:29 +0000
@@ -24,7 +24,7 @@
 libcups libcups.so.2
 libcupsimage libcupsimage.so.2
 libdl libdl.so.2
-libffi libffi.so.6
+libffi libffi.so.5
 libfontconfig libfontconfig.so.1
 libfreetype libfreetype.so.6
 libgcc_s libgcc_s.so.1

=== modified file 'stub_libs/5.0/S390X/libglib-2.0.c'
--- a/stub_libs/5.0/S390X/libglib-2.0.c	2012-10-19 18:13:40 +0000
+++ b/stub_libs/5.0/S390X/libglib-2.0.c	2012-10-25 21:20:29 +0000
@@ -1093,7 +1093,6 @@
 void g_strfreev() {} ;
 void g_string_append() {} ;
 void g_string_append_c() {} ;
-void g_string_append_c_inline() {} ;
 void g_string_append_len() {} ;
 void g_string_append_printf() {} ;
 void g_string_append_unichar() {} ;
@@ -1192,6 +1191,7 @@
 void g_thread_exit() {} ;
 void g_thread_foreach() {} ;
 void g_thread_get_initialized() {} ;
+void g_thread_gettime() {} ;
 void g_thread_join() {} ;
 void g_thread_new() {} ;
 void g_thread_pool_free() {} ;
@@ -1486,7 +1486,6 @@
 __asm__(".globl g_mem_gc_friendly; .pushsection .data; .type g_mem_gc_friendly, at object; .size g_mem_gc_friendly, 4; g_mem_gc_friendly: .long 0; .popsection");
 __asm__(".globl g_test_config_vars; .pushsection .data; .type g_test_config_vars, at object; .size g_test_config_vars, 4; g_test_config_vars: .long 0; .popsection");
 __asm__(".globl g_thread_functions_for_glib_use; .pushsection .data; .type g_thread_functions_for_glib_use, at object; .size g_thread_functions_for_glib_use, 168; g_thread_functions_for_glib_use: .long 0; .popsection");
-__asm__(".globl g_thread_gettime; .pushsection .data; .type g_thread_gettime, at object; .size g_thread_gettime, 4; g_thread_gettime: .long 0; .popsection");
 __asm__(".globl g_thread_use_default_impl; .pushsection .data; .type g_thread_use_default_impl, at object; .size g_thread_use_default_impl, 4; g_thread_use_default_impl: .long 0; .popsection");
 __asm__(".globl g_threads_got_initialized; .pushsection .data; .type g_threads_got_initialized, at object; .size g_threads_got_initialized, 4; g_threads_got_initialized: .long 0; .popsection");
 __asm__(".globl g_timeout_funcs; .pushsection .data; .type g_timeout_funcs, at object; .size g_timeout_funcs, 48; g_timeout_funcs: .long 0; .popsection");

=== modified file 'stub_libs/5.0/x86-64/LibNameMap.txt'
--- a/stub_libs/5.0/x86-64/LibNameMap.txt	2012-10-19 18:13:40 +0000
+++ b/stub_libs/5.0/x86-64/LibNameMap.txt	2012-10-25 21:20:29 +0000
@@ -24,7 +24,7 @@
 libcups libcups.so.2
 libcupsimage libcupsimage.so.2
 libdl libdl.so.2
-libffi libffi.so.6
+libffi libffi.so.5
 libfontconfig libfontconfig.so.1
 libfreetype libfreetype.so.6
 libgcc_s libgcc_s.so.1

=== modified file 'stub_libs/5.0/x86-64/libglib-2.0.c'
--- a/stub_libs/5.0/x86-64/libglib-2.0.c	2012-10-19 18:13:40 +0000
+++ b/stub_libs/5.0/x86-64/libglib-2.0.c	2012-10-25 21:20:29 +0000
@@ -1093,7 +1093,6 @@
 void g_strfreev() {} ;
 void g_string_append() {} ;
 void g_string_append_c() {} ;
-void g_string_append_c_inline() {} ;
 void g_string_append_len() {} ;
 void g_string_append_printf() {} ;
 void g_string_append_unichar() {} ;
@@ -1192,6 +1191,7 @@
 void g_thread_exit() {} ;
 void g_thread_foreach() {} ;
 void g_thread_get_initialized() {} ;
+void g_thread_gettime() {} ;
 void g_thread_join() {} ;
 void g_thread_new() {} ;
 void g_thread_pool_free() {} ;
@@ -1486,7 +1486,6 @@
 __asm__(".globl g_mem_gc_friendly; .pushsection .data; .type g_mem_gc_friendly, at object; .size g_mem_gc_friendly, 4; g_mem_gc_friendly: .long 0; .popsection");
 __asm__(".globl g_test_config_vars; .pushsection .data; .type g_test_config_vars, at object; .size g_test_config_vars, 4; g_test_config_vars: .long 0; .popsection");
 __asm__(".globl g_thread_functions_for_glib_use; .pushsection .data; .type g_thread_functions_for_glib_use, at object; .size g_thread_functions_for_glib_use, 168; g_thread_functions_for_glib_use: .long 0; .popsection");
-__asm__(".globl g_thread_gettime; .pushsection .data; .type g_thread_gettime, at object; .size g_thread_gettime, 4; g_thread_gettime: .long 0; .popsection");
 __asm__(".globl g_thread_use_default_impl; .pushsection .data; .type g_thread_use_default_impl, at object; .size g_thread_use_default_impl, 4; g_thread_use_default_impl: .long 0; .popsection");
 __asm__(".globl g_threads_got_initialized; .pushsection .data; .type g_threads_got_initialized, at object; .size g_threads_got_initialized, 4; g_threads_got_initialized: .long 0; .popsection");
 __asm__(".globl g_timeout_funcs; .pushsection .data; .type g_timeout_funcs, at object; .size g_timeout_funcs, 48; g_timeout_funcs: .long 0; .popsection");



More information about the lsb-messages mailing list