glib/: fully remove galias hacks

glib/.gitignore

-galias.h
-galiasdef.c
 gtester
 libglib-gdb.py
 makefile.msc

glib/Makefile.am

@@ -43,21 +43,13 @@ AM_CPPFLAGS = 				\
 glib.def: glib.symbols
 	$(AM_V_GEN) (echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 -DALL_FILES - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/	/' -e 's/G_GNUC_[^ ]*//g') > glib.def
 
-galias.h: $(srcdir)/makegalias.pl glib.symbols
-	  $(AM_V_GEN) $(PERL) $(srcdir)/makegalias.pl < $(srcdir)/glib.symbols > galias.h
-
-galiasdef.c: $(srcdir)/makegalias.pl glib.symbols
-	  $(AM_V_GEN) $(PERL) $(srcdir)/makegalias.pl -def < $(srcdir)/glib.symbols > galiasdef.c
-
 if OS_LINUX
 if HAVE_GNUC_VISIBILITY
 TESTS_ENVIRONMENT = GLIB_DEBUG_FLAGS="$(GLIB_DEBUG_FLAGS)"
-TESTS = abicheck.sh pltcheck.sh
+TESTS = abicheck.sh
 endif
 endif
 
-BUILT_SOURCES = galias.h galiasdef.c
-
 MIRRORING_TAB_SOURCE = 				\
 	glib-mirroring-tab/Makefile 		\
 	glib-mirroring-tab/gen-mirroring-tab.c	\
@@ -71,9 +63,7 @@ EXTRA_DIST += 			\
 	glib.rc.in		\
 	gen-unicode-tables.pl	\
 	gen-script-table.pl	\
-	makegalias.pl		\
 	abicheck.sh		\
-	pltcheck.sh		\
 	glib.symbols		\
 	gregex.c		\
 	gregex.h		\
@@ -84,9 +74,7 @@ EXTRA_DIST += 			\
 # These may be in the builddir too
 BUILT_EXTRA_DIST = 		\
 	makefile.msc		\
-	glib.rc			\
-	galias.h		\
-	galiasdef.c
+	glib.rc
 
 lib_LTLIBRARIES = libglib-2.0.la
 
@@ -336,7 +324,7 @@ glib_probes.h: glib_probes.d Makefile
 	sed -e "s,define STAP_HAS_SEMAPHORES 1,undef STAP_HAS_SEMAPHORES," < $@.tmp > $@ && rm -f $@.tmp
 glib_probes.o: glib_probes.d Makefile
 	$(DTRACE) -G -s $< -o $@
-BUILT_SOURCES += glib_probes.h glib_probes.o
+BUILT_SOURCES = glib_probes.h glib_probes.o
 CLEANFILES += glib_probes.h glib_probes.h.tmp
 libglib_2_0_la_LIBADD += glib_probes.o
 endif

glib/garray.c

@@ -40,7 +40,6 @@
 #include "gmessages.h"
 #include "gqsort.h"
 
-#include "galias.h"
 
 /**
  * SECTION: arrays
@@ -1590,6 +1589,3 @@ g_byte_array_sort_with_data (GByteArray       *array,
 {
   g_array_sort_with_data ((GArray *) array, compare_func, user_data);
 }
-
-#define __G_ARRAY_C__
-#include "galiasdef.c"

glib/gasyncqueue.c

@@ -33,7 +33,6 @@
 #include "gtestutils.h"
 #include "gthread.h"
 
-#include "galias.h"
 
 
 struct _GAsyncQueue
@@ -667,6 +666,3 @@ _g_async_queue_get_mutex (GAsyncQueue* queue)
 
   return queue->mutex;
 }
-
-#define __G_ASYNCQUEUE_C__
-#include "galiasdef.c"

glib/gatomic-gcc.c

@@ -21,7 +21,6 @@
 #include "config.h"
 
 #include "glib.h"
-#include "galias.h"
 
 gint
 g_atomic_int_exchange_and_add (volatile gint G_GNUC_MAY_ALIAS *atomic,
@@ -87,6 +86,3 @@ void
   *atomic = newval;
   __sync_synchronize ();
 }
-
-#define __G_ATOMIC_C__
-#include "galiasdef.c"

glib/gatomic.c

@@ -29,7 +29,6 @@
 
 #include "glib.h"
 #include "gthreadprivate.h"
-#include "galias.h"
 
 #if defined (__GNUC__)
 # if defined (G_ATOMIC_I486)
@@ -1053,6 +1052,3 @@ void
   g_atomic_pointer_set (atomic, newval);
 }
 #endif /* G_ATOMIC_OP_MEMORY_BARRIER_NEEDED */
-
-#define __G_ATOMIC_C__
-#include "galiasdef.c"

glib/gbacktrace.c

@@ -77,7 +77,6 @@
 #  endif
 #endif
 
-#include "galias.h"
 
 #ifndef G_OS_WIN32
 static void stack_trace (char **args);
@@ -303,6 +302,3 @@ stack_trace (char **args)
 }
 
 #endif /* !G_OS_WIN32 */
