-
Notifications
You must be signed in to change notification settings - Fork 205
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make native mvnd only require glibc 2.12 on ubuntu 22.04
The modern glibc from 2.34 had two breaking changes: move all api in
lib{pthread,dl,rt}.so into libc.so, new static start up code breaking
the runtime compatibility for old glibc (<2.34). See
https://developers.redhat.com/articles/2021/12/17/why-glibc-234-removed-libpthread
for more info.
This commit has 3 changes to overcome thes changes.
- override gcc path to redefine glibc symbols on the fly in the
generated .o by graalvm when linking
- provide a dynamic startup code to support both old and modern runtime
glibc
- add needed dynamic libraries: lib{pthread,rt,dl}.so.- Loading branch information
Showing
8 changed files
with
226 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| /* ref: | ||
| * https://elixir.bootlin.com/glibc/glibc-2.37.9000/source/csu/libc-start.c | ||
| * https://elixir.bootlin.com/glibc/glibc-2.33.9000/source/csu/elf-init.c#L68 | ||
| */ | ||
|
|
||
| #define _GNU_SOURCE | ||
| #include <dlfcn.h> | ||
| #include <stdint.h> | ||
|
|
||
| __asm__(".symver dlsym,dlsym@GLIBC_2.2.5"); | ||
| __asm__(".symver dlvsym,dlvsym@GLIBC_2.2.5"); | ||
|
|
||
| /* These magic symbols are provided by the linker. */ | ||
| extern void (*__init_array_start[])(int, char **, char **) __attribute__ ((visibility ("hidden"))); | ||
| extern void (*__init_array_end[])(int, char **, char **) __attribute__ ((visibility ("hidden"))); | ||
| extern void _init(void); | ||
|
|
||
| /* These functions are passed to __libc_start_main by the startup code. | ||
| These get statically linked into each program. */ | ||
|
|
||
| static void | ||
| __libc_csu_init(const int argc, char **const argv, char **const envp) | ||
| { | ||
| _init(); | ||
| const __auto_type size = __init_array_end - __init_array_start; | ||
| for (__auto_type i = 0; i < size; ++i) | ||
| (*__init_array_start[i])(argc, argv, envp); | ||
| } | ||
|
|
||
| int | ||
| __dynamic_libc_start_main(int (*const main)(int, char **, char **), | ||
| const int argc, | ||
| char ** const argv, | ||
| __typeof(&__libc_csu_init) init, | ||
| void (*const fini)(void), | ||
| void (*const rtld_fini)(void), | ||
| void (*const stack_end)) | ||
| { | ||
| _Static_assert(sizeof(uintptr_t) >= sizeof(void*), "uintptr_t should contain a object pointer"); | ||
| _Static_assert(sizeof(uintptr_t) <= sizeof(&__dynamic_libc_start_main), "function pointer should contain an uintptr_t"); | ||
|
|
||
| const __auto_type __libc_start_main = (__typeof(&__dynamic_libc_start_main))(uintptr_t)dlsym(RTLD_DEFAULT, "__libc_start_main"); | ||
| if (!dlvsym(RTLD_DEFAULT, "__libc_start_main", "GLIBC_2.34")) { | ||
| init = &__libc_csu_init; // old runtime glibc, ver < 2.34 | ||
| } | ||
|
|
||
| return __libc_start_main(main, argc, argv, init, fini, rtld_fini, stack_end); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| #!/bin/sh | ||
|
|
||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
|
|
||
| set -euf | ||
|
|
||
| base=$(dirname -- "$0") | ||
|
|
||
| # fix glibc api version on the fly | ||
| find . -name '*.o' -print0 | xargs -0rn 1 objcopy --redefine-syms="$base/glibc.redef" | ||
|
|
||
| exec gcc "$@" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| # KIND, either express or implied. See the License for the | ||
| # specific language governing permissions and limitations | ||
| # under the License. | ||
| __libc_start_main __dynamic_libc_start_main | ||
| clock_gettime clock_gettime@GLIBC_2.2.5 | ||
| dlopen dlopen@GLIBC_2.2.5 | ||
| dlsym dlsym@GLIBC_2.2.5 | ||
| memcpy memcpy@GLIBC_2.2.5 | ||
| posix_spawn posix_spawn@GLIBC_2.2.5 | ||
| pthread_attr_getguardsize pthread_attr_getguardsize@GLIBC_2.2.5 | ||
| pthread_attr_getstack pthread_attr_getstack@GLIBC_2.2.5 | ||
| pthread_attr_setstacksize pthread_attr_setstacksize@GLIBC_2.2.5 | ||
| pthread_condattr_setclock pthread_condattr_setclock@GLIBC_2.3.3 | ||
| pthread_create pthread_create@GLIBC_2.2.5 | ||
| pthread_getattr_np pthread_getattr_np@GLIBC_2.2.5 | ||
| pthread_join pthread_join@GLIBC_2.2.5 | ||
| pthread_kill pthread_kill@GLIBC_2.2.5 | ||
| pthread_setname_np pthread_setname_np@GLIBC_2.12 | ||
| sem_destroy sem_destroy@GLIBC_2.2.5 | ||
| sem_init sem_init@GLIBC_2.2.5 | ||
| sem_post sem_post@GLIBC_2.2.5 | ||
| sem_wait sem_wait@GLIBC_2.2.5 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters