[lld/mac] simplify export-options.s test a bit

[thakis]

Summary

• the macro seems needlessly clever -- shorter and imho clearer without it
• give all filenames an extension so they look like filenames
• rename .private_extern symbol from _private to _private_extern to prepare for follow-up that adds a truly private symbol

No behavior change.

[int3]

the macro seems needlessly clever -- shorter and imho clearer without it

That's what I was trying to tell @gkm in the original diff...

[int3]

lld/test/MachO/export-options.s

87

could simplify it further and remove the retqs too

[thakis]

thanks!

lld/test/MachO/export-options.s

87

having different symbols at the same address is maybe a bit confusing too. i'll keep as-is for now.

lld/test/MachO/export-options.s

 # RUN:     FileCheck --check-prefix=UNDEF %s
 
 # UNDEF: error: undefined symbol absent_literal
 # UNDEF-NEXT: >>> referenced from option -exported_symbol(s_list)
 # UNDEF-NOT: error: {{.*}} absent_gl{{.}}b
 
 ## Check that exported symbol is global
 # RUN: not %lld -dylib %t/default.o -o /dev/null \
-# RUN:         -exported_symbol _private 2>&1 | \
+# RUN:         -exported_symbol _private_extern 2>&1 | \
 # RUN:     FileCheck --check-prefix=PRIVATE %s
 
-# PRIVATE: error: cannot export hidden symbol _private
+# PRIVATE: error: cannot export hidden symbol _private_extern
 
 #--- default.s
 
-.macro DEFSYM, type, sym
-\type \sym
-\sym:
-  retq
-.endm
-
-DEFSYM .globl, _keep_globl
-DEFSYM .globl, _hide_globl
-DEFSYM .private_extern, _private
+.globl _keep_globl, _hide_globl
+_keep_globl:
+  retq
+_hide_globl:
+  retq
+.private_extern _private_extern
+_private_extern:
+  retq
 
 ## Check that the export trie is unaltered
 # RUN: %lld -dylib %t/default.o -o %t/default
 # RUN: llvm-objdump --macho --exports-trie %t/default | \
 # RUN:     FileCheck --check-prefix=DEFAULT %s
 
 # DEFAULT-LABEL: Exports trie:
 # DEFAULT-DAG:   _hide_globl
 # DEFAULT-DAG:   _keep_globl
-# DEFAULT-NOT:   _private
+# DEFAULT-NOT:   _private_extern
 
 ## Check that the export trie is shaped by an allow list and then
 ## by a deny list. Both lists are designed to yield the same result.
 
 ## Check the allow list
 # RUN: %lld -dylib %t/default.o -o %t/allowed \
 # RUN:     -exported_symbol _keep_globl
 # RUN: llvm-objdump --macho --exports-trie %t/allowed | \
 # RUN:     FileCheck --check-prefix=TRIE %s
 # RUN: llvm-nm -m %t/allowed | \
 # RUN:     FileCheck --check-prefix=NM %s
 
 ## Check the deny list
 # RUN: %lld -dylib %t/default.o -o %t/denied \
 # RUN:     -unexported_symbol _hide_globl
 # RUN: llvm-objdump --macho --exports-trie %t/denied | \
 # RUN:     FileCheck --check-prefix=TRIE %s
 # RUN: llvm-nm -m %t/denied | \
 # RUN:     FileCheck --check-prefix=NM %s
 
 # TRIE-LABEL: Exports trie:
 # TRIE-DAG:   _keep_globl
 # TRIE-NOT:   _hide_globl
-# TRIE-NOT:   _private
+# TRIE-NOT:   _private_extern
 
 # NM-DAG: external _keep_globl
 # NM-DAG: non-external (was a private external) _hide_globl
-# NM-DAG: non-external (was a private external) _private
+# NM-DAG: non-external (was a private external) _private_extern
 
 # RUN: llvm-mc -filetype=obj -triple=x86_64-apple-macos \
 # RUN:     %t/symdefs.s -o %t/symdefs.o
 
 #--- symdefs.s
 
-.macro DEFSYM, sym
-.globl \sym
-\sym:
-  retq
-.endm
-
-DEFSYM literal_only
-DEFSYM literal_also
-DEFSYM globby_only
-DEFSYM globby_also
+.globl literal_only, literal_also, globby_only, globby_also
+literal_only:
+  retq
+literal_also:
+  retq
+globby_only:
+  retq
+globby_also:
+  retq
 
-#--- literals
+#--- literals.txt
 
   literal_only # comment
   literal_also
 
 # globby_only
   globby_also
 
 ## Check that only string-literal patterns match
 ## Check that comments and blank lines are stripped from symbol list
 # RUN: %lld -dylib %t/symdefs.o -o %t/literal \
-# RUN:     -exported_symbols_list %t/literals
+# RUN:     -exported_symbols_list %t/literals.txt
 # RUN: llvm-objdump --macho --exports-trie %t/literal | \
 # RUN:     FileCheck --check-prefix=LITERAL %s
 
 # LITERAL-DAG: literal_only
 # LITERAL-DAG: literal_also
 # LITERAL-DAG: globby_also
 # LITERAL-NOT: globby_only
 
-#--- globbys
+#--- globbys.txt
 
 # literal_only
   l?ter[aeiou]l_*[^y] # comment
 
   *gl?bby_*
 
 ## Check that only glob patterns match
 ## Check that comments and blank lines are stripped from symbol list
 # RUN: %lld -dylib %t/symdefs.o -o %t/globby \
-# RUN:     -exported_symbols_list %t/globbys
+# RUN:     -exported_symbols_list %t/globbys.txt
 # RUN: llvm-objdump --macho --exports-trie %t/globby | \
 # RUN:     FileCheck --check-prefix=GLOBBY %s
 
 # GLOBBY-DAG: literal_also
 # GLOBBY-DAG: globby_only
 # GLOBBY-DAG: globby_also
 # GLOBBY-NOT: literal_only