Skip to content

Commit

Permalink
[lld,test] Convert text files from CRLF to LF
Browse files Browse the repository at this point in the history
  • Loading branch information
MaskRay committed May 3, 2024
1 parent 528f5ba commit 55ad294
Show file tree
Hide file tree
Showing 4 changed files with 116 additions and 116 deletions.
100 changes: 50 additions & 50 deletions lld/test/COFF/Inputs/combined-resources.rc
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
#include "windows.h"
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
myaccelerators ACCELERATORS
{
"^C", 999, VIRTKEY, ALT
"D", 1100, VIRTKEY, CONTROL, SHIFT
"^R", 444, ASCII, NOINVERT
}
cursor BITMAP "combined-resources-cursor.bmp"
okay BITMAP "combined-resources-okay.bmp"
14432 MENU
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
{
MENUITEM "yu", 100
MENUITEM "shala", 101
MENUITEM "kaoya", 102
}
testdialog DIALOG 10, 10, 200, 300
STYLE WS_POPUP | WS_BORDER
CAPTION "Test"
{
CTEXT "Continue:", 1, 10, 10, 230, 14
PUSHBUTTON "&OK", 2, 66, 134, 161, 13
}
12 ACCELERATORS
{
"X", 164, VIRTKEY, ALT
"H", 5678, VIRTKEY, CONTROL, SHIFT
"^R", 444, ASCII, NOINVERT
}
"eat" MENU
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS
{
MENUITEM "fish", 100
MENUITEM "salad", 101
MENUITEM "duck", 102
}
myresource stringarray {
"this is a user defined resource\0",
"it contains many strings\0",
}
#include "windows.h"

LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

myaccelerators ACCELERATORS
{
"^C", 999, VIRTKEY, ALT
"D", 1100, VIRTKEY, CONTROL, SHIFT
"^R", 444, ASCII, NOINVERT
}

cursor BITMAP "combined-resources-cursor.bmp"
okay BITMAP "combined-resources-okay.bmp"

14432 MENU
LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
{
MENUITEM "yu", 100
MENUITEM "shala", 101
MENUITEM "kaoya", 102
}

testdialog DIALOG 10, 10, 200, 300
STYLE WS_POPUP | WS_BORDER
CAPTION "Test"
{
CTEXT "Continue:", 1, 10, 10, 230, 14
PUSHBUTTON "&OK", 2, 66, 134, 161, 13
}

12 ACCELERATORS
{
"X", 164, VIRTKEY, ALT
"H", 5678, VIRTKEY, CONTROL, SHIFT
"^R", 444, ASCII, NOINVERT
}

"eat" MENU
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS
{
MENUITEM "fish", 100
MENUITEM "salad", 101
MENUITEM "duck", 102
}


myresource stringarray {
"this is a user defined resource\0",
"it contains many strings\0",
}
4 changes: 2 additions & 2 deletions lld/test/COFF/pdb-type-server-invalid-signature.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
# RUN: cp %S/Inputs/pdb-diff-cl.pdb %T
# RUN: lld-link %t3.obj -out:%t3.exe -debug -pdb:%t3.pdb -nodefaultlib -entry:main 2>&1 | FileCheck -DMSG=%errc_ENOENT %s -check-prefix=INVALID-PATH -allow-empty

# INVALID-PATH-NOT: warning: Cannot use debug info for '{{.*}}3.obj' [LNK4099]
# INVALID-PATH-NOT: failed to load reference 'c:\some_invalid_path_AABB98765\pdb-diff-cl.pdb': [[MSG]]
# INVALID-PATH-NOT: warning: Cannot use debug info for '{{.*}}3.obj' [LNK4099]
# INVALID-PATH-NOT: failed to load reference 'c:\some_invalid_path_AABB98765\pdb-diff-cl.pdb': [[MSG]]

--- !COFF
header:
Expand Down
92 changes: 46 additions & 46 deletions lld/test/COFF/pdb_char8_t.ll
Original file line number Diff line number Diff line change
@@ -1,46 +1,46 @@
; REQUIRES: x86
; RUN: llc -mtriple x86_64-windows-msvc -filetype obj -o %t.obj %s
; RUN: lld-link /nodefaultlib /noentry /dll /debug /out:%t.exe /pdb:%t.pdb %t.obj
; RUN: llvm-pdbutil dump -type-index=0x7c %t.pdb

; CHECK: 0x007C (char8_t) | char8_t

define dso_local i32 @main() #0 !dbg !9 {
%1 = alloca i32, align 4
%2 = alloca i8, align 1
store i32 0, ptr %1, align 4
call void @llvm.dbg.declare(metadata ptr %2, metadata !13, metadata !DIExpression()), !dbg !15
store i8 0, ptr %2, align 1, !dbg !15
%3 = load i8, ptr %2, align 1, !dbg !16
%4 = zext i8 %3 to i32, !dbg !16
ret i32 %4, !dbg !16
}

; Function Attrs: nofree nosync nounwind readnone speculatable willreturn
declare void @llvm.dbg.declare(metadata, metadata, metadata) #1

attributes #0 = { mustprogress noinline norecurse nounwind optnone uwtable "frame-pointer"="none" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
attributes #1 = { nofree nosync nounwind readnone speculatable willreturn }

