This is an archive of the discontinued LLVM Phabricator instance.

Differential D99673

[TextAPI] Add support for arm64_32
ClosedPublic

Authored by drodriguez on Mar 31 2021, 10:14 AM.

Details

Reviewers
cishida
ributzka
t.p.northover
Commits
rGf5c9db97a8a2: [TextAPI] Add support for arm64_32
Summary

Add a new architecture definition for arm64_32. The change should allow
the new architecture arm64_32 to be recognized in several pieces of
code, TextAPI parsing one of them. llvm-lipo will also recognize the
architecture and will allow lipoing files with this architecture without
failing.

Includes a small test that the architecture is recognized by llvm-nm.

Diff Detail

Event Timeline

drodriguez created this revision.Mar 31 2021, 10:14 AM
Herald added a subscriber: kristof.beyls. · View Herald TranscriptMar 31 2021, 10:14 AM
drodriguez requested review of this revision.Mar 31 2021, 10:14 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 31 2021, 10:14 AM
Herald added a subscriber: llvm-commits. · View Herald Transcript
Harbormaster completed remote builds in B96558: Diff 334480.Mar 31 2021, 10:45 AM
cishida accepted this revision.Apr 1 2021, 1:42 PM

LGTM

This revision is now accepted and ready to land.Apr 1 2021, 1:42 PM
Closed by commit rGf5c9db97a8a2: [TextAPI] Add support for arm64_32 (authored by drodriguez, committed by smeenai). · Explain WhyApr 1 2021, 5:19 PM
This revision was automatically updated to reflect the committed changes.
smeenai added a commit: rGf5c9db97a8a2: [TextAPI] Add support for arm64_32.

Revision Contents

PathSize
llvm/
include/
llvm/
TextAPI/
MachO/
6 lines
test/
Object/
Inputs/
13 lines
8 lines

Diff 334867

llvm/include/llvm/TextAPI/MachO/Architecture.def

Show All 31 Lines
ARCHINFO(armv7em, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V7EM, 32) ARCHINFO(armv7em, MachO::CPU_TYPE_ARM, MachO::CPU_SUBTYPE_ARM_V7EM, 32)
/// ///
/// ARM64 architectures sorted by cpu sub type id. /// ARM64 architectures sorted by cpu sub type id.
/// ///
ARCHINFO(arm64, MachO::CPU_TYPE_ARM64, MachO::CPU_SUBTYPE_ARM64_ALL, 64) ARCHINFO(arm64, MachO::CPU_TYPE_ARM64, MachO::CPU_SUBTYPE_ARM64_ALL, 64)
ARCHINFO(arm64e, MachO::CPU_TYPE_ARM64, MachO::CPU_SUBTYPE_ARM64E, 64) ARCHINFO(arm64e, MachO::CPU_TYPE_ARM64, MachO::CPU_SUBTYPE_ARM64E, 64)
///
/// ARM64_32 architectures sorted by cpu sub type id
///
ARCHINFO(arm64_32, MachO::CPU_TYPE_ARM64_32, MachO::CPU_SUBTYPE_ARM64_32_V8, 32)

llvm/test/Object/Inputs/tapi-v4-watchos.tbd

  • This file was added.
--- !tapi-tbd
tbd-version: 4
targets: [ armv7k-watchos-simulator, arm64_32-watchos-simulator ]
uuids:
- target: armv7k-watchos-simulator
value: 00000000-0000-0000-0000-000000000000
- target: arm64_32-watchos-simulator
value: 11111111-1111-1111-1111-111111111111
install-name: '/u/l/libFoo.dylib'
current-version: 1
exports:
- targets: [ armv7k-watchos-simulator, arm64_32-watchos-simulator ]
symbols: [ '_sym1' ]

llvm/test/Object/nm-tapi.test

RUN: llvm-nm %p/Inputs/tapi-v1.tbd 2>&1\ RUN: llvm-nm %p/Inputs/tapi-v1.tbd 2>&1\
RUN: | FileCheck %s -check-prefix V1 RUN: | FileCheck %s -check-prefix V1
RUN: llvm-nm %p/Inputs/tapi-v2.tbd \ RUN: llvm-nm %p/Inputs/tapi-v2.tbd \
RUN: | FileCheck %s -check-prefix V2 RUN: | FileCheck %s -check-prefix V2
RUN: llvm-nm --add-inlinedinfo --arch=x86_64 %p/Inputs/tapi-v3.tbd \ RUN: llvm-nm --add-inlinedinfo --arch=x86_64 %p/Inputs/tapi-v3.tbd \
RUN: | FileCheck %s -check-prefix V3 RUN: | FileCheck %s -check-prefix V3
RUN: llvm-nm %p/Inputs/tapi-v4.tbd \ RUN: llvm-nm %p/Inputs/tapi-v4.tbd \
RUN: | FileCheck %s -check-prefix V4 RUN: | FileCheck %s -check-prefix V4
RUN: llvm-nm %p/Inputs/tapi-v4-watchos.tbd \
RUN: | FileCheck %s -check-prefix V4-WATCH
V1: /u/l/libfoo.dylib (for architecture armv7): V1: /u/l/libfoo.dylib (for architecture armv7):
V1-NEXT: 00000000 S _sym V1-NEXT: 00000000 S _sym
V1: /u/l/libfoo.dylib (for architecture armv7s): V1: /u/l/libfoo.dylib (for architecture armv7s):
V1-NEXT: 00000000 S _sym V1-NEXT: 00000000 S _sym
V2: /u/l/libfoo.dylib (for architecture armv7): V2: /u/l/libfoo.dylib (for architecture armv7):
V2-NEXT: 00000000 S _sym1 V2-NEXT: 00000000 S _sym1
V2-NEXT: 00000000 S _sym2 V2-NEXT: 00000000 S _sym2
Show All 30 Lines
V4: /u/l/libFoo.dylib (for architecture i386): V4: /u/l/libFoo.dylib (for architecture i386):
V4-NEXT: 00000000 S _sym1 V4-NEXT: 00000000 S _sym1
V4-NEXT: 00000000 W _sym2 V4-NEXT: 00000000 W _sym2
V4-NEXT: 00000000 S _sym3 V4-NEXT: 00000000 S _sym3
V4-NEXT: 00000000 S _sym4 V4-NEXT: 00000000 S _sym4
V4: /u/l/libFoo.dylib (for architecture x86_64): V4: /u/l/libFoo.dylib (for architecture x86_64):
V4-NEXT: 0000000000000000 S _sym3 V4-NEXT: 0000000000000000 S _sym3
V4-NEXT: 0000000000000000 S _sym4 V4-NEXT: 0000000000000000 S _sym4
V4-WATCH: /u/l/libFoo.dylib (for architecture armv7k)
V4-WATCH-NEXT: 00000000 S _sym1
V4-WATCH: /u/l/libFoo.dylib (for architecture arm64_32)
V4-WATCH-NEXT: 00000000 S _sym1