Fix up bogon and missing log entries from .pmachata.threads branch.

1 files changed, 3 insertions, 152 deletions

diff --git a/configure.ac b/configure.ac
index 4008efda..a7a4cce2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -225,157 +225,8 @@ AC_CONFIG_FILES([tests/Makefile])
 AC_SUBST(USE_NLS, yes)
 AM_PO_SUBDIRS
 
-
-dnl Test of the config.h file.  We hide all kinds of configuration magic
-dnl in there.
-AH_BOTTOM([
-#ifdef USE_TLS
-# include <pthread.h>
-# define tls_key_t			__thread void *
-# define key_create(keyp, freefct)	(1)
-# define getspecific(key)		key
-# define setspecific(key,val)		key = val
-# define once_define(class,name)	class struct { } name
-# define once_execute(name,fct)		((void) &name, (void) (fct))
-# define rwlock_define(class,name)	class pthread_rwlock_t name
-# define rwlock_init(lock)		pthread_rwlock_init (&lock, NULL)
-# define rwlock_fini(lock)		pthread_rwlock_destroy (&lock)
-# define rwlock_rdlock(lock)		pthread_rwlock_rdlock (&lock)
-# define rwlock_wrlock(lock)		pthread_rwlock_wrlock (&lock)
-# define rwlock_unlock(lock)		pthread_rwlock_unlock (&lock)
-#else
-/* Eventually we will allow multi-threaded applications to use the
-   libraries.  Therefore we will add the necessary locking although
-   the macros used expand to nothing for now.  */
-#define lock_lock(lock) ((void) (lock))
-#define rwlock_define(class,name) class int name
-#define rwlock_init(lock) ((void) (lock))
-#define rwlock_fini(lock) ((void) (lock))
-#define rwlock_rdlock(lock) ((void) (lock))
-#define rwlock_wrlock(lock) ((void) (lock))
-#define rwlock_unlock(lock) ((void) (lock))
-#define tls_key_t void *
-#define key_create(keyp, freefct) (1)
-#define getspecific(key) key
-#define setspecific(key,val) key = val
-#define once_define(class,name) class int name
-#define once_execute(name,fct) \
-  do {									      \
-    if (name == 0)							      \
-      fct ();								      \
-    name = 1;								      \
-  } while (0)
-#endif
-
-/* gettext helper macro.  */
-#define N_(Str) Str
-
-/* Compiler-specific definitions.  */
-#define strong_alias(name, aliasname) \
-  extern __typeof (name) aliasname __attribute__ ((alias (#name)));
-
-#ifdef __i386__
-# define internal_function __attribute__ ((regparm (3), stdcall))
-#else
-# define internal_function /* nothing */
-#endif
-
-#define internal_strong_alias(name, aliasname) \
-  extern __typeof (name) aliasname __attribute__ ((alias (#name))) internal_function;
-
-#define attribute_hidden \
-  __attribute__ ((visibility ("hidden")))
-
-/* Define ALLOW_UNALIGNED if the architecture allows operations on
-   unaligned memory locations.  */
-#if defined __i386__ || defined __x86_64__
-# define ALLOW_UNALIGNED	1
-#else
-# define ALLOW_UNALIGNED	0
-#endif
-
-#if DEBUGPRED
-# ifdef __x86_64__
-asm (".section predict_data, \"aw\"; .previous\n"
-     ".section predict_line, \"a\"; .previous\n"
-     ".section predict_file, \"a\"; .previous");
-#  ifndef PIC
-#   define debugpred__(e, E) \
-  ({ long int _e = !!(e); \
-     asm volatile (".pushsection predict_data; ..predictcnt%=: .quad 0; .quad 0\n" \
-                   ".section predict_line; .quad %c1\n" \
-                   ".section predict_file; .quad %c2; .popsection\n" \
-                   "addq $1,..predictcnt%=(,%0,8)" \
-                   : : "r" (_e == E), "i" (__LINE__), "i" (__FILE__)); \
-    __builtin_expect (_e, E); \
-  })
-#  endif
-# elif defined __i386__
-asm (".section predict_data, \"aw\"; .previous\n"
-     ".section predict_line, \"a\"; .previous\n"
-     ".section predict_file, \"a\"; .previous");
-#  ifndef PIC
-#   define debugpred__(e, E) \
-  ({ long int _e = !!(e); \
-     asm volatile (".pushsection predict_data; ..predictcnt%=: .long 0; .long 0\n" \
-                   ".section predict_line; .long %c1\n" \
-                   ".section predict_file; .long %c2; .popsection\n" \
-                   "incl ..predictcnt%=(,%0,8)" \
-                   : : "r" (_e == E), "i" (__LINE__), "i" (__FILE__)); \
-    __builtin_expect (_e, E); \
-  })
-#  endif
-# endif
-# ifdef debugpred__
-#  define unlikely(e) debugpred__ (e,0)
-#  define likely(e) debugpred__ (e,1)
-# endif
-#endif
-#ifndef likely
-# define unlikely(expr) __builtin_expect (!!(expr), 0)
-# define likely(expr) __builtin_expect (!!(expr), 1)
-#endif
-
-#define obstack_calloc(ob, size) \
-  ({ size_t _s = (size); memset (obstack_alloc (ob, _s), '\0', _s); })
-#define obstack_strdup(ob, str) \
-  ({ const char *_s = (str); obstack_copy0 (ob, _s, strlen (_s)); })
-#define obstack_strndup(ob, str, n) \
-  ({ const char *_s = (str); obstack_copy0 (ob, _s, strnlen (_s, n)); })
-
-#if __STDC_VERSION__ >= 199901L
-# define flexarr_size /* empty */
-#else
-# define flexarr_size 0
-#endif
-
-/* Calling conventions.  */
-#ifdef __i386__
-# define CALLING_CONVENTION regparm (3), stdcall
-# define AND_CALLING_CONVENTION , regparm (3), stdcall
-#else
-# define CALLING_CONVENTION
-# define AND_CALLING_CONVENTION
-#endif
-
-/* Avoid PLT entries.  */
-#ifdef PIC
-# define INTUSE(name) _INTUSE(name)
-# define _INTUSE(name) __##name##_internal
-# define INTDEF(name) _INTDEF(name)
-# define _INTDEF(name) \
-  extern __typeof__ (name) __##name##_internal __attribute__ ((alias (#name)));
-# define INTDECL(name) _INTDECL(name)
-# define _INTDECL(name) \
-  extern __typeof__ (name) __##name##_internal attribute_hidden;
-#else
-# define INTUSE(name) name
-# define INTDEF(name) /* empty */
-# define INTDECL(name) /* empty */
-#endif
-
-/* This macro is used by the tests conditionalize for standalone building.  */
-#define ELFUTILS_HEADER(name) <lib##name.h>
-])
+dnl Appended to the config.h file.
+dnl We hide all kinds of configuration magic in lib/eu-config.h.
+AH_BOTTOM([#include <eu-config.h>])
 
 AC_OUTPUT