-
-#define __G_BACKTRACE_C__
-#include "galiasdef.c"

glib/gbase64.c

@@ -31,7 +31,6 @@
 #include "glib.h"
 #include "glibintl.h"
 
-#include "galias.h"
 
 /**
  * SECTION:base64 Base64 Encoding
@@ -441,7 +440,3 @@ g_base64_decode_inplace (gchar *text,
   
   return (guchar *) text; 
 }
-
-
-#define __G_BASE64_C__
-#include "galiasdef.c"

glib/gbitlock.c

@@ -29,7 +29,6 @@
 #include "gthreadprivate.h"
 #include "config.h"
 
-#include "galias.h"
 
 #ifdef G_BIT_LOCK_FORCE_FUTEX_EMULATION
 #undef HAVE_FUTEX
@@ -295,6 +294,3 @@ g_bit_unlock (volatile gint *address,
   if (g_atomic_int_get (&g_bit_lock_contended[class]))
     g_futex_wake (address);
 }
-
-#define __G_BITLOCK_C__
-#include "galiasdef.c"

glib/gbookmarkfile.c

@@ -55,7 +55,6 @@
 #include "gtimer.h"
 #include "gutils.h"
 
-#include "galias.h"
 
 /* XBEL 1.0 standard entities */
 #define XBEL_VERSION		"1.0"
@@ -3704,6 +3703,3 @@ g_bookmark_file_get_icon (GBookmarkFile  *bookmark,
   
   return TRUE;
 }
-
-#define __G_BOOKMARK_FILE_C__
-#include "galiasdef.c"

glib/gbuffer.c

@@ -27,7 +27,6 @@
 #include <glib/gatomic.h>
 #include <glib/gmem.h>
 
