Skip to content

Commit c427d22

Browse files
Remove all dependencies on the old autotools config header.
1 parent f91a1f4 commit c427d22

File tree

162 files changed

+38
-764
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

162 files changed

+38
-764
lines changed

config/qthread_check_makecontext.m4

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,6 @@ AC_CACHE_CHECK([for hand-implemented makecontext],
8181
esac])
8282
8383
AS_IF([test "$qthread_cv_makecontext" = "yes"],
84-
[AC_CHECK_FUNCS([memmove], [],
85-
[AC_MSG_ERROR([A functional memmove is required for the included makecontext.])])
86-
AC_CHECK_HEADERS([sys/ucontext.h stdarg.h sched.h signal.h sys/utsname.h])
87-
$1],
84+
[$1],
8885
[$2])
8986
])

configure.ac

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -229,16 +229,6 @@ AC_SEARCH_LIBS([accept], [xnet "socket -lnsl"])
229229

230230
AC_CACHE_SAVE
231231

232-
## ----------------------- ##
233-
## Checks for header files ##
234-
## ----------------------- ##
235-
AC_HEADER_STDC
236-
AC_HEADER_SYS_WAIT
237-
AC_HEADER_TIME
238-
AC_CHECK_HEADERS([fcntl.h ucontext.h sys/time.h sys/resource.h mach/mach_time.h malloc.h math.h sys/types.h sys/sysctl.h])
239-
240-
AC_CACHE_SAVE
241-
242232
## -------------------- ##
243233
## Check for structures ##
244234
## -------------------- ##
@@ -280,13 +270,6 @@ AS_IF([test "x$enable_precache_guard_pages" = "xyes"],
280270
[enable_precache_guard_pages="no"])
281271

282272

283-
AC_CACHE_SAVE
284-
285-
## --------------------------- ##
286-
## Check for library functions ##
287-
## --------------------------- ##
288-
AC_CHECK_FUNCS([memalign memcpy fstat64 lseek64 sched_yield sysconf getcontext])
289-
290273
AC_CACHE_SAVE
291274

