diff options
| author | George Burgess IV <gbiv@google.com> | 2021-04-15 20:52:51 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-15 20:52:51 +0000 |
| commit | 96f0822a64d8c0e7925a414e3c6afd65847ff393 (patch) | |
| tree | 72fab28769307d4c47d929b8b44554e817a14399 | |
| parent | 79e79951db534d674f29d10f8d7ee0edaed2c25e (diff) | |
| parent | 88f565a6710683a3009772115fd5cd752b66d371 (diff) | |
| download | x86_64-linux-glibc2.17-4.8-96f0822a64d8c0e7925a414e3c6afd65847ff393.tar.gz | |
Merge "glibc: allow use of SO_REUSEPORT" am: 01ea25b951 am: bed46c9109 am: 394f3eb833 am: 88f565a671android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-release
Original change: https://android-review.googlesource.com/c/platform/prebuilts/gcc/linux-x86/host/x86_64-linux-glibc2.17-4.8/+/1673806
Change-Id: I0a0c3c19dc93cee77e225ab9d0d1a62cf2afdf03
| -rw-r--r-- | sysroot-patches/glibc-2.17-enable-so-reuse-port.patch | 16 | ||||
| -rw-r--r-- | sysroot/usr/include/asm-generic/socket.h | 2 |
2 files changed, 17 insertions, 1 deletions
diff --git a/sysroot-patches/glibc-2.17-enable-so-reuse-port.patch b/sysroot-patches/glibc-2.17-enable-so-reuse-port.patch new file mode 100644 index 0000000..700c6a1 --- /dev/null +++ b/sysroot-patches/glibc-2.17-enable-so-reuse-port.patch @@ -0,0 +1,16 @@ +b/159148705 . All of our supported users have Linux 3.9+ at this point, so +SO_REUSEPORT should be made available to anyone who wants to use it. + +diff --git a/sysroot/usr/include/asm-generic/socket.h b/sysroot/usr/include/asm-generic/socket.h +index 2d32d07..316f06c 100644 +--- a/sysroot/usr/include/asm-generic/socket.h ++++ b/sysroot/usr/include/asm-generic/socket.h +@@ -22,7 +22,7 @@ + #define SO_PRIORITY 12 + #define SO_LINGER 13 + #define SO_BSDCOMPAT 14 +-/* To add :#define SO_REUSEPORT 15 */ ++#define SO_REUSEPORT 15 + + #ifndef SO_PASSCRED /* powerpc only differs in these */ + #define SO_PASSCRED 16 diff --git a/sysroot/usr/include/asm-generic/socket.h b/sysroot/usr/include/asm-generic/socket.h index 2d32d07..316f06c 100644 --- a/sysroot/usr/include/asm-generic/socket.h +++ b/sysroot/usr/include/asm-generic/socket.h @@ -22,7 +22,7 @@ #define SO_PRIORITY 12 #define SO_LINGER 13 #define SO_BSDCOMPAT 14 -/* To add :#define SO_REUSEPORT 15 */ +#define SO_REUSEPORT 15 #ifndef SO_PASSCRED /* powerpc only differs in these */ #define SO_PASSCRED 16 |