This is an archive of the discontinued LLVM Phabricator instance.

Differential D58339

Changes for running LLDB test suite for Swift on PowerPC64LE
Needs ReviewPublic

Authored by sarveshtamba on Feb 17 2019, 11:10 PM.

Download Raw Diff

This revision needs review, but there are no reviewers specified.

Details

Reviewers: None

Summary

The attached changes are required for running LLDB test suite related test cases for Apple Swift 5 on PowerPC64LE.

Diff Detail

Repository: rLLDB LLDB

Event Timeline

sarveshtamba created this revision.Feb 17 2019, 11:10 PM

Herald added subscribers: lldb-commits, jsji, mgorny, nemanjai. · View Herald TranscriptFeb 17 2019, 11:10 PM

I think you wanted to submit this patch to the downstream swift repo. I don't know exactly how that works, but I think they accept github pull requests.

Hi @labath , Should I be submitting this patch request directly to "https://github.com/apple/swift-lldb"?

I think so, but @davide (or someone else) can confirm that. In any case, it definitely shouldn't be here, as the llvm repo does not contain any of the swift code.

Any updates on this one?

Hi, can someone point me the right repo to submit these changes?

That should be the right repo: https://github.com/apple/swift-lldb

Revision Contents

Path

Size

source/

Target/

SwiftLanguageRuntime.cpp

3 lines

tools/

repl/

swift/

CMakeLists.txt

9 lines

Diff 187192

source/Target/SwiftLanguageRuntime.cpp

Show First 20 Lines • Show All 2,672 Lines • ▼ Show 20 Lines	case llvm::Triple::ArchType::x86:
addr &= ~SWIFT_ABI_I386_SWIFT_SPARE_BITS_MASK;		addr &= ~SWIFT_ABI_I386_SWIFT_SPARE_BITS_MASK;
break;		break;
case llvm::Triple::ArchType::x86_64:		case llvm::Triple::ArchType::x86_64:
addr &= ~SWIFT_ABI_X86_64_SWIFT_SPARE_BITS_MASK;		addr &= ~SWIFT_ABI_X86_64_SWIFT_SPARE_BITS_MASK;
break;		break;
case llvm::Triple::ArchType::systemz:		case llvm::Triple::ArchType::systemz:
addr &= ~SWIFT_ABI_S390X_SWIFT_SPARE_BITS_MASK;		addr &= ~SWIFT_ABI_S390X_SWIFT_SPARE_BITS_MASK;
break;		break;
		case llvm::Triple::ArchType::ppc64le:
		addr &= ~SWIFT_ABI_POWERPC64_SWIFT_SPARE_BITS_MASK;
		break;
default:		default:
break;		break;
}		}
break;		break;
}		}
return true;		return true;
}		}

▲ Show 20 Lines • Show All 1,713 Lines • Show Last 20 Lines

tools/repl/swift/CMakeLists.txt

	# Set the correct rpath to locate libswiftCore.			# Set the correct rpath to locate libswiftCore.
	if (LLDB_BUILD_FRAMEWORK)			if (LLDB_BUILD_FRAMEWORK)
	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath \			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-rpath \
	-Wl,${CMAKE_BINARY_DIR}/${LLDB_FRAMEWORK_INSTALL_DIR}/${LLDB_FRAMEWORK_RESOURCE_DIR}/Swift/macosx")			-Wl,${CMAKE_BINARY_DIR}/${LLDB_FRAMEWORK_INSTALL_DIR}/${LLDB_FRAMEWORK_RESOURCE_DIR}/Swift/macosx")
	elseif( CMAKE_SYSTEM_NAME MATCHES "Linux" )			elseif( CMAKE_SYSTEM_NAME MATCHES "Linux" )
	# Set the correct rpath to locate libswiftCore			# Set the correct rpath to locate libswiftCore
				if (CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "ppc64le")
				set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} \
				-Wl,-rpath,${CMAKE_BINARY_DIR}/../swift-linux-powerpc64le/lib${LLVM_LIBDIR_SUFFIX}/swift/linux/powerpc64le -Wl,-ldl")
				else()
	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} \			set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} \
	-Wl,-rpath,${CMAKE_BINARY_DIR}/../swift-linux-x86_64/lib${LLVM_LIBDIR_SUFFIX}/swift/linux -Wl,-ldl")			-Wl,-rpath,${CMAKE_BINARY_DIR}/../swift-linux-x86_64/lib${LLVM_LIBDIR_SUFFIX}/swift/linux -Wl,-ldl")
				endif()
	set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib/swift/linux:${CMAKE_INSTALL_RPATH}")			set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib/swift/linux:${CMAKE_INSTALL_RPATH}")
	endif()			endif()

	add_lldb_tool(repl_swift			add_lldb_tool(repl_swift
	main.c			main.c
	)			)

	# The dummy repl executable is a C program, but we always look for a mangled			# The dummy repl executable is a C program, but we always look for a mangled
	Show All 15 Lines