[lld] r278372 - Have one version of libSystem for each arch. NFC.
Pete Cooper via llvm-commits
llvm-commits at lists.llvm.org
Thu Aug 11 11:09:00 PDT 2016
Author: pete
Date: Thu Aug 11 13:08:59 2016
New Revision: 278372
URL: http://llvm.org/viewvc/llvm-project?rev=278372&view=rev
Log:
Have one version of libSystem for each arch. NFC.
An upcoming commit will change how we choose to reference a dylib. Currently
dylibs are only given an LC_LOAD_DYLIB in the final image if an atom is used.
This is different from ld64 which adds the load command when the dylib is referenced
on the cmdline.
In order to change this behaviour, we need libSystem.yaml to actually contain a mach header
so that it is parsed as a dylib, instead of currently being parsed as a normalised file.
To get a mach header, we also require an arch, so now we have one libsystem per arch and
all the tests have been updated to choose the correct one.
Added:
lld/trunk/test/mach-o/Inputs/arm64/
lld/trunk/test/mach-o/Inputs/arm64/libSystem.yaml
- copied, changed from r278359, lld/trunk/test/mach-o/Inputs/libSystem.yaml
lld/trunk/test/mach-o/Inputs/armv7/
lld/trunk/test/mach-o/Inputs/armv7/libSystem.yaml
- copied, changed from r278359, lld/trunk/test/mach-o/Inputs/libSystem.yaml
lld/trunk/test/mach-o/Inputs/x86/
lld/trunk/test/mach-o/Inputs/x86/libSystem.yaml
- copied, changed from r278359, lld/trunk/test/mach-o/Inputs/libSystem.yaml
lld/trunk/test/mach-o/Inputs/x86_64/
lld/trunk/test/mach-o/Inputs/x86_64/libSystem.yaml
- copied, changed from r278359, lld/trunk/test/mach-o/Inputs/libSystem.yaml
Removed:
lld/trunk/test/mach-o/Inputs/libSystem.yaml
Modified:
lld/trunk/test/mach-o/arm-interworking-movw.yaml
lld/trunk/test/mach-o/arm-interworking.yaml
lld/trunk/test/mach-o/arm-shims.yaml
lld/trunk/test/mach-o/data-in-code-load-command.yaml
lld/trunk/test/mach-o/data-only-dylib.yaml
lld/trunk/test/mach-o/dead-strip-globals.yaml
lld/trunk/test/mach-o/debug-syms.yaml
lld/trunk/test/mach-o/demangle.yaml
lld/trunk/test/mach-o/dso_handle.yaml
lld/trunk/test/mach-o/dylib-install-names.yaml
lld/trunk/test/mach-o/exe-offsets.yaml
lld/trunk/test/mach-o/exe-segment-overlap.yaml
lld/trunk/test/mach-o/executable-exports.yaml
lld/trunk/test/mach-o/exported_symbols_list-dylib.yaml
lld/trunk/test/mach-o/exported_symbols_list-undef.yaml
lld/trunk/test/mach-o/fat-archive.yaml
lld/trunk/test/mach-o/flat_namespace_undef_error.yaml
lld/trunk/test/mach-o/flat_namespace_undef_suppress.yaml
lld/trunk/test/mach-o/force_load-dylib.yaml
lld/trunk/test/mach-o/force_load-x86_64.yaml
lld/trunk/test/mach-o/function-starts-load-command.yaml
lld/trunk/test/mach-o/gcc_except_tab-got-arm64.yaml
lld/trunk/test/mach-o/got-order.yaml
lld/trunk/test/mach-o/image-base.yaml
lld/trunk/test/mach-o/interposing-section.yaml
lld/trunk/test/mach-o/lazy-bind-x86_64.yaml
lld/trunk/test/mach-o/library-order.yaml
lld/trunk/test/mach-o/library-rescan.yaml
lld/trunk/test/mach-o/mh_bundle_header.yaml
lld/trunk/test/mach-o/mh_dylib_header.yaml
lld/trunk/test/mach-o/objc_export_list.yaml
lld/trunk/test/mach-o/order_file-basic.yaml
lld/trunk/test/mach-o/parse-data-in-code-armv7.yaml
lld/trunk/test/mach-o/rpath.yaml
lld/trunk/test/mach-o/sectalign.yaml
lld/trunk/test/mach-o/sectattrs.yaml
lld/trunk/test/mach-o/source-version.yaml
lld/trunk/test/mach-o/stack-size.yaml
lld/trunk/test/mach-o/twolevel_namespace_undef_dynamic_lookup.yaml
lld/trunk/test/mach-o/twolevel_namespace_undef_warning_suppress.yaml
lld/trunk/test/mach-o/unwind-info-simple-arm64.yaml
lld/trunk/test/mach-o/unwind-info-simple-x86_64.yaml
lld/trunk/test/mach-o/upward-dylib-load-command.yaml
lld/trunk/test/mach-o/version-min-load-command.yaml
Copied: lld/trunk/test/mach-o/Inputs/arm64/libSystem.yaml (from r278359, lld/trunk/test/mach-o/Inputs/libSystem.yaml)
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/Inputs/arm64/libSystem.yaml?p2=lld/trunk/test/mach-o/Inputs/arm64/libSystem.yaml&p1=lld/trunk/test/mach-o/Inputs/libSystem.yaml&r1=278359&r2=278372&rev=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/Inputs/libSystem.yaml (original)
+++ lld/trunk/test/mach-o/Inputs/arm64/libSystem.yaml Thu Aug 11 13:08:59 2016
@@ -3,7 +3,6 @@
# and therefore will need a dylib definition of dyld_stub_binder.
#
----
shared-library-atoms:
- name: dyld_stub_binder
load-name: /usr/lib/libSystem.B.dylib
Copied: lld/trunk/test/mach-o/Inputs/armv7/libSystem.yaml (from r278359, lld/trunk/test/mach-o/Inputs/libSystem.yaml)
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/Inputs/armv7/libSystem.yaml?p2=lld/trunk/test/mach-o/Inputs/armv7/libSystem.yaml&p1=lld/trunk/test/mach-o/Inputs/libSystem.yaml&r1=278359&r2=278372&rev=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/Inputs/libSystem.yaml (original)
+++ lld/trunk/test/mach-o/Inputs/armv7/libSystem.yaml Thu Aug 11 13:08:59 2016
@@ -3,7 +3,6 @@
# and therefore will need a dylib definition of dyld_stub_binder.
#
----
shared-library-atoms:
- name: dyld_stub_binder
load-name: /usr/lib/libSystem.B.dylib
Removed: lld/trunk/test/mach-o/Inputs/libSystem.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/Inputs/libSystem.yaml?rev=278371&view=auto
==============================================================================
--- lld/trunk/test/mach-o/Inputs/libSystem.yaml (original)
+++ lld/trunk/test/mach-o/Inputs/libSystem.yaml (removed)
@@ -1,13 +0,0 @@
-#
-# For use by test cases that create dynamic output types which may needs stubs
-# and therefore will need a dylib definition of dyld_stub_binder.
-#
-
----
-shared-library-atoms:
- - name: dyld_stub_binder
- load-name: /usr/lib/libSystem.B.dylib
- type: code
- size: 0
-
-...
Copied: lld/trunk/test/mach-o/Inputs/x86/libSystem.yaml (from r278359, lld/trunk/test/mach-o/Inputs/libSystem.yaml)
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/Inputs/x86/libSystem.yaml?p2=lld/trunk/test/mach-o/Inputs/x86/libSystem.yaml&p1=lld/trunk/test/mach-o/Inputs/libSystem.yaml&r1=278359&r2=278372&rev=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/Inputs/libSystem.yaml (original)
+++ lld/trunk/test/mach-o/Inputs/x86/libSystem.yaml Thu Aug 11 13:08:59 2016
@@ -3,7 +3,6 @@
# and therefore will need a dylib definition of dyld_stub_binder.
#
----
shared-library-atoms:
- name: dyld_stub_binder
load-name: /usr/lib/libSystem.B.dylib
Copied: lld/trunk/test/mach-o/Inputs/x86_64/libSystem.yaml (from r278359, lld/trunk/test/mach-o/Inputs/libSystem.yaml)
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/Inputs/x86_64/libSystem.yaml?p2=lld/trunk/test/mach-o/Inputs/x86_64/libSystem.yaml&p1=lld/trunk/test/mach-o/Inputs/libSystem.yaml&r1=278359&r2=278372&rev=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/Inputs/libSystem.yaml (original)
+++ lld/trunk/test/mach-o/Inputs/x86_64/libSystem.yaml Thu Aug 11 13:08:59 2016
@@ -3,7 +3,6 @@
# and therefore will need a dylib definition of dyld_stub_binder.
#
----
shared-library-atoms:
- name: dyld_stub_binder
load-name: /usr/lib/libSystem.B.dylib
Modified: lld/trunk/test/mach-o/arm-interworking-movw.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/arm-interworking-movw.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/arm-interworking-movw.yaml (original)
+++ lld/trunk/test/mach-o/arm-interworking-movw.yaml Thu Aug 11 13:08:59 2016
@@ -1,7 +1,7 @@
# REQUIRES: arm
# RUN: lld -flavor darwin -arch armv7 -r -print_atoms %s -o %t | FileCheck %s
# RUN: lld -flavor darwin -arch armv7 -dylib -print_atoms %t -o %t2 \
-# RUN: %p/Inputs/libSystem.yaml -sectalign __TEXT __text 0x1000 | FileCheck %s
+# RUN: %p/Inputs/armv7/libSystem.yaml -sectalign __TEXT __text 0x1000 | FileCheck %s
# RUN: llvm-objdump -d -macho -no-symbolic-operands %t2 | FileCheck -check-prefix=CODE %s
#
# Test thumb and arm branches round trip through -r.
Modified: lld/trunk/test/mach-o/arm-interworking.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/arm-interworking.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/arm-interworking.yaml (original)
+++ lld/trunk/test/mach-o/arm-interworking.yaml Thu Aug 11 13:08:59 2016
@@ -1,7 +1,7 @@
# RUN: lld -flavor darwin -arch armv7 -r -print_atoms %s \
# RUN: %p/Inputs/arm-interworking.yaml -o %t | FileCheck %s \
# RUN: && lld -flavor darwin -arch armv7 -dylib -print_atoms \
-# RUN: %p/Inputs/libSystem.yaml %t -o %t2 | FileCheck %s \
+# RUN: %p/Inputs/armv7/libSystem.yaml %t -o %t2 | FileCheck %s \
# RUN: && llvm-readobj -s -sd %t2 | FileCheck -check-prefix=CODE %s
#
# Test thumb and arm branches round trip through -r.
Modified: lld/trunk/test/mach-o/arm-shims.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/arm-shims.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/arm-shims.yaml (original)
+++ lld/trunk/test/mach-o/arm-shims.yaml Thu Aug 11 13:08:59 2016
@@ -1,5 +1,5 @@
# RUN: lld -flavor darwin -arch armv7 %s %p/Inputs/arm-shims.yaml \
-# RUN: -dylib %p/Inputs/libSystem.yaml -o %t
+# RUN: -dylib %p/Inputs/armv7/libSystem.yaml -o %t
# RUN: llvm-readobj -s -sd %t | FileCheck %s
#
# Test b from arm to thumb or vice versa has shims added.s
Modified: lld/trunk/test/mach-o/data-in-code-load-command.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/data-in-code-load-command.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/data-in-code-load-command.yaml (original)
+++ lld/trunk/test/mach-o/data-in-code-load-command.yaml Thu Aug 11 13:08:59 2016
@@ -1,11 +1,11 @@
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/libSystem.yaml && llvm-objdump -private-headers %t | FileCheck %s
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/libSystem.yaml -static -data_in_code_info && llvm-objdump -private-headers %t | FileCheck %s
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/libSystem.yaml -no_data_in_code_info && llvm-objdump -private-headers %t | FileCheck %s --check-prefix=NO_DATA_IN_CODE_INFO
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/libSystem.yaml -static -data_in_code_info -no_data_in_code_info && llvm-objdump -private-headers %t | FileCheck %s --check-prefix=NO_DATA_IN_CODE_INFO
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/libSystem.yaml -static && llvm-objdump -private-headers %t | FileCheck %s --check-prefix=NO_DATA_IN_CODE_INFO
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/libSystem.yaml -r && llvm-objdump -private-headers %t | FileCheck %s
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/libSystem.yaml -r -data_in_code_info && llvm-objdump -private-headers %t | FileCheck %s
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/libSystem.yaml -r -no_data_in_code_info && llvm-objdump -private-headers %t | FileCheck %s --check-prefix=NO_DATA_IN_CODE_INFO
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml && llvm-objdump -private-headers %t | FileCheck %s
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static -data_in_code_info && llvm-objdump -private-headers %t | FileCheck %s
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -no_data_in_code_info && llvm-objdump -private-headers %t | FileCheck %s --check-prefix=NO_DATA_IN_CODE_INFO
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static -data_in_code_info -no_data_in_code_info && llvm-objdump -private-headers %t | FileCheck %s --check-prefix=NO_DATA_IN_CODE_INFO
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static && llvm-objdump -private-headers %t | FileCheck %s --check-prefix=NO_DATA_IN_CODE_INFO
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -r && llvm-objdump -private-headers %t | FileCheck %s
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -r -data_in_code_info && llvm-objdump -private-headers %t | FileCheck %s
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -r -no_data_in_code_info && llvm-objdump -private-headers %t | FileCheck %s --check-prefix=NO_DATA_IN_CODE_INFO
--- !mach-o
arch: x86_64
Modified: lld/trunk/test/mach-o/data-only-dylib.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/data-only-dylib.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/data-only-dylib.yaml (original)
+++ lld/trunk/test/mach-o/data-only-dylib.yaml Thu Aug 11 13:08:59 2016
@@ -1,4 +1,4 @@
-# RUN: lld -flavor darwin -arch x86_64 -dylib %s -o %t %p/Inputs/libSystem.yaml
+# RUN: lld -flavor darwin -arch x86_64 -dylib %s -o %t %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-nm %t | FileCheck %s
#
# Test that a data-only dylib can be built.
Modified: lld/trunk/test/mach-o/dead-strip-globals.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/dead-strip-globals.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/dead-strip-globals.yaml (original)
+++ lld/trunk/test/mach-o/dead-strip-globals.yaml Thu Aug 11 13:08:59 2016
@@ -1,6 +1,6 @@
-# RUN: lld -flavor darwin -arch x86_64 -dead_strip -export_dynamic %s -dylib %p/Inputs/libSystem.yaml -o %t.dylib -print_atoms | FileCheck -check-prefix=CHECK1 %s
-# RUN: lld -flavor darwin -arch x86_64 -export_dynamic -dead_strip %s -dylib %p/Inputs/libSystem.yaml -o %t.dylib -print_atoms | FileCheck -check-prefix=CHECK1 %s
-# RUN: lld -flavor darwin -arch x86_64 -dead_strip %s -dylib %p/Inputs/libSystem.yaml -o %t2.dylib -print_atoms | FileCheck -check-prefix=CHECK2 %s
+# RUN: lld -flavor darwin -arch x86_64 -dead_strip -export_dynamic %s -dylib %p/Inputs/x86_64/libSystem.yaml -o %t.dylib -print_atoms | FileCheck -check-prefix=CHECK1 %s
+# RUN: lld -flavor darwin -arch x86_64 -export_dynamic -dead_strip %s -dylib %p/Inputs/x86_64/libSystem.yaml -o %t.dylib -print_atoms | FileCheck -check-prefix=CHECK1 %s
+# RUN: lld -flavor darwin -arch x86_64 -dead_strip %s -dylib %p/Inputs/x86_64/libSystem.yaml -o %t2.dylib -print_atoms | FileCheck -check-prefix=CHECK2 %s
#
# Test that -export_dynamic -dead-strip from removing globals.
Modified: lld/trunk/test/mach-o/debug-syms.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/debug-syms.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/debug-syms.yaml (original)
+++ lld/trunk/test/mach-o/debug-syms.yaml Thu Aug 11 13:08:59 2016
@@ -1,4 +1,4 @@
-# RUN: lld -flavor darwin -arch x86_64 -o %t %s -dylib %p/Inputs/libSystem.yaml && \
+# RUN: lld -flavor darwin -arch x86_64 -o %t %s -dylib %p/Inputs/x86_64/libSystem.yaml && \
# RUN: llvm-nm -no-sort -debug-syms %t | FileCheck %s
# CHECK: 0000000000000000 - 00 0000 SO /Users/lhames/Projects/lld/lld-svn-tot/scratch/
Modified: lld/trunk/test/mach-o/demangle.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/demangle.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/demangle.yaml (original)
+++ lld/trunk/test/mach-o/demangle.yaml Thu Aug 11 13:08:59 2016
@@ -1,11 +1,11 @@
# REQUIRES: system-linker-mach-o
#
# RUN: not lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s \
-# RUN: -dylib -o %t %p/Inputs/libSystem.yaml 2> %t.err
+# RUN: -dylib -o %t %p/Inputs/x86_64/libSystem.yaml 2> %t.err
# RUN: FileCheck %s < %t.err
#
# RUN: not lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s \
-# RUN: -dylib -o %t %p/Inputs/libSystem.yaml -demangle 2> %t.err2
+# RUN: -dylib -o %t %p/Inputs/x86_64/libSystem.yaml -demangle 2> %t.err2
# RUN: FileCheck %s --check-prefix=DCHECK < %t.err2
#
# Test -demangle option works on undefined symbol errors.
Modified: lld/trunk/test/mach-o/dso_handle.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/dso_handle.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/dso_handle.yaml (original)
+++ lld/trunk/test/mach-o/dso_handle.yaml Thu Aug 11 13:08:59 2016
@@ -1,13 +1,13 @@
-# RUN: lld -flavor darwin -arch x86_64 %s %p/Inputs/libSystem.yaml -o %t1
+# RUN: lld -flavor darwin -arch x86_64 %s %p/Inputs/x86_64/libSystem.yaml -o %t1
# RUN: llvm-nm -m -n %t1 | FileCheck %s
#
-# RUN: lld -flavor darwin -arch x86_64 %s %p/Inputs/libSystem.yaml -dead_strip -o %t2
+# RUN: lld -flavor darwin -arch x86_64 %s %p/Inputs/x86_64/libSystem.yaml -dead_strip -o %t2
# RUN: llvm-nm -m -n %t2 | FileCheck %s
#
-# RUN: lld -flavor darwin -arch x86_64 %s %p/Inputs/libSystem.yaml -dylib -o %t3
+# RUN: lld -flavor darwin -arch x86_64 %s %p/Inputs/x86_64/libSystem.yaml -dylib -o %t3
# RUN: llvm-nm -m -n %t3 | FileCheck %s
#
-# RUN: lld -flavor darwin -arch x86_64 %s %p/Inputs/libSystem.yaml -bundle -o %t4
+# RUN: lld -flavor darwin -arch x86_64 %s %p/Inputs/x86_64/libSystem.yaml -bundle -o %t4
# RUN: llvm-nm -m -n %t4 | FileCheck %s
#
# Test that ___dso_handle symbol is available for executables, bundles, and dylibs
Modified: lld/trunk/test/mach-o/dylib-install-names.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/dylib-install-names.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/dylib-install-names.yaml (original)
+++ lld/trunk/test/mach-o/dylib-install-names.yaml Thu Aug 11 13:08:59 2016
@@ -1,25 +1,25 @@
# Check we accept -install_name correctly:
# RUN: lld -flavor darwin -arch x86_64 -install_name libwibble.dylib -dylib \
# RUN: -compatibility_version 2.0 -current_version 5.3 \
-# RUN: %p/Inputs/libSystem.yaml %s -o %t.dylib
+# RUN: %p/Inputs/x86_64/libSystem.yaml %s -o %t.dylib
# RUN: llvm-objdump -private-headers %t.dylib | FileCheck %s --check-prefix=CHECK-BINARY-WRITE
# Check we read LC_ID_DYLIB correctly:
# RUN: lld -flavor darwin -arch x86_64 %p/Inputs/use-dylib-install-names.yaml \
-# RUN: %p/Inputs/libSystem.yaml %t.dylib -dylib -o %t2.dylib
+# RUN: %p/Inputs/x86_64/libSystem.yaml %t.dylib -dylib -o %t2.dylib
# RUN: llvm-objdump -private-headers %t2.dylib | FileCheck %s --check-prefix=CHECK-BINARY-READ
# Check we default the install-name to the output file:
# RUN: lld -flavor darwin -arch x86_64 -dylib %s -o libwibble.dylib \
# RUN: -compatibility_version 2.0 -current_version 5.3 \
-# RUN: %p/Inputs/libSystem.yaml
+# RUN: %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-objdump -private-headers libwibble.dylib | FileCheck %s --check-prefix=CHECK-BINARY-WRITE
# RUN: rm -f libwibble.dylib
# Check -single_module does nothing
# RUN: lld -flavor darwin -arch x86_64 -dylib %s -install_name libwibble.dylib \
# RUN: -compatibility_version 2.0 -current_version 5.3 \
-# RUN: -single_module -o %t2.dylib %p/Inputs/libSystem.yaml
+# RUN: -single_module -o %t2.dylib %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-objdump -private-headers %t2.dylib | FileCheck %s --check-prefix=CHECK-BINARY-WRITE
--- !mach-o
Modified: lld/trunk/test/mach-o/exe-offsets.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/exe-offsets.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/exe-offsets.yaml (original)
+++ lld/trunk/test/mach-o/exe-offsets.yaml Thu Aug 11 13:08:59 2016
@@ -1,4 +1,4 @@
-# RUN: lld -flavor darwin -arch x86_64 %s -o %t -e start %p/Inputs/libSystem.yaml
+# RUN: lld -flavor darwin -arch x86_64 %s -o %t -e start %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-readobj -sections %t | FileCheck %s
# Make sure data gets put at offset
Modified: lld/trunk/test/mach-o/exe-segment-overlap.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/exe-segment-overlap.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/exe-segment-overlap.yaml (original)
+++ lld/trunk/test/mach-o/exe-segment-overlap.yaml Thu Aug 11 13:08:59 2016
@@ -1,4 +1,4 @@
-# RUN: lld -flavor darwin -arch x86_64 %s -o %t %p/Inputs/libSystem.yaml
+# RUN: lld -flavor darwin -arch x86_64 %s -o %t %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-readobj -sections -section-data %t | FileCheck %s
--- !native
Modified: lld/trunk/test/mach-o/executable-exports.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/executable-exports.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/executable-exports.yaml (original)
+++ lld/trunk/test/mach-o/executable-exports.yaml Thu Aug 11 13:08:59 2016
@@ -1,5 +1,5 @@
# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 \
-# RUN: %s %p/Inputs/libSystem.yaml -o %t && \
+# RUN: %s %p/Inputs/x86_64/libSystem.yaml -o %t && \
# RUN: llvm-objdump -exports-trie %t | FileCheck %s
#
#
Modified: lld/trunk/test/mach-o/exported_symbols_list-dylib.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/exported_symbols_list-dylib.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/exported_symbols_list-dylib.yaml (original)
+++ lld/trunk/test/mach-o/exported_symbols_list-dylib.yaml Thu Aug 11 13:08:59 2016
@@ -1,20 +1,20 @@
# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 -dylib \
-# RUN: %s %p/Inputs/libSystem.yaml -o %t \
+# RUN: %s %p/Inputs/x86_64/libSystem.yaml -o %t \
# RUN: -exported_symbols_list %p/Inputs/exported_symbols_list.exp && \
# RUN: llvm-nm -m %t | FileCheck %s
#
# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 -dylib \
-# RUN: %s %p/Inputs/libSystem.yaml -o %t2 \
+# RUN: %s %p/Inputs/x86_64/libSystem.yaml -o %t2 \
# RUN: -exported_symbol _foo -exported_symbol _b && \
# RUN: llvm-nm -m %t2 | FileCheck %s
#
# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 -dylib \
-# RUN: %s %p/Inputs/libSystem.yaml -o %t3 \
+# RUN: %s %p/Inputs/x86_64/libSystem.yaml -o %t3 \
# RUN: -unexported_symbol _bar -unexported_symbol _a && \
# RUN: llvm-nm -m %t3 | FileCheck %s
#
# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 -dylib \
-# RUN: %s %p/Inputs/libSystem.yaml -dead_strip -o %t \
+# RUN: %s %p/Inputs/x86_64/libSystem.yaml -dead_strip -o %t \
# RUN: -exported_symbols_list %p/Inputs/exported_symbols_list.exp && \
# RUN: llvm-nm -m %t | FileCheck -check-prefix=CHECK_DEAD %s
#
Modified: lld/trunk/test/mach-o/exported_symbols_list-undef.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/exported_symbols_list-undef.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/exported_symbols_list-undef.yaml (original)
+++ lld/trunk/test/mach-o/exported_symbols_list-undef.yaml Thu Aug 11 13:08:59 2016
@@ -1,5 +1,5 @@
# RUN: not lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 -dylib \
-# RUN: %s %p/Inputs/libSystem.yaml -o %t -exported_symbol _foobar 2> %t2
+# RUN: %s %p/Inputs/x86_64/libSystem.yaml -o %t -exported_symbol _foobar 2> %t2
#
# Test -exported_symbol fails if exported symbol not found.
#
Modified: lld/trunk/test/mach-o/fat-archive.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/fat-archive.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/fat-archive.yaml (original)
+++ lld/trunk/test/mach-o/fat-archive.yaml Thu Aug 11 13:08:59 2016
@@ -1,5 +1,5 @@
# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t \
-# RUN: -L %p/Inputs -lfoo %p/Inputs/libSystem.yaml
+# RUN: -L %p/Inputs -lfoo %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-nm -m -n %t | FileCheck %s
#
# Test that fat archives are handled.
Modified: lld/trunk/test/mach-o/flat_namespace_undef_error.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/flat_namespace_undef_error.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/flat_namespace_undef_error.yaml (original)
+++ lld/trunk/test/mach-o/flat_namespace_undef_error.yaml Thu Aug 11 13:08:59 2016
@@ -1,4 +1,4 @@
-# RUN: not lld -flavor darwin -arch x86_64 -macosx_version_min 10.9 -flat_namespace -undefined error %s -o %t %p/Inputs/libSystem.yaml 2>&1 | FileCheck %s
+# RUN: not lld -flavor darwin -arch x86_64 -macosx_version_min 10.9 -flat_namespace -undefined error %s -o %t %p/Inputs/x86_64/libSystem.yaml 2>&1 | FileCheck %s
--- !native
defined-atoms:
Modified: lld/trunk/test/mach-o/flat_namespace_undef_suppress.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/flat_namespace_undef_suppress.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/flat_namespace_undef_suppress.yaml (original)
+++ lld/trunk/test/mach-o/flat_namespace_undef_suppress.yaml Thu Aug 11 13:08:59 2016
@@ -1,4 +1,4 @@
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.9 -flat_namespace -undefined suppress %s -o %t %p/Inputs/libSystem.yaml
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.9 -flat_namespace -undefined suppress %s -o %t %p/Inputs/x86_64/libSystem.yaml
#
# Sanity check '-flat_namespace -undefined suppress'.
# This should pass without error, even though '_bar' is undefined.
Modified: lld/trunk/test/mach-o/force_load-dylib.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/force_load-dylib.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/force_load-dylib.yaml (original)
+++ lld/trunk/test/mach-o/force_load-dylib.yaml Thu Aug 11 13:08:59 2016
@@ -1,7 +1,7 @@
# RUN: lld -flavor darwin -arch x86_64 -dylib %p/Inputs/bar.yaml \
-# RUN: -install_name /usr/lib/libbar.dylib %p/Inputs/libSystem.yaml -o %t1.dylib
+# RUN: -install_name /usr/lib/libbar.dylib %p/Inputs/x86_64/libSystem.yaml -o %t1.dylib
# RUN: lld -flavor darwin -arch x86_64 -dylib %s -all_load %t1.dylib \
-# RUN: -install_name /usr/lib/libfoo.dylib %p/Inputs/libSystem.yaml -o %t
+# RUN: -install_name /usr/lib/libfoo.dylib %p/Inputs/x86_64/libSystem.yaml -o %t
# RUN: llvm-nm -m %t | FileCheck %s
#
#
Modified: lld/trunk/test/mach-o/force_load-x86_64.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/force_load-x86_64.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/force_load-x86_64.yaml (original)
+++ lld/trunk/test/mach-o/force_load-x86_64.yaml Thu Aug 11 13:08:59 2016
@@ -1,8 +1,8 @@
-# RUN: lld -flavor darwin -arch x86_64 %s %p/Inputs/libSystem.yaml \
+# RUN: lld -flavor darwin -arch x86_64 %s %p/Inputs/x86_64/libSystem.yaml \
# RUN: %p/Inputs/libfoo.a %p/Inputs/libbar.a -o %t1
# RUN: llvm-nm -m -n %t1 | FileCheck %s
#
-# RUN: lld -flavor darwin -arch x86_64 %s %p/Inputs/libSystem.yaml \
+# RUN: lld -flavor darwin -arch x86_64 %s %p/Inputs/x86_64/libSystem.yaml \
# RUN: -force_load %p/Inputs/libfoo.a %p/Inputs/libbar.a -o %t2
# RUN: llvm-nm -m -n %t2 | FileCheck --check-prefix=CHECKF %s
#
Modified: lld/trunk/test/mach-o/function-starts-load-command.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/function-starts-load-command.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/function-starts-load-command.yaml (original)
+++ lld/trunk/test/mach-o/function-starts-load-command.yaml Thu Aug 11 13:08:59 2016
@@ -1,8 +1,8 @@
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/libSystem.yaml && llvm-objdump -private-headers %t | FileCheck %s
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/libSystem.yaml -static -function_starts && llvm-objdump -private-headers %t | FileCheck %s
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/libSystem.yaml -no_function_starts && llvm-objdump -private-headers %t | FileCheck %s --check-prefix=NO_FUNCTION_STARTS
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/libSystem.yaml -static -function_starts -no_function_starts && llvm-objdump -private-headers %t | FileCheck %s --check-prefix=NO_FUNCTION_STARTS
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/libSystem.yaml -static && llvm-objdump -private-headers %t | FileCheck %s --check-prefix=NO_FUNCTION_STARTS
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml && llvm-objdump -private-headers %t | FileCheck %s
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static -function_starts && llvm-objdump -private-headers %t | FileCheck %s
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -no_function_starts && llvm-objdump -private-headers %t | FileCheck %s --check-prefix=NO_FUNCTION_STARTS
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static -function_starts -no_function_starts && llvm-objdump -private-headers %t | FileCheck %s --check-prefix=NO_FUNCTION_STARTS
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static && llvm-objdump -private-headers %t | FileCheck %s --check-prefix=NO_FUNCTION_STARTS
--- !mach-o
arch: x86_64
Modified: lld/trunk/test/mach-o/gcc_except_tab-got-arm64.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/gcc_except_tab-got-arm64.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/gcc_except_tab-got-arm64.yaml (original)
+++ lld/trunk/test/mach-o/gcc_except_tab-got-arm64.yaml Thu Aug 11 13:08:59 2016
@@ -1,5 +1,5 @@
# RUN: lld -flavor darwin -arch arm64 %s \
-# RUN: -dylib %p/Inputs/libSystem.yaml -o %t
+# RUN: -dylib %p/Inputs/arm64/libSystem.yaml -o %t
# RUN: llvm-objdump -section-headers %t | FileCheck %s
# Make sure that the GOT relocation from gcc_except_tab to the data
Modified: lld/trunk/test/mach-o/got-order.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/got-order.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/got-order.yaml (original)
+++ lld/trunk/test/mach-o/got-order.yaml Thu Aug 11 13:08:59 2016
@@ -1,5 +1,5 @@
# RUN: lld -flavor darwin -arch x86_64 %s %p/Inputs/got-order.yaml \
-# RUN: %p/Inputs/got-order2.yaml -o %t %p/Inputs/libSystem.yaml
+# RUN: %p/Inputs/got-order2.yaml -o %t %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-objdump -bind %t | FileCheck %s
#
# Test that GOT slots are sorted by name
Modified: lld/trunk/test/mach-o/image-base.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/image-base.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/image-base.yaml (original)
+++ lld/trunk/test/mach-o/image-base.yaml Thu Aug 11 13:08:59 2016
@@ -1,4 +1,4 @@
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.9 %s -o %t -image_base 31415926000 %p/Inputs/libSystem.yaml
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.9 %s -o %t -image_base 31415926000 %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-readobj -macho-segment %t | FileCheck %s
# RUN: not lld -flavor darwin -arch x86_64 -image_base 0x31415926530 %s >/dev/null 2> %t
# RUN: FileCheck < %t %s --check-prefix=CHECK-ERROR-MISPAGED
Modified: lld/trunk/test/mach-o/interposing-section.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/interposing-section.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/interposing-section.yaml (original)
+++ lld/trunk/test/mach-o/interposing-section.yaml Thu Aug 11 13:08:59 2016
@@ -1,5 +1,5 @@
# RUN: lld -flavor darwin -arch x86_64 %s %p/Inputs/interposing-section.yaml \
-# RUN: -dylib -o %t %p/Inputs/libSystem.yaml
+# RUN: -dylib -o %t %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-objdump -private-headers %t | FileCheck %s
#
# RUN: lld -flavor darwin -arch x86_64 %s -r -o %t1
Modified: lld/trunk/test/mach-o/lazy-bind-x86_64.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/lazy-bind-x86_64.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/lazy-bind-x86_64.yaml (original)
+++ lld/trunk/test/mach-o/lazy-bind-x86_64.yaml Thu Aug 11 13:08:59 2016
@@ -3,7 +3,7 @@
# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s \
# RUN: %p/Inputs/lazy-bind-x86_64.yaml %p/Inputs/lazy-bind-x86_64-2.yaml \
# RUN: %p/Inputs/lazy-bind-x86_64-3.yaml -o %t \
-# RUN: %p/Inputs/libSystem.yaml
+# RUN: %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-objdump -lazy-bind %t | FileCheck %s
# RUN: llvm-nm -m %t | FileCheck --check-prefix=CHECK-NM %s
# RUN: llvm-objdump -disassemble %t | FileCheck --check-prefix=CHECK-HELPERS %s
Modified: lld/trunk/test/mach-o/library-order.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/library-order.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/library-order.yaml (original)
+++ lld/trunk/test/mach-o/library-order.yaml Thu Aug 11 13:08:59 2016
@@ -1,5 +1,5 @@
# RUN: lld -flavor darwin -arch x86_64 %p/Inputs/libfoo.a %s -o %t \
-# RUN: %p/Inputs/libSystem.yaml
+# RUN: %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-nm -m -n %t | FileCheck %s
#
# Test that if library is before object file on command line, it still is used.
Modified: lld/trunk/test/mach-o/library-rescan.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/library-rescan.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/library-rescan.yaml (original)
+++ lld/trunk/test/mach-o/library-rescan.yaml Thu Aug 11 13:08:59 2016
@@ -1,5 +1,5 @@
# RUN: lld -flavor darwin -arch x86_64 %p/Inputs/libfoo.a %p/Inputs/libbar.a \
-# RUN: %s -o %t %p/Inputs/libSystem.yaml
+# RUN: %s -o %t %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-nm -m -n %t | FileCheck %s
#
# Test that static libraries are automatically rescanned (bar needs foo).
Modified: lld/trunk/test/mach-o/mh_bundle_header.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/mh_bundle_header.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/mh_bundle_header.yaml (original)
+++ lld/trunk/test/mach-o/mh_bundle_header.yaml Thu Aug 11 13:08:59 2016
@@ -1,5 +1,5 @@
-# RUN: lld -flavor darwin -arch x86_64 %s -bundle -o %t %p/Inputs/libSystem.yaml && llvm-nm -m -n %t | FileCheck %s
-# RUN: lld -flavor darwin -arch x86_64 %s -bundle -dead_strip -o %t %p/Inputs/libSystem.yaml && llvm-nm -m -n %t | FileCheck %s
+# RUN: lld -flavor darwin -arch x86_64 %s -bundle -o %t %p/Inputs/x86_64/libSystem.yaml && llvm-nm -m -n %t | FileCheck %s
+# RUN: lld -flavor darwin -arch x86_64 %s -bundle -dead_strip -o %t %p/Inputs/x86_64/libSystem.yaml && llvm-nm -m -n %t | FileCheck %s
#
# Test that __mh_bundle_header symbol is available for bundles
#
Modified: lld/trunk/test/mach-o/mh_dylib_header.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/mh_dylib_header.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/mh_dylib_header.yaml (original)
+++ lld/trunk/test/mach-o/mh_dylib_header.yaml Thu Aug 11 13:08:59 2016
@@ -1,4 +1,4 @@
-# RUN: lld -flavor darwin -arch x86_64 %s -dylib -o %t %p/Inputs/libSystem.yaml
+# RUN: lld -flavor darwin -arch x86_64 %s -dylib -o %t %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-nm -m -n %t | FileCheck %s
#
# Test that __mh_dylib_header symbol is available for dylibs
Modified: lld/trunk/test/mach-o/objc_export_list.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/objc_export_list.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/objc_export_list.yaml (original)
+++ lld/trunk/test/mach-o/objc_export_list.yaml Thu Aug 11 13:08:59 2016
@@ -1,5 +1,5 @@
# RUN: lld -flavor darwin -arch x86_64 -dylib %s -o %t \
-# RUN: -exported_symbol .objc_class_name_Foo %p/Inputs/libSystem.yaml
+# RUN: -exported_symbol .objc_class_name_Foo %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-nm -m %t | FileCheck %s
#
# Test that exported objc classes can be specificed using old naming
Modified: lld/trunk/test/mach-o/order_file-basic.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/order_file-basic.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/order_file-basic.yaml (original)
+++ lld/trunk/test/mach-o/order_file-basic.yaml Thu Aug 11 13:08:59 2016
@@ -1,4 +1,4 @@
-# RUN: lld -flavor darwin -arch x86_64 %s %p/Inputs/libSystem.yaml \
+# RUN: lld -flavor darwin -arch x86_64 %s %p/Inputs/x86_64/libSystem.yaml \
# RUN: -order_file %p/Inputs/order_file-basic.order \
# RUN: -force_load %p/Inputs/libfoo.a -o %t
# RUN: llvm-nm -m -n %t | FileCheck %s
Modified: lld/trunk/test/mach-o/parse-data-in-code-armv7.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/parse-data-in-code-armv7.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/parse-data-in-code-armv7.yaml (original)
+++ lld/trunk/test/mach-o/parse-data-in-code-armv7.yaml Thu Aug 11 13:08:59 2016
@@ -1,6 +1,6 @@
# RUN: lld -flavor darwin -arch armv7 -r -print_atoms %s -o %t | FileCheck %s
# RUN: lld -flavor darwin -arch armv7 -r -print_atoms %t -o %t2 | FileCheck %s
-# RUN: lld -flavor darwin -arch armv7 -dylib %s -o %t3.dylib %p/Inputs/libSystem.yaml \
+# RUN: lld -flavor darwin -arch armv7 -dylib %s -o %t3.dylib %p/Inputs/x86_64/libSystem.yaml \
# RUN: && llvm-objdump -macho -private-headers %t3.dylib | FileCheck --check-prefix=CHECK2 %s
#
# Test parsing LC_DATA_IN_CODE
Modified: lld/trunk/test/mach-o/rpath.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/rpath.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/rpath.yaml (original)
+++ lld/trunk/test/mach-o/rpath.yaml Thu Aug 11 13:08:59 2016
@@ -1,6 +1,6 @@
# Check we handle -rpath correctly:
# RUN: lld -flavor darwin -arch x86_64 -rpath @loader_path/../Frameworks \
-# RUN: %p/Inputs/libSystem.yaml %s -o %t
+# RUN: %p/Inputs/x86_64/libSystem.yaml %s -o %t
# RUN: llvm-objdump -private-headers %t | FileCheck %s --check-prefix=CHECK-BINARY-WRITE
--- !mach-o
Modified: lld/trunk/test/mach-o/sectalign.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/sectalign.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/sectalign.yaml (original)
+++ lld/trunk/test/mach-o/sectalign.yaml Thu Aug 11 13:08:59 2016
@@ -1,6 +1,6 @@
# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -dylib \
# RUN: -sectalign __DATA __custom 0x800 -sectalign __TEXT __text 0x400 \
-# RUN: %p/Inputs/libSystem.yaml -o %t \
+# RUN: %p/Inputs/x86_64/libSystem.yaml -o %t \
# RUN: && llvm-readobj -sections %t | FileCheck %s
#
# Test -sectalign option on __text and a custom section.
Modified: lld/trunk/test/mach-o/sectattrs.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/sectattrs.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/sectattrs.yaml (original)
+++ lld/trunk/test/mach-o/sectattrs.yaml Thu Aug 11 13:08:59 2016
@@ -1,5 +1,5 @@
# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -dylib \
-# RUN: %p/Inputs/libSystem.yaml -o %t \
+# RUN: %p/Inputs/x86_64/libSystem.yaml -o %t \
# RUN: && llvm-objdump -private-headers %t | FileCheck %s
#
Modified: lld/trunk/test/mach-o/source-version.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/source-version.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/source-version.yaml (original)
+++ lld/trunk/test/mach-o/source-version.yaml Thu Aug 11 13:08:59 2016
@@ -1,5 +1,5 @@
# RUN: not lld -flavor darwin -arch x86_64 -source_version 10.blah %s -o %t 2>&1 | FileCheck %s --check-prefix=ERROR
-# RUN: lld -flavor darwin -arch x86_64 -source_version 10.1.2.3.4 %s -o %t -dylib %p/Inputs/libSystem.yaml && llvm-objdump -private-headers %t | FileCheck %s
+# RUN: lld -flavor darwin -arch x86_64 -source_version 10.1.2.3.4 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml && llvm-objdump -private-headers %t | FileCheck %s
--- !mach-o
arch: x86_64
Modified: lld/trunk/test/mach-o/stack-size.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/stack-size.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/stack-size.yaml (original)
+++ lld/trunk/test/mach-o/stack-size.yaml Thu Aug 11 13:08:59 2016
@@ -1,6 +1,6 @@
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.9 %s -o %t %p/Inputs/libSystem.yaml
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.9 %s -o %t %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-objdump -private-headers %t | FileCheck --check-prefix=CHECK-DEFAULT %s
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.9 %s -o %t -stack_size 31415926000 %p/Inputs/libSystem.yaml
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.9 %s -o %t -stack_size 31415926000 %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-objdump -private-headers %t | FileCheck --check-prefix=CHECK-EXPLICIT %s
# RUN: not lld -flavor darwin -arch x86_64 -stack_size 0x31415926530 %s >/dev/null 2> %t
# RUN: FileCheck < %t %s --check-prefix=CHECK-ERROR-MISPAGED
Modified: lld/trunk/test/mach-o/twolevel_namespace_undef_dynamic_lookup.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/twolevel_namespace_undef_dynamic_lookup.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/twolevel_namespace_undef_dynamic_lookup.yaml (original)
+++ lld/trunk/test/mach-o/twolevel_namespace_undef_dynamic_lookup.yaml Thu Aug 11 13:08:59 2016
@@ -1,4 +1,4 @@
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.9 -twolevel_namespace -undefined dynamic_lookup %s -o %t %p/Inputs/libSystem.yaml
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.9 -twolevel_namespace -undefined dynamic_lookup %s -o %t %p/Inputs/x86_64/libSystem.yaml
#
# Sanity check '-twolevel_namespace -undefined dynamic_lookup'.
# This should pass without error, even though '_bar' is undefined.
Modified: lld/trunk/test/mach-o/twolevel_namespace_undef_warning_suppress.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/twolevel_namespace_undef_warning_suppress.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/twolevel_namespace_undef_warning_suppress.yaml (original)
+++ lld/trunk/test/mach-o/twolevel_namespace_undef_warning_suppress.yaml Thu Aug 11 13:08:59 2016
@@ -1,6 +1,6 @@
-# RUN: not lld -flavor darwin -arch x86_64 -macosx_version_min 10.9 -twolevel_namespace -undefined warning %s -o %t %p/Inputs/libSystem.yaml 2>&1 | \
+# RUN: not lld -flavor darwin -arch x86_64 -macosx_version_min 10.9 -twolevel_namespace -undefined warning %s -o %t %p/Inputs/x86_64/libSystem.yaml 2>&1 | \
# RUN: FileCheck --check-prefix=CHECK-WARNING %s
-# RUN: not lld -flavor darwin -arch x86_64 -macosx_version_min 10.9 -twolevel_namespace -undefined suppress %s -o %t %p/Inputs/libSystem.yaml 2>&1 | \
+# RUN: not lld -flavor darwin -arch x86_64 -macosx_version_min 10.9 -twolevel_namespace -undefined suppress %s -o %t %p/Inputs/x86_64/libSystem.yaml 2>&1 | \
# RUN: FileCheck --check-prefix=CHECK-SUPPRESS %s
--- !native
Modified: lld/trunk/test/mach-o/unwind-info-simple-arm64.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/unwind-info-simple-arm64.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/unwind-info-simple-arm64.yaml (original)
+++ lld/trunk/test/mach-o/unwind-info-simple-arm64.yaml Thu Aug 11 13:08:59 2016
@@ -1,5 +1,5 @@
# RUN: lld -flavor darwin -arch arm64 -o %t %s \
-# RUN: %p/Inputs/unwind-info-simple-arm64.yaml -e _main %p/Inputs/libSystem.yaml
+# RUN: %p/Inputs/unwind-info-simple-arm64.yaml -e _main %p/Inputs/arm64/libSystem.yaml
# RUN: llvm-objdump -unwind-info %t | FileCheck %s
--- !mach-o
Modified: lld/trunk/test/mach-o/unwind-info-simple-x86_64.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/unwind-info-simple-x86_64.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/unwind-info-simple-x86_64.yaml (original)
+++ lld/trunk/test/mach-o/unwind-info-simple-x86_64.yaml Thu Aug 11 13:08:59 2016
@@ -1,4 +1,4 @@
-# RUN: lld -flavor darwin -arch x86_64 %s -o %t -e _main %p/Inputs/libSystem.yaml
+# RUN: lld -flavor darwin -arch x86_64 %s -o %t -e _main %p/Inputs/x86_64/libSystem.yaml
# RUN: llvm-objdump -unwind-info %t | FileCheck %s
# CHECK: Contents of __unwind_info section:
Modified: lld/trunk/test/mach-o/upward-dylib-load-command.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/upward-dylib-load-command.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/upward-dylib-load-command.yaml (original)
+++ lld/trunk/test/mach-o/upward-dylib-load-command.yaml Thu Aug 11 13:08:59 2016
@@ -1,7 +1,7 @@
# RUN: lld -flavor darwin -arch x86_64 -dylib %p/Inputs/bar.yaml \
-# RUN: -install_name /usr/lib/libbar.dylib %p/Inputs/libSystem.yaml -o %t1.dylib
+# RUN: -install_name /usr/lib/libbar.dylib %p/Inputs/x86_64/libSystem.yaml -o %t1.dylib
# RUN: lld -flavor darwin -arch x86_64 -dylib %s -upward_library %t1.dylib \
-# RUN: -install_name /usr/lib/libfoo.dylib %p/Inputs/libSystem.yaml -o %t
+# RUN: -install_name /usr/lib/libfoo.dylib %p/Inputs/x86_64/libSystem.yaml -o %t
# RUN: llvm-objdump -private-headers %t | FileCheck %s
#
#
Modified: lld/trunk/test/mach-o/version-min-load-command.yaml
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/test/mach-o/version-min-load-command.yaml?rev=278372&r1=278371&r2=278372&view=diff
==============================================================================
--- lld/trunk/test/mach-o/version-min-load-command.yaml (original)
+++ lld/trunk/test/mach-o/version-min-load-command.yaml Thu Aug 11 13:08:59 2016
@@ -1,11 +1,11 @@
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/libSystem.yaml && llvm-objdump -private-headers %t | FileCheck %s
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/libSystem.yaml 2>&1 | FileCheck %s --check-prefix=WARNING
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/libSystem.yaml -static -version_load_command && llvm-objdump -private-headers %t | FileCheck %s
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/libSystem.yaml -no_version_load_command && llvm-objdump -private-headers %t | FileCheck %s --check-prefix=NO_VERSION_MIN
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/libSystem.yaml -static -version_load_command -no_version_load_command && llvm-objdump -private-headers %t | FileCheck %s --check-prefix=NO_VERSION_MIN
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/libSystem.yaml -static && llvm-objdump -private-headers %t | FileCheck %s --check-prefix=NO_VERSION_MIN
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml && llvm-objdump -private-headers %t | FileCheck %s
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml 2>&1 | FileCheck %s --check-prefix=WARNING
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static -version_load_command && llvm-objdump -private-headers %t | FileCheck %s
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -no_version_load_command && llvm-objdump -private-headers %t | FileCheck %s --check-prefix=NO_VERSION_MIN
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static -version_load_command -no_version_load_command && llvm-objdump -private-headers %t | FileCheck %s --check-prefix=NO_VERSION_MIN
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml -static && llvm-objdump -private-headers %t | FileCheck %s --check-prefix=NO_VERSION_MIN
-# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 -sdk_version 10.9 %s -o %t -dylib %p/Inputs/libSystem.yaml && llvm-objdump -private-headers %t | FileCheck %s --check-prefix=SDK_VERSION
+# RUN: lld -flavor darwin -arch x86_64 -macosx_version_min 10.8 -sdk_version 10.9 %s -o %t -dylib %p/Inputs/x86_64/libSystem.yaml && llvm-objdump -private-headers %t | FileCheck %s --check-prefix=SDK_VERSION
--- !mach-o
arch: x86_64
More information about the llvm-commits
mailing list