blob: 4337307223a1ce08f1b38a854553fe7e74307862 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
|
Index: golang/src/runtime/os_solaris.c
===================================================================
--- golang.orig/src/runtime/os_solaris.c
+++ golang/src/runtime/os_solaris.c
@@ -13,38 +13,38 @@
#pragma dynexport runtime·etext _etext
#pragma dynexport runtime·edata _edata
-#pragma dynimport libc·___errno ___errno "libc.so"
-#pragma dynimport libc·clock_gettime clock_gettime "libc.so"
-#pragma dynimport libc·close close "libc.so"
-#pragma dynimport libc·exit exit "libc.so"
-#pragma dynimport libc·fstat fstat "libc.so"
-#pragma dynimport libc·getcontext getcontext "libc.so"
-#pragma dynimport libc·getrlimit getrlimit "libc.so"
-#pragma dynimport libc·malloc malloc "libc.so"
-#pragma dynimport libc·mmap mmap "libc.so"
-#pragma dynimport libc·munmap munmap "libc.so"
-#pragma dynimport libc·open open "libc.so"
-#pragma dynimport libc·pthread_attr_destroy pthread_attr_destroy "libc.so"
-#pragma dynimport libc·pthread_attr_getstack pthread_attr_getstack "libc.so"
-#pragma dynimport libc·pthread_attr_init pthread_attr_init "libc.so"
-#pragma dynimport libc·pthread_attr_setdetachstate pthread_attr_setdetachstate "libc.so"
-#pragma dynimport libc·pthread_attr_setstack pthread_attr_setstack "libc.so"
-#pragma dynimport libc·pthread_create pthread_create "libc.so"
-#pragma dynimport libc·raise raise "libc.so"
-#pragma dynimport libc·read read "libc.so"
-#pragma dynimport libc·select select "libc.so"
-#pragma dynimport libc·sched_yield sched_yield "libc.so"
-#pragma dynimport libc·sem_init sem_init "libc.so"
-#pragma dynimport libc·sem_post sem_post "libc.so"
-#pragma dynimport libc·sem_reltimedwait_np sem_reltimedwait_np "libc.so"
-#pragma dynimport libc·sem_wait sem_wait "libc.so"
-#pragma dynimport libc·setitimer setitimer "libc.so"
-#pragma dynimport libc·sigaction sigaction "libc.so"
-#pragma dynimport libc·sigaltstack sigaltstack "libc.so"
-#pragma dynimport libc·sigprocmask sigprocmask "libc.so"
-#pragma dynimport libc·sysconf sysconf "libc.so"
-#pragma dynimport libc·usleep usleep "libc.so"
-#pragma dynimport libc·write write "libc.so"
+#pragma dynimport libc·___errno ___errno "libc.so.1"
+#pragma dynimport libc·clock_gettime clock_gettime "libc.so.1"
+#pragma dynimport libc·close close "libc.so.1"
+#pragma dynimport libc·exit exit "libc.so.1"
+#pragma dynimport libc·fstat fstat "libc.so.1"
+#pragma dynimport libc·getcontext getcontext "libc.so.1"
+#pragma dynimport libc·getrlimit getrlimit "libc.so.1"
+#pragma dynimport libc·malloc malloc "libc.so.1"
+#pragma dynimport libc·mmap mmap "libc.so.1"
+#pragma dynimport libc·munmap munmap "libc.so.1"
+#pragma dynimport libc·open open "libc.so.1"
+#pragma dynimport libc·pthread_attr_destroy pthread_attr_destroy "libc.so.1"
+#pragma dynimport libc·pthread_attr_getstack pthread_attr_getstack "libc.so.1"
+#pragma dynimport libc·pthread_attr_init pthread_attr_init "libc.so.1"
+#pragma dynimport libc·pthread_attr_setdetachstate pthread_attr_setdetachstate "libc.so.1"
+#pragma dynimport libc·pthread_attr_setstack pthread_attr_setstack "libc.so.1"
+#pragma dynimport libc·pthread_create pthread_create "libc.so.1"
+#pragma dynimport libc·raise raise "libc.so.1"
+#pragma dynimport libc·read read "libc.so.1"
+#pragma dynimport libc·select select "libc.so.1"
+#pragma dynimport libc·sched_yield sched_yield "libc.so.1"
+#pragma dynimport libc·sem_init sem_init "libc.so.1"
+#pragma dynimport libc·sem_post sem_post "libc.so.1"
+#pragma dynimport libc·sem_reltimedwait_np sem_reltimedwait_np "libc.so.1"
+#pragma dynimport libc·sem_wait sem_wait "libc.so.1"
+#pragma dynimport libc·setitimer setitimer "libc.so.1"
+#pragma dynimport libc·sigaction sigaction "libc.so.1"
+#pragma dynimport libc·sigaltstack sigaltstack "libc.so.1"
+#pragma dynimport libc·sigprocmask sigprocmask "libc.so.1"
+#pragma dynimport libc·sysconf sysconf "libc.so.1"
+#pragma dynimport libc·usleep usleep "libc.so.1"
+#pragma dynimport libc·write write "libc.so.1"
extern uintptr libc·___errno;
extern uintptr libc·clock_gettime;
Index: golang/src/runtime/syscall_solaris.c
===================================================================
--- golang.orig/src/runtime/syscall_solaris.c
+++ golang/src/runtime/syscall_solaris.c
@@ -2,22 +2,22 @@
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
-#pragma dynimport libc·chdir chdir "libc.so"
-#pragma dynimport libc·chroot chroot "libc.so"
-#pragma dynimport libc·close close "libc.so"
-#pragma dynimport libc·dlclose dlclose "libc.so"
-#pragma dynimport libc·dlopen dlopen "libc.so"
-#pragma dynimport libc·dlsym dlsym "libc.so"
-#pragma dynimport libc·execve execve "libc.so"
-#pragma dynimport libc·fcntl fcntl "libc.so"
-#pragma dynimport libc·gethostname gethostname "libc.so"
-#pragma dynimport libc·ioctl ioctl "libc.so"
-#pragma dynimport libc·pipe pipe "libc.so"
-#pragma dynimport libc·setgid setgid "libc.so"
-#pragma dynimport libc·setgroups setgroups "libc.so"
-#pragma dynimport libc·setsid setsid "libc.so"
-#pragma dynimport libc·setuid setuid "libc.so"
-#pragma dynimport libc·setpgid setsid "libc.so"
-#pragma dynimport libc·syscall syscall "libc.so"
-#pragma dynimport libc·forkx forkx "libc.so"
-#pragma dynimport libc·wait4 wait4 "libc.so"
+#pragma dynimport libc·chdir chdir "libc.so.1"
+#pragma dynimport libc·chroot chroot "libc.so.1"
+#pragma dynimport libc·close close "libc.so.1"
+#pragma dynimport libc·dlclose dlclose "libc.so.1"
+#pragma dynimport libc·dlopen dlopen "libc.so.1"
+#pragma dynimport libc·dlsym dlsym "libc.so.1"
+#pragma dynimport libc·execve execve "libc.so.1"
+#pragma dynimport libc·fcntl fcntl "libc.so.1"
+#pragma dynimport libc·gethostname gethostname "libc.so.1"
+#pragma dynimport libc·ioctl ioctl "libc.so.1"
+#pragma dynimport libc·pipe pipe "libc.so.1"
+#pragma dynimport libc·setgid setgid "libc.so.1"
+#pragma dynimport libc·setgroups setgroups "libc.so.1"
+#pragma dynimport libc·setsid setsid "libc.so.1"
+#pragma dynimport libc·setuid setuid "libc.so.1"
+#pragma dynimport libc·setpgid setsid "libc.so.1"
+#pragma dynimport libc·syscall syscall "libc.so.1"
+#pragma dynimport libc·forkx forkx "libc.so.1"
+#pragma dynimport libc·wait4 wait4 "libc.so.1"
Index: golang/src/runtime/netpoll_solaris.c
===================================================================
--- golang.orig/src/runtime/netpoll_solaris.c
+++ golang/src/runtime/netpoll_solaris.c
@@ -68,11 +68,11 @@
// again we know for sure we are always talking about the same file
// descriptor and can safely access the data we want (the event set).
-#pragma dynimport libc·fcntl fcntl "libc.so"
-#pragma dynimport libc·port_create port_create "libc.so"
-#pragma dynimport libc·port_associate port_associate "libc.so"
-#pragma dynimport libc·port_dissociate port_dissociate "libc.so"
-#pragma dynimport libc·port_getn port_getn "libc.so"
+#pragma dynimport libc·fcntl fcntl "libc.so.1"
+#pragma dynimport libc·port_create port_create "libc.so.1"
+#pragma dynimport libc·port_associate port_associate "libc.so.1"
+#pragma dynimport libc·port_dissociate port_dissociate "libc.so.1"
+#pragma dynimport libc·port_getn port_getn "libc.so.1"
extern uintptr libc·fcntl;
extern uintptr libc·port_create;
extern uintptr libc·port_associate;
Index: golang/src/syscall/zsyscall_solaris_amd64.go
===================================================================
--- golang.orig/src/syscall/zsyscall_solaris_amd64.go
+++ golang/src/syscall/zsyscall_solaris_amd64.go
@@ -6,8 +6,8 @@ package syscall
import "unsafe"
var (
- modlibc = newLazySO("libc.so")
- modlibsocket = newLazySO("libsocket.so")
+ modlibc = newLazySO("libc.so.1")
+ modlibsocket = newLazySO("libsocket.so.1")
procgetgroups = modlibc.NewProc("getgroups")
procsetgroups = modlibc.NewProc("setgroups")
|