-#include "galias.h"
 
 typedef struct
 {

glib/gcache.c

@@ -31,7 +31,6 @@
 #include "config.h"
 
 #include "glib.h"
-#include "galias.h"
 
 /**
  * SECTION: caches
@@ -326,6 +325,3 @@ g_cache_value_foreach (GCache   *cache,
 
   g_hash_table_foreach (cache->key_table, func, user_data);
 }
-
-#define __G_CACHE_C__
-#include "galiasdef.c"

glib/gchecksum.c

@@ -27,7 +27,6 @@
 #include "glib.h"
 #include "glibintl.h"
 
-#include "galias.h"
 
 /**
  * SECTION: checksum
@@ -1456,6 +1455,3 @@ g_compute_checksum_for_string (GChecksumType  checksum_type,
 
   return g_compute_checksum_for_data (checksum_type, (const guchar *) str, length);
 }
-
-#define __G_CHECKSUM_C__
-#include "galiasdef.c"

glib/gcompletion.c

@@ -39,7 +39,6 @@
 #undef G_DISABLE_DEPRECATED
 
 #include "gcompletion.h"
-#include "galias.h"
 
 /**
  * SECTION: completion
@@ -490,6 +489,3 @@ main (int   argc,
   return 0;
 }
 #endif
-
-#define __G_COMPLETION_C__
-#include "galiasdef.c"

glib/gconvert.c

@@ -55,7 +55,6 @@
 #error GNU libiconv not in use but included iconv.h is from libiconv
 #endif
 
-#include "galias.h"
 
 /* We try to terminate strings in unknown charsets with this many zero bytes
  * to ensure that multibyte strings really are nul-terminated when we return
@@ -2125,6 +2124,3 @@ g_filename_display_name (const gchar *filename)
 
   return display_name;
 }
-
-#define __G_CONVERT_C__
-#include "galiasdef.c"

glib/gdataset.c

@@ -37,7 +37,6 @@
 #include "glib.h"
 #include "gdatasetprivate.h"
 #include "glib_trace.h"
-#include "galias.h"
 
 /**
  * SECTION: datasets
@@ -1214,6 +1213,3 @@ g_intern_static_string (const gchar *string)
 
   return result;
 }
-
-#define __G_DATASET_C__
-#include "galiasdef.c"

glib/gdate.c

@@ -46,7 +46,6 @@
 #include <windows.h>
 #endif
 
-#include "galias.h"
 
 GDate*
 g_date_new (void)
@@ -1899,7 +1898,3 @@ g_date_strftime (gchar       *s,
   return retval;
 #endif
 }
-
-#define __G_DATE_C__
-#include "galiasdef.c"
-

glib/gdir.c

@@ -39,7 +39,6 @@
 
 #include "glibintl.h"
 
-#include "galias.h"
 
 #if defined (_MSC_VER) && !defined (HAVE_DIRENT_H)
 #include "../build/win32/dirent/dirent.h"
@@ -302,6 +301,3 @@ g_dir_close (GDir *dir)
 #endif
   g_free (dir);
 }
-
-#define __G_DIR_C__
-#include "galiasdef.c"

glib/gerror.c

@@ -27,7 +27,6 @@
 #include "config.h"
 
 #include "glib.h"
-#include "galias.h"
 
 
 /**
@@ -384,6 +383,3 @@ g_propagate_prefixed_error (GError      **dest,
       va_end (ap);
     }
 }
-
-#define __G_ERROR_C__
-#include "galiasdef.c"

glib/gfileutils.c

@@ -52,7 +52,6 @@
 #include "gstdio.h"
 #include "glibintl.h"
 
-#include "galias.h"
 
 /**
  * g_mkdir_with_parents:
@@ -2015,6 +2014,3 @@ g_file_open_tmp (const gchar  *tmpl,
 }
 
 #endif
-
-#define __G_FILEUTILS_C__
-#include "galiasdef.c"

glib/ghash.c

@@ -33,7 +33,6 @@
 #include <string.h>  /* memset */
 
 #include "glib.h"
-#include "galias.h"
 
 /**
  * SECTION: hash_tables
@@ -1456,6 +1455,3 @@ g_hash_table_get_values (GHashTable *hash_table)
 
   return retval;
 }
-
-#define __G_HASH_C__
-#include "galiasdef.c"

glib/ghook.c

@@ -34,7 +34,6 @@
 #include "config.h"
 
 #include "glib.h"
-#include "galias.h"
 
 
 /* --- functions --- */
@@ -633,6 +632,3 @@ g_hook_compare_ids (GHook *new_hook,
   
   return 0;
 }
-
-#define __G_HOOK_C__
-#include "galiasdef.c"

glib/ghostutils.c

@@ -26,7 +26,6 @@
 
 #include <string.h>
 
-#include "galias.h"
 
 /**
  * SECTION:ghostutils
@@ -764,6 +763,3 @@ g_hostname_is_ip_address (const gchar *hostname)
   /* If there's nothing left to parse, then it's ok. */
   return !*p;
 }
-
-#define __G_HOST_UTILS_C__
-#include "galiasdef.c"

glib/giochannel.c

@@ -48,7 +48,6 @@
 
 #include "glibintl.h"
 
