Fix global (static) constructor priorty so that OpenBLAS gets initialized before other libraries. Other unit test AIX fix.
This commit is contained in:
parent
4059a75c9c
commit
0e0d0bce1a
|
@ -266,7 +266,7 @@ so : ../$(LIBSONAME) linktest.c
|
||||||
|
|
||||||
../$(LIBSONAME) : aix.exp
|
../$(LIBSONAME) : aix.exp
|
||||||
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
|
$(CC) $(CFLAGS) $(LDFLAGS) -shared -o ../$(LIBSONAME) \
|
||||||
-Wl,-bE:aix.exp -Wl,-bbigtoc ../$(LIBNAME) $(EXTRALIB)
|
-Wl,-bcdtors:all:-2147481648:s,-bE:aix.exp -Wl,-bbigtoc ../$(LIBNAME) $(EXTRALIB)
|
||||||
|
|
||||||
aix.exp :
|
aix.exp :
|
||||||
/usr/bin/nm -X32_64 -PCpgl ../$(LIBNAME) | /usr/bin/awk '{ if ((($$ 2 == "T") \
|
/usr/bin/nm -X32_64 -PCpgl ../$(LIBNAME) | /usr/bin/awk '{ if ((($$ 2 == "T") \
|
||||||
|
|
|
@ -63,20 +63,18 @@ endif
|
||||||
all : run_test
|
all : run_test
|
||||||
|
|
||||||
ifeq ($(OSNAME), AIX)
|
ifeq ($(OSNAME), AIX)
|
||||||
ifeq ($(USE_OPENMP), 1)
|
|
||||||
$(UTESTBIN): $(OBJS)
|
$(UTESTBIN): $(OBJS)
|
||||||
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ ../$(LIBNAME) $(EXTRALIB)
|
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ ../$(LIBNAME) $(EXTRALIB)
|
||||||
|
|
||||||
|
$(UTESTEXTBIN): $(OBJS_EXT)
|
||||||
|
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ ../$(LIBNAME) $(EXTRALIB)
|
||||||
else
|
else
|
||||||
$(UTESTBIN): $(OBJS)
|
$(UTESTBIN): $(OBJS)
|
||||||
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ ../$(LIBNAME) $(EXTRALIB) $(FEXTRALIB)
|
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ ../$(LIBNAME) $(EXTRALIB) $(FEXTRALIB)
|
||||||
endif
|
|
||||||
else
|
|
||||||
$(UTESTBIN): $(OBJS)
|
|
||||||
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ ../$(LIBNAME) $(EXTRALIB) $(FEXTRALIB)
|
|
||||||
endif
|
|
||||||
|
|
||||||
$(UTESTEXTBIN): $(OBJS_EXT)
|
$(UTESTEXTBIN): $(OBJS_EXT)
|
||||||
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ ../$(LIBNAME) $(EXTRALIB) $(FEXTRALIB)
|
$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ ../$(LIBNAME) $(EXTRALIB) $(FEXTRALIB)
|
||||||
|
endif
|
||||||
|
|
||||||
run_test: $(UTESTBIN) $(UTESTEXTBIN)
|
run_test: $(UTESTBIN) $(UTESTEXTBIN)
|
||||||
ifneq ($(CROSS), 1)
|
ifneq ($(CROSS), 1)
|
||||||
|
|
Loading…
Reference in New Issue