From 0e0d0bce1a79bdd0a2642d7dc71ed37f7a318ec4 Mon Sep 17 00:00:00 2001
From: Chip Kerchner <chip.kerchner@ibm.com>
Date: Mon, 25 Mar 2024 15:11:55 -0500
Subject: [PATCH] Fix global (static) constructor priorty so that OpenBLAS gets
 initialized before other libraries.  Other unit test AIX fix.

---
 exports/Makefile |  2 +-
 utest/Makefile   | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/exports/Makefile b/exports/Makefile
index 27a291f341..4d929c8d3c 100644
--- a/exports/Makefile
+++ b/exports/Makefile
@@ -266,7 +266,7 @@ so : ../$(LIBSONAME) linktest.c
 
 ../$(LIBSONAME) : aix.exp
 	$(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 :
 	/usr/bin/nm -X32_64 -PCpgl ../$(LIBNAME) | /usr/bin/awk '{ if ((($$ 2 == "T") \
diff --git a/utest/Makefile b/utest/Makefile
index 0e3f2b8a72..ce0f5c4307 100644
--- a/utest/Makefile
+++ b/utest/Makefile
@@ -63,20 +63,18 @@ endif
 all : run_test
 
 ifeq ($(OSNAME), AIX)
-ifeq ($(USE_OPENMP), 1)
 $(UTESTBIN): $(OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ ../$(LIBNAME) $(EXTRALIB)
+
+$(UTESTEXTBIN): $(OBJS_EXT)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ ../$(LIBNAME) $(EXTRALIB)
 else
 $(UTESTBIN): $(OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ ../$(LIBNAME) $(EXTRALIB) $(FEXTRALIB)
-endif
-else
-$(UTESTBIN): $(OBJS)
-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ ../$(LIBNAME) $(EXTRALIB) $(FEXTRALIB)
-endif
 
 $(UTESTEXTBIN): $(OBJS_EXT)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ ../$(LIBNAME) $(EXTRALIB) $(FEXTRALIB)
+endif
 
 run_test: $(UTESTBIN) $(UTESTEXTBIN)
 ifneq ($(CROSS), 1)
@@ -88,4 +86,4 @@ clean:
 	-rm -f *.o $(UTESTBIN) $(UTESTEXTBIN)
 	-rm -f $(DIR_EXT)/*.o
 
-libs:
\ No newline at end of file
+libs: