Commit 608a31b9 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen
Browse files

Make PLT-reduction work with gcc4, and don't include everything in

2005-03-13  Matthias Clasen  <mclasen@redhat.com>

	Make PLT-reduction work with gcc4, and don't include
	everything in galias.h:

	* glib/glib.symbols: Group symbols by header and source file.
	* glib/makegalias.pl: Protect definitions by the same
	preprocessor symbols used to guard the headers. Move
	the alias declarations to a separate file which is
	produced when calling makegalias.pl -def
	* glib/Makefile.am (galiasdef.c): Add a rule to generate this
	file.
	* glib/*.c: Include galias.h after the other GLib headers,
	include galiasdef.c at the bottom.
parent 96913f7a
005-03-13 Matthias Clasen <mclasen@redhat.com>
Make PLT-reduction work with gcc4, and don't include
everything in galias.h:
* glib/glib.symbols: Group symbols by header and source file.
* glib/makegalias.pl: Protect definitions by the same
preprocessor symbols used to guard the headers. Move
the alias declarations to a separate file which is
produced when calling makegalias.pl -def
* glib/Makefile.am (galiasdef.c): Add a rule to generate this
file.
* glib/*.c: Include galias.h after the other GLib headers,
include galiasdef.c at the bottom.
* glib/glib.symbols: Add g_listenv and g_file_replace.
Fri Mar 11 23:51:12 2005 Soeren Sandmann <sandmann@redhat.com>
* glib/gfileutils.c (write_to_temp_file): Don't try and generate
......
005-03-13 Matthias Clasen <mclasen@redhat.com>
Make PLT-reduction work with gcc4, and don't include
everything in galias.h:
* glib/glib.symbols: Group symbols by header and source file.
* glib/makegalias.pl: Protect definitions by the same
preprocessor symbols used to guard the headers. Move
the alias declarations to a separate file which is
produced when calling makegalias.pl -def
* glib/Makefile.am (galiasdef.c): Add a rule to generate this
file.
* glib/*.c: Include galias.h after the other GLib headers,
include galiasdef.c at the bottom.
* glib/glib.symbols: Add g_listenv and g_file_replace.
Fri Mar 11 23:51:12 2005 Soeren Sandmann <sandmann@redhat.com>
* glib/gfileutils.c (write_to_temp_file): Don't try and generate
......
005-03-13 Matthias Clasen <mclasen@redhat.com>
Make PLT-reduction work with gcc4, and don't include
everything in galias.h:
* glib/glib.symbols: Group symbols by header and source file.
* glib/makegalias.pl: Protect definitions by the same
preprocessor symbols used to guard the headers. Move
the alias declarations to a separate file which is
produced when calling makegalias.pl -def
* glib/Makefile.am (galiasdef.c): Add a rule to generate this
file.
* glib/*.c: Include galias.h after the other GLib headers,
include galiasdef.c at the bottom.
* glib/glib.symbols: Add g_listenv and g_file_replace.
Fri Mar 11 23:51:12 2005 Soeren Sandmann <sandmann@redhat.com>
* glib/gfileutils.c (write_to_temp_file): Don't try and generate
......
005-03-13 Matthias Clasen <mclasen@redhat.com>
Make PLT-reduction work with gcc4, and don't include
everything in galias.h:
* glib/glib.symbols: Group symbols by header and source file.
* glib/makegalias.pl: Protect definitions by the same
preprocessor symbols used to guard the headers. Move
the alias declarations to a separate file which is
produced when calling makegalias.pl -def
* glib/Makefile.am (galiasdef.c): Add a rule to generate this
file.
* glib/*.c: Include galias.h after the other GLib headers,
include galiasdef.c at the bottom.
* glib/glib.symbols: Add g_listenv and g_file_replace.
Fri Mar 11 23:51:12 2005 Soeren Sandmann <sandmann@redhat.com>
* glib/gfileutils.c (write_to_temp_file): Don't try and generate
......
......@@ -14,18 +14,21 @@ INCLUDES = -I$(top_srcdir) -DG_LOG_DOMAIN=\"GLib\" \
$(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
glib.def: glib.symbols
(echo -e EXPORTS; $(CPP) -P -DINCLUDE_VARIABLES -DINCLUDE_INTERNAL_SYMBOLS -DG_OS_WIN32 - <$(srcdir)/glib.symbols | sed -e '/^$$/d' -e 's/^/ /' -e 's/G_GNUC_[^ ]*//g') > glib.def
(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: glib.symbols
$(PERL) $(srcdir)/makegalias.pl < $(srcdir)/glib.symbols > galias.h
galiasdef.c: glib.symbols
$(PERL) $(srcdir)/makegalias.pl -def < $(srcdir)/glib.symbols > galiasdef.c
if OS_LINUX
if HAVE_GNUC_VISIBILITY
TESTS = abicheck.sh
endif
endif
BUILT_SOURCES = galias.h
BUILT_SOURCES = galias.h galiasdef.c
EXTRA_DIST = \
makefile.msc.in \
......@@ -39,7 +42,8 @@ EXTRA_DIST = \
BUILT_EXTRA_DIST = \
makefile.msc \
glib.rc \
galias.h
galias.h \
galiasdef.c
lib_LTLIBRARIES = libglib-2.0.la
......
......@@ -5,7 +5,7 @@ egrep '^#([^i]|if).*[^\]$' "${top_builddir:-..}/glibconfig.h" > glibconfig.cpp
INCLUDES="-include ${top_builddir:-..}/config.h"
INCLUDES="$INCLUDES -include glibconfig.cpp"
cpp -P -DINCLUDE_INTERNAL_SYMBOLS -DG_STDIO_NO_WRAP_ON_UNIX $INCLUDES "${srcdir:-.}/glib.symbols" | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
cpp -P -DINCLUDE_INTERNAL_SYMBOLS -DG_STDIO_NO_WRAP_ON_UNIX -DALL_FILES $INCLUDES "${srcdir:-.}/glib.symbols" | sed -e '/^$/d' -e 's/ G_GNUC.*$//' -e 's/ PRIVATE$//' | sort > expected-abi
rm glibconfig.cpp
nm -D .libs/libglib-2.0.so | grep " T " | cut -d ' ' -f 3 | sort > actual-abi
......
......@@ -32,8 +32,15 @@
#include <string.h>
#include <stdlib.h>
#include "garray.h"
#include "gmem.h"
#include "gthread.h"
#include "gmessages.h"
#include "gqsort.h"
#include "galias.h"
#include "glib.h"
#define MIN_ARRAY_SIZE 16
......@@ -750,3 +757,6 @@ 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"
......@@ -26,8 +26,8 @@
#include "config.h"
#include "galias.h"
#include "glib.h"
#include "galias.h"
struct _GAsyncQueue
......@@ -444,3 +444,5 @@ g_async_queue_length_unlocked (GAsyncQueue* queue)
return queue->queue->length - queue->waiting_threads;
}
#define __G_ASYNCQUEUE_C__
#include "galiasdef.c"
......@@ -646,3 +646,6 @@ _g_atomic_thread_init (void)
g_atomic_mutex = g_mutex_new ();
#endif /* DEFINE_WITH_MUTEXES */
}
#define IN_FILE_gatomic 1
#include "galiasdef.c"
......@@ -35,7 +35,6 @@
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
#include "galias.h"
#include "glib.h"
#include "gprintfint.h"
......@@ -76,6 +75,7 @@
# endif
#endif
#include "galias.h"
#ifndef G_OS_WIN32
static void stack_trace (char **args);
......@@ -302,3 +302,6 @@ stack_trace (char **args)
}
#endif /* !G_OS_WIN32 */
#define __G_BACKTRACE_C__
#include "galiasdef.c"
......@@ -213,3 +213,6 @@ g_cache_node_destroy (GCacheNode *node)
g_mem_chunk_free (node_mem_chunk, node);
G_UNLOCK (node_mem_chunk);
}
#define IN_FILE_gcache 1
#include "galiasdef.c"
......@@ -32,9 +32,8 @@
#include <string.h>
#include "galias.h"
#include "glib.h"
#include "galias.h"
static void completion_check_cache (GCompletion* cmp,
gchar** new_prefix);
......@@ -346,3 +345,6 @@ main (int argc,
return 0;
}
#endif
#define __G_COMPLETION_C__
#include "galiasdef.c"
......@@ -28,7 +28,6 @@
#include <string.h>
#include <stdlib.h>
#include "galias.h"
#include "glib.h"
#include "gprintfint.h"
#include "gthreadinit.h"
......@@ -48,6 +47,8 @@
#error GNU libiconv not in use but included iconv.h is from libiconv
#endif
#include "galias.h"
GQuark
g_convert_error_quark (void)
{
......@@ -2003,3 +2004,5 @@ g_filename_display_name (const gchar *filename)
return display_name;
}
#define __G_CONVERT_C__
#include "galiasdef.c"
......@@ -34,8 +34,9 @@
#include "config.h"
#include <string.h>
#include "galias.h"
#include "glib.h"
#include "galias.h"
/* --- defines --- */
......@@ -544,7 +545,7 @@ g_data_initialize (void)
}
GQuark
g_quark_try_string (const gchar *string)
IA__g_quark_try_string (const gchar *string)
{
GQuark quark = 0;
g_return_val_if_fail (string != NULL, 0);
......@@ -631,3 +632,6 @@ g_quark_new (gchar *string)
return quark;
}
#define __G_DATASET_C__
#include "galiasdef.c"
......@@ -35,7 +35,6 @@
/* #define DEBUG_MSG(args) g_message args ; */
#endif
#include "galias.h"
#include "glib.h"
#include <time.h>
......@@ -43,6 +42,8 @@
#include <stdlib.h>
#include <locale.h>
#include "galias.h"
GDate*
g_date_new (void)
{
......@@ -1467,3 +1468,6 @@ g_date_strftime (gchar *s,
return retval;
}
#define __G_DATE_C__
#include "galiasdef.c"
......@@ -32,12 +32,13 @@
#include <dirent.h>
#endif
#include "galias.h"
#include "glib.h"
#include "gdir.h"
#include "glibintl.h"
#include "galias.h"
struct _GDir
{
union {
......@@ -343,3 +344,6 @@ g_dir_close (GDir *dir)
closedir (dir->u.dirp);
g_free (dir);
}
#define __G_DIR_C__
#include "galiasdef.c"
......@@ -26,8 +26,8 @@
#include "config.h"
#include "galias.h"
#include "glib.h"
#include "galias.h"
static GError*
......@@ -256,3 +256,6 @@ g_clear_error (GError **err)
*err = NULL;
}
}
#define __G_ERROR_C__
#include "galiasdef.c"
......@@ -20,7 +20,6 @@
#include "config.h"
#include "galias.h"
#include "glib.h"
#include <sys/stat.h>
......@@ -53,6 +52,8 @@
#include "gstdio.h"
#include "glibintl.h"
#include "galias.h"
/**
* g_file_test:
* @filename: a filename to test in the GLib file name encoding
......@@ -1721,3 +1722,6 @@ g_file_read_link (const gchar *filename,
return NULL;
#endif
}
#define __G_FILEUTILS_C__
#include "galiasdef.c"
......@@ -30,8 +30,8 @@
#include "config.h"
#include "galias.h"
#include "glib.h"
#include "galias.h"
#define HASH_TABLE_MIN_SIZE 11
......@@ -759,3 +759,6 @@ g_hash_nodes_destroy (GHashNode *hash_node,
}
#endif
}
#define __G_HASH_C__
#include "galiasdef.c"
......@@ -33,8 +33,8 @@
#include "config.h"
#include "galias.h"
#include "glib.h"
#include "galias.h"
/* --- defines --- */
......@@ -645,3 +645,6 @@ g_hook_compare_ids (GHook *new_hook,
return 0;
}
#define __G_HOOK_C__
#include "galiasdef.c"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment