Update TestLoadUnload to use base Makefile.

[chaoren]

Summary

The current Makefile scheme only allows one dylib to be specified in each make
invocation, so TestLoadUnload had a custom Makefile that's unrelated to the
base Makefile.rules. This change uses recursive make invocations to bypass the
single dylib restriction. See D11202 for more context.

[clayborg]

Yikes... Now I have no idea what this make file does.

Can't we just add new "DYLIB%u_XXX" variables to our make rules so we can just do something like:

DYLIB_C_SOURCES := a.c
DYLIB_NAME := loadunload_a
DYLIB2_C_SOURCES := b.c
DYLIB2_NAME := loadunload_b
DYLIB3_C_SOURCES := c.c
DYLIB3_NAME := loadunload_c
DYLIB4_C_SOURCES := d.c

And then have our makefile rules just do the right thing? Not that we didn't specify DYLIB4_NAME, but we should be able to deduce it from the name of the file (and make liba.dylib on Mac, liba.so on linux (just like we already derive DYLIB_NAME if needed)???

[chaoren]

We're going to need to hard code each of those in the base Makefile (and a copy for every rule involving each of those variables). AFAIK, Makefiles don't have pattern matching on variable names. Maybe it'll be more readable if instead of relying on $(MAKECMDGOALS) we can explicitly call different Makefiles?

E.g.,

Have Makefile.a, Makefile.b, ..., etc each containing the rules for lib_a, lib_b, ..., etc. Then the main Makefile call each of these with $(MAKE) -f Makefile.X.

[chaoren]

You can take a look at the hidden/Makefile for an example.

[chaoren]

• Split Makefile to isolate each dylib.

[chaoren]

• Avoid d.o conflict between lib_d and hidden_lib_d.

[clayborg]

Looks good.

[chaoren]

• Use custom install_name for lib_d.

[chaoren]

Hi Greg,

Two test cases were failing before this change. The original Makefile had a different EXEC_PATH variable for lib_d. I have no clue what -install_name does, but it seems to be hard-coded in the base Makefile to be @executable_path/$(DYLIB_FILENAME), could you please take a look if this change is alright?

[chaoren]

Rearrange.

lldb/trunk/test/functionalities/load_unload/Makefile

-CC ?= clang
-ifeq "$(ARCH)" ""
-  ARCH = x86_64
-endif
-
-ifeq "$(OS)" ""
-  OS = $(shell uname -s)
-endif
-
-CFLAGS ?= -g -O0
-CWD := $(shell pwd)
-
-LIB_PREFIX := libloadunload_
-
-ifeq "$(OS)" "Darwin"
-  CFLAGS += -arch $(ARCH)
-  DS := dsymutil
-  LD_FLAGS := -dynamiclib
-  LIB_A := $(LIB_PREFIX)a.dylib
-  LIB_B := $(LIB_PREFIX)b.dylib
-  LIB_C := $(LIB_PREFIX)c.dylib
-  LIB_D := $(LIB_PREFIX)d.dylib
-  EXEC_PATH := "@executable_path"
-  EXEC_PATH_A := -install_name $(EXEC_PATH)/$(LIB_A)
-  EXEC_PATH_B := -install_name $(EXEC_PATH)/$(LIB_B)
-  EXEC_PATH_C := -install_name $(EXEC_PATH)/$(LIB_C)
-  EXEC_PATH_D := -install_name $(CWD)/$(LIB_D)
-
-  DS_IF_DARWIN = $(DS) -o $@.dSYM $@
-else
-  CFLAGS += -fPIC
-  LD_FLAGS := -shared
-  LIB_DL := -ldl
-  LIB_A := $(LIB_PREFIX)a.so
-  LIB_B := $(LIB_PREFIX)b.so
-  LIB_C := $(LIB_PREFIX)c.so
-  LIB_D := $(LIB_PREFIX)d.so
-endif
-
-all: a.out $(LIB_A) $(LIB_B) $(LIB_C) $(LIB_D) hidden/$(LIB_D)
-
-a.out: main.o $(LIB_D)
-  $(CC) $(CFLAGS) -o a.out main.o -L. -pie -lloadunload_d $(LIB_DL)
-
-main.o: main.c
-  $(CC) $(CFLAGS) -c main.c
-
-hidden/$(LIB_D): dh.o
-  $(CC) $(CFLAGS) $(LD_FLAGS) -o hidden/$(LIB_D) dh.o
-  $(DS_IF_DARWIN)
-
-$(LIB_A): a.o $(LIB_B)
-  $(CC) $(CFLAGS) $(LD_FLAGS) $(EXEC_PATH_A) -o $(LIB_A) a.o -L. -lloadunload_b
-  $(DS_IF_DARWIN)
-
-a.o: a.c
-  $(CC) $(CFLAGS) -c a.c
-
-$(LIB_B): b.o
-  $(CC) $(CFLAGS) $(LD_FLAGS) $(EXEC_PATH_B) -o $(LIB_B) b.o
-  $(DS_IF_DARWIN)
-
-b.o: b.c
-  $(CC) $(CFLAGS) -c b.c
-
-$(LIB_C): c.o
-  $(CC) $(CFLAGS) $(LD_FLAGS) $(EXEC_PATH_C) -o $(LIB_C) c.o
-  $(DS_IF_DARWIN)
-
-c.o: c.c
-  $(CC) $(CFLAGS) -c c.c
-
-$(LIB_D): d.o
-  $(CC) $(CFLAGS) $(LD_FLAGS) $(EXEC_PATH_D) -o $(LIB_D) d.o
-  $(DS_IF_DARWIN)
+LEVEL := ../../make
 
