Upgrade obstack to gcc-12.2.0 am: 6705a37140 am: 6fe362eb62 am: fb65f424b1
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>
diff --git a/METADATA b/METADATA
index 3d6465d..1e1d850 100644
--- a/METADATA
+++ b/METADATA
@@ -7,13 +7,13 @@
}
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