-#include "galias.h"
 
 /**
  * SECTION: iochannels
@@ -2579,6 +2578,3 @@ g_io_channel_error_quark (void)
 {
   return g_quark_from_static_string ("g-io-channel-error-quark");
 }
-
-#define __G_IOCHANNEL_C__
-#include "galiasdef.c"

glib/giounix.c

@@ -44,7 +44,6 @@
 #include <fcntl.h>
 
 #include "glib.h"
-#include "galias.h"
 
 /*
  * Unix IO Channels
@@ -640,6 +639,3 @@ g_io_channel_unix_get_fd (GIOChannel *channel)
   GIOUnixChannel *unix_channel = (GIOUnixChannel *)channel;
   return unix_channel->fd;
 }
-
-#define __G_IO_UNIX_C__
-#include "galiasdef.c"

glib/giowin32.c

@@ -84,7 +84,6 @@
 #include "gstdio.h"
 #include "glibintl.h"
 
-#include "galias.h"
 
 typedef struct _GIOWin32Channel GIOWin32Channel;
 typedef struct _GIOWin32Watch GIOWin32Watch;
@@ -2239,6 +2238,3 @@ g_io_channel_win32_new_stream_socket (int socket)
 }
 
 #endif
-
-#define __G_IO_WIN32_C__
-#include "galiasdef.c"

glib/gkeyfile.c

@@ -65,7 +65,6 @@
 #include "gstrfuncs.h"
 #include "gutils.h"
 
-#include "galias.h"
 
 typedef struct _GKeyFileGroup GKeyFileGroup;
 
@@ -3929,6 +3928,3 @@ g_key_file_parse_comment_as_value (GKeyFile      *key_file,
 
   return g_string_free (string, FALSE);
 }
-
-#define __G_KEY_FILE_C__
-#include "galiasdef.c"

glib/glib.py

@@ -115,10 +115,7 @@ class GHashPrinter:
         try:
             string_hash = read_global_var ("g_str_hash")
         except:
-            try:
-                string_hash = read_global_var ("IA__g_str_hash")
-            except:
-                string_hash = None
+            string_hash = None
         if self.val != 0 and string_hash != None and self.val["hash_func"] == string_hash:
             self.keys_are_strings = True
 

glib/glib.symbols

 /* This file lists all exported symbols. It is used to generate
- * the glib.def file used to control exports on Windows and the
- * galias.h/galiasdef.c files used to avoid PLT entries for 
- * internal uses of exported functions (see makegalias.pl).
+ * the glib.def file used to control exports on Windows.
  * 
  * Every symbol must be included in the right
  * #ifdef IN_HEADER(sym) #endif and

glib/glist.c

@@ -31,7 +31,6 @@
 #include "config.h"
 
 #include "glib.h"
-#include "galias.h"
 
 /**
  * SECTION: linked_lists_double
@@ -1148,6 +1147,3 @@ g_list_sort_with_data (GList            *list,
 {
   return g_list_sort_real (list, (GFunc) compare_func, user_data);
 }
-
-#define __G_LIST_C__
-#include "galiasdef.c"

glib/gmain.c

@@ -77,7 +77,6 @@
 #include <sys/wait.h>
 #endif
 
-#include "galias.h"
 
 /* Types */
 
@@ -4251,6 +4250,3 @@ g_idle_remove_by_data (gpointer data)
 {
   return g_source_remove_by_funcs_user_data (&g_idle_funcs, data);
 }
-
-#define __G_MAIN_C__
-#include "galiasdef.c"

glib/gmappedfile.c

@@ -56,7 +56,6 @@
 
 #include "glibintl.h"
 
-#include "galias.h"
 
 #ifndef _O_BINARY
 #define _O_BINARY 0
@@ -343,6 +342,3 @@ g_mapped_file_unref (GMappedFile *file)
   if (g_atomic_int_dec_and_test (&file->ref_count))
     g_mapped_file_destroy (file);
 }
-
-#define __G_MAPPED_FILE_C__
-#include "galiasdef.c"

glib/gmarkup.c

@@ -29,7 +29,6 @@
 
 #include "glib.h"
 #include "glibintl.h"
-#include "galias.h"
 
 GQuark
 g_markup_error_quark (void)
