[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.
intel · May 5, 2023 · a136148 · a136148
1 parent a11dfd0
commit a136148
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git 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
@@ -20,7 +20,6 @@ def do_test(self):
     @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 @@ def test_universal64_executable(self):
     @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'})