292275
## ------------------------- ##
@@ -371,13 +354,6 @@ AS_IF([test "x$enable_asserts" != "xyes"],
371354
AS_IF([test "x$with_stack_alignment" = "x"],
372355
[with_stack_alignment=16])
373356

374-
AC_LINK_IFELSE([AC_LANG_SOURCE([[
375-
#include <unistd.h>
376-
377-
int main() {
378-
return sysconf(_SC_CLK_TCK);
379-
}]])],
380-
[AC_DEFINE([HAVE_SC_CLK_TCK], [1], [Define if _SC_CLK_TCK is available.])])
381357
dnl Which timer do we want to use
382358
qthread_timer_type=gettimeofday
383359
AS_IF([test "x$qthread_timer_type" = "xgettimeofday"],
@@ -445,7 +421,6 @@ AM_CONDITIONAL([COMPILE_TBB_BENCHMARKS], [test "x$have_tbb" = "xyes"])
445421
AM_CONDITIONAL([COMPILE_CILK_BENCHMARKS], [test "x$have_cilk" = "xyes"])
446422
AM_CONDITIONAL([COMPILE_LF_HASH], [test "x$enable_lf_febs" = "xyes"])
447423

448-
AC_CONFIG_HEADERS([include/config.h])
449424
AC_CONFIG_FILES([Makefile
450425
src/Makefile
451426
man/Makefile

include/fastcontext/386-ucontext.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
#ifdef HAVE_CONFIG_H
2-
#include <config.h>
3-
#endif
4-
51
#include <stdarg.h> /* for the qt_makectxt prototype */
62
#include <stddef.h> /* for size_t, per C89 */
73
#include <stdint.h>

include/fastcontext/arm-ucontext.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
#ifdef HAVE_CONFIG_H
2-
#include <config.h>
3-
#endif
4-
1+
#include "qthread/common.h"
52
#if (QTHREAD_ASSEMBLY_ARCH == QTHREAD_ARMV8_A64)
63
#define NEEDARMA64CONTEXT
74
#endif

include/fastcontext/taskimpl.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
#ifndef TASKIMPL_H
22
#define TASKIMPL_H
33

4-
#ifdef HAVE_CONFIG_H
5-
#include "config.h"
6-
#endif
7-
84
#include "qthread/common.h"
95

106
#if (QTHREAD_ASSEMBLY_ARCH == QTHREAD_IA32)

include/qt_affinity.h

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
#ifdef HAVE_CONFIG_H
2-
#include "config.h"
3-
#endif
4-
51
#include "qthread/qthread.h"
62

73
#include "qt_shepherd_innards.h"
@@ -12,18 +8,6 @@
128
typedef struct qthread_shepherd_s qthread_shepherd_t;
139
#endif
1410

15-
#if defined(QTHREAD_HAVE_HWLOC) && (HWLOC_API_VERSION > 0x00010000)
16-
#define QTHREAD_HAVE_MEM_AFFINITY
17-
#endif
18-
19-
#ifdef QTHREAD_HAVE_MEM_AFFINITY
20-
#define MEM_AFFINITY_ONLY_ARG(x) x,
21-
#define MEM_AFFINITY_ONLY(x) x
22-
#else
23-
#define MEM_AFFINITY_ONLY_ARG(x)
24-
#define MEM_AFFINITY_ONLY(x)
25-
#endif
26-
2711
/**
2812
* qt_topology_init() - initialize topology layer
2913
* @nbshepherds: The number of shepherds (after return).
@@ -91,7 +75,7 @@ void INTERNAL qt_affinity_set(qthread_worker_t *me,
9175
int qt_affinity_gendists(qthread_shepherd_t *sheps,
9276
qthread_shepherd_id_t nshepherds);
9377

94-
#ifdef QTHREAD_HAVE_MEM_AFFINITY
78+
#ifdef USE_HWLOC_MEM_AFFINITY
9579
void INTERNAL *qt_affinity_alloc(size_t bytes);
9680
void INTERNAL *qt_affinity_alloc_onnode(size_t bytes, int node);
9781
void INTERNAL qt_affinity_mem_tonode(void *addr, size_t bytes, int node);

include/qt_alloc.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#ifndef HAVE_QT_ALIGNED_ALLOC_H
2-
#define HAVE_QT_ALIGNED_ALLOC_H
1+
#ifndef QT_ALLOC_H
2+
#define QT_ALLOC_H
33

44
#include <stdint.h>
55
#include <stdlib.h>
@@ -28,5 +28,5 @@ void INTERNAL qt_internal_alignment_init(void);
2828
#endif
2929
extern size_t _pagesize;
3030
#define pagesize ((size_t)_pagesize)
31-
#endif // ifndef HAVE_QT_ALIGNED_ALLOC_H
31+
#endif // ifndef QT_ALLOC_H
3232
/* vim:set expandtab: */

include/qt_asserts.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
#define QTHREAD_ASSERTS_H
55
#endif
66

7-
#ifdef HAVE_CONFIG_H
8-
#include "config.h"
9-
#endif
10-
117
#include <assert.h> /* for assert() */
128

139
#ifdef qassert

include/qt_expect.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
#ifndef QTHREAD_EXPECT_H
22
#define QTHREAD_EXPECT_H
33

4-
#ifdef HAVE_CONFIG_H
5-
#include "config.h"
6-
#endif
7-
8-
#ifdef QTHREAD_EXPECT_OKAY
94
#define QTHREAD_EXPECT(x, y) __builtin_expect(!!(x), (y))
105
#define QTHREAD_LIKELY(x) __builtin_expect(!!(x), 1)
116
#define QTHREAD_UNLIKELY(x) __builtin_expect(!!(x), 0)
12-
#else
13-
#define QTHREAD_EXPECT(x, y) (x)
14-
#define QTHREAD_LIKELY(x) (x)
15-
#define QTHREAD_UNLIKELY(x) (x)
16-
#endif
177

188
#endif

include/qt_gcd.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
#ifdef HAVE_CONFIG_H
2-
#include "config.h"
3-
#endif
4-
51
#include <stdint.h>
62

73
static inline size_t qt_gcd(size_t a, size_t b) {

0 commit comments

Comments
 (0)