-d.o: d.c
-  $(CC) $(CFLAGS) -c d.c
+LIB_PREFIX := loadunload_
 
-dh.o: d.c
-  $(CC) $(CFLAGS) -DHIDDEN -c d.c -o dh.o
+LD_EXTRAS := -L. -l$(LIB_PREFIX)d -ldl
+C_SOURCES := main.c
 
-clean:
-  rm -rf $(wildcard *.o *~ *.dylib *.so a.out *.dSYM hidden/*)
+include $(LEVEL)/Makefile.rules
+
+.PHONY:
+a.out: lib_a lib_b lib_c lib_d hidden_lib_d
+
+lib_%:
+  $(MAKE) -f $*.mk
+
+hidden_lib_d:
+  $(MAKE) -C hidden
+
+clean::
+  $(MAKE) -f a.mk clean
+  $(MAKE) -f b.mk clean
+  $(MAKE) -f c.mk clean
+  $(MAKE) -f d.mk clean
+  $(MAKE) -C hidden clean

lldb/trunk/test/functionalities/load_unload/a.mk

+LEVEL := ../../make
+
+LIB_PREFIX := loadunload_
+
+CFLAGS_EXTRAS := -fPIC
+LD_EXTRAS := -L. -l$(LIB_PREFIX)b
+
+DYLIB_NAME := $(LIB_PREFIX)a
+DYLIB_C_SOURCES := a.c
+DYLIB_ONLY := YES
+
+include $(LEVEL)/Makefile.rules
+
+.PHONY:
+$(DYLIB_FILENAME): lib_b
+
+lib_b:
+  $(MAKE) -f b.mk
+
+clean::
+  $(MAKE) -f b.mk clean

lldb/trunk/test/functionalities/load_unload/b.mk

+LEVEL := ../../make
+
+LIB_PREFIX := loadunload_
+
+DYLIB_NAME := $(LIB_PREFIX)b
+DYLIB_C_SOURCES := b.c
+DYLIB_ONLY := YES
+
+include $(LEVEL)/Makefile.rules

lldb/trunk/test/functionalities/load_unload/c.mk

+LEVEL := ../../make
+
+LIB_PREFIX := loadunload_
+
+DYLIB_NAME := $(LIB_PREFIX)c
+DYLIB_C_SOURCES := c.c
+DYLIB_ONLY := YES
+
+include $(LEVEL)/Makefile.rules

lldb/trunk/test/functionalities/load_unload/d.c

 //===-- c.c -----------------------------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 int
 d_function ()
 { // Find this line number within d_dunction().
-#ifdef HIDDEN
-    return 12345;
-#else
     return 700;
-#endif
 }

lldb/trunk/test/functionalities/load_unload/d.mk

+LEVEL := ../../make
+
+LIB_PREFIX := loadunload_
+
+DYLIB_EXECUTABLE_PATH := $(CURDIR)
+
+DYLIB_NAME := $(LIB_PREFIX)d
+DYLIB_C_SOURCES := d.c
+DYLIB_ONLY := YES
+
+include $(LEVEL)/Makefile.rules

lldb/trunk/test/functionalities/load_unload/hidden/Makefile

+LEVEL := ../../../make
+
+LIB_PREFIX := loadunload_
+
+DYLIB_NAME := $(LIB_PREFIX)d
+DYLIB_C_SOURCES := d.c
+DYLIB_ONLY := YES
+
+include $(LEVEL)/Makefile.rules

lldb/trunk/test/functionalities/load_unload/hidden/d.c

+//===-- c.c -----------------------------------------------------*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+int
+d_function ()
+{ // Find this line number within d_dunction().
+    return 12345;
+}

lldb/trunk/test/make/Makefile.rules

ifeq (,$(filter $(OS), Windows_NT Android))
   endif
 endif
 OBJECTS =
 EXE ?= a.out
 
 ifneq "$(DYLIB_NAME)" ""
   ifeq "$(OS)" "Darwin"
     DYLIB_FILENAME = lib$(DYLIB_NAME).dylib
+    DYLIB_EXECUTABLE_PATH ?= @executable_path
   else ifeq "$(OS)" "Windows_NT"
     DYLIB_FILENAME = $(DYLIB_NAME).dll
   else
     DYLIB_FILENAME = lib$(DYLIB_NAME).so
   endif
 endif
 
 # Function that returns the counterpart C++ compiler, given $(CC) as arg.

 
 #----------------------------------------------------------------------
 # Make the dylib
 #----------------------------------------------------------------------
 $(DYLIB_OBJECTS) : CFLAGS += -DCOMPILING_LLDB_TEST_DLL
 
 $(DYLIB_FILENAME) : $(DYLIB_OBJECTS)
 ifeq "$(OS)" "Darwin"
-  $(LD) $(DYLIB_OBJECTS) $(LDFLAGS) -install_name "@executable_path/$(DYLIB_FILENAME)" -dynamiclib -o "$(DYLIB_FILENAME)"
+  $(LD) $(DYLIB_OBJECTS) $(LDFLAGS) -install_name "$(DYLIB_EXECUTABLE_PATH)/$(DYLIB_FILENAME)" -dynamiclib -o "$(DYLIB_FILENAME)"
 ifneq "$(MAKE_DSYM)" "NO"
 ifneq "$(DS)" ""
   "$(DS)" $(DSFLAGS) "$(DYLIB_FILENAME)"
 endif
 endif
 else
   $(LD) $(DYLIB_OBJECTS) $(LDFLAGS) -shared -o "$(DYLIB_FILENAME)"
 ifeq "$(SPLIT_DEBUG_SYMBOLS)" "YES"