!llvm.dbg.cu = !{!0}
!llvm.linker.options = !{}
!llvm.module.flags = !{!3, !4, !5, !6, !7}
!llvm.ident = !{!8}

!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 13.0.0", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, splitDebugInlining: false, nameTableKind: None)
!1 = !DIFile(filename: "pdb_char8_t.cpp", directory: "C:\\src", checksumkind: CSK_MD5, checksum: "a00748d29f4e59003184945cd3e17ee3")
!2 = !{}
!3 = !{i32 2, !"CodeView", i32 1}
!4 = !{i32 2, !"Debug Info Version", i32 3}
!5 = !{i32 1, !"wchar_size", i32 2}
!6 = !{i32 7, !"PIC Level", i32 2}
!7 = !{i32 7, !"uwtable", i32 1}
!8 = !{!"clang version 13.0.0"}
!9 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 1, type: !10, scopeLine: 2, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
!10 = !DISubroutineType(types: !11)
!11 = !{!12}
!12 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
!13 = !DILocalVariable(name: "local", scope: !9, file: !1, line: 3, type: !14)
!14 = !DIBasicType(name: "char8_t", size: 8, encoding: DW_ATE_UTF)
!15 = !DILocation(line: 3, scope: !9)
!16 = !DILocation(line: 4, scope: !9)
; REQUIRES: x86
; RUN: llc -mtriple x86_64-windows-msvc -filetype obj -o %t.obj %s
; RUN: lld-link /nodefaultlib /noentry /dll /debug /out:%t.exe /pdb:%t.pdb %t.obj
; RUN: llvm-pdbutil dump -type-index=0x7c %t.pdb

; CHECK: 0x007C (char8_t) | char8_t

define dso_local i32 @main() #0 !dbg !9 {
%1 = alloca i32, align 4
%2 = alloca i8, align 1
store i32 0, ptr %1, align 4
call void @llvm.dbg.declare(metadata ptr %2, metadata !13, metadata !DIExpression()), !dbg !15
store i8 0, ptr %2, align 1, !dbg !15
%3 = load i8, ptr %2, align 1, !dbg !16
%4 = zext i8 %3 to i32, !dbg !16
ret i32 %4, !dbg !16
}

; Function Attrs: nofree nosync nounwind readnone speculatable willreturn
declare void @llvm.dbg.declare(metadata, metadata, metadata) #1

attributes #0 = { mustprogress noinline norecurse nounwind optnone uwtable "frame-pointer"="none" "min-legal-vector-width"="0" "no-trapping-math"="true" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "tune-cpu"="generic" }
attributes #1 = { nofree nosync nounwind readnone speculatable willreturn }

!llvm.dbg.cu = !{!0}
!llvm.linker.options = !{}
!llvm.module.flags = !{!3, !4, !5, !6, !7}
!llvm.ident = !{!8}

!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 13.0.0", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, splitDebugInlining: false, nameTableKind: None)
!1 = !DIFile(filename: "pdb_char8_t.cpp", directory: "C:\\src", checksumkind: CSK_MD5, checksum: "a00748d29f4e59003184945cd3e17ee3")
!2 = !{}
!3 = !{i32 2, !"CodeView", i32 1}
!4 = !{i32 2, !"Debug Info Version", i32 3}
!5 = !{i32 1, !"wchar_size", i32 2}
!6 = !{i32 7, !"PIC Level", i32 2}
!7 = !{i32 7, !"uwtable", i32 1}
!8 = !{!"clang version 13.0.0"}
!9 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 1, type: !10, scopeLine: 2, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
!10 = !DISubroutineType(types: !11)
!11 = !{!12}
!12 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
!13 = !DILocalVariable(name: "local", scope: !9, file: !1, line: 3, type: !14)
!14 = !DIBasicType(name: "char8_t", size: 8, encoding: DW_ATE_UTF)
!15 = !DILocation(line: 3, scope: !9)
!16 = !DILocation(line: 4, scope: !9)
36 changes: 18 additions & 18 deletions lld/test/ELF/dynamic-list-cpp.s
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
# REQUIRES: x86

## Confirm both mangled and unmangled names may appear in
## the --dynamic-list file.

# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o

# RUN: echo '{ _Z1fv; extern "C++" { "g()"; }; };' > %t.list
# RUN: ld.lld -pie --dynamic-list %t.list %t.o -o %t
# RUN: llvm-readelf --dyn-syms %t | FileCheck %s

# CHECK: Symbol table '.dynsym' contains 3 entries:
# CHECK: _Z1fv
# CHECK-NEXT: _Z1gv

.globl _Z1fv, _Z1gv
_Z1fv:
_Z1gv:
# REQUIRES: x86

## Confirm both mangled and unmangled names may appear in
## the --dynamic-list file.

# RUN: llvm-mc -filetype=obj -triple=x86_64 %s -o %t.o

# RUN: echo '{ _Z1fv; extern "C++" { "g()"; }; };' > %t.list
# RUN: ld.lld -pie --dynamic-list %t.list %t.o -o %t
# RUN: llvm-readelf --dyn-syms %t | FileCheck %s

# CHECK: Symbol table '.dynsym' contains 3 entries:
# CHECK: _Z1fv
# CHECK-NEXT: _Z1gv

.globl _Z1fv, _Z1gv
_Z1fv:
_Z1gv:

0 comments on commit 55ad294

Please sign in to comment.