diff options
author | Sadaf Ebrahimi <sadafebrahimi@google.com> | 2022-10-10 17:41:40 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-10-10 17:41:40 +0000 |
commit | 9a2c12f67dfc425b788c970dc70f439fbe1ab9c6 (patch) | |
tree | c31d05681f41f9c7c074038d1ce61e1ad01930a6 | |
parent | 6140fdc649c236722cfa1cb6e2d3bd40013bf0cf (diff) | |
parent | fb65f424b1edf1875e09ceda618510b191ab9765 (diff) | |
download | obstack-master.tar.gz |
Upgrade obstack to gcc-12.2.0 am: 6705a37140 am: 6fe362eb62 am: fb65f424b1HEADandroid-u-rb-dp-10-gplandroid-u-qpr3-beta-2-gplandroid-u-qpr3-beta-1-gplandroid-u-qpr2-beta-3-gplandroid-u-qpr2-beta-2-gplandroid-u-qpr2-beta-1-gplandroid-u-qpr1-beta-2.2-gplandroid-u-qpr1-beta-1-gplandroid-15-dp-2-gplandroid-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000mastermainandroid14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseandroid-u-rb-dp-10-gpl
Original change: https://android-review.googlesource.com/c/platform/external/obstack/+/2243174
Change-Id: I77f9ee963327bb2eb072631702eed2a6c74b7884
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | METADATA | 8 | ||||
-rw-r--r-- | include/obstack.h | 8 | ||||
-rw-r--r-- | libiberty/obstack.c | 2 |
3 files changed, 9 insertions, 9 deletions
@@ -7,13 +7,13 @@ third_party { } url { type: ARCHIVE - value: "https://github.com/gcc-mirror/gcc/archive/releases/gcc-11.2.0.tar.gz" + value: "https://github.com/gcc-mirror/gcc/archive/releases/gcc-12.2.0.tar.gz" } - version: "releases/gcc-11.2.0" + version: "releases/gcc-12.2.0" license_type: RESTRICTED last_upgrade_date { - year: 2021 + year: 2022 month: 10 - day: 1 + day: 7 } } diff --git a/include/obstack.h b/include/obstack.h index a6eb6c9..ee71cda 100644 --- a/include/obstack.h +++ b/include/obstack.h @@ -1,5 +1,5 @@ /* obstack.h - object stack macros - Copyright (C) 1988-2021 Free Software Foundation, Inc. + Copyright (C) 1988-2022 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -137,9 +137,9 @@ relative to B. Otherwise, use the faster strategy of computing the alignment relative to 0. */ -#define __PTR_ALIGN(B, P, A) \ - __BPTR_ALIGN (sizeof (ptrdiff_t) < sizeof (void *) ? (B) : (char *) 0, \ - P, A) +#define __PTR_ALIGN(B, P, A) \ + (sizeof (ptrdiff_t) < sizeof (void *) ? __BPTR_ALIGN (B, P, A) \ + : (char *) (((ptrdiff_t) (P) + (A)) & ~(A))) #ifndef __attribute_pure__ # if defined __GNUC_MINOR__ && __GNUC__ * 1000 + __GNUC_MINOR__ >= 2096 diff --git a/libiberty/obstack.c b/libiberty/obstack.c index aa1173d..1415a87 100644 --- a/libiberty/obstack.c +++ b/libiberty/obstack.c @@ -1,5 +1,5 @@ /* obstack.c - subroutines used implicitly by object stack macros - Copyright (C) 1988-2021 Free Software Foundation, Inc. + Copyright (C) 1988-2022 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or |