From dce7edf7e67ad0622b02b5c9cbffafe42b5df131 Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Fri, 27 Sep 2019 18:52:34 +0000 Subject: [PATCH] Revert: [lldb] [testsuite] Remove redundant MAKE_DSYM := NO Revert: llvm-svn: 373061 It broke OSX testsuite: https://reviews.llvm.org/D67589#1686150 lldb/packages/Python/lldbsuite/test/macosx/function-starts/TestFunctionStarts.py llvm-svn: 373110 --- lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/Makefile | 2 ++ lldb/packages/Python/lldbsuite/test/api/multiple-targets/Makefile | 2 ++ lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile | 1 + lldb/packages/Python/lldbsuite/test/functionalities/archives/Makefile | 1 + lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile | 2 ++ .../lldbsuite/test/functionalities/plugins/command_plugin/Makefile | 1 + lldb/packages/Python/lldbsuite/test/macosx/function-starts/Makefile | 1 + .../packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/Makefile | 2 ++ .../lldbsuite/test/macosx/lc-note/kern-ver-str/create-empty-corefile.mk | 2 ++ lldb/packages/Python/lldbsuite/test/macosx/order/Makefile | 1 + lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/Makefile | 1 + lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/Makefile | 1 + .../packages/Python/lldbsuite/test/python_api/lldbutil/process/Makefile | 1 + lldb/packages/Python/lldbsuite/test/python_api/module_section/Makefile | 1 + lldb/packages/Python/lldbsuite/test/tools/lldb-server/Makefile | 1 + .../Python/lldbsuite/test/tools/lldb-server/inferior-crash/Makefile | 1 + .../Python/lldbsuite/test/tools/lldb-server/libraries-svr4/Makefile | 1 + 17 files changed, 22 insertions(+) diff --git a/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/Makefile b/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/Makefile index 5d62b28..f40386a 100644 --- a/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/Makefile +++ b/lldb/packages/Python/lldbsuite/test/api/multiple-debuggers/Makefile @@ -1,3 +1,5 @@ +MAKE_DSYM := NO + ENABLE_THREADS := YES CXX_SOURCES := multi-process-driver.cpp testprog.cpp diff --git a/lldb/packages/Python/lldbsuite/test/api/multiple-targets/Makefile b/lldb/packages/Python/lldbsuite/test/api/multiple-targets/Makefile index de4ec12..3316b59 100644 --- a/lldb/packages/Python/lldbsuite/test/api/multiple-targets/Makefile +++ b/lldb/packages/Python/lldbsuite/test/api/multiple-targets/Makefile @@ -1,3 +1,5 @@ +MAKE_DSYM := NO + ENABLE_THREADS := YES CXX_SOURCES := main.cpp diff --git a/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile b/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile index 0586501..8248c01 100644 --- a/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile +++ b/lldb/packages/Python/lldbsuite/test/commands/frame/recognizer/Makefile @@ -1,6 +1,7 @@ OBJC_SOURCES := main.m CFLAGS_EXTRAS := -g0 # No debug info. +MAKE_DSYM := NO diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/archives/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/archives/Makefile index db31e0f..4d1950c 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/archives/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/archives/Makefile @@ -1,5 +1,6 @@ C_SOURCES := main.c +MAKE_DSYM := NO ARCHIVE_NAME := libfoo.a ARCHIVE_C_SOURCES := a.c b.c diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile index 7f30275..c39b681 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/dead-strip/Makefile @@ -11,4 +11,6 @@ else LDFLAGS = $(CFLAGS) -Wl,--gc-sections endif +MAKE_DSYM := NO + include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/Makefile b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/Makefile index 38c4112..3119c37 100644 --- a/lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/Makefile +++ b/lldb/packages/Python/lldbsuite/test/functionalities/plugins/command_plugin/Makefile @@ -1,5 +1,6 @@ DYLIB_CXX_SOURCES := plugin.cpp DYLIB_NAME := plugin DYLIB_ONLY := YES +MAKE_DSYM := NO include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/macosx/function-starts/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/function-starts/Makefile index 4ccc4f966..0d6f517 100644 --- a/lldb/packages/Python/lldbsuite/test/macosx/function-starts/Makefile +++ b/lldb/packages/Python/lldbsuite/test/macosx/function-starts/Makefile @@ -1,5 +1,6 @@ CXX_SOURCES := main.cpp EXE := StripMe +MAKE_DSYM := NO include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/Makefile index b106353..af03cf6 100644 --- a/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/Makefile +++ b/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/Makefile @@ -1,3 +1,5 @@ +MAKE_DSYM := NO + C_SOURCES := main.c all: a.out create-empty-corefile diff --git a/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/create-empty-corefile.mk b/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/create-empty-corefile.mk index 046d4ad..4967e95 100644 --- a/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/create-empty-corefile.mk +++ b/lldb/packages/Python/lldbsuite/test/macosx/lc-note/kern-ver-str/create-empty-corefile.mk @@ -1,3 +1,5 @@ +MAKE_DSYM := NO + CXX_SOURCES := create-empty-corefile.cpp EXE = create-empty-corefile diff --git a/lldb/packages/Python/lldbsuite/test/macosx/order/Makefile b/lldb/packages/Python/lldbsuite/test/macosx/order/Makefile index cd50d6d..ee67988 100644 --- a/lldb/packages/Python/lldbsuite/test/macosx/order/Makefile +++ b/lldb/packages/Python/lldbsuite/test/macosx/order/Makefile @@ -1,4 +1,5 @@ C_SOURCES := main.c LD_EXTRAS = -Xlinker -order_file -Xlinker $(SRCDIR)/order-file +MAKE_DSYM := NO include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/Makefile index 1049594..c5fa3842 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/frame/Makefile @@ -1,3 +1,4 @@ C_SOURCES := main.c +MAKE_DSYM :=NO include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/Makefile index 08f36f4..4d11bbc 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/iter/Makefile @@ -1,5 +1,6 @@ CFLAGS_EXTRAS := -D__STDC_LIMIT_MACROS ENABLE_THREADS := YES CXX_SOURCES := main.cpp +MAKE_DSYM := NO include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/Makefile index 08f36f4..6b33049 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/lldbutil/process/Makefile @@ -1,5 +1,6 @@ CFLAGS_EXTRAS := -D__STDC_LIMIT_MACROS ENABLE_THREADS := YES CXX_SOURCES := main.cpp +MAKE_DSYM :=NO include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/python_api/module_section/Makefile b/lldb/packages/Python/lldbsuite/test/python_api/module_section/Makefile index a92c337..79209db 100644 --- a/lldb/packages/Python/lldbsuite/test/python_api/module_section/Makefile +++ b/lldb/packages/Python/lldbsuite/test/python_api/module_section/Makefile @@ -1,5 +1,6 @@ CFLAGS_EXTRAS := -D__STDC_LIMIT_MACROS ENABLE_THREADS := YES CXX_SOURCES := main.cpp b.cpp c.cpp +MAKE_DSYM :=NO include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/Makefile index 32bbba5..0c441ed 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/Makefile +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/Makefile @@ -1,5 +1,6 @@ CFLAGS_EXTRAS := -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS ENABLE_THREADS := YES CXX_SOURCES := main.cpp +MAKE_DSYM :=NO include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/Makefile index 72aaf45..536d2e8 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/Makefile +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/inferior-crash/Makefile @@ -1,5 +1,6 @@ CFLAGS_EXTRAS := -D__STDC_LIMIT_MACROS -D__STDC_FORMAT_MACROS -std=c++11 # LD_EXTRAS := -lpthread CXX_SOURCES := main.cpp +MAKE_DSYM :=NO include Makefile.rules diff --git a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/Makefile b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/Makefile index ec215dd..e5ed078 100644 --- a/lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/Makefile +++ b/lldb/packages/Python/lldbsuite/test/tools/lldb-server/libraries-svr4/Makefile @@ -2,6 +2,7 @@ LIB_PREFIX := svr4lib LD_EXTRAS := -L. -l$(LIB_PREFIX)_a -l$(LIB_PREFIX)_b\" CXX_SOURCES := main.cpp USE_LIBDL := 1 +MAKE_DSYM := NO include Makefile.rules -- 2.7.4