diff options
| author | Jonas Devlieghere <jonas@devlieghere.com> | 2023-05-05 08:59:34 -0700 |
|---|---|---|
| committer | Jonas Devlieghere <jonas@devlieghere.com> | 2023-05-05 09:01:23 -0700 |
| commit | a136148d8faa89d88820238d69855daeedbd8681 (patch) | |
| tree | 2b3aad2ef6db3429ed95380faad8eaa24b995216 | |
| parent | a11dfd0fe6b1c38495f7de9858a2d1839d2902b9 (diff) | |
| download | llvm-a136148d8faa89d88820238d69855daeedbd8681.zip llvm-a136148d8faa89d88820238d69855daeedbd8681.tar.gz llvm-a136148d8faa89d88820238d69855daeedbd8681.tar.bz2 | |
[lldb] Use Haswell instead of arm64 in TestUniversal64
The architecture doesn't really matter for the test, at least not until
the dynamic loader can load these fat64 binaries. Use Hawell instead of
arm64 to support older bots that don't know about Apple Silicon triples.
| -rw-r--r-- | lldb/test/API/macosx/universal64/Makefile | 10 | ||||
| -rw-r--r-- | lldb/test/API/macosx/universal64/TestUniversal64.py | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/lldb/test/API/macosx/universal64/Makefile b/lldb/test/API/macosx/universal64/Makefile index ea77386..bfbfc3d 100644 --- a/lldb/test/API/macosx/universal64/Makefile +++ b/lldb/test/API/macosx/universal64/Makefile @@ -8,17 +8,17 @@ include Makefile.rules all: fat.out -fat.out: fat.arm64.out fat.x86_64.out +fat.out: fat.x86_64h.out fat.x86_64.out lipo -fat64 -create -o $@ $^ fat.x86_64.out: fat.x86_64.o $(CC) -isysroot $(SDKROOT) -target x86_64-apple-macosx10.9 -o $@ $< -fat.arm64.out: fat.arm64.o - $(CC) -isysroot $(SDKROOT) -target arm64-apple-macosx10.9 -o $@ $< +fat.x86_64h.out: fat.x86_64h.o + $(CC) -isysroot $(SDKROOT) -target x86_64h-apple-macosx10.9 -o $@ $< fat.x86_64.o: main.c $(CC) -isysroot $(SDKROOT) -g -O0 -target x86_64-apple-macosx10.9 -c -o $@ $< -fat.arm64.o: main.c - $(CC) -isysroot $(SDKROOT) -g -O0 -target arm64-apple-macosx10.9 -c -o $@ $< +fat.x86_64h.o: main.c + $(CC) -isysroot $(SDKROOT) -g -O0 -target x86_64h-apple-macosx10.9 -c -o $@ $< diff --git a/lldb/test/API/macosx/universal64/TestUniversal64.py b/lldb/test/API/macosx/universal64/TestUniversal64.py index 2296ac8..44b15f8 100644 --- a/lldb/test/API/macosx/universal64/TestUniversal64.py +++ b/lldb/test/API/macosx/universal64/TestUniversal64.py @@ -20,7 +20,6 @@ class Universal64TestCase(TestBase): @skipIfAsan @skipUnlessDarwin @skipIfDarwinEmbedded - @skipIf(macos_version=["<", "11.0"]) def test_universal64_executable(self): """Test fat64 universal executable""" self.build(debug_info="dsym") @@ -30,7 +29,6 @@ class Universal64TestCase(TestBase): @skipIfAsan @skipUnlessDarwin @skipIfDarwinEmbedded - @skipIf(macos_version=["<", "11.0"]) def test_universal64_dsym(self): """Test fat64 universal dSYM""" self.build(debug_info="dsym", dictionary={'FAT64_DSYM': '1'}) |