@@ -2779,6 +2778,3 @@ failure:
 
   return FALSE;
 }
-
-#define __G_MARKUP_C__
-#include "galiasdef.c"

glib/gmem.c

@@ -41,7 +41,6 @@
 #include "gthread.h"
 #include "glib_trace.h"
 
-#include "galias.h"
 
 #define MEM_PROFILE_TABLE_SIZE 4096
 
@@ -1197,6 +1196,3 @@ _g_mem_thread_init_noprivate_nomessage (void)
   gmem_profile_mutex = g_mutex_new ();
 #endif
 }
-
-#define __G_MEM_C__
-#include "galiasdef.c"

glib/gmessages.c

@@ -45,7 +45,6 @@
 #include "gdebug.h"
 #include "gprintfint.h"
 #include "gthreadprivate.h"
-#include "galias.h"
 
 #ifdef G_OS_WIN32
 #include <process.h>		/* For getpid() */
@@ -575,12 +574,6 @@ g_return_if_fail_warning (const char *log_domain,
 			  const char *pretty_function,
 			  const char *expression)
 {
-  /*
-   * Omit the prefix used by the PLT-reduction
-   * technique used in GTK+. 
-   */
-  if (g_str_has_prefix (pretty_function, "IA__"))
-    pretty_function += 4;
   g_log (log_domain,
 	 G_LOG_LEVEL_CRITICAL,
 	 "%s: assertion `%s' failed",
@@ -616,12 +609,6 @@ g_assert_warning (const char *log_domain,
 		  const char *pretty_function,
 		  const char *expression)
 {
-  /*
-   * Omit the prefix used by the PLT-reduction
-   * technique used in GTK+. 
-   */
-  if (g_str_has_prefix (pretty_function, "IA__"))
-    pretty_function += 4;
   g_log (log_domain,
 	 G_LOG_LEVEL_ERROR,
 	 expression 
@@ -1161,6 +1148,3 @@ _g_debug_init (void)
       g_log_set_always_fatal (fatal_mask);
     }
 }
-
-#define __G_MESSAGES_C__
-#include "galiasdef.c"

glib/gnode.c

@@ -34,7 +34,6 @@
 #include "config.h"
 
 #include "glib.h"
-#include "galias.h"
 
 /**
  * SECTION: trees-nary
@@ -1276,6 +1275,3 @@ g_node_children_foreach (GNode		  *node,
 	}
     }
 }
-
-#define __G_NODE_C__
-#include "galiasdef.c"

glib/gnulib/g-gnulib.h

@@ -21,7 +21,6 @@
 #include "config.h"
 #include <stdlib.h>
 #include "glib/glib.h"
-#include "glib/galias.h"
 
 /* Private namespace for gnulib functions */
 #define asnprintf        _g_gnulib_asnprintf

glib/goption.c

@@ -132,7 +132,6 @@
 #include "glibintl.h"
 #include "gprintf.h"
 
-#include "galias.h"
 
 #include <string.h>
 #include <stdlib.h>
@@ -2380,7 +2379,3 @@ g_option_context_get_description (GOptionContext *context)
 
   return context->description;
 }
-
-
-#define __G_OPTION_C__
-#include "galiasdef.c"

glib/gpattern.c

@@ -28,7 +28,6 @@
 #include "gmem.h"
 #include "gunicode.h"
 #include "gutils.h" 
-#include "galias.h"
 
 /**
  * SECTION: patterns
@@ -441,6 +440,3 @@ g_pattern_match_simple (const gchar *pattern,
 
   return ergo;
 }
-
-#define __G_PATTERN_C__
-#include "galiasdef.c"

glib/gpoll.c

@@ -77,7 +77,6 @@
 #include <windows.h>
 #endif /* G_OS_WIN32 */
 
-#include "galias.h"
 
 #ifdef G_MAIN_POLL_DEBUG
 extern gboolean _g_main_poll_debug;
@@ -425,6 +424,3 @@ g_poll (GPollFD *fds,
 #endif /* !G_OS_WIN32 */
 
 #endif	/* !HAVE_POLL */
-
-#define __G_POLL_C__